Sun, 14 Sep 2003 01:59:09 +0000
[gaim-migrate @ 7372]
Several fixes for attempted NULL pointer frees, and some MSNSLP fixes.
Still not ready for use yet.
| 5309 | 1 | /** |
| 2 | * @file servconn.c Server connection functions | |
| 3 | * | |
| 4 | * gaim | |
| 5 | * | |
| 6 | * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org> | |
|
6701
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6122
diff
changeset
|
7 | * |
| 5309 | 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
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
25 | typedef struct |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
26 | { |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
27 | char *command; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
28 | MsnMessage *msg; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
29 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
30 | } MsnQueueEntry; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
31 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
32 | static gboolean |
|
5793
28d84d5e5663
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
33 | process_message(MsnServConn *servconn, MsnMessage *msg) |
|
5506
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
34 | { |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
35 | MsnServConnMsgCb cb; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
36 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
37 | cb = g_hash_table_lookup(servconn->msg_types, |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
38 | msn_message_get_content_type(msg)); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
39 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
40 | if (cb == NULL) { |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
41 | gaim_debug(GAIM_DEBUG_WARNING, "msn", |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
42 | "Unhandled content-type '%s': %s\n", |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
43 | msn_message_get_content_type(msg), |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
44 | msn_message_get_body(msg)); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
45 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
46 | return FALSE; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
47 | } |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
48 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
49 | cb(servconn, msg); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
50 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
51 | return TRUE; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
52 | } |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
53 | |
| 5309 | 54 | static gboolean |
|
5793
28d84d5e5663
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
55 | process_single_line(MsnServConn *servconn, char *str) |
| 5309 | 56 | { |
|
5897
6694ccd49129
[gaim-migrate @ 6329]
Christian Hammond <chipx86@chipx86.com>
parents:
5793
diff
changeset
|
57 | MsnSession *session = servconn->session; |
| 5309 | 58 | MsnServConnCommandCb cb; |
|
5897
6694ccd49129
[gaim-migrate @ 6329]
Christian Hammond <chipx86@chipx86.com>
parents:
5793
diff
changeset
|
59 | GSList *l, *l_next = NULL; |
| 5309 | 60 | gboolean result; |
| 61 | size_t param_count = 0; | |
| 62 | char *command, *param_start; | |
| 63 | char **params = NULL; | |
| 64 | ||
| 65 | command = str; | |
| 66 | ||
| 67 | /** | |
| 68 | * See how many spaces we have in this. | |
| 69 | */ | |
| 70 | param_start = strchr(command, ' '); | |
| 71 | ||
| 72 | if (param_start != NULL) { | |
| 73 | params = g_strsplit(param_start + 1, " ", 0); | |
| 74 | ||
| 75 | for (param_count = 0; params[param_count] != NULL; param_count++) | |
| 76 | ; | |
| 77 | ||
| 78 | *param_start = '\0'; | |
| 79 | } | |
| 80 | ||
| 81 | cb = g_hash_table_lookup(servconn->commands, command); | |
| 82 | ||
| 83 | if (cb == NULL) { | |
|
5317
2cffac4dfb06
[gaim-migrate @ 5689]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
84 | cb = g_hash_table_lookup(servconn->commands, "_UNKNOWN_"); |
| 5309 | 85 | |
| 86 | if (cb == NULL) { | |
| 87 | gaim_debug(GAIM_DEBUG_WARNING, "msn", | |
| 88 | "Unhandled command '%s'\n", str); | |
| 89 | ||
| 90 | if (params != NULL) | |
| 91 | g_strfreev(params); | |
| 92 | ||
| 93 | return TRUE; | |
| 94 | } | |
| 95 | } | |
| 96 | ||
| 97 | result = cb(servconn, command, (const char **)params, param_count); | |
| 98 | ||
| 99 | if (params != NULL) | |
| 100 | g_strfreev(params); | |
| 101 | ||
|
5898
77c591517706
[gaim-migrate @ 6330]
Christian Hammond <chipx86@chipx86.com>
parents:
5897
diff
changeset
|
102 | if (g_list_find(session->servconns, servconn) == NULL) |
|
5897
6694ccd49129
[gaim-migrate @ 6329]
Christian Hammond <chipx86@chipx86.com>
parents:
5793
diff
changeset
|
103 | return result; |
|
6694ccd49129
[gaim-migrate @ 6329]
Christian Hammond <chipx86@chipx86.com>
parents:
5793
diff
changeset
|
104 | |
|
5506
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
105 | /* Process all queued messages that are waiting on this command. */ |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
106 | for (l = servconn->msg_queue; l != NULL; l = l_next) { |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
107 | MsnQueueEntry *entry = l->data; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
108 | MsnMessage *msg; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
109 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
110 | l_next = l->next; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
111 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
112 | if (entry->command == NULL || |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
113 | !g_ascii_strcasecmp(entry->command, command)) { |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
114 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
115 | MsnUser *sender; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
116 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
117 | msg = entry->msg; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
118 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
119 | msn_message_ref(msg); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
120 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
121 | sender = msn_message_get_sender(msg); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
122 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
123 | servconn->msg_passport = g_strdup(msn_user_get_passport(sender)); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
124 | servconn->msg_friendly = g_strdup(msn_user_get_name(sender)); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
125 | |
|
5793
28d84d5e5663
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
126 | process_message(servconn, msg); |
|
5506
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
127 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
128 | g_free(servconn->msg_passport); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
129 | g_free(servconn->msg_friendly); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
130 | |
|
6122
9fbbcb229460
[gaim-migrate @ 6596]
Mark Doliner <markdoliner@pidgin.im>
parents:
5962
diff
changeset
|
131 | msn_servconn_unqueue_message(servconn, entry->msg); |
|
9fbbcb229460
[gaim-migrate @ 6596]
Mark Doliner <markdoliner@pidgin.im>
parents:
5962
diff
changeset
|
132 | |
|
5506
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
133 | msn_message_destroy(msg); |
|
5744
138b30636f76
[gaim-migrate @ 6168]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
134 | entry->msg = NULL; |
|
5506
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
135 | } |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
136 | } |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
137 | |
| 5309 | 138 | return result; |
| 139 | } | |
| 140 | ||
| 141 | static gboolean | |
|
5793
28d84d5e5663
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
142 | process_multi_line(MsnServConn *servconn, char *buffer) |
| 5309 | 143 | { |
| 144 | char msg_str[MSN_BUF_LEN]; | |
|
5962
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
145 | gboolean result = TRUE; |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
146 | |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
147 | if (servconn->multiline_type == MSN_MULTILINE_MSG) { |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
148 | MsnMessage *msg; |
| 5309 | 149 | |
|
5962
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
150 | g_snprintf(msg_str, sizeof(msg_str), |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
151 | "MSG %s %s %d\r\n%s", |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
152 | servconn->msg_passport, servconn->msg_friendly, |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
153 | servconn->multiline_len, buffer); |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
154 | |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
155 | gaim_debug(GAIM_DEBUG_MISC, "msn", |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
156 | "Message: {%s}\n", buffer); |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
157 | |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
158 | msg = msn_message_new_from_str(servconn->session, msg_str); |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
159 | |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
160 | result = process_message(servconn, msg); |
| 5309 | 161 | |
|
5962
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
162 | msn_message_destroy(msg); |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
163 | } |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
164 | else if (servconn->multiline_type == MSN_MULTILINE_IPG) { |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
165 | g_snprintf(msg_str, sizeof(msg_str), |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
166 | "IPG %d\r\n%s", |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
167 | servconn->multiline_len, buffer); |
|
5436
a0e0bacaa196
[gaim-migrate @ 5818]
Christian Hammond <chipx86@chipx86.com>
parents:
5317
diff
changeset
|
168 | |
|
5962
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
169 | gaim_debug(GAIM_DEBUG_MISC, "msn", |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
170 | "Incoming Page: {%s}\n", buffer); |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
171 | } |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
172 | else if (servconn->multiline_type == MSN_MULTILINE_NOT) { |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
173 | g_snprintf(msg_str, sizeof(msg_str), |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
174 | "NOT %d\r\n%s", |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
175 | servconn->multiline_len, buffer); |
|
5506
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
176 | |
|
5962
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
177 | gaim_debug(GAIM_DEBUG_MISC, "msn", |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
178 | "Notification: {%s}\n", buffer); |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
179 | } |
| 5309 | 180 | |
|
5506
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
181 | return result; |
| 5309 | 182 | } |
| 183 | ||
| 184 | static void | |
|
5793
28d84d5e5663
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
185 | connect_cb(gpointer data, gint source, GaimInputCondition cond) |
| 5309 | 186 | { |
| 187 | MsnServConn *servconn = data; | |
| 188 | ||
| 189 | if (servconn->connect_cb(data, source, cond)) | |
| 190 | servconn->inpa = gaim_input_add(servconn->fd, GAIM_INPUT_READ, | |
| 191 | servconn->login_cb, data); | |
| 192 | } | |
| 193 | ||
| 194 | MsnServConn * | |
| 195 | msn_servconn_new(MsnSession *session) | |
| 196 | { | |
| 197 | MsnServConn *servconn; | |
| 198 | ||
| 199 | g_return_val_if_fail(session != NULL, NULL); | |
| 200 | ||
| 201 | servconn = g_new0(MsnServConn, 1); | |
| 202 | ||
| 203 | servconn->login_cb = msn_servconn_parse_data; | |
| 204 | servconn->session = session; | |
| 205 | ||
| 206 | servconn->commands = g_hash_table_new_full(g_str_hash, g_str_equal, | |
| 207 | g_free, NULL); | |
| 208 | ||
| 209 | servconn->msg_types = g_hash_table_new_full(g_str_hash, g_str_equal, | |
| 210 | g_free, NULL); | |
| 211 | ||
|
5898
77c591517706
[gaim-migrate @ 6330]
Christian Hammond <chipx86@chipx86.com>
parents:
5897
diff
changeset
|
212 | session->servconns = g_list_append(session->servconns, servconn); |
|
77c591517706
[gaim-migrate @ 6330]
Christian Hammond <chipx86@chipx86.com>
parents:
5897
diff
changeset
|
213 | |
| 5309 | 214 | return servconn; |
| 215 | } | |
| 216 | ||
| 217 | gboolean | |
| 218 | msn_servconn_connect(MsnServConn *servconn) | |
| 219 | { | |
| 220 | int i; | |
| 221 | ||
| 222 | g_return_val_if_fail(servconn != NULL, FALSE); | |
| 223 | g_return_val_if_fail(servconn->server != NULL, FALSE); | |
| 224 | g_return_val_if_fail(!servconn->connected, TRUE); | |
| 225 | ||
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5506
diff
changeset
|
226 | i = gaim_proxy_connect(servconn->session->account, servconn->server, |
|
5793
28d84d5e5663
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
227 | servconn->port, connect_cb, servconn); |
| 5309 | 228 | |
| 229 | if (i == 0) | |
| 230 | servconn->connected = TRUE; | |
| 231 | ||
| 232 | return servconn->connected; | |
| 233 | } | |
| 234 | ||
| 235 | void | |
| 236 | msn_servconn_disconnect(MsnServConn *servconn) | |
| 237 | { | |
| 238 | g_return_if_fail(servconn != NULL); | |
| 239 | g_return_if_fail(servconn->connected); | |
| 240 | ||
| 241 | if (servconn->inpa) | |
| 242 | gaim_input_remove(servconn->inpa); | |
| 243 | ||
|
5744
138b30636f76
[gaim-migrate @ 6168]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
244 | close(servconn->fd); |
|
138b30636f76
[gaim-migrate @ 6168]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
245 | |
|
6827
df4411142ece
[gaim-migrate @ 7372]
Christian Hammond <chipx86@chipx86.com>
parents:
6826
diff
changeset
|
246 | if (servconn->rxqueue != NULL) |
|
df4411142ece
[gaim-migrate @ 7372]
Christian Hammond <chipx86@chipx86.com>
parents:
6826
diff
changeset
|
247 | g_free(servconn->rxqueue); |
| 5309 | 248 | |
|
5506
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
249 | while (servconn->txqueue != NULL) { |
| 5309 | 250 | g_free(servconn->txqueue->data); |
| 251 | ||
| 252 | servconn->txqueue = g_slist_remove(servconn->txqueue, | |
| 253 | servconn->txqueue->data); | |
| 254 | } | |
| 255 | ||
|
5506
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
256 | while (servconn->msg_queue != NULL) { |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
257 | MsnQueueEntry *entry = servconn->msg_queue->data; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
258 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
259 | msn_servconn_unqueue_message(servconn, entry->msg); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
260 | } |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
261 | |
| 5309 | 262 | servconn->connected = FALSE; |
| 263 | } | |
| 264 | ||
| 265 | void | |
| 266 | msn_servconn_destroy(MsnServConn *servconn) | |
| 267 | { | |
|
5898
77c591517706
[gaim-migrate @ 6330]
Christian Hammond <chipx86@chipx86.com>
parents:
5897
diff
changeset
|
268 | MsnSession *session; |
|
77c591517706
[gaim-migrate @ 6330]
Christian Hammond <chipx86@chipx86.com>
parents:
5897
diff
changeset
|
269 | |
| 5309 | 270 | g_return_if_fail(servconn != NULL); |
| 271 | ||
|
5898
77c591517706
[gaim-migrate @ 6330]
Christian Hammond <chipx86@chipx86.com>
parents:
5897
diff
changeset
|
272 | session = servconn->session; |
|
77c591517706
[gaim-migrate @ 6330]
Christian Hammond <chipx86@chipx86.com>
parents:
5897
diff
changeset
|
273 | |
|
77c591517706
[gaim-migrate @ 6330]
Christian Hammond <chipx86@chipx86.com>
parents:
5897
diff
changeset
|
274 | session->servconns = g_list_remove(session->servconns, servconn); |
|
77c591517706
[gaim-migrate @ 6330]
Christian Hammond <chipx86@chipx86.com>
parents:
5897
diff
changeset
|
275 | |
| 5309 | 276 | if (servconn->connected) |
| 277 | msn_servconn_disconnect(servconn); | |
| 278 | ||
| 279 | if (servconn->server != NULL) | |
| 280 | g_free(servconn->server); | |
| 281 | ||
| 282 | g_free(servconn); | |
| 283 | } | |
| 284 | ||
| 285 | void | |
| 286 | msn_servconn_set_server(MsnServConn *servconn, const char *server, int port) | |
| 287 | { | |
| 288 | g_return_if_fail(servconn != NULL); | |
| 289 | g_return_if_fail(server != NULL); | |
| 290 | g_return_if_fail(port > 0); | |
| 291 | ||
| 292 | if (servconn->server != NULL) | |
| 293 | g_free(servconn->server); | |
| 294 | ||
| 295 | servconn->server = g_strdup(server); | |
| 296 | servconn->port = port; | |
| 297 | } | |
| 298 | ||
| 299 | const char * | |
| 300 | msn_servconn_get_server(const MsnServConn *servconn) | |
| 301 | { | |
| 302 | g_return_val_if_fail(servconn != NULL, NULL); | |
| 303 | ||
| 304 | return servconn->server; | |
| 305 | } | |
| 306 | ||
| 307 | int | |
| 308 | msn_servconn_get_port(const MsnServConn *servconn) | |
| 309 | { | |
| 310 | g_return_val_if_fail(servconn != NULL, 0); | |
| 311 | ||
| 312 | return servconn->port; | |
| 313 | } | |
| 314 | ||
| 315 | void | |
| 316 | msn_servconn_set_connect_cb(MsnServConn *servconn, | |
| 317 | gboolean (*connect_cb)(gpointer, gint, | |
| 318 | GaimInputCondition)) | |
| 319 | { | |
| 320 | g_return_if_fail(servconn != NULL); | |
| 321 | ||
| 322 | servconn->connect_cb = connect_cb; | |
| 323 | } | |
| 324 | ||
| 325 | void | |
| 326 | msn_servconn_set_failed_read_cb(MsnServConn *servconn, | |
| 327 | void (*failed_read_cb)(gpointer, gint, | |
| 328 | GaimInputCondition)) | |
| 329 | { | |
| 330 | g_return_if_fail(servconn != NULL); | |
| 331 | ||
| 332 | servconn->failed_read_cb = failed_read_cb; | |
| 333 | } | |
| 334 | ||
| 335 | size_t | |
| 336 | msn_servconn_write(MsnServConn *servconn, const char *buf, size_t size) | |
| 337 | { | |
| 338 | g_return_val_if_fail(servconn != NULL, 0); | |
| 339 | ||
|
6827
df4411142ece
[gaim-migrate @ 7372]
Christian Hammond <chipx86@chipx86.com>
parents:
6826
diff
changeset
|
340 | #if 0 |
| 5309 | 341 | gaim_debug(GAIM_DEBUG_MISC, "msn", "C: %s%s", buf, |
| 342 | (*(buf + size - 1) == '\n' ? "" : "\n")); | |
|
6827
df4411142ece
[gaim-migrate @ 7372]
Christian Hammond <chipx86@chipx86.com>
parents:
6826
diff
changeset
|
343 | #endif |
| 5309 | 344 | |
| 345 | return write(servconn->fd, buf, size); | |
| 346 | } | |
| 347 | ||
| 348 | gboolean | |
| 349 | msn_servconn_send_command(MsnServConn *servconn, const char *command, | |
| 350 | const char *params) | |
| 351 | { | |
| 352 | char buf[MSN_BUF_LEN]; | |
| 353 | ||
| 354 | g_return_val_if_fail(servconn != NULL, FALSE); | |
| 355 | g_return_val_if_fail(command != NULL, FALSE); | |
| 356 | ||
| 357 | if (params == NULL) | |
| 358 | g_snprintf(buf, sizeof(buf), "%s %u\r\n", command, | |
| 359 | servconn->session->trId++); | |
| 360 | else | |
| 361 | g_snprintf(buf, sizeof(buf), "%s %u %s\r\n", | |
| 362 | command, servconn->session->trId++, params); | |
| 363 | ||
| 364 | return (msn_servconn_write(servconn, buf, strlen(buf)) > 0); | |
| 365 | } | |
| 366 | ||
| 367 | void | |
|
5506
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
368 | msn_servconn_queue_message(MsnServConn *servconn, const char *command, |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
369 | MsnMessage *msg) |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
370 | { |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
371 | MsnQueueEntry *entry; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
372 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
373 | g_return_if_fail(servconn != NULL); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
374 | g_return_if_fail(msg != NULL); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
375 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
376 | entry = g_new0(MsnQueueEntry, 1); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
377 | entry->msg = msg; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
378 | entry->command = (command == NULL ? NULL : g_strdup(command)); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
379 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
380 | servconn->msg_queue = g_slist_append(servconn->msg_queue, entry); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
381 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
382 | msn_message_ref(msg); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
383 | } |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
384 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
385 | void |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
386 | msn_servconn_unqueue_message(MsnServConn *servconn, MsnMessage *msg) |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
387 | { |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
388 | MsnQueueEntry *entry = NULL; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
389 | GSList *l; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
390 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
391 | g_return_if_fail(servconn != NULL); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
392 | g_return_if_fail(msg != NULL); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
393 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
394 | for (l = servconn->msg_queue; l != NULL; l = l->next) { |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
395 | entry = l->data; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
396 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
397 | if (entry->msg == msg) |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
398 | break; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
399 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
400 | entry = NULL; |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
401 | } |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
402 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
403 | g_return_if_fail(entry != NULL); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
404 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
405 | msn_message_unref(msg); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
406 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
407 | servconn->msg_queue = g_slist_remove(servconn->msg_queue, entry); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
408 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
409 | if (entry->command != NULL) |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
410 | g_free(entry->command); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
411 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
412 | g_free(entry); |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
413 | } |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
414 | |
|
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5454
diff
changeset
|
415 | void |
| 5309 | 416 | msn_servconn_register_command(MsnServConn *servconn, const char *command, |
| 417 | MsnServConnCommandCb cb) | |
| 418 | { | |
| 419 | char *command_up; | |
| 420 | ||
| 421 | g_return_if_fail(servconn != NULL); | |
| 422 | g_return_if_fail(command != NULL); | |
| 423 | g_return_if_fail(cb != NULL); | |
| 424 | ||
| 425 | command_up = g_ascii_strup(command, -1); | |
| 426 | ||
| 427 | g_hash_table_insert(servconn->commands, command_up, cb); | |
| 428 | } | |
| 429 | ||
| 430 | void | |
| 431 | msn_servconn_register_msg_type(MsnServConn *servconn, | |
| 432 | const char *content_type, | |
| 433 | MsnServConnMsgCb cb) | |
| 434 | { | |
| 435 | g_return_if_fail(servconn != NULL); | |
| 436 | g_return_if_fail(content_type != NULL); | |
| 437 | g_return_if_fail(cb != NULL); | |
| 438 | ||
| 439 | g_hash_table_insert(servconn->msg_types, g_strdup(content_type), cb); | |
| 440 | } | |
| 441 | ||
| 442 | void | |
| 443 | msn_servconn_parse_data(gpointer data, gint source, GaimInputCondition cond) | |
| 444 | { | |
| 445 | MsnServConn *servconn = (MsnServConn *)data; | |
|
5899
cc081a4924f6
[gaim-migrate @ 6331]
Christian Hammond <chipx86@chipx86.com>
parents:
5898
diff
changeset
|
446 | MsnSession *session = servconn->session; |
| 5309 | 447 | char buf[MSN_BUF_LEN]; |
| 448 | gboolean cont = TRUE; | |
| 449 | int len; | |
| 450 | ||
| 451 | len = read(servconn->fd, buf, sizeof(buf)); | |
| 452 | ||
| 453 | if (len <= 0) { | |
| 454 | if (servconn->failed_read_cb != NULL) | |
| 455 | servconn->failed_read_cb(data, source, cond); | |
| 456 | ||
| 457 | return; | |
| 458 | } | |
| 459 | ||
| 460 | servconn->rxqueue = g_realloc(servconn->rxqueue, len + servconn->rxlen); | |
| 461 | memcpy(servconn->rxqueue + servconn->rxlen, buf, len); | |
| 462 | servconn->rxlen += len; | |
| 463 | ||
| 464 | while (cont) { | |
|
5962
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
465 | if (servconn->parsing_multiline) { |
| 5309 | 466 | char *msg; |
| 467 | ||
| 468 | if (servconn->rxlen == 0) | |
| 469 | break; | |
| 470 | ||
|
5962
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
471 | if (servconn->multiline_len > servconn->rxlen) |
| 5309 | 472 | break; |
| 473 | ||
| 474 | msg = servconn->rxqueue; | |
|
5962
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
475 | servconn->rxlen -= servconn->multiline_len; |
| 5309 | 476 | |
| 477 | if (servconn->rxlen) { | |
|
5962
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
478 | servconn->rxqueue = g_memdup(msg + servconn->multiline_len, |
| 5309 | 479 | servconn->rxlen); |
| 480 | } | |
| 481 | else { | |
| 482 | servconn->rxqueue = NULL; | |
|
5962
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
483 | msg = g_realloc(msg, servconn->multiline_len + 1); |
| 5309 | 484 | } |
| 485 | ||
|
5962
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
486 | msg[servconn->multiline_len] = '\0'; |
|
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
487 | servconn->parsing_multiline = FALSE; |
| 5309 | 488 | |
|
5793
28d84d5e5663
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
489 | process_multi_line(servconn, msg); |
| 5309 | 490 | |
|
5899
cc081a4924f6
[gaim-migrate @ 6331]
Christian Hammond <chipx86@chipx86.com>
parents:
5898
diff
changeset
|
491 | if (g_list_find(session->servconns, servconn) != NULL) { |
|
5962
d5413616b57b
[gaim-migrate @ 6409]
Christian Hammond <chipx86@chipx86.com>
parents:
5899
diff
changeset
|
492 | servconn->multiline_len = 0; |
|
5899
cc081a4924f6
[gaim-migrate @ 6331]
Christian Hammond <chipx86@chipx86.com>
parents:
5898
diff
changeset
|
493 | |
|
cc081a4924f6
[gaim-migrate @ 6331]
Christian Hammond <chipx86@chipx86.com>
parents:
5898
diff
changeset
|
494 | if (servconn->msg_passport != NULL) |
|
cc081a4924f6
[gaim-migrate @ 6331]
Christian Hammond <chipx86@chipx86.com>
parents:
5898
diff
changeset
|
495 | g_free(servconn->msg_passport); |
|
cc081a4924f6
[gaim-migrate @ 6331]
Christian Hammond <chipx86@chipx86.com>
parents:
5898
diff
changeset
|
496 | |
|
cc081a4924f6
[gaim-migrate @ 6331]
Christian Hammond <chipx86@chipx86.com>
parents:
5898
diff
changeset
|
497 | if (servconn->msg_friendly != NULL) |
|
cc081a4924f6
[gaim-migrate @ 6331]
Christian Hammond <chipx86@chipx86.com>
parents:
5898
diff
changeset
|
498 | g_free(servconn->msg_friendly); |
|
cc081a4924f6
[gaim-migrate @ 6331]
Christian Hammond <chipx86@chipx86.com>
parents:
5898
diff
changeset
|
499 | } |
|
cc081a4924f6
[gaim-migrate @ 6331]
Christian Hammond <chipx86@chipx86.com>
parents:
5898
diff
changeset
|
500 | else |
|
cc081a4924f6
[gaim-migrate @ 6331]
Christian Hammond <chipx86@chipx86.com>
parents:
5898
diff
changeset
|
501 | cont = 0; |
|
cc081a4924f6
[gaim-migrate @ 6331]
Christian Hammond <chipx86@chipx86.com>
parents:
5898
diff
changeset
|
502 | |
| 5309 | 503 | g_free(msg); |
| 504 | } | |
| 505 | else { | |
| 506 | char *end = servconn->rxqueue; | |
| 507 | char *cmd; | |
| 508 | int cmdlen, i; | |
| 509 | ||
| 510 | if (!servconn->rxlen) | |
| 511 | return; | |
| 512 | ||
| 513 | for (i = 0; i < servconn->rxlen - 1; end++, i++) { | |
| 514 | if (*end == '\r' && end[1] == '\n') | |
| 515 | break; | |
| 516 | } | |
| 517 | ||
| 518 | if (i == servconn->rxlen - 1) | |
| 519 | return; | |
| 520 | ||
| 521 | cmdlen = end - servconn->rxqueue + 2; | |
| 522 | cmd = servconn->rxqueue; | |
| 523 | servconn->rxlen -= cmdlen; | |
| 524 | ||
| 525 | if (servconn->rxlen) | |
| 526 | servconn->rxqueue = g_memdup(cmd + cmdlen, servconn->rxlen); | |
| 527 | else { | |
| 528 | servconn->rxqueue = NULL; | |
| 529 | cmd = g_realloc(cmd, cmdlen + 1); | |
| 530 | } | |
| 531 | ||
| 532 | cmd[cmdlen] = '\0'; | |
| 533 | ||
| 534 | gaim_debug(GAIM_DEBUG_MISC, "msn", "S: %s", cmd); | |
| 535 | ||
| 536 | g_strchomp(cmd); | |
| 537 | ||
|
5793
28d84d5e5663
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5785
diff
changeset
|
538 | cont = process_single_line(servconn, cmd); |
| 5309 | 539 | |
| 540 | g_free(cmd); | |
| 541 | } | |
| 542 | } | |
| 543 | } | |
| 544 |