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