Mon, 04 Mar 2002 04:18:02 +0000
[gaim-migrate @ 3014]
Improved typing notification for Yahoo so that it sends and recieves notification that the user has stopped typing.
Also, combined serv_send_typing and serv_send_typing_stopped... expect the same with serv_got_typing_stopped.
| 2086 | 1 | #include "config.h" |
| 2 | ||
| 3 | #include <stdlib.h> | |
| 4 | #include <string.h> | |
|
2167
cbb558585911
[gaim-migrate @ 2177]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2162
diff
changeset
|
5 | #include <errno.h> |
| 2086 | 6 | #include <stdio.h> |
| 7 | #include <unistd.h> | |
| 8 | #include <ctype.h> | |
| 9 | #include "gaim.h" | |
| 10 | #include "prpl.h" | |
| 11 | #include "proxy.h" | |
| 12 | #include "md5.h" | |
| 13 | ||
| 14 | #include "pixmaps/msn_online.xpm" | |
| 15 | #include "pixmaps/msn_away.xpm" | |
| 16 | ||
| 17 | #define MSN_BUF_LEN 8192 | |
| 18 | #define MIME_HEADER "MIME-Version: 1.0\r\n" \ | |
| 19 | "Content-Type: text/plain; charset=UTF-8\r\n" \ | |
|
2273
b7c08d737d81
[gaim-migrate @ 2283]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2265
diff
changeset
|
20 | "User-Agent: Gaim/" VERSION "\r\n" \ |
| 2086 | 21 | "X-MMS-IM-Format: FN=MS%20Sans%20Serif; EF=; CO=0; PF=0\r\n\r\n" |
| 22 | ||
|
2541
0afd3aaba327
[gaim-migrate @ 2554]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2501
diff
changeset
|
23 | #define HOTMAIL_URL "http://www.hotmail.com/cgi-bin/folders" |
| 2932 | 24 | #define PASSPORT_URL "http://lc1.law13.hotmail.passport.com/cgi-bin/dologin?login=" |
|
2541
0afd3aaba327
[gaim-migrate @ 2554]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2501
diff
changeset
|
25 | |
| 2086 | 26 | #define MSN_ONLINE 1 |
| 27 | #define MSN_BUSY 2 | |
| 28 | #define MSN_IDLE 3 | |
| 29 | #define MSN_BRB 4 | |
| 30 | #define MSN_AWAY 5 | |
| 31 | #define MSN_PHONE 6 | |
| 32 | #define MSN_LUNCH 7 | |
| 33 | #define MSN_OFFLINE 8 | |
| 34 | #define MSN_HIDDEN 9 | |
| 35 | ||
| 36 | #define USEROPT_HOTMAIL 0 | |
| 37 | ||
| 2993 | 38 | #define MSN_TYPING_RECV_TIMEOUT 6 |
| 39 | #define MSN_TYPING_SEND_TIMEOUT 4 | |
| 40 | ||
| 2086 | 41 | struct msn_data { |
| 42 | int fd; | |
| 43 | int trId; | |
| 44 | int inpa; | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
45 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
46 | char *rxqueue; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
47 | int rxlen; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
48 | gboolean msg; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
49 | char *msguser; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
50 | int msglen; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
51 | |
| 2086 | 52 | GSList *switches; |
| 53 | GSList *fl; | |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
54 | GSList *permit; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
55 | GSList *deny; |
| 2086 | 56 | }; |
| 57 | ||
| 58 | struct msn_switchboard { | |
| 59 | struct gaim_connection *gc; | |
| 60 | struct conversation *chat; | |
| 61 | int fd; | |
| 62 | int inpa; | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
63 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
64 | char *rxqueue; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
65 | int rxlen; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
66 | gboolean msg; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
67 | char *msguser; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
68 | int msglen; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
69 | |
| 2086 | 70 | char *sessid; |
| 71 | char *auth; | |
| 72 | int trId; | |
| 73 | int total; | |
| 74 | char *user; | |
|
2591
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
75 | GSList *txqueue; |
| 2086 | 76 | }; |
| 77 | ||
| 78 | struct msn_buddy { | |
| 79 | char *user; | |
| 80 | char *friend; | |
| 81 | }; | |
| 82 | ||
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
83 | static void msn_login_callback(gpointer, gint, GaimInputCondition); |
|
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
84 | static void msn_login_xfr_connect(gpointer, gint, GaimInputCondition); |
| 2086 | 85 | |
| 86 | #define GET_NEXT(tmp) while (*(tmp) && !isspace(*(tmp))) \ | |
| 87 | (tmp)++; \ | |
| 88 | *(tmp)++ = 0; \ | |
| 89 | while (*(tmp) && isspace(*(tmp))) \ | |
| 90 | (tmp)++; | |
| 91 | ||
| 92 | static char *msn_name() | |
| 93 | { | |
| 94 | return "MSN"; | |
| 95 | } | |
| 96 | ||
| 97 | static char *msn_normalize(const char *s) | |
| 98 | { | |
| 99 | static char buf[BUF_LEN]; | |
| 100 | ||
| 101 | g_return_val_if_fail(s != NULL, NULL); | |
| 102 | ||
| 103 | g_snprintf(buf, sizeof(buf), "%s%s", s, strchr(s, '@') ? "" : "@hotmail.com"); | |
| 104 | ||
| 105 | return buf; | |
| 106 | } | |
| 107 | ||
| 108 | static int msn_write(int fd, void *data, int len) | |
| 109 | { | |
|
2311
2381470530c2
[gaim-migrate @ 2321]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2303
diff
changeset
|
110 | debug_printf("MSN C: %s", data); |
| 2086 | 111 | return write(fd, data, len); |
| 112 | } | |
| 113 | ||
| 114 | static char *url_decode(const char *msg) | |
| 115 | { | |
| 116 | static char buf[MSN_BUF_LEN]; | |
| 117 | int i, j = 0; | |
| 118 | ||
| 119 | bzero(buf, sizeof(buf)); | |
| 120 | for (i = 0; i < strlen(msg); i++) { | |
| 121 | char hex[3]; | |
| 122 | if (msg[i] != '%') { | |
| 123 | buf[j++] = msg[i]; | |
| 124 | continue; | |
| 125 | } | |
| 2093 | 126 | strncpy(hex, msg + ++i, 2); hex[2] = 0; |
| 127 | /* i is pointing to the start of the number */ | |
| 128 | i++; /* now it's at the end and at the start of the for loop | |
| 129 | will be at the next character */ | |
| 130 | buf[j++] = strtol(hex, NULL, 16); | |
| 2086 | 131 | } |
| 132 | buf[j] = 0; | |
| 133 | ||
| 134 | return buf; | |
| 135 | } | |
| 136 | ||
|
2219
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
137 | static char *url_encode(const char *msg) |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
138 | { |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
139 | static char buf[MSN_BUF_LEN]; |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
140 | int i, j = 0; |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
141 | |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
142 | bzero(buf, sizeof(buf)); |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
143 | for (i = 0; i < strlen(msg); i++) { |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
144 | if (isalnum(msg[i])) |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
145 | buf[j++] = msg[i]; |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
146 | else { |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
147 | sprintf(buf + j, "%%%02x", (unsigned char)msg[i]); |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
148 | j += 3; |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
149 | } |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
150 | } |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
151 | buf[j] = 0; |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
152 | |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
153 | return buf; |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
154 | } |
|
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
155 | |
| 2086 | 156 | static char *handle_errcode(char *buf, gboolean show) |
| 157 | { | |
| 158 | int errcode; | |
| 159 | static char msg[MSN_BUF_LEN]; | |
| 160 | ||
| 161 | buf[4] = 0; | |
| 162 | errcode = atoi(buf); | |
| 163 | ||
| 164 | switch (errcode) { | |
| 165 | case 200: | |
| 166 | g_snprintf(msg, sizeof(msg), "Syntax Error (probably a Gaim bug)"); | |
| 167 | break; | |
| 168 | case 201: | |
| 169 | g_snprintf(msg, sizeof(msg), "Invalid Parameter (probably a Gaim bug)"); | |
| 170 | break; | |
| 171 | case 205: | |
| 172 | g_snprintf(msg, sizeof(msg), "Invalid User"); | |
| 173 | break; | |
| 174 | case 206: | |
| 175 | g_snprintf(msg, sizeof(msg), "Fully Qualified Domain Name missing"); | |
| 176 | break; | |
| 177 | case 207: | |
| 178 | g_snprintf(msg, sizeof(msg), "Already Login"); | |
| 179 | break; | |
| 180 | case 208: | |
| 181 | g_snprintf(msg, sizeof(msg), "Invalid Username"); | |
| 182 | break; | |
| 183 | case 209: | |
| 184 | g_snprintf(msg, sizeof(msg), "Invalid Friendly Name"); | |
| 185 | break; | |
| 186 | case 210: | |
| 187 | g_snprintf(msg, sizeof(msg), "List Full"); | |
| 188 | break; | |
| 189 | case 215: | |
| 190 | g_snprintf(msg, sizeof(msg), "Already there"); | |
| 191 | break; | |
| 192 | case 216: | |
| 193 | g_snprintf(msg, sizeof(msg), "Not on list"); | |
| 194 | break; | |
|
2842
2b2eff92a48b
[gaim-migrate @ 2855]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2820
diff
changeset
|
195 | case 217: |
|
2b2eff92a48b
[gaim-migrate @ 2855]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2820
diff
changeset
|
196 | g_snprintf(msg, sizeof(msg), "User is offline"); |
|
2b2eff92a48b
[gaim-migrate @ 2855]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2820
diff
changeset
|
197 | break; |
| 2086 | 198 | case 218: |
| 199 | g_snprintf(msg, sizeof(msg), "Already in the mode"); | |
| 200 | break; | |
| 201 | case 219: | |
| 202 | g_snprintf(msg, sizeof(msg), "Already in opposite list"); | |
| 203 | break; | |
| 204 | case 280: | |
| 205 | g_snprintf(msg, sizeof(msg), "Switchboard failed"); | |
| 206 | break; | |
| 207 | case 281: | |
| 208 | g_snprintf(msg, sizeof(msg), "Notify Transfer failed"); | |
| 209 | break; | |
| 210 | ||
| 211 | case 300: | |
| 212 | g_snprintf(msg, sizeof(msg), "Required fields missing"); | |
| 213 | break; | |
| 214 | case 302: | |
| 215 | g_snprintf(msg, sizeof(msg), "Not logged in"); | |
| 216 | break; | |
| 217 | ||
| 218 | case 500: | |
| 219 | g_snprintf(msg, sizeof(msg), "Internal server error"); | |
| 220 | break; | |
| 221 | case 501: | |
| 222 | g_snprintf(msg, sizeof(msg), "Database server error"); | |
| 223 | break; | |
| 224 | case 510: | |
| 225 | g_snprintf(msg, sizeof(msg), "File operation error"); | |
| 226 | break; | |
| 227 | case 520: | |
| 228 | g_snprintf(msg, sizeof(msg), "Memory allocation error"); | |
| 229 | break; | |
| 230 | ||
| 231 | case 600: | |
| 232 | g_snprintf(msg, sizeof(msg), "Server busy"); | |
| 233 | break; | |
| 234 | case 601: | |
| 235 | g_snprintf(msg, sizeof(msg), "Server unavailable"); | |
| 236 | break; | |
| 237 | case 602: | |
| 238 | g_snprintf(msg, sizeof(msg), "Peer Notification server down"); | |
| 239 | break; | |
| 240 | case 603: | |
| 241 | g_snprintf(msg, sizeof(msg), "Database connect error"); | |
| 242 | break; | |
| 243 | case 604: | |
| 244 | g_snprintf(msg, sizeof(msg), "Server is going down (abandon ship)"); | |
| 245 | break; | |
| 246 | ||
| 247 | case 707: | |
| 248 | g_snprintf(msg, sizeof(msg), "Error creating connection"); | |
| 249 | break; | |
| 250 | case 711: | |
| 251 | g_snprintf(msg, sizeof(msg), "Unable to write"); | |
| 252 | break; | |
| 253 | case 712: | |
| 254 | g_snprintf(msg, sizeof(msg), "Session overload"); | |
| 255 | break; | |
| 256 | case 713: | |
| 257 | g_snprintf(msg, sizeof(msg), "User is too active"); | |
| 258 | break; | |
| 259 | case 714: | |
| 260 | g_snprintf(msg, sizeof(msg), "Too many sessions"); | |
| 261 | break; | |
| 262 | case 715: | |
| 263 | g_snprintf(msg, sizeof(msg), "Not expected"); | |
| 264 | break; | |
| 265 | case 717: | |
| 266 | g_snprintf(msg, sizeof(msg), "Bad friend file"); | |
| 267 | break; | |
| 268 | ||
| 269 | case 911: | |
| 270 | g_snprintf(msg, sizeof(msg), "Authentication failed"); | |
| 271 | break; | |
| 272 | case 913: | |
| 273 | g_snprintf(msg, sizeof(msg), "Not allowed when offline"); | |
| 274 | break; | |
| 275 | case 920: | |
| 276 | g_snprintf(msg, sizeof(msg), "Not accepting new users"); | |
| 277 | break; | |
| 278 | ||
| 279 | default: | |
| 280 | g_snprintf(msg, sizeof(msg), "Unknown Error Code"); | |
| 281 | break; | |
| 282 | } | |
| 283 | ||
| 284 | if (show) | |
| 285 | do_error_dialog(msg, "MSN Error"); | |
| 286 | ||
| 287 | return msg; | |
| 288 | } | |
| 289 | ||
| 290 | static void handle_hotmail(struct gaim_connection *gc, char *data) | |
| 291 | { | |
| 2932 | 292 | char login_url[2048]; |
| 293 | ||
| 294 | snprintf(login_url, sizeof(login_url), "%s%s&passwd=%s", PASSPORT_URL, gc->username, gc->password); | |
| 295 | ||
|
2153
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
296 | if (strstr(data, "Content-Type: text/x-msmsgsinitialemailnotification;")) { |
|
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
297 | char *x = strstr(data, "Inbox-Unread:"); |
|
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
298 | if (!x) return; |
|
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
299 | x += strlen("Inbox-Unread: "); |
| 2932 | 300 | connection_has_mail(gc, atoi(x), NULL, NULL, login_url); |
|
2153
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
301 | } else if (strstr(data, "Content-Type: text/x-msmsgsemailnotification;")) { |
|
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
302 | char *from = strstr(data, "From:"); |
|
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
303 | char *subject = strstr(data, "Subject:"); |
|
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
304 | char *x; |
|
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
305 | if (!from || !subject) { |
| 2932 | 306 | connection_has_mail(gc, 1, NULL, NULL, login_url); |
|
2153
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
307 | return; |
|
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
308 | } |
|
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
309 | from += strlen("From: "); |
|
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
310 | x = strstr(from, "\r\n"); *x = 0; |
|
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
311 | subject += strlen("Subject: "); |
|
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
312 | x = strstr(subject, "\r\n"); *x = 0; |
| 2932 | 313 | connection_has_mail(gc, -1, from, subject, login_url); |
| 2086 | 314 | } |
| 315 | } | |
| 316 | ||
| 317 | static struct msn_switchboard *msn_find_switch(struct gaim_connection *gc, char *id) | |
| 318 | { | |
| 319 | struct msn_data *md = gc->proto_data; | |
| 320 | GSList *m = md->switches; | |
| 321 | ||
| 322 | while (m) { | |
| 323 | struct msn_switchboard *ms = m->data; | |
| 324 | m = m->next; | |
|
2591
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
325 | if ((ms->total <= 1) && !g_strcasecmp(ms->user, id)) |
| 2086 | 326 | return ms; |
| 327 | } | |
| 328 | ||
| 329 | return NULL; | |
| 330 | } | |
| 331 | ||
| 332 | static struct msn_switchboard *msn_find_switch_by_id(struct gaim_connection *gc, int id) | |
| 333 | { | |
| 334 | struct msn_data *md = gc->proto_data; | |
| 335 | GSList *m = md->switches; | |
| 336 | ||
| 337 | while (m) { | |
| 338 | struct msn_switchboard *ms = m->data; | |
| 339 | m = m->next; | |
| 340 | if (ms->chat && (ms->chat->id == id)) | |
| 341 | return ms; | |
| 342 | } | |
| 343 | ||
| 344 | return NULL; | |
| 345 | } | |
| 346 | ||
| 347 | static struct msn_switchboard *msn_find_writable_switch(struct gaim_connection *gc) | |
| 348 | { | |
| 349 | struct msn_data *md = gc->proto_data; | |
| 350 | GSList *m = md->switches; | |
| 351 | ||
| 352 | while (m) { | |
| 353 | struct msn_switchboard *ms = m->data; | |
| 354 | m = m->next; | |
| 355 | if (ms->txqueue) | |
| 356 | return ms; | |
| 357 | } | |
| 358 | ||
| 359 | return NULL; | |
| 360 | } | |
| 361 | ||
| 362 | static void msn_kill_switch(struct msn_switchboard *ms) | |
| 363 | { | |
| 364 | struct gaim_connection *gc = ms->gc; | |
| 365 | struct msn_data *md = gc->proto_data; | |
| 366 | ||
| 367 | if (ms->inpa) | |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
368 | gaim_input_remove(ms->inpa); |
| 2086 | 369 | close(ms->fd); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
370 | g_free(ms->rxqueue); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
371 | if (ms->msg) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
372 | g_free(ms->msguser); |
| 2086 | 373 | if (ms->sessid) |
| 374 | g_free(ms->sessid); | |
| 375 | g_free(ms->auth); | |
| 376 | if (ms->user) | |
| 377 | g_free(ms->user); | |
|
2591
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
378 | while (ms->txqueue) { |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
379 | g_free(ms->txqueue->data); |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
380 | ms->txqueue = g_slist_remove(ms->txqueue, ms->txqueue->data); |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
381 | } |
| 2086 | 382 | if (ms->chat) |
| 383 | serv_got_chat_left(gc, ms->chat->id); | |
| 384 | ||
| 385 | md->switches = g_slist_remove(md->switches, ms); | |
| 386 | ||
| 387 | g_free(ms); | |
| 388 | } | |
| 389 | ||
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
390 | static int msn_process_switch(struct msn_switchboard *ms, char *buf) |
| 2086 | 391 | { |
| 392 | struct gaim_connection *gc = ms->gc; | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
393 | char sendbuf[MSN_BUF_LEN]; |
| 2086 | 394 | static int id = 0; |
| 395 | ||
| 396 | if (!g_strncasecmp(buf, "ACK", 3)) { | |
| 397 | } else if (!g_strncasecmp(buf, "ANS", 3)) { | |
| 398 | if (ms->chat) | |
| 399 | add_chat_buddy(ms->chat, gc->username); | |
| 400 | } else if (!g_strncasecmp(buf, "BYE", 3)) { | |
| 401 | if (ms->chat) { | |
| 402 | char *user, *tmp = buf; | |
| 403 | GET_NEXT(tmp); | |
| 404 | user = tmp; | |
|
2820
4e07191ca3d0
[gaim-migrate @ 2833]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2773
diff
changeset
|
405 | remove_chat_buddy(ms->chat, user, NULL); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
406 | } else { |
| 2086 | 407 | msn_kill_switch(ms); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
408 | return 0; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
409 | } |
| 2086 | 410 | } else if (!g_strncasecmp(buf, "CAL", 3)) { |
| 411 | } else if (!g_strncasecmp(buf, "IRO", 3)) { | |
| 412 | char *tot, *user, *tmp = buf; | |
| 413 | ||
| 414 | GET_NEXT(tmp); | |
| 415 | GET_NEXT(tmp); | |
| 416 | GET_NEXT(tmp); | |
| 417 | tot = tmp; | |
| 418 | GET_NEXT(tmp); | |
| 419 | ms->total = atoi(tot); | |
| 420 | user = tmp; | |
| 421 | GET_NEXT(tmp); | |
| 422 | ||
| 423 | if (ms->total > 1) { | |
| 424 | if (!ms->chat) | |
| 425 | ms->chat = serv_got_joined_chat(gc, ++id, "MSN Chat"); | |
| 426 | add_chat_buddy(ms->chat, user); | |
| 427 | } | |
| 428 | } else if (!g_strncasecmp(buf, "JOI", 3)) { | |
| 429 | char *user, *tmp = buf; | |
| 430 | GET_NEXT(tmp); | |
| 431 | user = tmp; | |
| 432 | GET_NEXT(tmp); | |
| 433 | ||
| 434 | if (ms->total == 1) { | |
| 435 | ms->chat = serv_got_joined_chat(gc, ++id, "MSN Chat"); | |
| 436 | add_chat_buddy(ms->chat, ms->user); | |
| 437 | add_chat_buddy(ms->chat, gc->username); | |
| 438 | g_free(ms->user); | |
| 439 | ms->user = NULL; | |
| 440 | } | |
| 441 | if (ms->chat) | |
| 442 | add_chat_buddy(ms->chat, user); | |
| 443 | ms->total++; | |
|
2591
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
444 | while (ms->txqueue) { |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
445 | char *send = add_cr(ms->txqueue->data); |
|
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
446 | char *utf8 = str_to_utf8(send); |
|
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
447 | g_free(send); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
448 | g_snprintf(sendbuf, sizeof(sendbuf), "MSG %d N %d\r\n%s%s", ++ms->trId, |
| 2086 | 449 | strlen(MIME_HEADER) + strlen(utf8), |
| 450 | MIME_HEADER, utf8); | |
| 451 | g_free(utf8); | |
|
2591
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
452 | g_free(ms->txqueue->data); |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
453 | ms->txqueue = g_slist_remove(ms->txqueue, ms->txqueue->data); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
454 | if (msn_write(ms->fd, sendbuf, strlen(sendbuf)) < 0) { |
| 2086 | 455 | msn_kill_switch(ms); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
456 | return 0; |
|
2591
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
457 | } |
| 2086 | 458 | debug_printf("\n"); |
| 459 | } | |
| 460 | } else if (!g_strncasecmp(buf, "MSG", 3)) { | |
| 461 | char *user, *tmp = buf; | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
462 | int length; |
| 2086 | 463 | |
| 464 | GET_NEXT(tmp); | |
| 465 | user = tmp; | |
| 466 | ||
| 467 | GET_NEXT(tmp); | |
| 468 | ||
| 469 | GET_NEXT(tmp); | |
| 470 | length = atoi(tmp); | |
| 471 | ||
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
472 | ms->msg = TRUE; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
473 | ms->msguser = g_strdup(user); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
474 | ms->msglen = length; |
| 2086 | 475 | } else if (!g_strncasecmp(buf, "NAK", 3)) { |
| 476 | do_error_dialog("A message may not have been received.", "MSN Error"); | |
| 477 | } else if (!g_strncasecmp(buf, "NLN", 3)) { | |
| 478 | } else if (!g_strncasecmp(buf, "OUT", 3)) { | |
| 479 | if (ms->chat) | |
| 480 | serv_got_chat_left(gc, ms->chat->id); | |
| 481 | msn_kill_switch(ms); | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
482 | return 0; |
| 2086 | 483 | } else if (!g_strncasecmp(buf, "USR", 3)) { |
| 484 | /* good, we got USR, now we need to find out who we want to talk to */ | |
| 485 | struct msn_switchboard *ms = msn_find_writable_switch(gc); | |
| 486 | ||
| 487 | if (!ms) | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
488 | return 0; |
| 2086 | 489 | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
490 | g_snprintf(sendbuf, sizeof(sendbuf), "CAL %d %s\r\n", ++ms->trId, ms->user); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
491 | if (msn_write(ms->fd, sendbuf, strlen(sendbuf)) < 0) { |
| 2086 | 492 | msn_kill_switch(ms); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
493 | return 0; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
494 | } |
| 2086 | 495 | } else if (isdigit(*buf)) { |
| 496 | handle_errcode(buf, TRUE); | |
| 497 | } else { | |
| 498 | debug_printf("Unhandled message!\n"); | |
| 499 | } | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
500 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
501 | return 1; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
502 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
503 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
504 | static void msn_process_switch_msg(struct msn_switchboard *ms, char *msg) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
505 | { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
506 | char *content, *agent, *utf; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
507 | int flags = 0; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
508 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
509 | agent = strstr(msg, "User-Agent: "); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
510 | if (agent) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
511 | if (!g_strncasecmp(agent, "User-Agent: Gaim", strlen("User-Agent: Gaim"))) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
512 | flags |= IM_FLAG_GAIMUSER; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
513 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
514 | content = strstr(msg, "Content-Type: "); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
515 | if (!content) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
516 | return; |
| 2993 | 517 | if (!g_strncasecmp(content, "Content-Type: text/x-msmsgscontrol\r\n", |
| 518 | strlen( "Content-Type: text/x-msmsgscontrol\r\n"))) { | |
| 519 | if (strstr(content,"TypingUser: ")) { | |
| 520 | serv_got_typing(ms->gc, ms->msguser, MSN_TYPING_RECV_TIMEOUT); | |
| 521 | return; | |
| 522 | } | |
| 523 | } else if (!g_strncasecmp(content, "Content-Type: text/plain", | |
| 524 | strlen("Content-Type: text/plain"))) { | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
525 | char *skiphead; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
526 | skiphead = strstr(msg, "\r\n\r\n"); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
527 | if (!skiphead || !skiphead[4]) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
528 | return; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
529 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
530 | skiphead += 4; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
531 | utf = utf8_to_str(skiphead); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
532 | strip_linefeed(utf); |
| 2993 | 533 | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
534 | if (ms->chat) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
535 | serv_got_chat_in(ms->gc, ms->chat->id, ms->msguser, flags, utf, time(NULL)); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
536 | else |
|
2856
046ed5e89321
[gaim-migrate @ 2869]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2842
diff
changeset
|
537 | serv_got_im(ms->gc, ms->msguser, utf, flags, time(NULL), -1); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
538 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
539 | g_free(utf); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
540 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
541 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
542 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
543 | static void msn_switchboard_callback(gpointer data, gint source, GaimInputCondition cond) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
544 | { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
545 | struct msn_switchboard *ms = data; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
546 | char buf[MSN_BUF_LEN]; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
547 | int cont = 1; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
548 | int len; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
549 | |
| 2970 | 550 | /* This is really stupid and I hate to put this here. */ |
| 551 | if (ms->fd != source) | |
| 552 | ms->fd = source; | |
| 553 | ||
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
554 | len = read(ms->fd, buf, sizeof(buf)); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
555 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
556 | if (len <= 0) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
557 | msn_kill_switch(ms); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
558 | return; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
559 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
560 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
561 | ms->rxqueue = g_realloc(ms->rxqueue, len + ms->rxlen); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
562 | memcpy(ms->rxqueue + ms->rxlen, buf, len); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
563 | ms->rxlen += len; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
564 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
565 | while (cont) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
566 | if (!ms->rxlen) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
567 | return; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
568 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
569 | if (ms->msg) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
570 | char *msg; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
571 | if (ms->msglen > ms->rxlen) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
572 | return; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
573 | msg = ms->rxqueue; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
574 | ms->rxlen -= ms->msglen; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
575 | if (ms->rxlen) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
576 | ms->rxqueue = g_memdup(msg + ms->msglen, ms->rxlen); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
577 | } else { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
578 | ms->rxqueue = NULL; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
579 | msg = g_realloc(msg, ms->msglen + 1); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
580 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
581 | msg[ms->msglen] = 0; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
582 | ms->msglen = 0; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
583 | ms->msg = FALSE; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
584 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
585 | msn_process_switch_msg(ms, msg); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
586 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
587 | g_free(ms->msguser); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
588 | g_free(msg); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
589 | } else { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
590 | char *end = ms->rxqueue; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
591 | int cmdlen; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
592 | char *cmd; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
593 | int i = 0; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
594 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
595 | while (i + 1 < ms->rxlen) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
596 | if (*end == '\r' && end[1] == '\n') |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
597 | break; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
598 | end++; i++; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
599 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
600 | if (i + 1 == ms->rxlen) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
601 | return; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
602 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
603 | cmdlen = end - ms->rxqueue + 2; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
604 | cmd = ms->rxqueue; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
605 | ms->rxlen -= cmdlen; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
606 | if (ms->rxlen) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
607 | ms->rxqueue = g_memdup(cmd + cmdlen, ms->rxlen); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
608 | } else { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
609 | ms->rxqueue = NULL; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
610 | cmd = g_realloc(cmd, cmdlen + 1); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
611 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
612 | cmd[cmdlen] = 0; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
613 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
614 | debug_printf("MSN S: %s", cmd); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
615 | g_strchomp(cmd); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
616 | cont = msn_process_switch(ms, cmd); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
617 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
618 | g_free(cmd); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
619 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
620 | } |
| 2086 | 621 | } |
| 622 | ||
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
623 | static void msn_rng_connect(gpointer data, gint source, GaimInputCondition cond) |
| 2086 | 624 | { |
| 625 | struct msn_switchboard *ms = data; | |
| 626 | struct gaim_connection *gc = ms->gc; | |
| 627 | struct msn_data *md; | |
| 628 | char buf[MSN_BUF_LEN]; | |
| 629 | ||
| 630 | if (source == -1 || !g_slist_find(connections, gc)) { | |
|
2210
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
631 | close(source); |
| 2086 | 632 | g_free(ms->sessid); |
| 633 | g_free(ms->auth); | |
| 634 | g_free(ms); | |
| 635 | return; | |
| 636 | } | |
| 637 | ||
| 638 | md = gc->proto_data; | |
| 639 | ||
| 640 | if (ms->fd != source) | |
| 641 | ms->fd = source; | |
| 642 | ||
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
643 | g_snprintf(buf, sizeof(buf), "ANS %d %s %s %s\r\n", ++ms->trId, gc->username, ms->auth, ms->sessid); |
| 2086 | 644 | if (msn_write(ms->fd, buf, strlen(buf)) < 0) { |
| 645 | close(ms->fd); | |
| 646 | g_free(ms->sessid); | |
| 647 | g_free(ms->auth); | |
| 648 | g_free(ms); | |
| 649 | return; | |
| 650 | } | |
| 651 | ||
| 652 | md->switches = g_slist_append(md->switches, ms); | |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
653 | ms->inpa = gaim_input_add(ms->fd, GAIM_INPUT_READ, msn_switchboard_callback, ms); |
| 2086 | 654 | } |
| 655 | ||
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
656 | static void msn_ss_xfr_connect(gpointer data, gint source, GaimInputCondition cond) |
| 2086 | 657 | { |
| 658 | struct msn_switchboard *ms = data; | |
| 659 | struct gaim_connection *gc = ms->gc; | |
| 660 | char buf[MSN_BUF_LEN]; | |
| 661 | ||
| 662 | if (source == -1 || !g_slist_find(connections, gc)) { | |
|
2210
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
663 | close(source); |
|
2265
e98463b04393
[gaim-migrate @ 2275]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2231
diff
changeset
|
664 | if (g_slist_find(connections, gc)) { |
|
e98463b04393
[gaim-migrate @ 2275]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2231
diff
changeset
|
665 | msn_kill_switch(ms); |
|
e98463b04393
[gaim-migrate @ 2275]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2231
diff
changeset
|
666 | do_error_dialog(_("MSN Error"), _("Gaim was unable to send a message")); |
|
e98463b04393
[gaim-migrate @ 2275]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2231
diff
changeset
|
667 | } |
| 2086 | 668 | return; |
| 669 | } | |
| 670 | ||
| 671 | if (ms->fd != source) | |
| 672 | ms->fd = source; | |
| 673 | ||
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
674 | g_snprintf(buf, sizeof(buf), "USR %d %s %s\r\n", ++ms->trId, gc->username, ms->auth); |
| 2086 | 675 | if (msn_write(ms->fd, buf, strlen(buf)) < 0) { |
| 676 | g_free(ms->auth); | |
| 677 | g_free(ms); | |
| 678 | return; | |
| 679 | } | |
| 680 | ||
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
681 | ms->inpa = gaim_input_add(ms->fd, GAIM_INPUT_READ, msn_switchboard_callback, ms); |
| 2086 | 682 | } |
| 683 | ||
| 684 | struct msn_add_permit { | |
| 685 | struct gaim_connection *gc; | |
| 686 | char *user; | |
| 687 | char *friend; | |
| 688 | }; | |
| 689 | ||
| 690 | static void msn_accept_add(gpointer w, struct msn_add_permit *map) | |
| 691 | { | |
| 692 | struct msn_data *md = map->gc->proto_data; | |
| 693 | char buf[MSN_BUF_LEN]; | |
| 694 | ||
|
2773
3f711c709792
[gaim-migrate @ 2786]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2758
diff
changeset
|
695 | g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, map->user, url_encode(map->friend)); |
| 2086 | 696 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
| 697 | hide_login_progress(map->gc, "Write error"); | |
| 698 | signoff(map->gc); | |
| 699 | return; | |
| 700 | } | |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
701 | build_allow_list(); /* er. right. we'll need to have a thing for this in CUI too */ |
|
2582
7d3056893188
[gaim-migrate @ 2595]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2541
diff
changeset
|
702 | |
|
7d3056893188
[gaim-migrate @ 2595]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2541
diff
changeset
|
703 | show_got_added(map->gc, NULL, map->user, map->friend, NULL); |
| 2086 | 704 | } |
| 705 | ||
| 706 | static void msn_cancel_add(gpointer w, struct msn_add_permit *map) | |
| 707 | { | |
| 708 | g_free(map->user); | |
| 709 | g_free(map->friend); | |
| 710 | g_free(map); | |
| 711 | } | |
| 712 | ||
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
713 | static int msn_process_main(struct gaim_connection *gc, char *buf) |
| 2086 | 714 | { |
| 715 | struct msn_data *md = gc->proto_data; | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
716 | char sendbuf[MSN_BUF_LEN]; |
| 2086 | 717 | |
| 718 | if (!g_strncasecmp(buf, "ADD", 3)) { | |
| 719 | char *list, *user, *friend, *tmp = buf; | |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
720 | struct msn_add_permit *ap; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
721 | GSList *perm = gc->permit; |
| 2086 | 722 | char msg[MSN_BUF_LEN]; |
| 723 | ||
| 724 | GET_NEXT(tmp); | |
| 725 | GET_NEXT(tmp); | |
| 726 | list = tmp; | |
| 727 | ||
| 728 | GET_NEXT(tmp); | |
| 729 | GET_NEXT(tmp); | |
| 730 | user = tmp; | |
| 731 | ||
| 732 | GET_NEXT(tmp); | |
| 733 | friend = tmp; | |
| 734 | ||
| 735 | if (g_strcasecmp(list, "RL")) | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
736 | return 1; |
| 2086 | 737 | |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
738 | while (perm) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
739 | if (!g_strcasecmp(perm->data, user)) |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
740 | return 1; |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
741 | perm = perm->next; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
742 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
743 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
744 | ap = g_new0(struct msn_add_permit, 1); |
| 2086 | 745 | ap->user = g_strdup(user); |
|
2611
1ede78cf9716
[gaim-migrate @ 2624]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2607
diff
changeset
|
746 | ap->friend = g_strdup(url_decode(friend)); |
| 2086 | 747 | ap->gc = gc; |
| 748 | ||
| 749 | g_snprintf(msg, sizeof(msg), "The user %s (%s) wants to add you to their buddy list.", | |
| 750 | ap->user, url_decode(ap->friend)); | |
| 751 | ||
| 752 | do_ask_dialog(msg, ap, msn_accept_add, msn_cancel_add); | |
| 753 | } else if (!g_strncasecmp(buf, "BLP", 3)) { | |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
754 | char *type, *tmp = buf; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
755 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
756 | GET_NEXT(tmp); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
757 | GET_NEXT(tmp); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
758 | GET_NEXT(tmp); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
759 | type = tmp; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
760 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
761 | if (!g_strcasecmp(type, "AL")) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
762 | /* If the current setting is AL, messages |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
763 | * from users who are not in BL will be delivered |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
764 | * |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
765 | * In other words, deny some */ |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
766 | gc->permdeny = DENY_SOME; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
767 | } else { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
768 | /* If the current |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
769 | * setting is BL, only messages from people who are in the AL will be |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
770 | * delivered. |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
771 | * |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
772 | * In other words, permit some */ |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
773 | gc->permdeny = PERMIT_SOME; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
774 | } |
| 2086 | 775 | } else if (!g_strncasecmp(buf, "BPR", 3)) { |
| 776 | } else if (!g_strncasecmp(buf, "CHG", 3)) { | |
| 777 | } else if (!g_strncasecmp(buf, "CHL", 3)) { | |
| 778 | char *hash = buf; | |
| 779 | char buf2[MSN_BUF_LEN]; | |
| 780 | md5_state_t st; | |
| 781 | md5_byte_t di[16]; | |
| 782 | int i; | |
| 783 | ||
| 784 | GET_NEXT(hash); | |
| 785 | GET_NEXT(hash); | |
| 786 | ||
| 787 | md5_init(&st); | |
| 788 | md5_append(&st, (const md5_byte_t *)hash, strlen(hash)); | |
| 789 | md5_append(&st, (const md5_byte_t *)"Q1P7W2E4J9R8U3S5", strlen("Q1P7W2E4J9R8U3S5")); | |
| 790 | md5_finish(&st, di); | |
| 791 | ||
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
792 | g_snprintf(sendbuf, sizeof(sendbuf), "QRY %d msmsgs@msnmsgr.com 32\r\n", ++md->trId); |
| 2086 | 793 | for (i = 0; i < 16; i++) { |
| 794 | g_snprintf(buf2, sizeof(buf2), "%02x", di[i]); | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
795 | strcat(sendbuf, buf2); |
| 2086 | 796 | } |
| 797 | ||
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
798 | if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) { |
| 2086 | 799 | hide_login_progress(gc, "Unable to write to server"); |
| 800 | signoff(gc); | |
| 801 | } | |
| 802 | ||
| 803 | debug_printf("\n"); | |
| 804 | } else if (!g_strncasecmp(buf, "FLN", 3)) { | |
| 805 | char *usr = buf; | |
| 806 | ||
| 807 | GET_NEXT(usr); | |
| 808 | serv_got_update(gc, usr, 0, 0, 0, 0, 0, 0); | |
| 809 | } else if (!g_strncasecmp(buf, "GTC", 3)) { | |
| 810 | } else if (!g_strncasecmp(buf, "INF", 3)) { | |
| 811 | } else if (!g_strncasecmp(buf, "ILN", 3)) { | |
|
2607
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
812 | char *state, *user, *friend, *tmp = buf; |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
813 | struct buddy *b; |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
814 | int status = 0; |
| 2086 | 815 | |
| 816 | GET_NEXT(tmp); | |
| 817 | ||
| 818 | GET_NEXT(tmp); | |
| 819 | state = tmp; | |
| 820 | ||
| 821 | GET_NEXT(tmp); | |
| 822 | user = tmp; | |
| 823 | ||
| 824 | GET_NEXT(tmp); | |
|
2607
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
825 | friend = url_decode(tmp); |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
826 | |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
827 | if ((b = find_buddy(gc, user)) != NULL) { |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
828 | if (b->proto_data) |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
829 | g_free(b->proto_data); |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
830 | b->proto_data = g_strdup(friend); |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
831 | } |
| 2086 | 832 | |
| 833 | if (!g_strcasecmp(state, "BSY")) { | |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
834 | status |= UC_UNAVAILABLE | (MSN_BUSY << 1); |
| 2086 | 835 | } else if (!g_strcasecmp(state, "IDL")) { |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
836 | status |= UC_UNAVAILABLE | (MSN_IDLE << 1); |
| 2086 | 837 | } else if (!g_strcasecmp(state, "BRB")) { |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
838 | status |= UC_UNAVAILABLE | (MSN_BRB << 1); |
| 2086 | 839 | } else if (!g_strcasecmp(state, "AWY")) { |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
840 | status |= UC_UNAVAILABLE | (MSN_AWAY << 1); |
| 2086 | 841 | } else if (!g_strcasecmp(state, "PHN")) { |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
842 | status |= UC_UNAVAILABLE | (MSN_PHONE << 1); |
| 2086 | 843 | } else if (!g_strcasecmp(state, "LUN")) { |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
844 | status |= UC_UNAVAILABLE | (MSN_LUNCH << 1); |
| 2086 | 845 | } |
| 846 | ||
| 847 | serv_got_update(gc, user, 1, 0, 0, 0, status, 0); | |
| 848 | } else if (!g_strncasecmp(buf, "LST", 3)) { | |
| 849 | char *which, *who, *friend, *tmp = buf; | |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
850 | int pos, tot; |
| 2086 | 851 | |
| 852 | GET_NEXT(tmp); | |
| 853 | GET_NEXT(tmp); | |
| 854 | which = tmp; | |
| 855 | ||
| 856 | GET_NEXT(tmp); | |
| 857 | GET_NEXT(tmp); | |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
858 | pos = strtol(tmp, NULL, 10); |
| 2086 | 859 | GET_NEXT(tmp); |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
860 | tot = strtol(tmp, NULL, 10); |
| 2086 | 861 | GET_NEXT(tmp); |
| 862 | who = tmp; | |
| 863 | ||
| 864 | GET_NEXT(tmp); | |
| 865 | friend = url_decode(tmp); | |
| 866 | ||
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
867 | if (!g_strcasecmp(which, "FL") && pos) { |
| 2086 | 868 | struct msn_buddy *b = g_new0(struct msn_buddy, 1); |
| 869 | b->user = g_strdup(who); | |
| 870 | b->friend = g_strdup(friend); | |
| 871 | md->fl = g_slist_append(md->fl, b); | |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
872 | } else if (!g_strcasecmp(which, "AL") && pos) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
873 | gc->permit = g_slist_append(gc->permit, g_strdup(who)); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
874 | } else if (!g_strcasecmp(which, "BL") && pos) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
875 | gc->deny = g_slist_append(gc->deny, g_strdup(who)); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
876 | } else if (!g_strcasecmp(which, "RL")) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
877 | if (pos != tot) |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
878 | return 1; |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
879 | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
880 | g_snprintf(sendbuf, sizeof(sendbuf), "CHG %d NLN\r\n", ++md->trId); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
881 | if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) { |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
882 | hide_login_progress(gc, "Unable to write"); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
883 | signoff(gc); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
884 | return 0; |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
885 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
886 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
887 | account_online(gc); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
888 | serv_finish_login(gc); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
889 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
890 | md->permit = g_slist_copy(gc->permit); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
891 | md->deny = g_slist_copy(gc->deny); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
892 | |
| 2086 | 893 | if (bud_list_cache_exists(gc)) |
|
2382
69a4e3665132
[gaim-migrate @ 2395]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2311
diff
changeset
|
894 | do_import(gc, NULL); |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
895 | else { |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
896 | g_snprintf(sendbuf, sizeof(sendbuf), "BLP %d AL\r\n", ++md->trId); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
897 | if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) { |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
898 | hide_login_progress(gc, "Unable to write"); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
899 | signoff(gc); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
900 | return 0; |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
901 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
902 | } |
| 2086 | 903 | while (md->fl) { |
| 904 | struct msn_buddy *mb = md->fl->data; | |
| 905 | struct buddy *b; | |
| 906 | md->fl = g_slist_remove(md->fl, mb); | |
| 907 | if (!(b = find_buddy(gc, mb->user))) | |
| 908 | add_buddy(gc, "Buddies", mb->user, mb->friend); | |
| 909 | else if (!g_strcasecmp(b->name, b->show)) { | |
| 910 | g_snprintf(b->show, sizeof(b->show), "%s", mb->friend); | |
| 911 | handle_buddy_rename(b, b->name); | |
| 912 | } | |
| 913 | g_free(mb->user); | |
| 914 | g_free(mb->friend); | |
| 915 | g_free(mb); | |
| 916 | } | |
| 917 | } | |
| 918 | } else if (!g_strncasecmp(buf, "MSG", 3)) { | |
| 919 | char *user, *tmp = buf; | |
| 920 | int length; | |
| 921 | ||
| 922 | GET_NEXT(tmp); | |
| 923 | user = tmp; | |
| 924 | ||
| 925 | GET_NEXT(tmp); | |
| 926 | ||
| 927 | GET_NEXT(tmp); | |
| 928 | length = atoi(tmp); | |
| 929 | ||
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
930 | md->msg = TRUE; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
931 | md->msguser = g_strdup(user); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
932 | md->msglen = length; |
| 2086 | 933 | } else if (!g_strncasecmp(buf, "NLN", 3)) { |
|
2607
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
934 | char *state, *user, *friend, *tmp = buf; |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
935 | struct buddy *b; |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
936 | int status = 0; |
| 2086 | 937 | |
| 938 | GET_NEXT(tmp); | |
| 939 | state = tmp; | |
| 940 | ||
| 941 | GET_NEXT(tmp); | |
| 942 | user = tmp; | |
| 943 | ||
| 944 | GET_NEXT(tmp); | |
|
2607
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
945 | friend = url_decode(tmp); |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
946 | |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
947 | if ((b = find_buddy(gc, user)) != NULL) { |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
948 | if (b->proto_data) |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
949 | g_free(b->proto_data); |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
950 | b->proto_data = g_strdup(friend); |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
951 | } |
| 2086 | 952 | |
| 953 | if (!g_strcasecmp(state, "BSY")) { | |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
954 | status |= UC_UNAVAILABLE | (MSN_BUSY << 1); |
| 2086 | 955 | } else if (!g_strcasecmp(state, "IDL")) { |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
956 | status |= UC_UNAVAILABLE | (MSN_IDLE << 1); |
| 2086 | 957 | } else if (!g_strcasecmp(state, "BRB")) { |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
958 | status |= UC_UNAVAILABLE | (MSN_BRB << 1); |
| 2086 | 959 | } else if (!g_strcasecmp(state, "AWY")) { |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
960 | status |= UC_UNAVAILABLE | (MSN_AWAY << 1); |
| 2086 | 961 | } else if (!g_strcasecmp(state, "PHN")) { |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
962 | status |= UC_UNAVAILABLE | (MSN_PHONE << 1); |
| 2086 | 963 | } else if (!g_strcasecmp(state, "LUN")) { |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
964 | status |= UC_UNAVAILABLE | (MSN_LUNCH << 1); |
| 2086 | 965 | } |
| 966 | ||
| 967 | serv_got_update(gc, user, 1, 0, 0, 0, status, 0); | |
| 968 | } else if (!g_strncasecmp(buf, "OUT", 3)) { | |
| 2887 | 969 | char *tmp = buf; |
| 970 | ||
| 971 | GET_NEXT(tmp); | |
| 972 | if (!g_strncasecmp(tmp, "OTH", 3)) { | |
|
2889
9cf00c3b75f6
[gaim-migrate @ 2902]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2888
diff
changeset
|
973 | hide_login_progress(gc, _("You have been disconnected. You have " |
|
9cf00c3b75f6
[gaim-migrate @ 2902]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2888
diff
changeset
|
974 | "signed on from another location.")); |
|
9cf00c3b75f6
[gaim-migrate @ 2902]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2888
diff
changeset
|
975 | signoff(gc); |
|
9cf00c3b75f6
[gaim-migrate @ 2902]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2888
diff
changeset
|
976 | return 0; |
| 2887 | 977 | } |
| 2086 | 978 | } else if (!g_strncasecmp(buf, "PRP", 3)) { |
|
2541
0afd3aaba327
[gaim-migrate @ 2554]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2501
diff
changeset
|
979 | } else if (!g_strncasecmp(buf, "QNG", 3)) { |
| 2086 | 980 | } else if (!g_strncasecmp(buf, "QRY", 3)) { |
|
2213
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
981 | } else if (!g_strncasecmp(buf, "REA", 3)) { |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
982 | char *friend, *tmp = buf; |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
983 | |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
984 | GET_NEXT(tmp); |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
985 | GET_NEXT(tmp); |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
986 | GET_NEXT(tmp); |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
987 | GET_NEXT(tmp); |
|
2219
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
988 | friend = url_decode(tmp); |
|
2213
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
989 | |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
990 | g_snprintf(gc->displayname, sizeof(gc->displayname), "%s", friend); |
| 2086 | 991 | } else if (!g_strncasecmp(buf, "REM", 3)) { |
| 992 | } else if (!g_strncasecmp(buf, "RNG", 3)) { | |
| 993 | struct msn_switchboard *ms; | |
| 994 | char *sessid, *ssaddr, *auth, *user; | |
| 995 | int port, i = 0; | |
| 996 | char *tmp = buf; | |
| 997 | ||
| 998 | GET_NEXT(tmp); | |
| 999 | sessid = tmp; | |
| 1000 | ||
| 1001 | GET_NEXT(tmp); | |
| 1002 | ssaddr = tmp; | |
| 1003 | ||
| 1004 | GET_NEXT(tmp); | |
| 1005 | ||
| 1006 | GET_NEXT(tmp); | |
| 1007 | auth = tmp; | |
| 1008 | ||
| 1009 | GET_NEXT(tmp); | |
| 1010 | user = tmp; | |
| 1011 | GET_NEXT(tmp); | |
| 1012 | ||
| 1013 | while (ssaddr[i] && ssaddr[i] != ':') i++; | |
| 1014 | if (ssaddr[i] == ':') { | |
| 1015 | char *x = &ssaddr[i + 1]; | |
| 1016 | ssaddr[i] = 0; | |
| 1017 | port = atoi(x); | |
| 1018 | } else | |
| 1019 | port = 1863; | |
| 1020 | ||
| 1021 | ms = g_new0(struct msn_switchboard, 1); | |
|
2688
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1022 | ms->fd = proxy_connect(ssaddr, port, msn_rng_connect, ms); |
|
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1023 | if (ms->fd < 0) { |
|
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1024 | g_free(ms); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1025 | return 1; |
|
2688
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1026 | } |
| 2086 | 1027 | ms->user = g_strdup(user); |
| 1028 | ms->sessid = g_strdup(sessid); | |
| 1029 | ms->auth = g_strdup(auth); | |
| 1030 | ms->gc = gc; | |
| 1031 | } else if (!g_strncasecmp(buf, "SYN", 3)) { | |
| 1032 | } else if (!g_strncasecmp(buf, "USR", 3)) { | |
| 1033 | } else if (!g_strncasecmp(buf, "XFR", 3)) { | |
| 1034 | char *host = strstr(buf, "SB"); | |
| 1035 | int port; | |
| 1036 | int i = 0; | |
| 1037 | gboolean switchboard = TRUE; | |
| 1038 | char *tmp; | |
| 1039 | ||
| 1040 | if (!host) { | |
| 1041 | host = strstr(buf, "NS"); | |
| 1042 | if (!host) { | |
| 1043 | hide_login_progress(gc, "Got invalid XFR\n"); | |
| 1044 | signoff(gc); | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1045 | return 0; |
| 2086 | 1046 | } |
| 1047 | switchboard = FALSE; | |
| 1048 | } | |
| 1049 | ||
| 1050 | GET_NEXT(host); | |
| 1051 | while (host[i] && host[i] != ':') i++; | |
| 1052 | if (host[i] == ':') { | |
| 1053 | tmp = &host[i + 1]; | |
| 1054 | host[i] = 0; | |
| 1055 | while (isdigit(*tmp)) tmp++; | |
| 1056 | *tmp++ = 0; | |
| 1057 | port = atoi(&host[i + 1]); | |
| 1058 | } else { | |
| 1059 | port = 1863; | |
| 1060 | tmp = host; | |
| 1061 | GET_NEXT(tmp); | |
| 1062 | } | |
| 1063 | ||
| 1064 | if (switchboard) { | |
| 1065 | struct msn_switchboard *ms = msn_find_writable_switch(gc); | |
| 1066 | if (!ms) | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1067 | return 1; |
| 2086 | 1068 | |
| 1069 | GET_NEXT(tmp); | |
| 1070 | ||
|
2688
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1071 | ms->fd = proxy_connect(host, port, msn_ss_xfr_connect, ms); |
|
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1072 | if (ms->fd < 0) { |
|
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1073 | msn_kill_switch(ms); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1074 | return 1; |
|
2688
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1075 | } |
| 2086 | 1076 | ms->auth = g_strdup(tmp); |
| 1077 | } else { | |
| 1078 | close(md->fd); | |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
1079 | gaim_input_remove(md->inpa); |
| 2086 | 1080 | md->inpa = 0; |
| 1081 | md->fd = proxy_connect(host, port, msn_login_xfr_connect, gc); | |
|
2688
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1082 | if (md->fd < 0) { |
|
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1083 | hide_login_progress(gc, "Error transfering"); |
|
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1084 | signoff(gc); |
|
2740
66eddefd4632
[gaim-migrate @ 2753]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2739
diff
changeset
|
1085 | return 0; |
|
2688
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1086 | } |
| 2086 | 1087 | } |
| 1088 | } else if (isdigit(*buf)) { | |
| 1089 | handle_errcode(buf, TRUE); | |
| 1090 | } else { | |
| 1091 | debug_printf("Unhandled message!\n"); | |
| 1092 | } | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1093 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1094 | return 1; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1095 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1096 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1097 | static void msn_process_main_msg(struct gaim_connection *gc, char *msg) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1098 | { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1099 | struct msn_data *md = gc->proto_data; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1100 | char *skiphead, *utf; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1101 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1102 | if (!g_strcasecmp(md->msguser, "hotmail")) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1103 | handle_hotmail(gc, msg); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1104 | return; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1105 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1106 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1107 | skiphead = strstr(msg, "\r\n\r\n"); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1108 | if (!skiphead || !skiphead[4]) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1109 | return; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1110 | skiphead += 4; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1111 | utf = utf8_to_str(skiphead); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1112 | strip_linefeed(utf); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1113 | |
|
2856
046ed5e89321
[gaim-migrate @ 2869]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2842
diff
changeset
|
1114 | serv_got_im(gc, md->msguser, utf, 0, time(NULL), -1); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1115 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1116 | g_free(utf); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1117 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1118 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1119 | static void msn_callback(gpointer data, gint source, GaimInputCondition cond) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1120 | { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1121 | struct gaim_connection *gc = data; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1122 | struct msn_data *md = gc->proto_data; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1123 | char buf[MSN_BUF_LEN]; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1124 | int cont = 1; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1125 | int len; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1126 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1127 | len = read(md->fd, buf, sizeof(buf)); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1128 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1129 | if (len <= 0) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1130 | hide_login_progress(gc, "Error reading from server"); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1131 | signoff(gc); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1132 | return; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1133 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1134 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1135 | md->rxqueue = g_realloc(md->rxqueue, len + md->rxlen); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1136 | memcpy(md->rxqueue + md->rxlen, buf, len); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1137 | md->rxlen += len; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1138 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1139 | while (cont) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1140 | if (!md->rxlen) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1141 | return; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1142 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1143 | if (md->msg) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1144 | char *msg; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1145 | if (md->msglen > md->rxlen) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1146 | return; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1147 | msg = md->rxqueue; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1148 | md->rxlen -= md->msglen; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1149 | if (md->rxlen) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1150 | md->rxqueue = g_memdup(msg + md->msglen, md->rxlen); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1151 | } else { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1152 | md->rxqueue = NULL; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1153 | msg = g_realloc(msg, md->msglen + 1); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1154 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1155 | msg[md->msglen] = 0; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1156 | md->msglen = 0; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1157 | md->msg = FALSE; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1158 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1159 | msn_process_main_msg(gc, msg); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1160 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1161 | g_free(md->msguser); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1162 | g_free(msg); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1163 | } else { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1164 | char *end = md->rxqueue; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1165 | int cmdlen; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1166 | char *cmd; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1167 | int i = 0; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1168 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1169 | while (i + 1 < md->rxlen) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1170 | if (*end == '\r' && end[1] == '\n') |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1171 | break; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1172 | end++; i++; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1173 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1174 | if (i + 1 == md->rxlen) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1175 | return; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1176 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1177 | cmdlen = end - md->rxqueue + 2; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1178 | cmd = md->rxqueue; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1179 | md->rxlen -= cmdlen; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1180 | if (md->rxlen) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1181 | md->rxqueue = g_memdup(cmd + cmdlen, md->rxlen); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1182 | } else { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1183 | md->rxqueue = NULL; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1184 | cmd = g_realloc(cmd, cmdlen + 1); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1185 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1186 | cmd[cmdlen] = 0; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1187 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1188 | debug_printf("MSN S: %s", cmd); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1189 | g_strchomp(cmd); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1190 | cont = msn_process_main(gc, cmd); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1191 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1192 | g_free(cmd); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1193 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1194 | } |
| 2086 | 1195 | } |
| 1196 | ||
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
1197 | static void msn_login_xfr_connect(gpointer data, gint source, GaimInputCondition cond) |
| 2086 | 1198 | { |
| 1199 | struct gaim_connection *gc = data; | |
| 1200 | struct msn_data *md; | |
| 1201 | char buf[MSN_BUF_LEN]; | |
| 1202 | ||
|
2210
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1203 | if (!g_slist_find(connections, gc)) { |
|
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1204 | close(source); |
| 2086 | 1205 | return; |
|
2210
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1206 | } |
| 2086 | 1207 | |
| 1208 | md = gc->proto_data; | |
| 1209 | ||
| 1210 | if (md->fd != source) | |
| 1211 | md->fd = source; | |
| 1212 | ||
| 1213 | if (md->fd == -1) { | |
| 1214 | hide_login_progress(gc, "Unable to connect to Notification Server"); | |
| 1215 | signoff(gc); | |
| 1216 | return; | |
| 1217 | } | |
| 1218 | ||
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1219 | g_snprintf(buf, sizeof(buf), "VER %d MSNP5\r\n", ++md->trId); |
| 2086 | 1220 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
| 1221 | hide_login_progress(gc, "Unable to talk to Notification Server"); | |
| 1222 | signoff(gc); | |
| 1223 | return; | |
| 1224 | } | |
| 1225 | ||
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
1226 | md->inpa = gaim_input_add(md->fd, GAIM_INPUT_READ, msn_login_callback, gc); |
| 2086 | 1227 | } |
| 1228 | ||
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1229 | static int msn_process_login(struct gaim_connection *gc, char *buf) |
| 2086 | 1230 | { |
| 1231 | struct msn_data *md = gc->proto_data; | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1232 | char sendbuf[MSN_BUF_LEN]; |
| 2086 | 1233 | |
| 1234 | if (!g_strncasecmp(buf, "VER", 3)) { | |
|
2226
33ae7ffa5144
[gaim-migrate @ 2236]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2219
diff
changeset
|
1235 | /* we got VER, check to see that MSNP5 is in the list, then send INF */ |
|
33ae7ffa5144
[gaim-migrate @ 2236]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2219
diff
changeset
|
1236 | if (!strstr(buf, "MSNP5")) { |
| 2086 | 1237 | hide_login_progress(gc, "Protocol not supported"); |
| 1238 | signoff(gc); | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1239 | return 0; |
| 2086 | 1240 | } |
| 1241 | ||
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1242 | g_snprintf(sendbuf, sizeof(sendbuf), "INF %d\r\n", ++md->trId); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1243 | if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) { |
| 2086 | 1244 | hide_login_progress(gc, "Unable to request INF\n"); |
| 1245 | signoff(gc); | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1246 | return 0; |
| 2086 | 1247 | } |
| 1248 | } else if (!g_strncasecmp(buf, "INF", 3)) { | |
| 1249 | /* check to make sure we can use md5 */ | |
| 1250 | if (!strstr(buf, "MD5")) { | |
| 1251 | hide_login_progress(gc, "Unable to login using MD5"); | |
| 1252 | signoff(gc); | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1253 | return 0; |
| 2086 | 1254 | } |
| 1255 | ||
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1256 | g_snprintf(sendbuf, sizeof(sendbuf), "USR %d MD5 I %s\r\n", ++md->trId, gc->username); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1257 | if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) { |
| 2086 | 1258 | hide_login_progress(gc, "Unable to send USR\n"); |
| 1259 | signoff(gc); | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1260 | return 0; |
| 2086 | 1261 | } |
| 1262 | ||
| 1263 | set_login_progress(gc, 3, "Requesting to send password"); | |
| 1264 | } else if (!g_strncasecmp(buf, "USR", 3)) { | |
|
2210
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1265 | char *resp, *friend, *tmp = buf; |
|
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1266 | |
|
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1267 | GET_NEXT(tmp); |
|
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1268 | GET_NEXT(tmp); |
|
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1269 | resp = tmp; |
|
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1270 | GET_NEXT(tmp); |
|
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1271 | GET_NEXT(tmp); |
|
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1272 | friend = tmp; |
|
2213
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1273 | GET_NEXT(tmp); |
|
2219
7dbab190aea4
[gaim-migrate @ 2229]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2213
diff
changeset
|
1274 | friend = url_decode(friend); |
|
2210
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1275 | |
| 2086 | 1276 | /* so here, we're either getting the challenge or the OK */ |
|
2213
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1277 | if (!g_strcasecmp(resp, "OK")) { |
|
2210
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1278 | g_snprintf(gc->displayname, sizeof(gc->displayname), "%s", friend); |
|
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1279 | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1280 | g_snprintf(sendbuf, sizeof(sendbuf), "SYN %d 0\r\n", ++md->trId); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1281 | if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) { |
| 2086 | 1282 | hide_login_progress(gc, "Unable to write"); |
| 1283 | signoff(gc); | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1284 | return 0; |
| 2086 | 1285 | } |
| 1286 | ||
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
1287 | gaim_input_remove(md->inpa); |
|
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
1288 | md->inpa = gaim_input_add(md->fd, GAIM_INPUT_READ, msn_callback, gc); |
|
2739
7300588a3544
[gaim-migrate @ 2752]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2738
diff
changeset
|
1289 | return 0; |
|
2213
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1290 | } else if (!g_strcasecmp(resp, "MD5")) { |
| 2086 | 1291 | char buf2[MSN_BUF_LEN]; |
| 1292 | md5_state_t st; | |
| 1293 | md5_byte_t di[16]; | |
| 1294 | int i; | |
| 1295 | ||
|
2213
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1296 | g_snprintf(buf2, sizeof(buf2), "%s%s", friend, gc->password); |
| 2086 | 1297 | |
| 1298 | md5_init(&st); | |
| 1299 | md5_append(&st, (const md5_byte_t *)buf2, strlen(buf2)); | |
| 1300 | md5_finish(&st, di); | |
| 1301 | ||
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1302 | g_snprintf(sendbuf, sizeof(sendbuf), "USR %d MD5 S ", ++md->trId); |
| 2086 | 1303 | for (i = 0; i < 16; i++) { |
| 1304 | g_snprintf(buf2, sizeof(buf2), "%02x", di[i]); | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1305 | strcat(sendbuf, buf2); |
| 2086 | 1306 | } |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1307 | strcat(sendbuf, "\n"); |
| 2086 | 1308 | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1309 | if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) { |
| 2086 | 1310 | hide_login_progress(gc, "Unable to send password"); |
| 1311 | signoff(gc); | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1312 | return 0; |
| 2086 | 1313 | } |
| 1314 | ||
| 1315 | set_login_progress(gc, 4, "Password sent"); | |
| 1316 | } | |
| 1317 | } else if (!g_strncasecmp(buf, "XFR", 3)) { | |
| 1318 | char *host = strstr(buf, "NS"); | |
| 1319 | int port; | |
| 1320 | int i = 0; | |
| 1321 | ||
| 1322 | if (!host) { | |
| 1323 | hide_login_progress(gc, "Got invalid XFR\n"); | |
| 1324 | signoff(gc); | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1325 | return 0; |
| 2086 | 1326 | } |
| 1327 | ||
| 1328 | GET_NEXT(host); | |
| 1329 | while (host[i] && host[i] != ':') i++; | |
| 1330 | if (host[i] == ':') { | |
| 1331 | char *x = &host[i + 1]; | |
| 1332 | host[i] = 0; | |
| 1333 | port = atoi(x); | |
| 1334 | } else | |
| 1335 | port = 1863; | |
| 1336 | ||
| 1337 | close(md->fd); | |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
1338 | gaim_input_remove(md->inpa); |
| 2086 | 1339 | md->inpa = 0; |
| 1340 | md->fd = 0; | |
| 1341 | md->fd = proxy_connect(host, port, msn_login_xfr_connect, gc); | |
|
2688
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1342 | if (md->fd < 0) { |
|
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1343 | hide_login_progress(gc, "Unable to transfer"); |
|
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1344 | signoff(gc); |
|
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1345 | } |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1346 | return 0; |
| 2086 | 1347 | } else { |
| 1348 | if (isdigit(*buf)) | |
| 1349 | hide_login_progress(gc, handle_errcode(buf, FALSE)); | |
| 1350 | else | |
| 1351 | hide_login_progress(gc, "Unable to parse message"); | |
| 1352 | signoff(gc); | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1353 | return 0; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1354 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1355 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1356 | return 1; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1357 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1358 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1359 | static void msn_login_callback(gpointer data, gint source, GaimInputCondition cond) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1360 | { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1361 | struct gaim_connection *gc = data; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1362 | struct msn_data *md = gc->proto_data; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1363 | char buf[MSN_BUF_LEN]; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1364 | int cont = 1; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1365 | int len; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1366 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1367 | len = read(md->fd, buf, sizeof(buf)); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1368 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1369 | if (len <= 0) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1370 | hide_login_progress(gc, "Error reading from server"); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1371 | signoff(gc); |
| 2086 | 1372 | return; |
| 1373 | } | |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1374 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1375 | md->rxqueue = g_realloc(md->rxqueue, len + md->rxlen); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1376 | memcpy(md->rxqueue + md->rxlen, buf, len); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1377 | md->rxlen += len; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1378 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1379 | while (cont) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1380 | char *end = md->rxqueue; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1381 | int cmdlen; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1382 | char *cmd; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1383 | int i = 0; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1384 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1385 | if (!md->rxlen) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1386 | return; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1387 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1388 | while (i + 1 < md->rxlen) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1389 | if (*end == '\r' && end[1] == '\n') |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1390 | break; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1391 | end++; i++; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1392 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1393 | if (i + 1 == md->rxlen) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1394 | return; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1395 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1396 | cmdlen = end - md->rxqueue + 2; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1397 | cmd = md->rxqueue; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1398 | md->rxlen -= cmdlen; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1399 | if (md->rxlen) { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1400 | md->rxqueue = g_memdup(cmd + cmdlen, md->rxlen); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1401 | } else { |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1402 | md->rxqueue = NULL; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1403 | cmd = g_realloc(cmd, cmdlen + 1); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1404 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1405 | cmd[cmdlen] = 0; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1406 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1407 | debug_printf("MSN S: %s", cmd); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1408 | g_strchomp(cmd); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1409 | cont = msn_process_login(gc, cmd); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1410 | |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1411 | g_free(cmd); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1412 | } |
| 2086 | 1413 | } |
| 1414 | ||
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
1415 | static void msn_login_connect(gpointer data, gint source, GaimInputCondition cond) |
| 2086 | 1416 | { |
| 1417 | struct gaim_connection *gc = data; | |
| 1418 | struct msn_data *md; | |
| 1419 | char buf[1024]; | |
| 1420 | ||
|
2210
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1421 | if (!g_slist_find(connections, gc)) { |
|
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1422 | close(source); |
| 2086 | 1423 | return; |
|
2210
37d4364497f5
[gaim-migrate @ 2220]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1424 | } |
| 2086 | 1425 | |
| 1426 | md = gc->proto_data; | |
| 1427 | ||
| 1428 | if (md->fd != source) | |
| 1429 | md->fd = source; | |
| 1430 | ||
| 1431 | if (md->fd == -1) { | |
| 1432 | hide_login_progress(gc, "Unable to connect"); | |
| 1433 | signoff(gc); | |
| 1434 | return; | |
| 1435 | } | |
| 1436 | ||
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1437 | g_snprintf(buf, sizeof(buf), "VER %d MSNP5\r\n", ++md->trId); |
| 2086 | 1438 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
| 1439 | hide_login_progress(gc, "Unable to write to server"); | |
| 1440 | signoff(gc); | |
| 1441 | return; | |
| 1442 | } | |
| 1443 | ||
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
1444 | md->inpa = gaim_input_add(md->fd, GAIM_INPUT_READ, msn_login_callback, gc); |
| 2086 | 1445 | set_login_progress(gc, 2, "Synching with server"); |
| 1446 | } | |
| 1447 | ||
| 1448 | static void msn_login(struct aim_user *user) | |
| 1449 | { | |
| 1450 | struct gaim_connection *gc = new_gaim_conn(user); | |
| 1451 | struct msn_data *md = gc->proto_data = g_new0(struct msn_data, 1); | |
| 1452 | ||
| 1453 | set_login_progress(gc, 1, "Connecting"); | |
| 1454 | ||
| 1455 | g_snprintf(gc->username, sizeof(gc->username), "%s", msn_normalize(gc->username)); | |
| 1456 | ||
| 1457 | md->fd = proxy_connect("messenger.hotmail.com", 1863, msn_login_connect, gc); | |
|
2688
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1458 | if (md->fd < 0) { |
|
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1459 | hide_login_progress(gc, "Unable to connect"); |
|
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1460 | signoff(gc); |
|
f1f8c4ff8794
[gaim-migrate @ 2701]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2681
diff
changeset
|
1461 | } |
| 2086 | 1462 | } |
| 1463 | ||
| 1464 | static void msn_close(struct gaim_connection *gc) | |
| 1465 | { | |
| 1466 | struct msn_data *md = gc->proto_data; | |
| 1467 | close(md->fd); | |
| 1468 | if (md->inpa) | |
|
2090
bab8b7e309db
[gaim-migrate @ 2100]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2086
diff
changeset
|
1469 | gaim_input_remove(md->inpa); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1470 | g_free(md->rxqueue); |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1471 | if (md->msg) |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
1472 | g_free(md->msguser); |
| 2086 | 1473 | while (md->switches) |
| 1474 | msn_kill_switch(md->switches->data); | |
| 1475 | while (md->fl) { | |
| 1476 | struct msn_buddy *tmp = md->fl->data; | |
| 1477 | md->fl = g_slist_remove(md->fl, tmp); | |
| 1478 | g_free(tmp->user); | |
| 1479 | g_free(tmp->friend); | |
| 1480 | g_free(tmp); | |
| 1481 | } | |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1482 | g_slist_free(md->permit); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1483 | g_slist_free(md->deny); |
| 2086 | 1484 | g_free(md); |
| 1485 | } | |
| 1486 | ||
| 3001 | 1487 | static int msn_send_typing(struct gaim_connection *gc, char *who, int typing) { |
| 2993 | 1488 | struct msn_switchboard *ms = msn_find_switch(gc, who); |
| 1489 | char header[MSN_BUF_LEN] = "MIME-Version: 1.0\r\n" | |
| 1490 | "Content-Type: text/x-msmsgscontrol\r\n" | |
| 1491 | "User-Agent: Gaim/" VERSION "\r\n" | |
| 1492 | "TypingUser: "; | |
| 1493 | char buf [MSN_BUF_LEN]; | |
| 3001 | 1494 | if (!ms || !typing) |
| 1495 | return 0; | |
| 2993 | 1496 | g_snprintf(buf, sizeof(buf), "MSG %d N %d\r\n%s%s\r\n\r\n\r\n", |
| 1497 | ++ms->trId, | |
| 1498 | strlen(header) + strlen("\r\n\r\n\r\n") + strlen(gc->username), | |
| 1499 | header, gc->username); | |
| 1500 | if (msn_write(ms->fd, buf, strlen(buf)) < 0) | |
| 1501 | msn_kill_switch(ms); | |
| 1502 | return MSN_TYPING_SEND_TIMEOUT; | |
| 1503 | } | |
| 1504 | ||
|
2231
9d8593ab093e
[gaim-migrate @ 2241]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2230
diff
changeset
|
1505 | static int msn_send_im(struct gaim_connection *gc, char *who, char *message, int flags) |
| 2086 | 1506 | { |
| 1507 | struct msn_data *md = gc->proto_data; | |
| 1508 | struct msn_switchboard *ms = msn_find_switch(gc, who); | |
| 1509 | char buf[MSN_BUF_LEN]; | |
| 1510 | ||
| 1511 | if (ms) { | |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1512 | char *utf8, *send; |
|
2591
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1513 | |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1514 | if (ms->txqueue) { |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1515 | debug_printf("appending to queue\n"); |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1516 | ms->txqueue = g_slist_append(ms->txqueue, g_strdup(message)); |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1517 | return 1; |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1518 | } |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1519 | |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1520 | send = add_cr(message); |
|
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1521 | utf8 = str_to_utf8(send); |
|
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1522 | g_free(send); |
| 2086 | 1523 | g_snprintf(buf, sizeof(buf), "MSG %d N %d\r\n%s%s", ++ms->trId, |
| 1524 | strlen(MIME_HEADER) + strlen(utf8), | |
| 1525 | MIME_HEADER, utf8); | |
| 1526 | g_free(utf8); | |
| 1527 | if (msn_write(ms->fd, buf, strlen(buf)) < 0) | |
| 1528 | msn_kill_switch(ms); | |
| 1529 | debug_printf("\n"); | |
| 1530 | } else if (strcmp(who, gc->username)) { | |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1531 | g_snprintf(buf, MSN_BUF_LEN, "XFR %d SB\r\n", ++md->trId); |
| 2086 | 1532 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
| 1533 | hide_login_progress(gc, "Write error"); | |
| 1534 | signoff(gc); | |
|
2303
18171aa8cd37
[gaim-migrate @ 2313]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2273
diff
changeset
|
1535 | return 1; |
| 2086 | 1536 | } |
| 1537 | ||
| 1538 | ms = g_new0(struct msn_switchboard, 1); | |
| 1539 | md->switches = g_slist_append(md->switches, ms); | |
| 1540 | ms->user = g_strdup(who); | |
|
2591
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1541 | ms->txqueue = g_slist_append(ms->txqueue, g_strdup(message)); |
| 2086 | 1542 | ms->gc = gc; |
| 1543 | ms->fd = -1; | |
| 1544 | } else | |
| 1545 | /* in msn you can't send messages to yourself, so we'll fake like we received it ;) */ | |
|
2856
046ed5e89321
[gaim-migrate @ 2869]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2842
diff
changeset
|
1546 | serv_got_im(gc, who, message, flags | IM_FLAG_GAIMUSER, time(NULL), -1); |
|
2303
18171aa8cd37
[gaim-migrate @ 2313]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2273
diff
changeset
|
1547 | return 1; |
| 2086 | 1548 | } |
| 1549 | ||
|
2167
cbb558585911
[gaim-migrate @ 2177]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2162
diff
changeset
|
1550 | static int msn_chat_send(struct gaim_connection *gc, int id, char *message) |
| 2086 | 1551 | { |
| 1552 | struct msn_switchboard *ms = msn_find_switch_by_id(gc, id); | |
| 1553 | char buf[MSN_BUF_LEN]; | |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1554 | char *utf8, *send; |
| 2086 | 1555 | |
| 1556 | if (!ms) | |
|
2167
cbb558585911
[gaim-migrate @ 2177]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2162
diff
changeset
|
1557 | return -EINVAL; |
| 2086 | 1558 | |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1559 | send = add_cr(message); |
|
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1560 | utf8 = str_to_utf8(send); |
|
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1561 | g_free(send); |
| 2086 | 1562 | g_snprintf(buf, sizeof(buf), "MSG %d N %d\r\n%s%s", ++ms->trId, |
|
2870
07c39370b585
[gaim-migrate @ 2883]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2856
diff
changeset
|
1563 | strlen(MIME_HEADER) + strlen(utf8), |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1564 | MIME_HEADER, utf8); |
|
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1565 | g_free(utf8); |
|
2591
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1566 | if (msn_write(ms->fd, buf, strlen(buf)) < 0) { |
| 2086 | 1567 | msn_kill_switch(ms); |
|
2591
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1568 | return 0; |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1569 | } |
| 2086 | 1570 | debug_printf("\n"); |
| 1571 | serv_got_chat_in(gc, id, gc->username, 0, message, time(NULL)); | |
|
2167
cbb558585911
[gaim-migrate @ 2177]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2162
diff
changeset
|
1572 | return 0; |
| 2086 | 1573 | } |
| 1574 | ||
| 1575 | static void msn_chat_invite(struct gaim_connection *gc, int id, char *msg, char *who) | |
| 1576 | { | |
| 1577 | struct msn_switchboard *ms = msn_find_switch_by_id(gc, id); | |
| 1578 | char buf[MSN_BUF_LEN]; | |
| 1579 | ||
| 1580 | if (!ms) | |
| 1581 | return; | |
| 1582 | ||
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1583 | g_snprintf(buf, sizeof(buf), "CAL %d %s\r\n", ++ms->trId, who); |
| 2086 | 1584 | if (msn_write(ms->fd, buf, strlen(buf)) < 0) |
| 1585 | msn_kill_switch(ms); | |
| 1586 | } | |
| 1587 | ||
| 1588 | static void msn_chat_leave(struct gaim_connection *gc, int id) | |
| 1589 | { | |
| 1590 | struct msn_switchboard *ms = msn_find_switch_by_id(gc, id); | |
| 1591 | char buf[MSN_BUF_LEN]; | |
| 1592 | ||
| 1593 | if (!ms) | |
| 1594 | return; | |
| 1595 | ||
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1596 | g_snprintf(buf, sizeof(buf), "OUT\r\n"); |
| 2086 | 1597 | if (msn_write(ms->fd, buf, strlen(buf)) < 0) |
| 1598 | msn_kill_switch(ms); | |
| 1599 | } | |
| 1600 | ||
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
1601 | static GList *msn_away_states(struct gaim_connection *gc) |
| 2086 | 1602 | { |
| 1603 | GList *m = NULL; | |
| 1604 | ||
| 1605 | m = g_list_append(m, "Available"); | |
| 1606 | m = g_list_append(m, "Away From Computer"); | |
| 1607 | m = g_list_append(m, "Be Right Back"); | |
| 1608 | m = g_list_append(m, "Busy"); | |
| 1609 | m = g_list_append(m, "On The Phone"); | |
| 1610 | m = g_list_append(m, "Out To Lunch"); | |
|
2152
e627966d7d81
[gaim-migrate @ 2162]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2123
diff
changeset
|
1611 | m = g_list_append(m, "Hidden"); |
| 2086 | 1612 | |
| 1613 | return m; | |
| 1614 | } | |
| 1615 | ||
| 1616 | static void msn_set_away(struct gaim_connection *gc, char *state, char *msg) | |
| 1617 | { | |
| 1618 | struct msn_data *md = gc->proto_data; | |
| 1619 | char buf[MSN_BUF_LEN]; | |
| 1620 | char *away; | |
| 1621 | ||
| 1622 | gc->away = NULL; | |
| 1623 | ||
| 1624 | if (msg) { | |
| 1625 | gc->away = ""; | |
| 1626 | away = "AWY"; | |
| 1627 | } else if (state) { | |
| 1628 | gc->away = ""; | |
| 1629 | ||
| 1630 | if (!strcmp(state, "Away From Computer")) | |
| 1631 | away = "AWY"; | |
| 1632 | else if (!strcmp(state, "Be Right Back")) | |
| 1633 | away = "BRB"; | |
| 1634 | else if (!strcmp(state, "Busy")) | |
| 1635 | away = "BSY"; | |
| 1636 | else if (!strcmp(state, "On The Phone")) | |
| 1637 | away = "PHN"; | |
| 1638 | else if (!strcmp(state, "Out To Lunch")) | |
| 1639 | away = "LUN"; | |
|
2152
e627966d7d81
[gaim-migrate @ 2162]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2123
diff
changeset
|
1640 | else if (!strcmp(state, "Hidden")) |
|
e627966d7d81
[gaim-migrate @ 2162]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2123
diff
changeset
|
1641 | away = "HDN"; |
| 2086 | 1642 | else { |
| 1643 | gc->away = NULL; | |
| 1644 | away = "NLN"; | |
| 1645 | } | |
| 1646 | } else if (gc->is_idle) | |
| 1647 | away = "IDL"; | |
| 1648 | else | |
| 1649 | away = "NLN"; | |
| 1650 | ||
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1651 | g_snprintf(buf, sizeof(buf), "CHG %d %s\r\n", ++md->trId, away); |
| 2086 | 1652 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
| 1653 | hide_login_progress(gc, "Write error"); | |
| 1654 | signoff(gc); | |
| 1655 | return; | |
| 1656 | } | |
| 1657 | } | |
| 1658 | ||
| 1659 | static void msn_set_idle(struct gaim_connection *gc, int idle) | |
| 1660 | { | |
| 1661 | struct msn_data *md = gc->proto_data; | |
| 1662 | char buf[MSN_BUF_LEN]; | |
| 1663 | ||
| 1664 | if (gc->away) | |
| 1665 | return; | |
| 1666 | if (idle) | |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1667 | g_snprintf(buf, sizeof(buf), "CHG %d IDL\r\n", ++md->trId); |
| 2086 | 1668 | else |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1669 | g_snprintf(buf, sizeof(buf), "CHG %d NLN\r\n", ++md->trId); |
| 2086 | 1670 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
| 1671 | hide_login_progress(gc, "Write error"); | |
| 1672 | signoff(gc); | |
| 1673 | return; | |
| 1674 | } | |
| 1675 | } | |
| 1676 | ||
| 1677 | static char **msn_list_icon(int uc) | |
| 1678 | { | |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
1679 | if (uc == 0) |
| 2086 | 1680 | return msn_online_xpm; |
| 1681 | ||
| 1682 | return msn_away_xpm; | |
| 1683 | } | |
| 1684 | ||
| 1685 | static char *msn_get_away_text(int s) | |
| 1686 | { | |
| 1687 | switch (s) { | |
| 1688 | case MSN_BUSY : | |
| 1689 | return "Busy"; | |
| 1690 | case MSN_BRB : | |
| 1691 | return "Be right back"; | |
| 1692 | case MSN_AWAY : | |
| 1693 | return "Away from the computer"; | |
| 1694 | case MSN_PHONE : | |
| 1695 | return "On the phone"; | |
| 1696 | case MSN_LUNCH : | |
| 1697 | return "Out to lunch"; | |
| 1698 | case MSN_IDLE : | |
| 1699 | return "Idle"; | |
| 1700 | default: | |
| 1701 | return "Available"; | |
| 1702 | } | |
| 1703 | } | |
| 1704 | ||
|
2607
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1705 | static void msn_reset_friend(struct gaim_connection *gc, char *who) |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1706 | { |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1707 | struct buddy *b = find_buddy(gc, who); |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1708 | if (!b || !b->proto_data) |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1709 | return; |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1710 | g_snprintf(b->show, sizeof(b->show), "%s", (char *)b->proto_data); |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1711 | handle_buddy_rename(b, b->name); |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1712 | } |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1713 | |
|
2170
5c93594ff522
[gaim-migrate @ 2180]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2169
diff
changeset
|
1714 | static GList *msn_buddy_menu(struct gaim_connection *gc, char *who) |
| 2086 | 1715 | { |
|
2170
5c93594ff522
[gaim-migrate @ 2180]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2169
diff
changeset
|
1716 | GList *m = NULL; |
|
5c93594ff522
[gaim-migrate @ 2180]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2169
diff
changeset
|
1717 | struct proto_buddy_menu *pbm; |
| 2086 | 1718 | struct buddy *b = find_buddy(gc, who); |
|
2170
5c93594ff522
[gaim-migrate @ 2180]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2169
diff
changeset
|
1719 | static char buf[MSN_BUF_LEN]; |
| 2086 | 1720 | |
|
2607
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1721 | pbm = g_new0(struct proto_buddy_menu, 1); |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1722 | pbm->label = "Reset friendly name"; |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1723 | pbm->callback = msn_reset_friend; |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1724 | pbm->gc = gc; |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1725 | m = g_list_append(m, pbm); |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
1726 | |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
1727 | if (!b || !(b->uc >> 1)) |
|
2170
5c93594ff522
[gaim-migrate @ 2180]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2169
diff
changeset
|
1728 | return m; |
| 2086 | 1729 | |
|
2170
5c93594ff522
[gaim-migrate @ 2180]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2169
diff
changeset
|
1730 | pbm = g_new0(struct proto_buddy_menu, 1); |
|
2501
5e1fa4926c93
[gaim-migrate @ 2514]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2494
diff
changeset
|
1731 | g_snprintf(buf, sizeof(buf), "Status: %s", msn_get_away_text(b->uc >> 1)); |
|
2170
5c93594ff522
[gaim-migrate @ 2180]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2169
diff
changeset
|
1732 | pbm->label = buf; |
|
5c93594ff522
[gaim-migrate @ 2180]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2169
diff
changeset
|
1733 | pbm->callback = NULL; |
|
5c93594ff522
[gaim-migrate @ 2180]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2169
diff
changeset
|
1734 | pbm->gc = gc; |
|
5c93594ff522
[gaim-migrate @ 2180]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2169
diff
changeset
|
1735 | m = g_list_append(m, pbm); |
|
5c93594ff522
[gaim-migrate @ 2180]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2169
diff
changeset
|
1736 | |
|
5c93594ff522
[gaim-migrate @ 2180]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2169
diff
changeset
|
1737 | return m; |
| 2086 | 1738 | } |
| 1739 | ||
|
2588
4456409e8343
[gaim-migrate @ 2601]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2582
diff
changeset
|
1740 | static void msn_add_buddy(struct gaim_connection *gc, char *name) |
| 2086 | 1741 | { |
| 1742 | struct msn_data *md = gc->proto_data; | |
|
2588
4456409e8343
[gaim-migrate @ 2601]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2582
diff
changeset
|
1743 | char *who = msn_normalize(name); |
| 2086 | 1744 | char buf[MSN_BUF_LEN]; |
| 1745 | GSList *l = md->fl; | |
| 1746 | ||
|
2600
4319d341eaaf
[gaim-migrate @ 2613]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2597
diff
changeset
|
1747 | if (who[0] == '@') |
|
4319d341eaaf
[gaim-migrate @ 2613]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2597
diff
changeset
|
1748 | /* how did this happen? */ |
|
4319d341eaaf
[gaim-migrate @ 2613]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2597
diff
changeset
|
1749 | return; |
|
4319d341eaaf
[gaim-migrate @ 2613]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2597
diff
changeset
|
1750 | |
| 2953 | 1751 | if (strchr(who, ' ')) |
| 2952 | 1752 | /* This is a broken blist entry. */ |
| 1753 | return; | |
| 1754 | ||
| 2086 | 1755 | while (l) { |
| 1756 | struct msn_buddy *b = l->data; | |
| 1757 | if (!g_strcasecmp(who, b->user)) | |
| 1758 | break; | |
| 1759 | l = l->next; | |
| 1760 | } | |
| 1761 | if (l) | |
| 1762 | return; | |
| 1763 | ||
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1764 | g_snprintf(buf, sizeof(buf), "ADD %d FL %s %s\r\n", ++md->trId, who, who); |
| 2086 | 1765 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
| 1766 | hide_login_progress(gc, "Write error"); | |
| 1767 | signoff(gc); | |
| 1768 | return; | |
| 1769 | } | |
| 1770 | } | |
| 1771 | ||
|
2681
73cd94b9e78e
[gaim-migrate @ 2694]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2665
diff
changeset
|
1772 | static void msn_rem_buddy(struct gaim_connection *gc, char *who, char *group) |
| 2086 | 1773 | { |
| 1774 | struct msn_data *md = gc->proto_data; | |
| 1775 | char buf[MSN_BUF_LEN]; | |
| 1776 | ||
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1777 | g_snprintf(buf, sizeof(buf), "REM %d FL %s\r\n", ++md->trId, who); |
| 2086 | 1778 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
| 1779 | hide_login_progress(gc, "Write error"); | |
| 1780 | signoff(gc); | |
| 1781 | return; | |
| 1782 | } | |
| 1783 | } | |
| 1784 | ||
|
2213
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1785 | static void msn_act_id(gpointer data, char *entry) |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1786 | { |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1787 | struct gaim_connection *gc = data; |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1788 | struct msn_data *md = gc->proto_data; |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1789 | char buf[MSN_BUF_LEN]; |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1790 | |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1791 | g_snprintf(buf, sizeof(buf), "REA %d %s %s\r\n", ++md->trId, gc->username, url_encode(entry)); |
|
2213
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1792 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1793 | hide_login_progress(gc, "Write error"); |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1794 | signoff(gc); |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1795 | return; |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1796 | } |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1797 | } |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1798 | |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1799 | static void msn_do_action(struct gaim_connection *gc, char *act) |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1800 | { |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1801 | if (!strcmp(act, "Set Friendly Name")) { |
|
2541
0afd3aaba327
[gaim-migrate @ 2554]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2501
diff
changeset
|
1802 | do_prompt_dialog("Set Friendly Name:", gc->displayname, gc, msn_act_id, NULL); |
| 2758 | 1803 | } else if (!strcmp(act, "Reset All Friendly Names")) { |
| 1804 | GSList *g = gc->groups; | |
| 1805 | while (g) { | |
| 1806 | GSList *m = ((struct group *)g->data)->members; | |
| 1807 | while (m) { | |
| 1808 | struct buddy *b = m->data; | |
| 1809 | if (b->present) | |
| 1810 | msn_reset_friend(gc, b->name); | |
| 1811 | m = m->next; | |
| 1812 | } | |
| 1813 | g = g->next; | |
| 1814 | } | |
|
2213
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1815 | } |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1816 | } |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1817 | |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1818 | static GList *msn_actions() |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1819 | { |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1820 | GList *m = NULL; |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1821 | |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1822 | m = g_list_append(m, "Set Friendly Name"); |
| 2758 | 1823 | m = g_list_append(m, "Reset All Friendly Names"); |
|
2213
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1824 | |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1825 | return m; |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1826 | } |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1827 | |
|
2591
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1828 | static void msn_convo_closed(struct gaim_connection *gc, char *who) |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1829 | { |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1830 | struct msn_switchboard *ms = msn_find_switch(gc, who); |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1831 | |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1832 | if (ms) |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1833 | msn_kill_switch(ms); |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1834 | } |
|
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
1835 | |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1836 | static void msn_keepalive(struct gaim_connection *gc) |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1837 | { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1838 | struct msn_data *md = gc->proto_data; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1839 | char buf[MSN_BUF_LEN]; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1840 | |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1841 | g_snprintf(buf, sizeof(buf), "PNG\r\n"); |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1842 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1843 | hide_login_progress(gc, "Write error"); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1844 | signoff(gc); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1845 | return; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1846 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1847 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1848 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1849 | static void msn_set_permit_deny(struct gaim_connection *gc) |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1850 | { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1851 | struct msn_data *md = gc->proto_data; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1852 | char buf[MSN_BUF_LEN]; |
|
2665
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1853 | GSList *s, *t = NULL; |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1854 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1855 | if (gc->permdeny == PERMIT_ALL || gc->permdeny == DENY_SOME) |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1856 | g_snprintf(buf, sizeof(buf), "BLP %d AL\r\n", ++md->trId); |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1857 | else |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1858 | g_snprintf(buf, sizeof(buf), "BLP %d BL\r\n", ++md->trId); |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1859 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1860 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1861 | hide_login_progress(gc, "Write error"); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1862 | signoff(gc); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1863 | return; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1864 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1865 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1866 | /* this is safe because we'll always come here after we've gotten the list off the server, |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1867 | * and data is never removed. So if the lengths are equal we don't know about anyone locally |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1868 | * and so there's no sense in going through them all. */ |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1869 | if (g_slist_length(gc->permit) == g_slist_length(md->permit)) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1870 | g_slist_free(md->permit); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1871 | md->permit = NULL; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1872 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1873 | if (g_slist_length(gc->deny) == g_slist_length(md->deny)) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1874 | g_slist_free(md->deny); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1875 | md->deny = NULL; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1876 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1877 | if (!md->permit && !md->deny) |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1878 | return; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1879 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1880 | s = g_slist_nth(gc->permit, g_slist_length(md->permit)); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1881 | while (s) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1882 | char *who = s->data; |
|
2665
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1883 | s = s->next; |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1884 | if (!strchr(who, '@')) { |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1885 | t = g_slist_append(t, who); |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1886 | continue; |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1887 | } |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1888 | g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, who, who); |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1889 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1890 | hide_login_progress(gc, "Write error"); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1891 | signoff(gc); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1892 | return; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1893 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1894 | } |
|
2665
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1895 | while (t) { |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1896 | char *who = t->data; |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1897 | gc->permit = g_slist_remove(gc->permit, who); |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1898 | g_free(who); |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1899 | t = t->next; |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1900 | } |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1901 | if (t) |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1902 | g_slist_free(t); |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1903 | t = NULL; |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1904 | g_slist_free(md->permit); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1905 | md->permit = NULL; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1906 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1907 | s = g_slist_nth(gc->deny, g_slist_length(md->deny)); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1908 | while (s) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1909 | char *who = s->data; |
|
2665
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1910 | s = s->next; |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1911 | if (!strchr(who, '@')) { |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1912 | t = g_slist_append(t, who); |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1913 | continue; |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1914 | } |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1915 | g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, who, who); |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1916 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1917 | hide_login_progress(gc, "Write error"); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1918 | signoff(gc); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1919 | return; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1920 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1921 | } |
|
2665
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1922 | while (t) { |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1923 | char *who = t->data; |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1924 | gc->deny = g_slist_remove(gc->deny, who); |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1925 | g_free(who); |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1926 | t = t->next; |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1927 | } |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1928 | if (t) |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1929 | g_slist_free(t); |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1930 | g_slist_free(md->deny); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1931 | md->deny = NULL; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1932 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1933 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1934 | static void msn_add_permit(struct gaim_connection *gc, char *who) |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1935 | { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1936 | struct msn_data *md = gc->proto_data; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1937 | char buf[MSN_BUF_LEN]; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1938 | |
|
2665
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1939 | if (!strchr(who, '@')) { |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1940 | do_error_dialog(_("Invalid name"), _("MSN Error")); |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1941 | gc->permit = g_slist_remove(gc->permit, who); |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1942 | g_free(who); |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1943 | return; |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1944 | } |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1945 | |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1946 | g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, who, who); |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1947 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1948 | hide_login_progress(gc, "Write error"); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1949 | signoff(gc); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1950 | return; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1951 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1952 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1953 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1954 | static void msn_rem_permit(struct gaim_connection *gc, char *who) |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1955 | { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1956 | struct msn_data *md = gc->proto_data; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1957 | char buf[MSN_BUF_LEN]; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1958 | |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1959 | g_snprintf(buf, sizeof(buf), "REM %d AL %s\r\n", ++md->trId, who); |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1960 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1961 | hide_login_progress(gc, "Write error"); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1962 | signoff(gc); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1963 | return; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1964 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1965 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1966 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1967 | static void msn_add_deny(struct gaim_connection *gc, char *who) |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1968 | { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1969 | struct msn_data *md = gc->proto_data; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1970 | char buf[MSN_BUF_LEN]; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1971 | |
|
2665
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1972 | if (!strchr(who, '@')) { |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1973 | do_error_dialog(_("Invalid name"), _("MSN Error")); |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1974 | gc->deny = g_slist_remove(gc->deny, who); |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1975 | g_free(who); |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1976 | return; |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1977 | } |
|
966d8e2b5017
[gaim-migrate @ 2678]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2611
diff
changeset
|
1978 | |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1979 | g_snprintf(buf, sizeof(buf), "ADD %d BL %s %s\r\n", ++md->trId, who, who); |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1980 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1981 | hide_login_progress(gc, "Write error"); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1982 | signoff(gc); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1983 | return; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1984 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1985 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1986 | |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1987 | static void msn_rem_deny(struct gaim_connection *gc, char *who) |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1988 | { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1989 | struct msn_data *md = gc->proto_data; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1990 | char buf[MSN_BUF_LEN]; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1991 | |
|
2603
0c39616168c9
[gaim-migrate @ 2616]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2600
diff
changeset
|
1992 | g_snprintf(buf, sizeof(buf), "REM %d BL %s\r\n", ++md->trId, who); |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1993 | if (msn_write(md->fd, buf, strlen(buf)) < 0) { |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1994 | hide_login_progress(gc, "Write error"); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1995 | signoff(gc); |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1996 | return; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1997 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1998 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1999 | |
|
2607
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
2000 | static void msn_buddy_free(struct buddy *b) |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
2001 | { |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
2002 | if (b->proto_data) |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
2003 | g_free(b->proto_data); |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
2004 | } |
|
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
2005 | |
| 2086 | 2006 | static struct prpl *my_protocol = NULL; |
| 2007 | ||
| 2008 | void msn_init(struct prpl *ret) | |
| 2009 | { | |
| 2010 | ret->protocol = PROTO_MSN; | |
|
2153
f38e418776a7
[gaim-migrate @ 2163]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2152
diff
changeset
|
2011 | ret->options = OPT_PROTO_MAIL_CHECK; |
| 2086 | 2012 | ret->name = msn_name; |
| 2013 | ret->list_icon = msn_list_icon; | |
| 2014 | ret->buddy_menu = msn_buddy_menu; | |
| 2015 | ret->login = msn_login; | |
| 2016 | ret->close = msn_close; | |
| 2017 | ret->send_im = msn_send_im; | |
| 2993 | 2018 | ret->send_typing = msn_send_typing; |
| 2086 | 2019 | ret->away_states = msn_away_states; |
| 2020 | ret->set_away = msn_set_away; | |
| 2021 | ret->set_idle = msn_set_idle; | |
| 2022 | ret->add_buddy = msn_add_buddy; | |
| 2023 | ret->remove_buddy = msn_rem_buddy; | |
| 2024 | ret->chat_send = msn_chat_send; | |
| 2025 | ret->chat_invite = msn_chat_invite; | |
| 2026 | ret->chat_leave = msn_chat_leave; | |
| 2027 | ret->normalize = msn_normalize; | |
|
2213
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
2028 | ret->do_action = msn_do_action; |
|
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
2029 | ret->actions = msn_actions; |
|
2591
b3a239d80606
[gaim-migrate @ 2604]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2588
diff
changeset
|
2030 | ret->convo_closed = msn_convo_closed; |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
2031 | ret->keepalive = msn_keepalive; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
2032 | ret->set_permit_deny = msn_set_permit_deny; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
2033 | ret->add_permit = msn_add_permit; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
2034 | ret->rem_permit = msn_rem_permit; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
2035 | ret->add_deny = msn_add_deny; |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
2036 | ret->rem_deny = msn_rem_deny; |
|
2607
7bcd3ea48df3
[gaim-migrate @ 2620]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2603
diff
changeset
|
2037 | ret->buddy_free = msn_buddy_free; |
| 2086 | 2038 | |
| 2039 | my_protocol = ret; | |
| 2040 | } | |
| 2041 | ||
| 2042 | #ifndef STATIC | |
| 2043 | ||
| 2044 | char *gaim_plugin_init(GModule *handle) | |
| 2045 | { | |
| 2046 | load_protocol(msn_init, sizeof(struct prpl)); | |
| 2047 | return NULL; | |
| 2048 | } | |
| 2049 | ||
| 2050 | void gaim_plugin_remove() | |
| 2051 | { | |
| 2052 | struct prpl *p = find_prpl(PROTO_MSN); | |
| 2053 | if (p == my_protocol) | |
| 2054 | unload_protocol(p); | |
| 2055 | } | |
| 2056 | ||
| 2057 | char *name() | |
| 2058 | { | |
| 2059 | return "MSN"; | |
| 2060 | } | |
| 2061 | ||
| 2062 | char *description() | |
| 2063 | { | |
|
2162
2a9f076b0af9
[gaim-migrate @ 2172]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2153
diff
changeset
|
2064 | return PRPL_DESC("MSN"); |
| 2086 | 2065 | } |
| 2066 | ||
| 2067 | #endif |