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