Mercurial > pidgin
annotate src/protocols/msn/servconn.c @ 5836:09f7f23dc83a
[gaim-migrate @ 6267]
I think I've fixed the negative online time for real, now. Or, at least
reduced the frequency of it happening. Also added the ability to see
iChat's "available" messages.
Sean, I ended up changing more than I thought I would have to, but that's
partially because I like to change things a lot.
If it conflicts or whatever feel free to back it out and I can re-patch it
back in when you're done with your stuff.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 12 Jun 2003 03:27:58 +0000 |
parents | 952710ac6635 |
children | e3733414ca08 |
rev | line source |
---|---|
5309 | 1 /** |
2 * @file servconn.c Server connection functions | |
3 * | |
4 * gaim | |
5 * | |
6 * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org> | |
7 * | |
8 * This program is free software; you can redistribute it and/or modify | |
9 * it under the terms of the GNU General Public License as published by | |
10 * the Free Software Foundation; either version 2 of the License, or | |
11 * (at your option) any later version. | |
12 * | |
13 * This program is distributed in the hope that it will be useful, | |
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 * GNU General Public License for more details. | |
17 * | |
18 * You should have received a copy of the GNU General Public License | |
19 * along with this program; if not, write to the Free Software | |
20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
21 */ | |
22 #include "msn.h" | |
23 #include "servconn.h" | |
24 | |
5506
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
25 typedef struct |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
26 { |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
27 char *command; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
28 MsnMessage *msg; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
29 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
30 } MsnQueueEntry; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
31 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
32 static gboolean |
5793
952710ac6635
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
33 process_message(MsnServConn *servconn, MsnMessage *msg) |
5506
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
34 { |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
35 MsnServConnMsgCb cb; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
36 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
37 cb = g_hash_table_lookup(servconn->msg_types, |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
38 msn_message_get_content_type(msg)); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
39 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
40 if (cb == NULL) { |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
41 gaim_debug(GAIM_DEBUG_WARNING, "msn", |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
42 "Unhandled content-type '%s': %s\n", |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
43 msn_message_get_content_type(msg), |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
44 msn_message_get_body(msg)); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
45 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
46 return FALSE; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
47 } |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
48 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
49 cb(servconn, msg); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
50 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
51 return TRUE; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
52 } |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
53 |
5309 | 54 static gboolean |
5793
952710ac6635
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
55 process_single_line(MsnServConn *servconn, char *str) |
5309 | 56 { |
57 MsnServConnCommandCb cb; | |
5506
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
58 GSList *l, *l_next; |
5309 | 59 gboolean result; |
60 size_t param_count = 0; | |
61 char *command, *param_start; | |
62 char **params = NULL; | |
63 | |
64 command = str; | |
65 | |
66 /** | |
67 * See how many spaces we have in this. | |
68 */ | |
69 param_start = strchr(command, ' '); | |
70 | |
71 if (param_start != NULL) { | |
72 params = g_strsplit(param_start + 1, " ", 0); | |
73 | |
74 for (param_count = 0; params[param_count] != NULL; param_count++) | |
75 ; | |
76 | |
77 *param_start = '\0'; | |
78 } | |
79 | |
80 cb = g_hash_table_lookup(servconn->commands, command); | |
81 | |
82 if (cb == NULL) { | |
5317
2b437c18719e
[gaim-migrate @ 5689]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
83 cb = g_hash_table_lookup(servconn->commands, "_UNKNOWN_"); |
5309 | 84 |
85 if (cb == NULL) { | |
86 gaim_debug(GAIM_DEBUG_WARNING, "msn", | |
87 "Unhandled command '%s'\n", str); | |
88 | |
89 if (params != NULL) | |
90 g_strfreev(params); | |
91 | |
92 return TRUE; | |
93 } | |
94 } | |
95 | |
96 result = cb(servconn, command, (const char **)params, param_count); | |
97 | |
98 if (params != NULL) | |
99 g_strfreev(params); | |
100 | |
5506
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
101 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
102 /* Process all queued messages that are waiting on this command. */ |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
103 for (l = servconn->msg_queue; l != NULL; l = l_next) { |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
104 MsnQueueEntry *entry = l->data; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
105 MsnMessage *msg; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
106 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
107 l_next = l->next; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
108 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
109 if (entry->command == NULL || |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
110 !g_ascii_strcasecmp(entry->command, command)) { |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
111 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
112 MsnUser *sender; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
113 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
114 msg = entry->msg; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
115 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
116 msn_message_ref(msg); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
117 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
118 sender = msn_message_get_sender(msg); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
119 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
120 servconn->msg_passport = g_strdup(msn_user_get_passport(sender)); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
121 servconn->msg_friendly = g_strdup(msn_user_get_name(sender)); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
122 |
5793
952710ac6635
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
123 process_message(servconn, msg); |
5506
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
124 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
125 g_free(servconn->msg_passport); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
126 g_free(servconn->msg_friendly); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
127 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
128 msn_message_destroy(msg); |
5744
6b87c127fe7b
[gaim-migrate @ 6168]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
129 entry->msg = NULL; |
5785
5419c37a6b0c
[gaim-migrate @ 6210]
Christian Hammond <chipx86@chipx86.com>
parents:
5744
diff
changeset
|
130 |
5419c37a6b0c
[gaim-migrate @ 6210]
Christian Hammond <chipx86@chipx86.com>
parents:
5744
diff
changeset
|
131 msn_servconn_unqueue_message(servconn, entry->msg); |
5506
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
132 } |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
133 } |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
134 |
5309 | 135 return result; |
136 } | |
137 | |
138 static gboolean | |
5793
952710ac6635
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
139 process_multi_line(MsnServConn *servconn, char *buffer) |
5309 | 140 { |
141 MsnMessage *msg; | |
142 char msg_str[MSN_BUF_LEN]; | |
5506
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
143 gboolean result; |
5309 | 144 |
145 g_snprintf(msg_str, sizeof(msg_str), | |
146 "MSG %s %s %d\r\n%s", | |
147 servconn->msg_passport, servconn->msg_friendly, | |
148 servconn->msg_len, buffer); | |
149 | |
5436
ad445074d239
[gaim-migrate @ 5818]
Christian Hammond <chipx86@chipx86.com>
parents:
5317
diff
changeset
|
150 gaim_debug(GAIM_DEBUG_MISC, "msn", |
5454
c6efac0e28ff
[gaim-migrate @ 5842]
Christian Hammond <chipx86@chipx86.com>
parents:
5436
diff
changeset
|
151 "Message: {%s}\n", buffer); |
5436
ad445074d239
[gaim-migrate @ 5818]
Christian Hammond <chipx86@chipx86.com>
parents:
5317
diff
changeset
|
152 |
5506
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
153 msg = msn_message_new_from_str(servconn->session, msg_str); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
154 |
5793
952710ac6635
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
155 result = process_message(servconn, msg); |
5309 | 156 |
157 msn_message_destroy(msg); | |
158 | |
5506
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
159 return result; |
5309 | 160 } |
161 | |
162 static void | |
5793
952710ac6635
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
163 connect_cb(gpointer data, gint source, GaimInputCondition cond) |
5309 | 164 { |
165 MsnServConn *servconn = data; | |
166 | |
167 if (servconn->connect_cb(data, source, cond)) | |
168 servconn->inpa = gaim_input_add(servconn->fd, GAIM_INPUT_READ, | |
169 servconn->login_cb, data); | |
170 } | |
171 | |
172 MsnServConn * | |
173 msn_servconn_new(MsnSession *session) | |
174 { | |
175 MsnServConn *servconn; | |
176 | |
177 g_return_val_if_fail(session != NULL, NULL); | |
178 | |
179 servconn = g_new0(MsnServConn, 1); | |
180 | |
181 servconn->login_cb = msn_servconn_parse_data; | |
182 servconn->session = session; | |
183 | |
184 servconn->commands = g_hash_table_new_full(g_str_hash, g_str_equal, | |
185 g_free, NULL); | |
186 | |
187 servconn->msg_types = g_hash_table_new_full(g_str_hash, g_str_equal, | |
188 g_free, NULL); | |
189 | |
190 return servconn; | |
191 } | |
192 | |
193 gboolean | |
194 msn_servconn_connect(MsnServConn *servconn) | |
195 { | |
196 int i; | |
197 | |
198 g_return_val_if_fail(servconn != NULL, FALSE); | |
199 g_return_val_if_fail(servconn->server != NULL, FALSE); | |
200 g_return_val_if_fail(!servconn->connected, TRUE); | |
201 | |
5681
46d7ad0dfa26
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5506
diff
changeset
|
202 i = gaim_proxy_connect(servconn->session->account, servconn->server, |
5793
952710ac6635
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
203 servconn->port, connect_cb, servconn); |
5309 | 204 |
205 if (i == 0) | |
206 servconn->connected = TRUE; | |
207 | |
208 return servconn->connected; | |
209 } | |
210 | |
211 void | |
212 msn_servconn_disconnect(MsnServConn *servconn) | |
213 { | |
214 g_return_if_fail(servconn != NULL); | |
215 g_return_if_fail(servconn->connected); | |
216 | |
217 if (servconn->inpa) | |
218 gaim_input_remove(servconn->inpa); | |
219 | |
5744
6b87c127fe7b
[gaim-migrate @ 6168]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
220 close(servconn->fd); |
6b87c127fe7b
[gaim-migrate @ 6168]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
221 |
5309 | 222 g_free(servconn->rxqueue); |
223 | |
5506
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
224 while (servconn->txqueue != NULL) { |
5309 | 225 g_free(servconn->txqueue->data); |
226 | |
227 servconn->txqueue = g_slist_remove(servconn->txqueue, | |
228 servconn->txqueue->data); | |
229 } | |
230 | |
5506
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
231 while (servconn->msg_queue != NULL) { |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
232 MsnQueueEntry *entry = servconn->msg_queue->data; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
233 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
234 msn_servconn_unqueue_message(servconn, entry->msg); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
235 } |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
236 |
5309 | 237 servconn->connected = FALSE; |
238 } | |
239 | |
240 void | |
241 msn_servconn_destroy(MsnServConn *servconn) | |
242 { | |
243 g_return_if_fail(servconn != NULL); | |
244 | |
245 if (servconn->connected) | |
246 msn_servconn_disconnect(servconn); | |
247 | |
248 if (servconn->server != NULL) | |
249 g_free(servconn->server); | |
250 | |
251 g_free(servconn); | |
252 } | |
253 | |
254 void | |
255 msn_servconn_set_server(MsnServConn *servconn, const char *server, int port) | |
256 { | |
257 g_return_if_fail(servconn != NULL); | |
258 g_return_if_fail(server != NULL); | |
259 g_return_if_fail(port > 0); | |
260 | |
261 if (servconn->server != NULL) | |
262 g_free(servconn->server); | |
263 | |
264 servconn->server = g_strdup(server); | |
265 servconn->port = port; | |
266 } | |
267 | |
268 const char * | |
269 msn_servconn_get_server(const MsnServConn *servconn) | |
270 { | |
271 g_return_val_if_fail(servconn != NULL, NULL); | |
272 | |
273 return servconn->server; | |
274 } | |
275 | |
276 int | |
277 msn_servconn_get_port(const MsnServConn *servconn) | |
278 { | |
279 g_return_val_if_fail(servconn != NULL, 0); | |
280 | |
281 return servconn->port; | |
282 } | |
283 | |
284 void | |
285 msn_servconn_set_connect_cb(MsnServConn *servconn, | |
286 gboolean (*connect_cb)(gpointer, gint, | |
287 GaimInputCondition)) | |
288 { | |
289 g_return_if_fail(servconn != NULL); | |
290 | |
291 servconn->connect_cb = connect_cb; | |
292 } | |
293 | |
294 void | |
295 msn_servconn_set_failed_read_cb(MsnServConn *servconn, | |
296 void (*failed_read_cb)(gpointer, gint, | |
297 GaimInputCondition)) | |
298 { | |
299 g_return_if_fail(servconn != NULL); | |
300 | |
301 servconn->failed_read_cb = failed_read_cb; | |
302 } | |
303 | |
304 size_t | |
305 msn_servconn_write(MsnServConn *servconn, const char *buf, size_t size) | |
306 { | |
307 g_return_val_if_fail(servconn != NULL, 0); | |
308 | |
309 gaim_debug(GAIM_DEBUG_MISC, "msn", "C: %s%s", buf, | |
310 (*(buf + size - 1) == '\n' ? "" : "\n")); | |
311 | |
312 return write(servconn->fd, buf, size); | |
313 } | |
314 | |
315 gboolean | |
316 msn_servconn_send_command(MsnServConn *servconn, const char *command, | |
317 const char *params) | |
318 { | |
319 char buf[MSN_BUF_LEN]; | |
320 | |
321 g_return_val_if_fail(servconn != NULL, FALSE); | |
322 g_return_val_if_fail(command != NULL, FALSE); | |
323 | |
324 if (params == NULL) | |
325 g_snprintf(buf, sizeof(buf), "%s %u\r\n", command, | |
326 servconn->session->trId++); | |
327 else | |
328 g_snprintf(buf, sizeof(buf), "%s %u %s\r\n", | |
329 command, servconn->session->trId++, params); | |
330 | |
331 return (msn_servconn_write(servconn, buf, strlen(buf)) > 0); | |
332 } | |
333 | |
334 void | |
5506
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
335 msn_servconn_queue_message(MsnServConn *servconn, const char *command, |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
336 MsnMessage *msg) |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
337 { |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
338 MsnQueueEntry *entry; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
339 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
340 g_return_if_fail(servconn != NULL); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
341 g_return_if_fail(msg != NULL); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
342 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
343 entry = g_new0(MsnQueueEntry, 1); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
344 entry->msg = msg; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
345 entry->command = (command == NULL ? NULL : g_strdup(command)); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
346 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
347 servconn->msg_queue = g_slist_append(servconn->msg_queue, entry); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
348 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
349 msn_message_ref(msg); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
350 } |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
351 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
352 void |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
353 msn_servconn_unqueue_message(MsnServConn *servconn, MsnMessage *msg) |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
354 { |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
355 MsnQueueEntry *entry = NULL; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
356 GSList *l; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
357 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
358 g_return_if_fail(servconn != NULL); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
359 g_return_if_fail(msg != NULL); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
360 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
361 for (l = servconn->msg_queue; l != NULL; l = l->next) { |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
362 entry = l->data; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
363 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
364 if (entry->msg == msg) |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
365 break; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
366 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
367 entry = NULL; |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
368 } |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
369 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
370 g_return_if_fail(entry != NULL); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
371 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
372 msn_message_unref(msg); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
373 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
374 servconn->msg_queue = g_slist_remove(servconn->msg_queue, entry); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
375 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
376 if (entry->command != NULL) |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
377 g_free(entry->command); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
378 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
379 g_free(entry); |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
380 } |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
381 |
4f72b611f0ee
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
382 void |
5309 | 383 msn_servconn_register_command(MsnServConn *servconn, const char *command, |
384 MsnServConnCommandCb cb) | |
385 { | |
386 char *command_up; | |
387 | |
388 g_return_if_fail(servconn != NULL); | |
389 g_return_if_fail(command != NULL); | |
390 g_return_if_fail(cb != NULL); | |
391 | |
392 command_up = g_ascii_strup(command, -1); | |
393 | |
394 g_hash_table_insert(servconn->commands, command_up, cb); | |
395 } | |
396 | |
397 void | |
398 msn_servconn_register_msg_type(MsnServConn *servconn, | |
399 const char *content_type, | |
400 MsnServConnMsgCb cb) | |
401 { | |
402 g_return_if_fail(servconn != NULL); | |
403 g_return_if_fail(content_type != NULL); | |
404 g_return_if_fail(cb != NULL); | |
405 | |
406 g_hash_table_insert(servconn->msg_types, g_strdup(content_type), cb); | |
407 } | |
408 | |
409 void | |
410 msn_servconn_parse_data(gpointer data, gint source, GaimInputCondition cond) | |
411 { | |
412 MsnServConn *servconn = (MsnServConn *)data; | |
413 char buf[MSN_BUF_LEN]; | |
414 gboolean cont = TRUE; | |
415 int len; | |
416 | |
417 len = read(servconn->fd, buf, sizeof(buf)); | |
418 | |
419 if (len <= 0) { | |
420 if (servconn->failed_read_cb != NULL) | |
421 servconn->failed_read_cb(data, source, cond); | |
422 | |
423 return; | |
424 } | |
425 | |
426 servconn->rxqueue = g_realloc(servconn->rxqueue, len + servconn->rxlen); | |
427 memcpy(servconn->rxqueue + servconn->rxlen, buf, len); | |
428 servconn->rxlen += len; | |
429 | |
430 while (cont) { | |
431 if (servconn->parsing_msg) { | |
432 char *msg; | |
433 | |
434 if (servconn->rxlen == 0) | |
435 break; | |
436 | |
437 if (servconn->msg_len > servconn->rxlen) | |
438 break; | |
439 | |
440 msg = servconn->rxqueue; | |
441 servconn->rxlen -= servconn->msg_len; | |
442 | |
443 if (servconn->rxlen) { | |
444 servconn->rxqueue = g_memdup(msg + servconn->msg_len, | |
445 servconn->rxlen); | |
446 } | |
447 else { | |
448 servconn->rxqueue = NULL; | |
449 msg = g_realloc(msg, servconn->msg_len + 1); | |
450 } | |
451 | |
452 msg[servconn->msg_len] = '\0'; | |
453 servconn->parsing_msg = FALSE; | |
454 | |
5793
952710ac6635
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
455 process_multi_line(servconn, msg); |
5309 | 456 |
457 servconn->msg_len = 0; | |
458 g_free(servconn->msg_passport); | |
459 g_free(servconn->msg_friendly); | |
460 g_free(msg); | |
461 } | |
462 else { | |
463 char *end = servconn->rxqueue; | |
464 char *cmd; | |
465 int cmdlen, i; | |
466 | |
467 if (!servconn->rxlen) | |
468 return; | |
469 | |
470 for (i = 0; i < servconn->rxlen - 1; end++, i++) { | |
471 if (*end == '\r' && end[1] == '\n') | |
472 break; | |
473 } | |
474 | |
475 if (i == servconn->rxlen - 1) | |
476 return; | |
477 | |
478 cmdlen = end - servconn->rxqueue + 2; | |
479 cmd = servconn->rxqueue; | |
480 servconn->rxlen -= cmdlen; | |
481 | |
482 if (servconn->rxlen) | |
483 servconn->rxqueue = g_memdup(cmd + cmdlen, servconn->rxlen); | |
484 else { | |
485 servconn->rxqueue = NULL; | |
486 cmd = g_realloc(cmd, cmdlen + 1); | |
487 } | |
488 | |
489 cmd[cmdlen] = '\0'; | |
490 | |
491 gaim_debug(GAIM_DEBUG_MISC, "msn", "S: %s", cmd); | |
492 | |
493 g_strchomp(cmd); | |
494 | |
5793
952710ac6635
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
495 cont = process_single_line(servconn, cmd); |
5309 | 496 |
497 g_free(cmd); | |
498 } | |
499 } | |
500 } | |
501 |