Mon, 31 Oct 2011 06:32:01 +0000
Remove the silly destroy argument from purple_account_set_password and
purple_keyring_set_password. Make the password argument const. All
code paths would free the password immediately, anyway. Except maybe
the KWallet plugin, but that really appears totally broken, to be
honest.
| 13593 | 1 | /* |
| 15884 | 2 | * Purple's oscar protocol plugin |
| 13593 | 3 | * This file is the legal property of its developers. |
| 4 | * Please see the AUTHORS file distributed alongside this file. | |
| 5 | * | |
| 6 | * This library is free software; you can redistribute it and/or | |
| 7 | * modify it under the terms of the GNU Lesser General Public | |
| 8 | * License as published by the Free Software Foundation; either | |
| 9 | * version 2 of the License, or (at your option) any later version. | |
| 10 | * | |
| 11 | * This library is distributed in the hope that it will be useful, | |
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 14 | * Lesser General Public License for more details. | |
| 15 | * | |
| 16 | * You should have received a copy of the GNU Lesser General Public | |
| 17 | * License along with this library; if not, write to the Free Software | |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19110
diff
changeset
|
18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 13593 | 19 | */ |
| 20 | ||
| 21 | #include "oscar.h" | |
| 22 | ||
|
34019
bc87f596bb4c
compile, appears to work too.
Ka-Hing Cheung <khc@pidgin.im>
parents:
24659
diff
changeset
|
23 | #include "account.h" |
| 13593 | 24 | #include "eventloop.h" |
|
14171
351b731b9553
[gaim-migrate @ 16743]
Mark Doliner <markdoliner@pidgin.im>
parents:
14048
diff
changeset
|
25 | #include "proxy.h" |
| 13593 | 26 | |
| 27 | #ifndef _WIN32 | |
| 28 | #include <netdb.h> | |
| 29 | #include <sys/socket.h> | |
| 30 | #include <netinet/in.h> | |
| 31 | #endif | |
| 32 | ||
| 33 | #ifdef _WIN32 | |
| 34 | #include "win32dep.h" | |
| 35 | #endif | |
| 36 | ||
| 37 | /** | |
| 38 | * This sends a channel 1 SNAC containing the FLAP version. | |
| 39 | * The FLAP version is sent by itself at the beginning of every | |
| 40 | * connection to a FLAP server. It is always the very first | |
| 41 | * packet sent by both the server and the client after the SYN, | |
| 42 | * SYN/ACK, ACK handshake. | |
| 43 | */ | |
| 44 | void | |
| 45 | flap_connection_send_version(OscarData *od, FlapConnection *conn) | |
| 46 | { | |
| 47 | FlapFrame *frame; | |
| 48 | ||
| 49 | frame = flap_frame_new(od, 0x01, 4); | |
|
27367
82426b0162d4
Make a function static and add two comments
Mark Doliner <markdoliner@pidgin.im>
parents:
25519
diff
changeset
|
50 | byte_stream_put32(&frame->data, 0x00000001); /* FLAP Version */ |
| 13593 | 51 | flap_connection_send(conn, frame); |
| 52 | } | |
| 53 | ||
| 54 | /** | |
|
15150
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
55 | * This sends a channel 1 FLAP containing the FLAP version and |
| 13593 | 56 | * the authentication cookie. This is sent when connecting to |
| 57 | * any FLAP server after the initial connection to the auth | |
| 58 | * server. It is always the very first packet sent by both the | |
| 59 | * server and the client after the SYN, SYN/ACK, ACK handshake. | |
| 60 | */ | |
| 61 | void | |
| 62 | flap_connection_send_version_with_cookie(OscarData *od, FlapConnection *conn, guint16 length, const guint8 *chipsahoy) | |
| 63 | { | |
| 64 | FlapFrame *frame; | |
|
17443
bae8548d98b3
Cleanup and simplification of some tlvlist stuff in the oscar protocol.
Mark Doliner <markdoliner@pidgin.im>
parents:
17280
diff
changeset
|
65 | GSList *tlvlist = NULL; |
| 13593 | 66 | |
| 67 | frame = flap_frame_new(od, 0x01, 4 + 2 + 2 + length); | |
|
27367
82426b0162d4
Make a function static and add two comments
Mark Doliner <markdoliner@pidgin.im>
parents:
25519
diff
changeset
|
68 | byte_stream_put32(&frame->data, 0x00000001); /* FLAP Version */ |
|
17443
bae8548d98b3
Cleanup and simplification of some tlvlist stuff in the oscar protocol.
Mark Doliner <markdoliner@pidgin.im>
parents:
17280
diff
changeset
|
69 | aim_tlvlist_add_raw(&tlvlist, 0x0006, length, chipsahoy); |
|
bae8548d98b3
Cleanup and simplification of some tlvlist stuff in the oscar protocol.
Mark Doliner <markdoliner@pidgin.im>
parents:
17280
diff
changeset
|
70 | aim_tlvlist_write(&frame->data, &tlvlist); |
|
bae8548d98b3
Cleanup and simplification of some tlvlist stuff in the oscar protocol.
Mark Doliner <markdoliner@pidgin.im>
parents:
17280
diff
changeset
|
71 | aim_tlvlist_free(tlvlist); |
| 13593 | 72 | |
| 73 | flap_connection_send(conn, frame); | |
| 74 | } | |
| 75 | ||
|
27385
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
76 | void |
|
28815
207193c7d909
oscar: Fix 'Allow multiple simultaenous logins' with clientLogin.
Paul Aurich <darkrain42@pidgin.im>
parents:
28804
diff
changeset
|
77 | flap_connection_send_version_with_cookie_and_clientinfo(OscarData *od, FlapConnection *conn, guint16 length, const guint8 *chipsahoy, ClientInfo *ci, gboolean allow_multiple_logins) |
|
27385
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
78 | { |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
79 | FlapFrame *frame; |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
80 | GSList *tlvlist = NULL; |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
81 | |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
82 | frame = flap_frame_new(od, 0x01, 1152 + length); |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
83 | |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
84 | byte_stream_put32(&frame->data, 0x00000001); /* FLAP Version */ |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
85 | aim_tlvlist_add_raw(&tlvlist, 0x0006, length, chipsahoy); |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
86 | |
|
27688
8c89470bfe9d
Oh, we don't need a special ui_info field for the AIM clientstring
Mark Doliner <markdoliner@pidgin.im>
parents:
27687
diff
changeset
|
87 | if (ci->clientstring != NULL) |
|
8c89470bfe9d
Oh, we don't need a special ui_info field for the AIM clientstring
Mark Doliner <markdoliner@pidgin.im>
parents:
27687
diff
changeset
|
88 | aim_tlvlist_add_str(&tlvlist, 0x0003, ci->clientstring); |
|
8c89470bfe9d
Oh, we don't need a special ui_info field for the AIM clientstring
Mark Doliner <markdoliner@pidgin.im>
parents:
27687
diff
changeset
|
89 | else { |
|
8c89470bfe9d
Oh, we don't need a special ui_info field for the AIM clientstring
Mark Doliner <markdoliner@pidgin.im>
parents:
27687
diff
changeset
|
90 | gchar *clientstring = oscar_get_clientstring(); |
|
27687
f46b6b5c25e1
Use the ui_info hash table instead of prefs when passing the clientstring
Mark Doliner <markdoliner@pidgin.im>
parents:
27635
diff
changeset
|
91 | aim_tlvlist_add_str(&tlvlist, 0x0003, clientstring); |
|
27688
8c89470bfe9d
Oh, we don't need a special ui_info field for the AIM clientstring
Mark Doliner <markdoliner@pidgin.im>
parents:
27687
diff
changeset
|
92 | g_free(clientstring); |
|
8c89470bfe9d
Oh, we don't need a special ui_info field for the AIM clientstring
Mark Doliner <markdoliner@pidgin.im>
parents:
27687
diff
changeset
|
93 | } |
|
27385
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
94 | aim_tlvlist_add_16(&tlvlist, 0x0017, (guint16)ci->major); |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
95 | aim_tlvlist_add_16(&tlvlist, 0x0018, (guint16)ci->minor); |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
96 | aim_tlvlist_add_16(&tlvlist, 0x0019, (guint16)ci->point); |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
97 | aim_tlvlist_add_16(&tlvlist, 0x001a, (guint16)ci->build); |
|
28815
207193c7d909
oscar: Fix 'Allow multiple simultaenous logins' with clientLogin.
Paul Aurich <darkrain42@pidgin.im>
parents:
28804
diff
changeset
|
98 | aim_tlvlist_add_8(&tlvlist, 0x004a, (allow_multiple_logins ? 0x01 : 0x03)); |
|
27385
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
99 | |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
100 | aim_tlvlist_write(&frame->data, &tlvlist); |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
101 | |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
102 | aim_tlvlist_free(tlvlist); |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
103 | |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
104 | flap_connection_send(conn, frame); |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
105 | } |
|
cd0d721fec8f
Check in code that connects to oscar using clientLogin. This is the
Mark Doliner <markdoliner@pidgin.im>
parents:
27382
diff
changeset
|
106 | |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
107 | static struct rateclass * |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
108 | flap_connection_get_rateclass(FlapConnection *conn, guint16 family, guint16 subtype) |
|
15152
6eb1a86c7729
[gaim-migrate @ 17876]
Mark Doliner <markdoliner@pidgin.im>
parents:
15151
diff
changeset
|
109 | { |
|
15168
4e604d302448
[gaim-migrate @ 17892]
Mark Doliner <markdoliner@pidgin.im>
parents:
15167
diff
changeset
|
110 | gconstpointer key; |
|
29261
e39105368ed6
Put all our rateclass members in a single hash table instead of in one
Mark Doliner <markdoliner@pidgin.im>
parents:
29260
diff
changeset
|
111 | gpointer rateclass; |
|
15168
4e604d302448
[gaim-migrate @ 17892]
Mark Doliner <markdoliner@pidgin.im>
parents:
15167
diff
changeset
|
112 | |
|
4e604d302448
[gaim-migrate @ 17892]
Mark Doliner <markdoliner@pidgin.im>
parents:
15167
diff
changeset
|
113 | key = GUINT_TO_POINTER((family << 16) + subtype); |
|
29261
e39105368ed6
Put all our rateclass members in a single hash table instead of in one
Mark Doliner <markdoliner@pidgin.im>
parents:
29260
diff
changeset
|
114 | rateclass = g_hash_table_lookup(conn->rateclass_members, key); |
|
e39105368ed6
Put all our rateclass members in a single hash table instead of in one
Mark Doliner <markdoliner@pidgin.im>
parents:
29260
diff
changeset
|
115 | if (rateclass != NULL) |
|
e39105368ed6
Put all our rateclass members in a single hash table instead of in one
Mark Doliner <markdoliner@pidgin.im>
parents:
29260
diff
changeset
|
116 | return rateclass; |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
117 | |
|
29259
87336a2f470d
optimization to the oscar prpl to use less memory, care of Shaun Lindsay
Mark Doliner <markdoliner@pidgin.im>
parents:
29258
diff
changeset
|
118 | return conn->default_rateclass; |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
119 | } |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
120 | |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
121 | /* |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
122 | * Attempt to calculate what our new current average would be if we |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
123 | * were to send a SNAC in this rateclass at the given time. |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
124 | */ |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
125 | static guint32 |
|
15172
8032180fbca3
[gaim-migrate @ 17896]
Mark Doliner <markdoliner@pidgin.im>
parents:
15169
diff
changeset
|
126 | rateclass_get_new_current(FlapConnection *conn, struct rateclass *rateclass, struct timeval *now) |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
127 | { |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
128 | unsigned long timediff; /* In milliseconds */ |
|
28804
24b032f5d478
oscar: Update the rate calculations based on OSCAR docs.
Aman Gupta <aman@tmm1.net>
parents:
27813
diff
changeset
|
129 | guint32 current; |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
130 | |
|
29258
05ad83b03e68
We were using this formula from before the documentation was public, and
Mark Doliner <markdoliner@pidgin.im>
parents:
28815
diff
changeset
|
131 | /* This formula is documented at http://dev.aol.com/aim/oscar/#RATELIMIT */ |
|
15172
8032180fbca3
[gaim-migrate @ 17896]
Mark Doliner <markdoliner@pidgin.im>
parents:
15169
diff
changeset
|
132 | timediff = (now->tv_sec - rateclass->last.tv_sec) * 1000 + (now->tv_usec - rateclass->last.tv_usec) / 1000; |
|
28804
24b032f5d478
oscar: Update the rate calculations based on OSCAR docs.
Aman Gupta <aman@tmm1.net>
parents:
27813
diff
changeset
|
133 | current = ((rateclass->current * (rateclass->windowsize - 1)) + timediff) / rateclass->windowsize; |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
134 | |
|
28804
24b032f5d478
oscar: Update the rate calculations based on OSCAR docs.
Aman Gupta <aman@tmm1.net>
parents:
27813
diff
changeset
|
135 | return MIN(current, rateclass->max); |
|
15152
6eb1a86c7729
[gaim-migrate @ 17876]
Mark Doliner <markdoliner@pidgin.im>
parents:
15151
diff
changeset
|
136 | } |
|
6eb1a86c7729
[gaim-migrate @ 17876]
Mark Doliner <markdoliner@pidgin.im>
parents:
15151
diff
changeset
|
137 | |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
138 | /* |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
139 | * Attempt to send the contents of a given queue |
|
23888
415748b9d4f7
This looks good to me. I'm thinking we probably don't want to get
Mark Doliner <markdoliner@pidgin.im>
parents:
23886
diff
changeset
|
140 | * |
|
415748b9d4f7
This looks good to me. I'm thinking we probably don't want to get
Mark Doliner <markdoliner@pidgin.im>
parents:
23886
diff
changeset
|
141 | * @return TRUE if the queue was completely emptied or was initially |
|
415748b9d4f7
This looks good to me. I'm thinking we probably don't want to get
Mark Doliner <markdoliner@pidgin.im>
parents:
23886
diff
changeset
|
142 | * empty; FALSE if rate limiting prevented it from being |
|
415748b9d4f7
This looks good to me. I'm thinking we probably don't want to get
Mark Doliner <markdoliner@pidgin.im>
parents:
23886
diff
changeset
|
143 | * emptied. |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
144 | */ |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
145 | static gboolean flap_connection_send_snac_queue(FlapConnection *conn, struct timeval now, GQueue *queue) |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
146 | { |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
147 | while (!g_queue_is_empty(queue)) |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
148 | { |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
149 | QueuedSnac *queued_snac; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
150 | struct rateclass *rateclass; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
151 | |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
152 | queued_snac = g_queue_peek_head(queue); |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
153 | |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
154 | rateclass = flap_connection_get_rateclass(conn, queued_snac->family, queued_snac->subtype); |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
155 | if (rateclass != NULL) |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
156 | { |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
157 | guint32 new_current; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
158 | |
|
15172
8032180fbca3
[gaim-migrate @ 17896]
Mark Doliner <markdoliner@pidgin.im>
parents:
15169
diff
changeset
|
159 | new_current = rateclass_get_new_current(conn, rateclass, &now); |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
160 | |
|
28804
24b032f5d478
oscar: Update the rate calculations based on OSCAR docs.
Aman Gupta <aman@tmm1.net>
parents:
27813
diff
changeset
|
161 | if (rateclass->dropping_snacs || new_current <= rateclass->alert) |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
162 | /* Not ready to send this SNAC yet--keep waiting. */ |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
163 | return FALSE; |
|
23888
415748b9d4f7
This looks good to me. I'm thinking we probably don't want to get
Mark Doliner <markdoliner@pidgin.im>
parents:
23886
diff
changeset
|
164 | |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
165 | rateclass->current = new_current; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
166 | rateclass->last.tv_sec = now.tv_sec; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
167 | rateclass->last.tv_usec = now.tv_usec; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
168 | } |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
169 | |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
170 | flap_connection_send(conn, queued_snac->frame); |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
171 | g_free(queued_snac); |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
172 | g_queue_pop_head(queue); |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
173 | } |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
174 | |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
175 | /* We emptied the queue */ |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
176 | return TRUE; |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
177 | } |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
178 | |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
179 | static gboolean flap_connection_send_queued(gpointer data) |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
180 | { |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
181 | FlapConnection *conn; |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
182 | struct timeval now; |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
183 | |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
184 | conn = data; |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
185 | gettimeofday(&now, NULL); |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
186 | |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
187 | purple_debug_info("oscar", "Attempting to send %u queued SNACs and %u queued low-priority SNACs for %p\n", |
|
24317
f51faf0f2f36
Don't use g_queue_get_length because it requires glib 2.4
Mark Doliner <markdoliner@pidgin.im>
parents:
23889
diff
changeset
|
188 | (conn->queued_snacs ? conn->queued_snacs->length : 0), |
|
f51faf0f2f36
Don't use g_queue_get_length because it requires glib 2.4
Mark Doliner <markdoliner@pidgin.im>
parents:
23889
diff
changeset
|
189 | (conn->queued_lowpriority_snacs ? conn->queued_lowpriority_snacs->length : 0), |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
190 | conn); |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
191 | if (!conn->queued_snacs || flap_connection_send_snac_queue(conn, now, conn->queued_snacs)) { |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
192 | if (!conn->queued_lowpriority_snacs || flap_connection_send_snac_queue(conn, now, conn->queued_lowpriority_snacs)) { |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
193 | /* Both queues emptied. */ |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
194 | conn->queued_timeout = 0; |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
195 | return FALSE; |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
196 | } |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
197 | } |
|
23888
415748b9d4f7
This looks good to me. I'm thinking we probably don't want to get
Mark Doliner <markdoliner@pidgin.im>
parents:
23886
diff
changeset
|
198 | |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
199 | /* We couldn't send all our SNACs. Keep trying */ |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
200 | return TRUE; |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
201 | } |
|
15152
6eb1a86c7729
[gaim-migrate @ 17876]
Mark Doliner <markdoliner@pidgin.im>
parents:
15151
diff
changeset
|
202 | |
| 13593 | 203 | /** |
|
15150
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
204 | * This sends a channel 2 FLAP containing a SNAC. The SNAC family and |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
205 | * subtype are looked up in the rate info for this connection, and if |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
206 | * sending this SNAC will induce rate limiting then we delay sending |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
207 | * of the SNAC by putting it into an outgoing holding queue. |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
208 | * |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
209 | * @param data The optional bytestream that makes up the data portion |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
210 | * of this SNAC. For empty SNACs this should be NULL. |
|
23888
415748b9d4f7
This looks good to me. I'm thinking we probably don't want to get
Mark Doliner <markdoliner@pidgin.im>
parents:
23886
diff
changeset
|
211 | * @param high_priority If TRUE, the SNAC will be queued normally if |
|
31517
3e5023a642b4
Send keepalives for all types of network connections. Will hopefully
Mark Doliner <markdoliner@pidgin.im>
parents:
30885
diff
changeset
|
212 | * needed. If FALSE, it will be queued separately, to be sent |
|
23888
415748b9d4f7
This looks good to me. I'm thinking we probably don't want to get
Mark Doliner <markdoliner@pidgin.im>
parents:
23886
diff
changeset
|
213 | * only if all high priority SNACs have been sent. |
|
15150
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
214 | */ |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
215 | void |
|
30678
78aacd015725
Removed unused "flags" parameter.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
30668
diff
changeset
|
216 | flap_connection_send_snac_with_priority(OscarData *od, FlapConnection *conn, guint16 family, const guint16 subtype, aim_snacid_t snacid, ByteStream *data, gboolean high_priority) |
|
15150
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
217 | { |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
218 | FlapFrame *frame; |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
219 | guint32 length; |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
220 | gboolean enqueue = FALSE; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
221 | struct rateclass *rateclass; |
|
15150
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
222 | |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
223 | length = data != NULL ? data->offset : 0; |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
224 | |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
225 | frame = flap_frame_new(od, 0x02, 10 + length); |
|
30678
78aacd015725
Removed unused "flags" parameter.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
30668
diff
changeset
|
226 | aim_putsnac(&frame->data, family, subtype, snacid); |
|
15150
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
227 | |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
228 | if (length > 0) |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
229 | { |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
230 | byte_stream_rewind(data); |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
231 | byte_stream_putbs(&frame->data, data, length); |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
232 | } |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
233 | |
|
15168
4e604d302448
[gaim-migrate @ 17892]
Mark Doliner <markdoliner@pidgin.im>
parents:
15167
diff
changeset
|
234 | if (conn->queued_timeout != 0) |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
235 | enqueue = TRUE; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
236 | else if ((rateclass = flap_connection_get_rateclass(conn, family, subtype)) != NULL) |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
237 | { |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
238 | struct timeval now; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
239 | guint32 new_current; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
240 | |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
241 | gettimeofday(&now, NULL); |
|
15172
8032180fbca3
[gaim-migrate @ 17896]
Mark Doliner <markdoliner@pidgin.im>
parents:
15169
diff
changeset
|
242 | new_current = rateclass_get_new_current(conn, rateclass, &now); |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
243 | |
|
28804
24b032f5d478
oscar: Update the rate calculations based on OSCAR docs.
Aman Gupta <aman@tmm1.net>
parents:
27813
diff
changeset
|
244 | if (rateclass->dropping_snacs || new_current <= rateclass->alert) |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
245 | { |
|
28804
24b032f5d478
oscar: Update the rate calculations based on OSCAR docs.
Aman Gupta <aman@tmm1.net>
parents:
27813
diff
changeset
|
246 | purple_debug_info("oscar", "Current rate for conn %p would be %u, but we alert at %u; enqueueing\n", conn, new_current, rateclass->alert); |
|
22860
2b0e247173b2
All SNACs on FLAP channel 2 except in the auth family are now sent through
Evan Schoenberg <evands@pidgin.im>
parents:
22622
diff
changeset
|
247 | |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
248 | enqueue = TRUE; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
249 | } |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
250 | else |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
251 | { |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
252 | rateclass->current = new_current; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
253 | rateclass->last.tv_sec = now.tv_sec; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
254 | rateclass->last.tv_usec = now.tv_usec; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
255 | } |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
256 | } |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
257 | |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
258 | if (enqueue) |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
259 | { |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
260 | /* We've been sending too fast, so delay this message */ |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
261 | QueuedSnac *queued_snac; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
262 | |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
263 | queued_snac = g_new(QueuedSnac, 1); |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
264 | queued_snac->family = family; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
265 | queued_snac->subtype = subtype; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
266 | queued_snac->frame = frame; |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
267 | |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
268 | if (high_priority) { |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
269 | if (!conn->queued_snacs) |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
270 | conn->queued_snacs = g_queue_new(); |
|
23888
415748b9d4f7
This looks good to me. I'm thinking we probably don't want to get
Mark Doliner <markdoliner@pidgin.im>
parents:
23886
diff
changeset
|
271 | g_queue_push_tail(conn->queued_snacs, queued_snac); |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
272 | } else { |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
273 | if (!conn->queued_lowpriority_snacs) |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
274 | conn->queued_lowpriority_snacs = g_queue_new(); |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
275 | g_queue_push_tail(conn->queued_lowpriority_snacs, queued_snac); |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
276 | } |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
277 | |
|
15168
4e604d302448
[gaim-migrate @ 17892]
Mark Doliner <markdoliner@pidgin.im>
parents:
15167
diff
changeset
|
278 | if (conn->queued_timeout == 0) |
| 15884 | 279 | conn->queued_timeout = purple_timeout_add(500, flap_connection_send_queued, conn); |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
280 | |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
281 | return; |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
282 | } |
|
15150
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
283 | |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
284 | flap_connection_send(conn, frame); |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
285 | } |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
286 | |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
287 | void |
|
30678
78aacd015725
Removed unused "flags" parameter.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
30668
diff
changeset
|
288 | flap_connection_send_snac(OscarData *od, FlapConnection *conn, guint16 family, const guint16 subtype, aim_snacid_t snacid, ByteStream *data) |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
289 | { |
|
30678
78aacd015725
Removed unused "flags" parameter.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
30668
diff
changeset
|
290 | flap_connection_send_snac_with_priority(od, conn, family, subtype, snacid, data, TRUE); |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
291 | } |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
292 | |
|
15150
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
293 | /** |
|
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
294 | * This sends an empty channel 4 FLAP. This is sent to signify |
| 13593 | 295 | * that we're logging off. This shouldn't really be necessary-- |
| 296 | * usually the AIM server will detect that the TCP connection has | |
| 297 | * been destroyed--but it's good practice. | |
| 298 | */ | |
| 299 | static void | |
| 300 | flap_connection_send_close(OscarData *od, FlapConnection *conn) | |
| 301 | { | |
| 302 | FlapFrame *frame; | |
| 303 | ||
| 304 | frame = flap_frame_new(od, 0x04, 0); | |
| 305 | flap_connection_send(conn, frame); | |
| 306 | } | |
| 307 | ||
| 308 | /** | |
|
15150
c218efb19164
[gaim-migrate @ 17874]
Mark Doliner <markdoliner@pidgin.im>
parents:
15148
diff
changeset
|
309 | * This sends an empty channel 5 FLAP. This is used as a keepalive |
| 13593 | 310 | * packet in FLAP connections. WinAIM 4.x and higher send these |
| 311 | * _every minute_ to keep the connection alive. | |
| 312 | */ | |
| 313 | void | |
| 314 | flap_connection_send_keepalive(OscarData *od, FlapConnection *conn) | |
| 315 | { | |
| 316 | FlapFrame *frame; | |
| 317 | ||
| 318 | frame = flap_frame_new(od, 0x05, 0); | |
| 319 | flap_connection_send(conn, frame); | |
| 320 | ||
| 321 | /* clean out SNACs over 60sec old */ | |
| 322 | aim_cleansnacs(od, 60); | |
| 323 | } | |
| 324 | ||
| 325 | /** | |
| 326 | * Allocate a new empty connection structure. | |
| 327 | * | |
| 328 | * @param od The oscar session associated with this connection. | |
| 329 | * @param type Type of connection to create | |
| 330 | * | |
| 331 | * @return Returns the new connection structure. | |
| 332 | */ | |
| 333 | FlapConnection * | |
| 334 | flap_connection_new(OscarData *od, int type) | |
| 335 | { | |
| 336 | FlapConnection *conn; | |
| 337 | ||
| 338 | conn = g_new0(FlapConnection, 1); | |
| 339 | conn->od = od; | |
| 15884 | 340 | conn->buffer_outgoing = purple_circ_buffer_new(0); |
| 13593 | 341 | conn->fd = -1; |
| 342 | conn->subtype = -1; | |
| 343 | conn->type = type; | |
|
29261
e39105368ed6
Put all our rateclass members in a single hash table instead of in one
Mark Doliner <markdoliner@pidgin.im>
parents:
29260
diff
changeset
|
344 | conn->rateclass_members = g_hash_table_new(g_direct_hash, g_direct_equal); |
| 13593 | 345 | |
|
14410
a5ae93474db6
[gaim-migrate @ 17050]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
346 | od->oscar_connections = g_slist_prepend(od->oscar_connections, conn); |
| 13593 | 347 | |
| 348 | return conn; | |
| 349 | } | |
| 350 | ||
| 351 | /** | |
| 352 | * Close (but not free) a connection. | |
| 353 | * | |
|
14171
351b731b9553
[gaim-migrate @ 16743]
Mark Doliner <markdoliner@pidgin.im>
parents:
14048
diff
changeset
|
354 | * This cancels any currently pending connection attempt, |
|
351b731b9553
[gaim-migrate @ 16743]
Mark Doliner <markdoliner@pidgin.im>
parents:
14048
diff
changeset
|
355 | * closes any open fd and frees the auth cookie. |
| 13593 | 356 | * |
| 357 | * @param conn The connection to close. | |
| 358 | */ | |
| 359 | void | |
| 360 | flap_connection_close(OscarData *od, FlapConnection *conn) | |
| 361 | { | |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
362 | if (conn->connect_data != NULL) |
|
14171
351b731b9553
[gaim-migrate @ 16743]
Mark Doliner <markdoliner@pidgin.im>
parents:
14048
diff
changeset
|
363 | { |
| 15884 | 364 | purple_proxy_connect_cancel(conn->connect_data); |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
365 | conn->connect_data = NULL; |
|
14171
351b731b9553
[gaim-migrate @ 16743]
Mark Doliner <markdoliner@pidgin.im>
parents:
14048
diff
changeset
|
366 | } |
| 13593 | 367 | |
|
29754
f05a8c1637bf
oscar: Fix a race condition that leads to a crash.
Paul Aurich <darkrain42@pidgin.im>
parents:
29261
diff
changeset
|
368 | if (conn->gsc != NULL && conn->gsc->connect_data != NULL) |
|
f05a8c1637bf
oscar: Fix a race condition that leads to a crash.
Paul Aurich <darkrain42@pidgin.im>
parents:
29261
diff
changeset
|
369 | { |
|
f05a8c1637bf
oscar: Fix a race condition that leads to a crash.
Paul Aurich <darkrain42@pidgin.im>
parents:
29261
diff
changeset
|
370 | purple_ssl_close(conn->gsc); |
|
f05a8c1637bf
oscar: Fix a race condition that leads to a crash.
Paul Aurich <darkrain42@pidgin.im>
parents:
29261
diff
changeset
|
371 | conn->gsc = NULL; |
|
f05a8c1637bf
oscar: Fix a race condition that leads to a crash.
Paul Aurich <darkrain42@pidgin.im>
parents:
29261
diff
changeset
|
372 | } |
|
f05a8c1637bf
oscar: Fix a race condition that leads to a crash.
Paul Aurich <darkrain42@pidgin.im>
parents:
29261
diff
changeset
|
373 | |
|
23878
63d4f60097a4
Daniel Atallah pointed out that this was obviously wrong. So we would
Mark Doliner <markdoliner@pidgin.im>
parents:
23082
diff
changeset
|
374 | if (conn->new_conn_data != NULL) |
|
14171
351b731b9553
[gaim-migrate @ 16743]
Mark Doliner <markdoliner@pidgin.im>
parents:
14048
diff
changeset
|
375 | { |
|
351b731b9553
[gaim-migrate @ 16743]
Mark Doliner <markdoliner@pidgin.im>
parents:
14048
diff
changeset
|
376 | if (conn->type == SNAC_FAMILY_CHAT) |
|
351b731b9553
[gaim-migrate @ 16743]
Mark Doliner <markdoliner@pidgin.im>
parents:
14048
diff
changeset
|
377 | { |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
378 | oscar_chat_destroy(conn->new_conn_data); |
|
23879
ba5affe13543
I swear I did this! I must have gotten a little overzealous with the
Mark Doliner <markdoliner@pidgin.im>
parents:
23878
diff
changeset
|
379 | conn->new_conn_data = NULL; |
|
14171
351b731b9553
[gaim-migrate @ 16743]
Mark Doliner <markdoliner@pidgin.im>
parents:
14048
diff
changeset
|
380 | } |
|
351b731b9553
[gaim-migrate @ 16743]
Mark Doliner <markdoliner@pidgin.im>
parents:
14048
diff
changeset
|
381 | } |
| 13593 | 382 | |
|
27382
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
383 | if ((conn->fd >= 0 || conn->gsc != NULL) |
|
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
384 | && conn->type == SNAC_FAMILY_LOCATE) |
|
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
385 | flap_connection_send_close(od, conn); |
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
386 | |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
387 | if (conn->watcher_incoming != 0) |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
388 | { |
| 15884 | 389 | purple_input_remove(conn->watcher_incoming); |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
390 | conn->watcher_incoming = 0; |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
391 | } |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
392 | |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
393 | if (conn->watcher_outgoing != 0) |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
394 | { |
| 15884 | 395 | purple_input_remove(conn->watcher_outgoing); |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
396 | conn->watcher_outgoing = 0; |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
397 | } |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
398 | |
|
27382
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
399 | if (conn->fd >= 0) |
|
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
400 | { |
|
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
401 | close(conn->fd); |
|
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
402 | conn->fd = -1; |
|
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
403 | } |
|
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
404 | |
|
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
405 | if (conn->gsc != NULL) |
|
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
406 | { |
|
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
407 | purple_ssl_close(conn->gsc); |
|
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
408 | conn->gsc = NULL; |
|
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
409 | } |
|
4a4dfc6ad0d6
Stop the watchers before closing the fds
Mark Doliner <markdoliner@pidgin.im>
parents:
27367
diff
changeset
|
410 | |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
411 | g_free(conn->buffer_incoming.data.data); |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
412 | conn->buffer_incoming.data.data = NULL; |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
413 | |
| 15884 | 414 | purple_circ_buffer_destroy(conn->buffer_outgoing); |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
415 | conn->buffer_outgoing = NULL; |
| 13593 | 416 | } |
| 417 | ||
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
418 | /** |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
419 | * Free a FlapFrame |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
420 | * |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
421 | * @param frame The frame to free. |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
422 | */ |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
423 | static void |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
424 | flap_frame_destroy(FlapFrame *frame) |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
425 | { |
|
15168
4e604d302448
[gaim-migrate @ 17892]
Mark Doliner <markdoliner@pidgin.im>
parents:
15167
diff
changeset
|
426 | g_free(frame->data.data); |
|
4e604d302448
[gaim-migrate @ 17892]
Mark Doliner <markdoliner@pidgin.im>
parents:
15167
diff
changeset
|
427 | g_free(frame); |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
428 | } |
|
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
429 | |
| 13593 | 430 | static gboolean |
| 431 | flap_connection_destroy_cb(gpointer data) | |
| 432 | { | |
| 433 | FlapConnection *conn; | |
|
13609
a6fbfad454b6
[gaim-migrate @ 15994]
Mark Doliner <markdoliner@pidgin.im>
parents:
13603
diff
changeset
|
434 | OscarData *od; |
| 15884 | 435 | PurpleAccount *account; |
|
18874
556ca90e3b0d
Call the AIM_CB_SPECIAL_CONNERR callback from
Mark Doliner <markdoliner@pidgin.im>
parents:
17573
diff
changeset
|
436 | aim_rxcallback_t userfunc; |
| 13593 | 437 | |
| 438 | conn = data; | |
|
30885
aea5b6af4258
oscar: Add useful object debugging for #5927.
Paul Aurich <darkrain42@pidgin.im>
parents:
30678
diff
changeset
|
439 | /* Explicitly added for debugging #5927. Don't re-order this, only |
|
aea5b6af4258
oscar: Add useful object debugging for #5927.
Paul Aurich <darkrain42@pidgin.im>
parents:
30678
diff
changeset
|
440 | * consider removing it. |
|
aea5b6af4258
oscar: Add useful object debugging for #5927.
Paul Aurich <darkrain42@pidgin.im>
parents:
30678
diff
changeset
|
441 | */ |
|
aea5b6af4258
oscar: Add useful object debugging for #5927.
Paul Aurich <darkrain42@pidgin.im>
parents:
30678
diff
changeset
|
442 | purple_debug_info("oscar", "Destroying FLAP connection %p\n", conn); |
|
aea5b6af4258
oscar: Add useful object debugging for #5927.
Paul Aurich <darkrain42@pidgin.im>
parents:
30678
diff
changeset
|
443 | |
|
13609
a6fbfad454b6
[gaim-migrate @ 15994]
Mark Doliner <markdoliner@pidgin.im>
parents:
13603
diff
changeset
|
444 | od = conn->od; |
|
22296
120207b25525
Undo revision c10f76ea0a1d80d4b5e7c2807c239a9bbb59bc1e. This should
Mark Doliner <markdoliner@pidgin.im>
parents:
22295
diff
changeset
|
445 | account = purple_connection_get_account(od->gc); |
| 13593 | 446 | |
|
30885
aea5b6af4258
oscar: Add useful object debugging for #5927.
Paul Aurich <darkrain42@pidgin.im>
parents:
30678
diff
changeset
|
447 | purple_debug_info("oscar", "Destroying oscar connection (%p) of " |
|
aea5b6af4258
oscar: Add useful object debugging for #5927.
Paul Aurich <darkrain42@pidgin.im>
parents:
30678
diff
changeset
|
448 | "type 0x%04hx. Disconnect reason is %d\n", conn, |
|
18874
556ca90e3b0d
Call the AIM_CB_SPECIAL_CONNERR callback from
Mark Doliner <markdoliner@pidgin.im>
parents:
17573
diff
changeset
|
449 | conn->type, conn->disconnect_reason); |
| 13593 | 450 | |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
451 | od->oscar_connections = g_slist_remove(od->oscar_connections, conn); |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
452 | |
|
18874
556ca90e3b0d
Call the AIM_CB_SPECIAL_CONNERR callback from
Mark Doliner <markdoliner@pidgin.im>
parents:
17573
diff
changeset
|
453 | if ((userfunc = aim_callhandler(od, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNERR))) |
|
556ca90e3b0d
Call the AIM_CB_SPECIAL_CONNERR callback from
Mark Doliner <markdoliner@pidgin.im>
parents:
17573
diff
changeset
|
454 | userfunc(od, conn, NULL, conn->disconnect_code, conn->error_message); |
|
556ca90e3b0d
Call the AIM_CB_SPECIAL_CONNERR callback from
Mark Doliner <markdoliner@pidgin.im>
parents:
17573
diff
changeset
|
455 | |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
456 | /* |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
457 | * TODO: If we don't have a SNAC_FAMILY_LOCATE connection then |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
458 | * we should try to request one instead of disconnecting. |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
459 | */ |
|
22296
120207b25525
Undo revision c10f76ea0a1d80d4b5e7c2807c239a9bbb59bc1e. This should
Mark Doliner <markdoliner@pidgin.im>
parents:
22295
diff
changeset
|
460 | if (!account->disconnecting && ((od->oscar_connections == NULL) |
|
120207b25525
Undo revision c10f76ea0a1d80d4b5e7c2807c239a9bbb59bc1e. This should
Mark Doliner <markdoliner@pidgin.im>
parents:
22295
diff
changeset
|
461 | || (!flap_connection_getbytype(od, SNAC_FAMILY_LOCATE)))) |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
462 | { |
| 15884 | 463 | /* No more FLAP connections! Sign off this PurpleConnection! */ |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
464 | gchar *tmp; |
| 21279 | 465 | PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR; |
|
20452
a9fc6198b5c6
Add disconnection reasons to oscar.
Will Thompson <resiak@pidgin.im>
parents:
19859
diff
changeset
|
466 | |
|
18875
c9c59be46538
Move a call to purple_connection_error() from oscar.c to
Mark Doliner <markdoliner@pidgin.im>
parents:
18874
diff
changeset
|
467 | if (conn->disconnect_code == 0x0001) { |
| 21279 | 468 | reason = PURPLE_CONNECTION_ERROR_NAME_IN_USE; |
|
27628
26ab0a63a199
Remove trailing periods from short disconnection error messags and remove
Mark Doliner <markdoliner@pidgin.im>
parents:
27385
diff
changeset
|
469 | tmp = g_strdup(_("You have signed on from another location")); |
|
20658
91594d39738c
Clear the password consistently when we get a "Signed-On elsewhere" or a "Invalid Password" disconnection. Disconnection reason codes will take care of this in the core, but until then, this is ok. Fixes #3204.
Daniel Atallah <datallah@pidgin.im>
parents:
19859
diff
changeset
|
470 | if (!purple_account_get_remember_password(account)) |
|
34029
059c1270db1f
Remove the silly destroy argument from purple_account_set_password and
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34028
diff
changeset
|
471 | purple_account_set_password(account, NULL, NULL, NULL); |
|
18875
c9c59be46538
Move a call to purple_connection_error() from oscar.c to
Mark Doliner <markdoliner@pidgin.im>
parents:
18874
diff
changeset
|
472 | } else if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED) |
|
27628
26ab0a63a199
Remove trailing periods from short disconnection error messags and remove
Mark Doliner <markdoliner@pidgin.im>
parents:
27385
diff
changeset
|
473 | tmp = g_strdup(_("Server closed the connection")); |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
474 | else if (conn->disconnect_reason == OSCAR_DISCONNECT_LOST_CONNECTION) |
|
27628
26ab0a63a199
Remove trailing periods from short disconnection error messags and remove
Mark Doliner <markdoliner@pidgin.im>
parents:
27385
diff
changeset
|
475 | tmp = g_strdup_printf(_("Lost connection with server: %s"), |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
476 | conn->error_message); |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
477 | else if (conn->disconnect_reason == OSCAR_DISCONNECT_INVALID_DATA) |
|
27628
26ab0a63a199
Remove trailing periods from short disconnection error messags and remove
Mark Doliner <markdoliner@pidgin.im>
parents:
27385
diff
changeset
|
478 | tmp = g_strdup(_("Received invalid data on connection with server")); |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
479 | else if (conn->disconnect_reason == OSCAR_DISCONNECT_COULD_NOT_CONNECT) |
|
27635
0cd19038c417
More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents:
27628
diff
changeset
|
480 | tmp = g_strdup_printf(_("Unable to connect: %s"), |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
481 | conn->error_message); |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
482 | else |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
483 | /* |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
484 | * We shouldn't print a message for some disconnect_reasons. |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
485 | * Like OSCAR_DISCONNECT_LOCAL_CLOSED. |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
486 | */ |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
487 | tmp = NULL; |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
488 | |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
489 | if (tmp != NULL) |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
490 | { |
|
32157
39ba2e2492ee
Rename purple_connection_error_reason to purple_connection_error
Mark Doliner <markdoliner@pidgin.im>
parents:
31517
diff
changeset
|
491 | purple_connection_error(od->gc, reason, tmp); |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
492 | g_free(tmp); |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
493 | } |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
494 | } |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
495 | |
|
13609
a6fbfad454b6
[gaim-migrate @ 15994]
Mark Doliner <markdoliner@pidgin.im>
parents:
13603
diff
changeset
|
496 | flap_connection_close(od, conn); |
| 13593 | 497 | |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
498 | g_free(conn->error_message); |
|
14171
351b731b9553
[gaim-migrate @ 16743]
Mark Doliner <markdoliner@pidgin.im>
parents:
14048
diff
changeset
|
499 | g_free(conn->cookie); |
|
351b731b9553
[gaim-migrate @ 16743]
Mark Doliner <markdoliner@pidgin.im>
parents:
14048
diff
changeset
|
500 | |
| 13593 | 501 | /* |
| 502 | * Free conn->internal, if necessary | |
| 503 | */ | |
| 504 | if (conn->type == SNAC_FAMILY_CHAT) | |
|
13609
a6fbfad454b6
[gaim-migrate @ 15994]
Mark Doliner <markdoliner@pidgin.im>
parents:
13603
diff
changeset
|
505 | flap_connection_destroy_chat(od, conn); |
| 13593 | 506 | |
|
14410
a5ae93474db6
[gaim-migrate @ 17050]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
507 | g_slist_free(conn->groups); |
|
15148
48ce0abb422a
[gaim-migrate @ 17872]
Mark Doliner <markdoliner@pidgin.im>
parents:
15147
diff
changeset
|
508 | while (conn->rateclasses != NULL) |
|
48ce0abb422a
[gaim-migrate @ 17872]
Mark Doliner <markdoliner@pidgin.im>
parents:
15147
diff
changeset
|
509 | { |
|
29261
e39105368ed6
Put all our rateclass members in a single hash table instead of in one
Mark Doliner <markdoliner@pidgin.im>
parents:
29260
diff
changeset
|
510 | g_free(conn->rateclasses->data); |
|
15148
48ce0abb422a
[gaim-migrate @ 17872]
Mark Doliner <markdoliner@pidgin.im>
parents:
15147
diff
changeset
|
511 | conn->rateclasses = g_slist_delete_link(conn->rateclasses, conn->rateclasses); |
|
48ce0abb422a
[gaim-migrate @ 17872]
Mark Doliner <markdoliner@pidgin.im>
parents:
15147
diff
changeset
|
512 | } |
| 13593 | 513 | |
|
29261
e39105368ed6
Put all our rateclass members in a single hash table instead of in one
Mark Doliner <markdoliner@pidgin.im>
parents:
29260
diff
changeset
|
514 | g_hash_table_destroy(conn->rateclass_members); |
|
e39105368ed6
Put all our rateclass members in a single hash table instead of in one
Mark Doliner <markdoliner@pidgin.im>
parents:
29260
diff
changeset
|
515 | |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
516 | if (conn->queued_snacs) { |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
517 | while (!g_queue_is_empty(conn->queued_snacs)) |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
518 | { |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
519 | QueuedSnac *queued_snac; |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
520 | queued_snac = g_queue_pop_head(conn->queued_snacs); |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
521 | flap_frame_destroy(queued_snac->frame); |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
522 | g_free(queued_snac); |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
523 | } |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
524 | g_queue_free(conn->queued_snacs); |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
525 | } |
|
23886
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
526 | |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
527 | if (conn->queued_lowpriority_snacs) { |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
528 | while (!g_queue_is_empty(conn->queued_lowpriority_snacs)) |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
529 | { |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
530 | QueuedSnac *queued_snac; |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
531 | queued_snac = g_queue_pop_head(conn->queued_lowpriority_snacs); |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
532 | flap_frame_destroy(queued_snac->frame); |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
533 | g_free(queued_snac); |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
534 | } |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
535 | g_queue_free(conn->queued_lowpriority_snacs); |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
536 | } |
|
416eb5818cee
Added `flap_connection_send_snac_with_priority()`, which allows specifying
Evan Schoenberg <evands@pidgin.im>
parents:
23879
diff
changeset
|
537 | |
|
15168
4e604d302448
[gaim-migrate @ 17892]
Mark Doliner <markdoliner@pidgin.im>
parents:
15167
diff
changeset
|
538 | if (conn->queued_timeout > 0) |
| 15884 | 539 | purple_timeout_remove(conn->queued_timeout); |
|
15167
7114af0af12f
[gaim-migrate @ 17891]
Mark Doliner <markdoliner@pidgin.im>
parents:
15153
diff
changeset
|
540 | |
|
14048
b577c53406c0
[gaim-migrate @ 16556]
Mark Doliner <markdoliner@pidgin.im>
parents:
13726
diff
changeset
|
541 | g_free(conn); |
|
b577c53406c0
[gaim-migrate @ 16556]
Mark Doliner <markdoliner@pidgin.im>
parents:
13726
diff
changeset
|
542 | |
| 13593 | 543 | return FALSE; |
| 544 | } | |
| 545 | ||
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
546 | /** |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
547 | * See the comments for the parameters of |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
548 | * flap_connection_schedule_destroy(). |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
549 | */ |
| 13593 | 550 | void |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
551 | flap_connection_destroy(FlapConnection *conn, OscarDisconnectReason reason, const gchar *error_message) |
| 13593 | 552 | { |
| 553 | if (conn->destroy_timeout != 0) | |
| 15884 | 554 | purple_timeout_remove(conn->destroy_timeout); |
|
13609
a6fbfad454b6
[gaim-migrate @ 15994]
Mark Doliner <markdoliner@pidgin.im>
parents:
13603
diff
changeset
|
555 | conn->disconnect_reason = reason; |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
556 | g_free(conn->error_message); |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
557 | conn->error_message = g_strdup(error_message); |
| 13593 | 558 | flap_connection_destroy_cb(conn); |
| 559 | } | |
| 560 | ||
| 561 | /** | |
| 15884 | 562 | * Schedule Purple to destroy the given FlapConnection as soon as we |
| 13593 | 563 | * return control back to the program's main loop. We must do this |
| 564 | * if we want to destroy the connection but we are still using it | |
| 565 | * for some reason. | |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
566 | * |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
567 | * @param reason The reason for the disconnection. |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
568 | * @param error_message A brief error message that gives more detail |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
569 | * regarding the reason for the disconnecting. This should |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
570 | * be NULL for everything except OSCAR_DISCONNECT_LOST_CONNECTION, |
|
21389
e1dd8142bb87
replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents:
20658
diff
changeset
|
571 | * in which case it should contain the value of g_strerror(errno), |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
572 | * and OSCAR_DISCONNECT_COULD_NOT_CONNECT, in which case it |
|
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
573 | * should contain the error_message passed back from the call |
| 15884 | 574 | * to purple_proxy_connect(). |
| 13593 | 575 | */ |
| 576 | void | |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
577 | flap_connection_schedule_destroy(FlapConnection *conn, OscarDisconnectReason reason, const gchar *error_message) |
| 13593 | 578 | { |
| 579 | if (conn->destroy_timeout != 0) | |
| 580 | /* Already taken care of */ | |
| 581 | return; | |
| 582 | ||
| 15884 | 583 | purple_debug_info("oscar", "Scheduling destruction of FLAP " |
|
30885
aea5b6af4258
oscar: Add useful object debugging for #5927.
Paul Aurich <darkrain42@pidgin.im>
parents:
30678
diff
changeset
|
584 | "connection %p of type 0x%04hx\n", conn, conn->type); |
|
13609
a6fbfad454b6
[gaim-migrate @ 15994]
Mark Doliner <markdoliner@pidgin.im>
parents:
13603
diff
changeset
|
585 | conn->disconnect_reason = reason; |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14454
diff
changeset
|
586 | g_free(conn->error_message); |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
587 | conn->error_message = g_strdup(error_message); |
| 15884 | 588 | conn->destroy_timeout = purple_timeout_add(0, flap_connection_destroy_cb, conn); |
| 13593 | 589 | } |
| 590 | ||
| 591 | /** | |
| 592 | * In OSCAR, every connection has a set of SNAC groups associated | |
| 593 | * with it. These are the groups that you can send over this connection | |
| 594 | * without being guaranteed a "Not supported" SNAC error. | |
| 595 | * | |
| 596 | * The grand theory of things says that these associations transcend | |
| 597 | * what libfaim calls "connection types" (conn->type). You can probably | |
| 598 | * see the elegance here, but since I want to revel in it for a bit, you | |
| 599 | * get to hear it all spelled out. | |
| 600 | * | |
| 601 | * So let us say that you have your core BOS connection running. One | |
| 602 | * of your modules has just given you a SNAC of the group 0x0004 to send | |
| 603 | * you. Maybe an IM destined for some twit in Greenland. So you start | |
| 604 | * at the top of your connection list, looking for a connection that | |
| 605 | * claims to support group 0x0004. You find one. Why, that neat BOS | |
| 606 | * connection of yours can do that. So you send it on its way. | |
| 607 | * | |
| 608 | * Now, say, that fellow from Greenland has friends and they all want to | |
| 609 | * meet up with you in a lame chat room. This has landed you a SNAC | |
| 610 | * in the family 0x000e and you have to admit you're a bit lost. You've | |
| 611 | * searched your connection list for someone who wants to make your life | |
| 612 | * easy and deliver this SNAC for you, but there isn't one there. | |
| 613 | * | |
| 614 | * Here comes the good bit. Without even letting anyone know, particularly | |
| 615 | * the module that decided to send this SNAC, and definitely not that twit | |
| 616 | * in Greenland, you send out a service request. In this request, you have | |
| 617 | * marked the need for a connection supporting group 0x000e. A few seconds | |
| 618 | * later, you receive a service redirect with an IP address and a cookie in | |
| 619 | * it. Great, you say. Now I have something to do. Off you go, making | |
| 620 | * that connection. One of the first things you get from this new server | |
| 621 | * is a message saying that indeed it does support the group you were looking | |
| 622 | * for. So you continue and send rate confirmation and all that. | |
| 623 | * | |
| 624 | * Then you remember you had that SNAC to send, and now you have a means to | |
| 625 | * do it, and you do, and everyone is happy. Except the Greenlander, who is | |
| 626 | * still stuck in the bitter cold. | |
| 627 | * | |
| 628 | * Oh, and this is useful for building the Migration SNACs, too. In the | |
| 629 | * future, this may help convince me to implement rate limit mitigation | |
| 630 | * for real. We'll see. | |
| 631 | * | |
| 632 | * Just to make me look better, I'll say that I've known about this great | |
| 633 | * scheme for quite some time now. But I still haven't convinced myself | |
| 634 | * to make libfaim work that way. It would take a fair amount of effort, | |
| 635 | * and probably some client API changes as well. (Whenever I don't want | |
| 636 | * to do something, I just say it would change the client API. Then I | |
| 637 | * instantly have a couple of supporters of not doing it.) | |
| 638 | * | |
| 639 | * Generally, addgroup is only called by the internal handling of the | |
| 640 | * server ready SNAC. So if you want to do something before that, you'll | |
| 641 | * have to be more creative. That is done rather early, though, so I don't | |
| 642 | * think you have to worry about it. Unless you're me. I care deeply | |
| 643 | * about such inane things. | |
| 644 | * | |
| 645 | */ | |
| 646 | ||
| 647 | /** | |
| 648 | * Find a FlapConnection that supports the given oscar | |
| 649 | * family. | |
| 650 | */ | |
| 651 | FlapConnection * | |
| 652 | flap_connection_findbygroup(OscarData *od, guint16 group) | |
| 653 | { | |
|
14410
a5ae93474db6
[gaim-migrate @ 17050]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
654 | GSList *cur; |
| 13593 | 655 | |
| 656 | for (cur = od->oscar_connections; cur != NULL; cur = cur->next) | |
| 657 | { | |
| 658 | FlapConnection *conn; | |
|
14410
a5ae93474db6
[gaim-migrate @ 17050]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
659 | GSList *l; |
| 13593 | 660 | |
| 661 | conn = cur->data; | |
| 662 | ||
|
13612
c51da9e6fec1
[gaim-migrate @ 15997]
Mark Doliner <markdoliner@pidgin.im>
parents:
13611
diff
changeset
|
663 | for (l = conn->groups; l != NULL; l = l->next) |
| 13593 | 664 | { |
|
13612
c51da9e6fec1
[gaim-migrate @ 15997]
Mark Doliner <markdoliner@pidgin.im>
parents:
13611
diff
changeset
|
665 | if (GPOINTER_TO_UINT(l->data) == group) |
| 13593 | 666 | return conn; |
| 667 | } | |
| 668 | } | |
| 669 | ||
| 670 | return NULL; | |
| 671 | } | |
| 672 | ||
| 673 | /** | |
| 674 | * Locates a connection of the specified type in the | |
| 675 | * specified session. | |
| 676 | * | |
| 677 | * TODO: Use flap_connection_findbygroup everywhere and get rid of this. | |
| 678 | * | |
| 679 | * @param od The session to search. | |
| 680 | * @param type The type of connection to look for. | |
| 681 | * | |
| 682 | * @return Returns the first connection found of the given target type, | |
| 683 | * or NULL if none could be found. | |
| 684 | */ | |
| 685 | FlapConnection * | |
| 686 | flap_connection_getbytype(OscarData *od, int type) | |
| 687 | { | |
|
14410
a5ae93474db6
[gaim-migrate @ 17050]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
688 | GSList *cur; |
| 13593 | 689 | |
| 690 | for (cur = od->oscar_connections; cur != NULL; cur = cur->next) | |
| 691 | { | |
| 692 | FlapConnection *conn; | |
| 693 | conn = cur->data; | |
| 694 | if ((conn->type == type) && (conn->connected)) | |
| 695 | return conn; | |
| 696 | } | |
| 697 | ||
| 698 | return NULL; | |
| 699 | } | |
| 700 | ||
| 701 | FlapConnection * | |
| 702 | flap_connection_getbytype_all(OscarData *od, int type) | |
| 703 | { | |
|
14410
a5ae93474db6
[gaim-migrate @ 17050]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
704 | GSList *cur; |
| 13593 | 705 | |
| 706 | for (cur = od->oscar_connections; cur; cur = cur->next) | |
| 707 | { | |
| 708 | FlapConnection *conn; | |
| 709 | conn = cur->data; | |
| 710 | if (conn->type == type) | |
| 711 | return conn; | |
| 712 | } | |
| 713 | ||
| 714 | return NULL; | |
| 715 | } | |
| 716 | ||
| 717 | /** | |
| 718 | * Allocate a new FLAP frame. | |
| 719 | * | |
| 720 | * @param channel The FLAP channel. This is almost always 2. | |
| 721 | */ | |
| 722 | FlapFrame * | |
| 723 | flap_frame_new(OscarData *od, guint16 channel, int datalen) | |
| 724 | { | |
| 725 | FlapFrame *frame; | |
| 726 | ||
| 727 | frame = g_new0(FlapFrame, 1); | |
| 728 | frame->channel = channel; | |
| 729 | ||
| 730 | if (datalen > 0) | |
|
15151
bb985812fefa
[gaim-migrate @ 17875]
Mark Doliner <markdoliner@pidgin.im>
parents:
15150
diff
changeset
|
731 | byte_stream_new(&frame->data, datalen); |
| 13593 | 732 | |
| 733 | return frame; | |
| 734 | } | |
| 735 | ||
| 736 | static void | |
| 737 | parse_snac(OscarData *od, FlapConnection *conn, FlapFrame *frame) | |
| 738 | { | |
| 739 | aim_module_t *cur; | |
| 740 | aim_modsnac_t snac; | |
| 741 | ||
| 30668 | 742 | if (byte_stream_bytes_left(&frame->data) < 10) |
| 13593 | 743 | return; |
| 744 | ||
| 745 | snac.family = byte_stream_get16(&frame->data); | |
| 746 | snac.subtype = byte_stream_get16(&frame->data); | |
| 747 | snac.flags = byte_stream_get16(&frame->data); | |
| 748 | snac.id = byte_stream_get32(&frame->data); | |
| 749 | ||
| 750 | /* SNAC flags are apparently uniform across all SNACs, so we handle them here */ | |
| 751 | if (snac.flags & 0x0001) { | |
| 752 | /* | |
| 753 | * This means the SNAC will be followed by another SNAC with | |
| 754 | * related information. We don't need to do anything about | |
| 755 | * this here. | |
| 756 | */ | |
| 757 | } | |
| 758 | if (snac.flags & 0x8000) { | |
| 759 | /* | |
| 760 | * This packet contains the version of the family that this SNAC is | |
| 761 | * in. You get this when your SSI module is version 2 or higher. | |
| 762 | * For now we have no need for this, but you could always save | |
| 763 | * it as a part of aim_modnsac_t, or something. The format is... | |
| 764 | * 2 byte length of total mini-header (which is 6 bytes), then TLV | |
| 765 | * of type 0x0001, length 0x0002, value is the 2 byte version | |
| 766 | * number | |
| 767 | */ | |
| 768 | byte_stream_advance(&frame->data, byte_stream_get16(&frame->data)); | |
| 769 | } | |
| 770 | ||
| 771 | for (cur = (aim_module_t *)od->modlistv; cur; cur = cur->next) { | |
| 772 | ||
| 773 | if (!(cur->flags & AIM_MODFLAG_MULTIFAMILY) && | |
| 774 | (cur->family != snac.family)) | |
| 775 | continue; | |
| 776 | ||
| 777 | if (cur->snachandler(od, conn, cur, frame, &snac, &frame->data)) | |
| 778 | return; | |
| 779 | } | |
| 780 | } | |
| 781 | ||
| 782 | static void | |
| 783 | parse_fakesnac(OscarData *od, FlapConnection *conn, FlapFrame *frame, guint16 family, guint16 subtype) | |
| 784 | { | |
| 785 | aim_module_t *cur; | |
| 786 | aim_modsnac_t snac; | |
| 787 | ||
| 788 | snac.family = family; | |
| 789 | snac.subtype = subtype; | |
| 790 | snac.flags = snac.id = 0; | |
| 791 | ||
| 792 | for (cur = (aim_module_t *)od->modlistv; cur; cur = cur->next) { | |
| 793 | ||
| 794 | if (!(cur->flags & AIM_MODFLAG_MULTIFAMILY) && | |
| 795 | (cur->family != snac.family)) | |
| 796 | continue; | |
| 797 | ||
| 798 | if (cur->snachandler(od, conn, cur, frame, &snac, &frame->data)) | |
| 799 | return; | |
| 800 | } | |
| 801 | } | |
| 802 | ||
| 803 | static void | |
| 804 | parse_flap_ch4(OscarData *od, FlapConnection *conn, FlapFrame *frame) | |
| 805 | { | |
|
17443
bae8548d98b3
Cleanup and simplification of some tlvlist stuff in the oscar protocol.
Mark Doliner <markdoliner@pidgin.im>
parents:
17280
diff
changeset
|
806 | GSList *tlvlist; |
| 13593 | 807 | char *msg = NULL; |
| 808 | ||
| 30668 | 809 | if (byte_stream_bytes_left(&frame->data) == 0) { |
| 13593 | 810 | /* XXX should do something with this */ |
| 811 | return; | |
| 812 | } | |
| 813 | ||
|
13603
12489c04a4ea
[gaim-migrate @ 15988]
Mark Doliner <markdoliner@pidgin.im>
parents:
13593
diff
changeset
|
814 | /* An ICQ account is logging in */ |
| 13593 | 815 | if (conn->type == SNAC_FAMILY_AUTH) |
| 816 | { | |
| 817 | parse_fakesnac(od, conn, frame, 0x0017, 0x0003); | |
| 818 | return; | |
| 819 | } | |
| 820 | ||
| 821 | tlvlist = aim_tlvlist_read(&frame->data); | |
| 822 | ||
| 823 | if (aim_tlv_gettlv(tlvlist, 0x0009, 1)) | |
|
18874
556ca90e3b0d
Call the AIM_CB_SPECIAL_CONNERR callback from
Mark Doliner <markdoliner@pidgin.im>
parents:
17573
diff
changeset
|
824 | conn->disconnect_code = aim_tlv_get16(tlvlist, 0x0009, 1); |
| 13593 | 825 | |
| 826 | if (aim_tlv_gettlv(tlvlist, 0x000b, 1)) | |
| 827 | msg = aim_tlv_getstr(tlvlist, 0x000b, 1); | |
| 828 | ||
|
18874
556ca90e3b0d
Call the AIM_CB_SPECIAL_CONNERR callback from
Mark Doliner <markdoliner@pidgin.im>
parents:
17573
diff
changeset
|
829 | /* |
|
556ca90e3b0d
Call the AIM_CB_SPECIAL_CONNERR callback from
Mark Doliner <markdoliner@pidgin.im>
parents:
17573
diff
changeset
|
830 | * The server ended this FLAP connnection, so let's be nice and |
|
556ca90e3b0d
Call the AIM_CB_SPECIAL_CONNERR callback from
Mark Doliner <markdoliner@pidgin.im>
parents:
17573
diff
changeset
|
831 | * close the physical TCP connection |
|
556ca90e3b0d
Call the AIM_CB_SPECIAL_CONNERR callback from
Mark Doliner <markdoliner@pidgin.im>
parents:
17573
diff
changeset
|
832 | */ |
|
556ca90e3b0d
Call the AIM_CB_SPECIAL_CONNERR callback from
Mark Doliner <markdoliner@pidgin.im>
parents:
17573
diff
changeset
|
833 | flap_connection_schedule_destroy(conn, |
|
556ca90e3b0d
Call the AIM_CB_SPECIAL_CONNERR callback from
Mark Doliner <markdoliner@pidgin.im>
parents:
17573
diff
changeset
|
834 | OSCAR_DISCONNECT_REMOTE_CLOSED, msg); |
| 13593 | 835 | |
|
17443
bae8548d98b3
Cleanup and simplification of some tlvlist stuff in the oscar protocol.
Mark Doliner <markdoliner@pidgin.im>
parents:
17280
diff
changeset
|
836 | aim_tlvlist_free(tlvlist); |
| 13593 | 837 | |
|
17280
7c0472208173
Make all the oscar memory allocations and frees use the glib functions to avoid problems when mixing C runtimes.
Daniel Atallah <datallah@pidgin.im>
parents:
15884
diff
changeset
|
838 | g_free(msg); |
| 13593 | 839 | } |
| 840 | ||
| 841 | /** | |
| 842 | * Takes a new incoming FLAP frame and sends it to the appropriate | |
| 843 | * handler function to be parsed. | |
| 844 | */ | |
| 845 | static void | |
| 846 | parse_flap(OscarData *od, FlapConnection *conn, FlapFrame *frame) | |
| 847 | { | |
| 848 | if (frame->channel == 0x01) { | |
| 849 | guint32 flap_version = byte_stream_get32(&frame->data); | |
| 850 | if (flap_version != 0x00000001) | |
| 851 | { | |
| 852 | /* Error! */ | |
| 15884 | 853 | purple_debug_warning("oscar", "Expecting FLAP version " |
|
22622
1ecb840b5101
Fix a bunch of compiler warnings caused by my addition of G_GNUC_PRINTF()
Mark Doliner <markdoliner@pidgin.im>
parents:
22317
diff
changeset
|
854 | "0x00000001 but received FLAP version %08x. Closing connection.\n", |
| 13593 | 855 | flap_version); |
|
13609
a6fbfad454b6
[gaim-migrate @ 15994]
Mark Doliner <markdoliner@pidgin.im>
parents:
13603
diff
changeset
|
856 | flap_connection_schedule_destroy(conn, |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
857 | OSCAR_DISCONNECT_INVALID_DATA, NULL); |
| 13593 | 858 | } |
| 859 | else | |
| 860 | conn->connected = TRUE; | |
| 861 | ||
| 862 | } else if (frame->channel == 0x02) { | |
| 863 | parse_snac(od, conn, frame); | |
| 864 | ||
| 865 | } else if (frame->channel == 0x04) { | |
| 866 | parse_flap_ch4(od, conn, frame); | |
| 867 | ||
| 868 | } else if (frame->channel == 0x05) { | |
| 869 | /* TODO: Reset our keepalive watchdog? */ | |
| 870 | ||
| 871 | } | |
| 872 | } | |
| 873 | ||
| 874 | /** | |
| 875 | * Read in all available data on the socket for a given connection. | |
| 876 | * All complete FLAPs handled immedate after they're received. | |
| 877 | * Incomplete FLAP data is stored locally and appended to the next | |
| 878 | * time this callback is triggered. | |
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
879 | * |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
880 | * This is called by flap_connection_recv_cb and |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
881 | * flap_connection_recv_cb_ssl for unencrypted/encrypted connections. |
| 13593 | 882 | */ |
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
883 | static void |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
884 | flap_connection_recv(FlapConnection *conn) |
| 13593 | 885 | { |
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
886 | gpointer buf; |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
887 | gsize buflen; |
|
23079
b887906eed60
More s/ssize_t/gssize/
Daniel Atallah <datallah@pidgin.im>
parents:
23004
diff
changeset
|
888 | gssize read; |
| 13593 | 889 | |
| 890 | /* Read data until we run out of data and break out of the loop */ | |
| 891 | while (TRUE) | |
| 892 | { | |
| 893 | /* Start reading a new FLAP */ | |
| 894 | if (conn->buffer_incoming.data.data == NULL) | |
| 895 | { | |
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
896 | buf = conn->header + conn->header_received; |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
897 | buflen = 6 - conn->header_received; |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
898 | |
|
15256
c57887cd5d08
[gaim-migrate @ 17983]
Mark Doliner <markdoliner@pidgin.im>
parents:
15191
diff
changeset
|
899 | /* Read the first 6 bytes (the FLAP header) */ |
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
900 | if (conn->gsc) |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
901 | read = purple_ssl_read(conn->gsc, buf, buflen); |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
902 | else |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
903 | read = recv(conn->fd, buf, buflen, 0); |
| 13593 | 904 | |
| 905 | /* Check if the FLAP server closed the connection */ | |
| 906 | if (read == 0) | |
| 907 | { | |
|
13609
a6fbfad454b6
[gaim-migrate @ 15994]
Mark Doliner <markdoliner@pidgin.im>
parents:
13603
diff
changeset
|
908 | flap_connection_schedule_destroy(conn, |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
909 | OSCAR_DISCONNECT_REMOTE_CLOSED, NULL); |
| 13593 | 910 | break; |
| 911 | } | |
| 912 | ||
| 913 | /* If there was an error then close the connection */ | |
|
17539
0fd875385856
Only check for EAGAIN if send returns -1, not when it returns 0
Mark Doliner <markdoliner@pidgin.im>
parents:
17443
diff
changeset
|
914 | if (read < 0) |
| 13593 | 915 | { |
| 916 | if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) | |
| 917 | /* No worries */ | |
| 918 | break; | |
| 919 | ||
| 920 | /* Error! */ | |
|
13609
a6fbfad454b6
[gaim-migrate @ 15994]
Mark Doliner <markdoliner@pidgin.im>
parents:
13603
diff
changeset
|
921 | flap_connection_schedule_destroy(conn, |
|
21389
e1dd8142bb87
replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents:
20658
diff
changeset
|
922 | OSCAR_DISCONNECT_LOST_CONNECTION, g_strerror(errno)); |
| 13593 | 923 | break; |
| 924 | } | |
|
32679
fd936a0b84f7
Add a purple_connection_update_last_received() function to update the
Andrew Victor <andrew.victor@mxit.com>
parents:
32157
diff
changeset
|
925 | purple_connection_update_last_received(conn->od->gc); |
| 13593 | 926 | |
| 927 | /* If we don't even have a complete FLAP header then do nothing */ | |
|
15256
c57887cd5d08
[gaim-migrate @ 17983]
Mark Doliner <markdoliner@pidgin.im>
parents:
15191
diff
changeset
|
928 | conn->header_received += read; |
|
c57887cd5d08
[gaim-migrate @ 17983]
Mark Doliner <markdoliner@pidgin.im>
parents:
15191
diff
changeset
|
929 | if (conn->header_received < 6) |
| 13593 | 930 | break; |
| 931 | ||
| 932 | /* All FLAP frames must start with the byte 0x2a */ | |
|
15256
c57887cd5d08
[gaim-migrate @ 17983]
Mark Doliner <markdoliner@pidgin.im>
parents:
15191
diff
changeset
|
933 | if (aimutil_get8(&conn->header[0]) != 0x2a) |
| 13593 | 934 | { |
|
13609
a6fbfad454b6
[gaim-migrate @ 15994]
Mark Doliner <markdoliner@pidgin.im>
parents:
13603
diff
changeset
|
935 | flap_connection_schedule_destroy(conn, |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
936 | OSCAR_DISCONNECT_INVALID_DATA, NULL); |
| 13593 | 937 | break; |
| 938 | } | |
| 939 | ||
| 940 | /* Initialize a new temporary FlapFrame for incoming data */ | |
|
15256
c57887cd5d08
[gaim-migrate @ 17983]
Mark Doliner <markdoliner@pidgin.im>
parents:
15191
diff
changeset
|
941 | conn->buffer_incoming.channel = aimutil_get8(&conn->header[1]); |
|
c57887cd5d08
[gaim-migrate @ 17983]
Mark Doliner <markdoliner@pidgin.im>
parents:
15191
diff
changeset
|
942 | conn->buffer_incoming.seqnum = aimutil_get16(&conn->header[2]); |
|
c57887cd5d08
[gaim-migrate @ 17983]
Mark Doliner <markdoliner@pidgin.im>
parents:
15191
diff
changeset
|
943 | conn->buffer_incoming.data.len = aimutil_get16(&conn->header[4]); |
| 13593 | 944 | conn->buffer_incoming.data.data = g_new(guint8, conn->buffer_incoming.data.len); |
| 945 | conn->buffer_incoming.data.offset = 0; | |
| 946 | } | |
| 947 | ||
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
948 | buflen = conn->buffer_incoming.data.len - conn->buffer_incoming.data.offset; |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
949 | if (buflen) |
| 13593 | 950 | { |
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
951 | buf = &conn->buffer_incoming.data.data[conn->buffer_incoming.data.offset]; |
| 13593 | 952 | /* Read data into the temporary FlapFrame until it is complete */ |
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
953 | if (conn->gsc) |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
954 | read = purple_ssl_read(conn->gsc, buf, buflen); |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
955 | else |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
956 | read = recv(conn->fd, buf, buflen, 0); |
| 13593 | 957 | |
| 958 | /* Check if the FLAP server closed the connection */ | |
| 959 | if (read == 0) | |
| 960 | { | |
|
13609
a6fbfad454b6
[gaim-migrate @ 15994]
Mark Doliner <markdoliner@pidgin.im>
parents:
13603
diff
changeset
|
961 | flap_connection_schedule_destroy(conn, |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
962 | OSCAR_DISCONNECT_REMOTE_CLOSED, NULL); |
| 13593 | 963 | break; |
| 964 | } | |
| 965 | ||
|
17539
0fd875385856
Only check for EAGAIN if send returns -1, not when it returns 0
Mark Doliner <markdoliner@pidgin.im>
parents:
17443
diff
changeset
|
966 | if (read < 0) |
| 13593 | 967 | { |
| 968 | if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) | |
| 969 | /* No worries */ | |
| 970 | break; | |
| 971 | ||
| 972 | /* Error! */ | |
|
13609
a6fbfad454b6
[gaim-migrate @ 15994]
Mark Doliner <markdoliner@pidgin.im>
parents:
13603
diff
changeset
|
973 | flap_connection_schedule_destroy(conn, |
|
21389
e1dd8142bb87
replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents:
20658
diff
changeset
|
974 | OSCAR_DISCONNECT_LOST_CONNECTION, g_strerror(errno)); |
| 13593 | 975 | break; |
| 976 | } | |
| 977 | ||
| 978 | conn->buffer_incoming.data.offset += read; | |
| 979 | if (conn->buffer_incoming.data.offset < conn->buffer_incoming.data.len) | |
| 980 | /* Waiting for more data to arrive */ | |
| 981 | break; | |
| 982 | } | |
| 983 | ||
| 984 | /* We have a complete FLAP! Handle it and continue reading */ | |
| 985 | byte_stream_rewind(&conn->buffer_incoming.data); | |
| 986 | parse_flap(conn->od, conn, &conn->buffer_incoming); | |
| 987 | conn->lastactivity = time(NULL); | |
| 988 | ||
| 989 | g_free(conn->buffer_incoming.data.data); | |
| 990 | conn->buffer_incoming.data.data = NULL; | |
|
15256
c57887cd5d08
[gaim-migrate @ 17983]
Mark Doliner <markdoliner@pidgin.im>
parents:
15191
diff
changeset
|
991 | |
|
c57887cd5d08
[gaim-migrate @ 17983]
Mark Doliner <markdoliner@pidgin.im>
parents:
15191
diff
changeset
|
992 | conn->header_received = 0; |
| 13593 | 993 | } |
| 994 | } | |
| 995 | ||
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
996 | void |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
997 | flap_connection_recv_cb(gpointer data, gint source, PurpleInputCondition cond) |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
998 | { |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
999 | FlapConnection *conn = data; |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1000 | |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1001 | flap_connection_recv(conn); |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1002 | } |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1003 | |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1004 | void |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1005 | flap_connection_recv_cb_ssl(gpointer data, PurpleSslConnection *gsc, PurpleInputCondition cond) |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1006 | { |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1007 | FlapConnection *conn = data; |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1008 | |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1009 | flap_connection_recv(conn); |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1010 | } |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1011 | |
|
25519
d15507b37c1a
Shuffle a few comments around to make it look like I did something
Mark Doliner <markdoliner@pidgin.im>
parents:
25128
diff
changeset
|
1012 | /** |
|
d15507b37c1a
Shuffle a few comments around to make it look like I did something
Mark Doliner <markdoliner@pidgin.im>
parents:
25128
diff
changeset
|
1013 | * @param source When this function is called as a callback source is |
|
d15507b37c1a
Shuffle a few comments around to make it look like I did something
Mark Doliner <markdoliner@pidgin.im>
parents:
25128
diff
changeset
|
1014 | * set to the fd that triggered the callback. But this function |
|
d15507b37c1a
Shuffle a few comments around to make it look like I did something
Mark Doliner <markdoliner@pidgin.im>
parents:
25128
diff
changeset
|
1015 | * is also called directly from flap_connection_send_byte_stream(), |
|
d15507b37c1a
Shuffle a few comments around to make it look like I did something
Mark Doliner <markdoliner@pidgin.im>
parents:
25128
diff
changeset
|
1016 | * in which case source will be -1. So don't use source--use |
|
d15507b37c1a
Shuffle a few comments around to make it look like I did something
Mark Doliner <markdoliner@pidgin.im>
parents:
25128
diff
changeset
|
1017 | * conn->gsc or conn->fd instead. |
|
d15507b37c1a
Shuffle a few comments around to make it look like I did something
Mark Doliner <markdoliner@pidgin.im>
parents:
25128
diff
changeset
|
1018 | */ |
| 13593 | 1019 | static void |
| 15884 | 1020 | send_cb(gpointer data, gint source, PurpleInputCondition cond) |
| 13593 | 1021 | { |
| 1022 | FlapConnection *conn; | |
| 1023 | int writelen, ret; | |
| 1024 | ||
| 1025 | conn = data; | |
| 15884 | 1026 | writelen = purple_circ_buffer_get_max_read(conn->buffer_outgoing); |
| 13593 | 1027 | |
| 1028 | if (writelen == 0) | |
| 1029 | { | |
| 15884 | 1030 | purple_input_remove(conn->watcher_outgoing); |
| 13593 | 1031 | conn->watcher_outgoing = 0; |
| 1032 | return; | |
| 1033 | } | |
| 1034 | ||
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1035 | if (conn->gsc) |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1036 | ret = purple_ssl_write(conn->gsc, conn->buffer_outgoing->outptr, |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1037 | writelen); |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1038 | else |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1039 | ret = send(conn->fd, conn->buffer_outgoing->outptr, writelen, 0); |
| 13593 | 1040 | if (ret <= 0) |
| 1041 | { | |
|
27628
26ab0a63a199
Remove trailing periods from short disconnection error messags and remove
Mark Doliner <markdoliner@pidgin.im>
parents:
27385
diff
changeset
|
1042 | if (ret < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) |
| 13593 | 1043 | /* No worries */ |
| 1044 | return; | |
| 1045 | ||
| 1046 | /* Error! */ | |
| 15884 | 1047 | purple_input_remove(conn->watcher_outgoing); |
|
15191
d52a86abd255
[gaim-migrate @ 17915]
Mark Doliner <markdoliner@pidgin.im>
parents:
15172
diff
changeset
|
1048 | conn->watcher_outgoing = 0; |
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1049 | if (conn->gsc) { |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1050 | purple_ssl_close(conn->gsc); |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1051 | conn->gsc = NULL; |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1052 | } else { |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1053 | close(conn->fd); |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1054 | conn->fd = -1; |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1055 | } |
|
14454
df290cda81a3
[gaim-migrate @ 17099]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
1056 | flap_connection_schedule_destroy(conn, |
|
21389
e1dd8142bb87
replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents:
20658
diff
changeset
|
1057 | OSCAR_DISCONNECT_LOST_CONNECTION, g_strerror(errno)); |
| 13593 | 1058 | return; |
| 1059 | } | |
| 1060 | ||
| 15884 | 1061 | purple_circ_buffer_mark_read(conn->buffer_outgoing, ret); |
| 13593 | 1062 | } |
| 1063 | ||
| 1064 | static void | |
| 1065 | flap_connection_send_byte_stream(ByteStream *bs, FlapConnection *conn, size_t count) | |
| 1066 | { | |
| 1067 | if (conn == NULL) | |
| 1068 | return; | |
| 1069 | ||
| 1070 | /* Make sure we don't send past the end of the bs */ | |
| 30668 | 1071 | if (count > byte_stream_bytes_left(bs)) |
| 1072 | count = byte_stream_bytes_left(bs); /* truncate to remaining space */ | |
| 13593 | 1073 | |
| 1074 | if (count == 0) | |
| 1075 | return; | |
| 1076 | ||
| 1077 | /* Add everything to our outgoing buffer */ | |
| 15884 | 1078 | purple_circ_buffer_append(conn->buffer_outgoing, bs->data, count); |
| 13593 | 1079 | |
| 1080 | /* If we haven't already started writing stuff, then start the cycle */ | |
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1081 | if (conn->watcher_outgoing == 0) |
| 13593 | 1082 | { |
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1083 | if (conn->gsc) { |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1084 | conn->watcher_outgoing = purple_input_add(conn->gsc->fd, |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1085 | PURPLE_INPUT_WRITE, send_cb, conn); |
|
25519
d15507b37c1a
Shuffle a few comments around to make it look like I did something
Mark Doliner <markdoliner@pidgin.im>
parents:
25128
diff
changeset
|
1086 | send_cb(conn, -1, 0); |
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1087 | } else if (conn->fd >= 0) { |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1088 | conn->watcher_outgoing = purple_input_add(conn->fd, |
|
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1089 | PURPLE_INPUT_WRITE, send_cb, conn); |
|
25519
d15507b37c1a
Shuffle a few comments around to make it look like I did something
Mark Doliner <markdoliner@pidgin.im>
parents:
25128
diff
changeset
|
1090 | send_cb(conn, -1, 0); |
|
25126
2a75db143599
First pass at adding SSL connections to OSCAR.
Paul Aurich <darkrain42@pidgin.im>
parents:
24659
diff
changeset
|
1091 | } |
| 13593 | 1092 | } |
| 1093 | } | |
| 1094 | ||
| 1095 | static void | |
| 1096 | sendframe_flap(FlapConnection *conn, FlapFrame *frame) | |
| 1097 | { | |
| 1098 | ByteStream bs; | |
| 1099 | int payloadlen, bslen; | |
| 1100 | ||
| 1101 | payloadlen = byte_stream_curpos(&frame->data); | |
| 1102 | ||
|
15151
bb985812fefa
[gaim-migrate @ 17875]
Mark Doliner <markdoliner@pidgin.im>
parents:
15150
diff
changeset
|
1103 | byte_stream_new(&bs, 6 + payloadlen); |
| 13593 | 1104 | |
| 1105 | /* FLAP header */ | |
| 1106 | byte_stream_put8(&bs, 0x2a); | |
| 1107 | byte_stream_put8(&bs, frame->channel); | |
| 1108 | byte_stream_put16(&bs, frame->seqnum); | |
| 1109 | byte_stream_put16(&bs, payloadlen); | |
| 1110 | ||
| 1111 | /* Payload */ | |
| 1112 | byte_stream_rewind(&frame->data); | |
| 1113 | byte_stream_putbs(&bs, &frame->data, payloadlen); | |
| 1114 | ||
| 1115 | bslen = byte_stream_curpos(&bs); | |
| 1116 | byte_stream_rewind(&bs); | |
| 1117 | flap_connection_send_byte_stream(&bs, conn, bslen); | |
| 1118 | ||
|
22861
76cb58c0c40a
Used byte_stream_destroy(), added in 2b0e247173b206213210577c194020c78c864474,
Evan Schoenberg <evands@pidgin.im>
parents:
22860
diff
changeset
|
1119 | byte_stream_destroy(&bs); |
| 13593 | 1120 | } |
| 1121 | ||
| 1122 | void | |
| 1123 | flap_connection_send(FlapConnection *conn, FlapFrame *frame) | |
| 1124 | { | |
|
15169
5066b0eb6abf
[gaim-migrate @ 17893]
Mark Doliner <markdoliner@pidgin.im>
parents:
15168
diff
changeset
|
1125 | frame->seqnum = ++(conn->seqnum_out); |
| 13593 | 1126 | sendframe_flap(conn, frame); |
| 1127 | flap_frame_destroy(frame); | |
| 1128 | } |