comparison src/protocols/oscar/family_icq.c @ 13253:87a7c3077c19

[gaim-migrate @ 15619] More cleaning up of oscar. Renamed some functions to be more clear. Got rid of some stuff that wasn't used. Inlined some small things in conn.c that were only used once. The goals of all this are 1. Non-blocking I/O for all connections 2. p2p stuff won't use the same struct as oscar connections, because that's stupid 3. The oscar PRPL should be less scary committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 12 Feb 2006 21:27:04 +0000
parents f260d319bbbc
children 6519aeb66b31
comparison
equal deleted inserted replaced
13252:2871c385c45a 13253:87a7c3077c19
35 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015))) 35 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015)))
36 return -EINVAL; 36 return -EINVAL;
37 37
38 bslen = 2 + 4 + 2 + 2; 38 bslen = 2 + 4 + 2 + 2;
39 39
40 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen))) 40 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen)))
41 return -ENOMEM; 41 return -ENOMEM;
42 42
43 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0); 43 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0);
44 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid); 44 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid);
45 45
67 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015))) 67 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015)))
68 return -EINVAL; 68 return -EINVAL;
69 69
70 bslen = 2 + 4 + 2 + 2; 70 bslen = 2 + 4 + 2 + 2;
71 71
72 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen))) 72 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen)))
73 return -ENOMEM; 73 return -ENOMEM;
74 74
75 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0); 75 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0);
76 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid); 76 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid);
77 77
100 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015))) 100 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015)))
101 return -EINVAL; 101 return -EINVAL;
102 102
103 bslen = 2+4+2+2+2+2+2+1+1+1+1+1+1; 103 bslen = 2+4+2+2+2+2+2+1+1+1+1+1+1;
104 104
105 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen))) 105 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen)))
106 return -ENOMEM; 106 return -ENOMEM;
107 107
108 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0); 108 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0);
109 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid); 109 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid);
110 110
155 passwdlen = strlen(passwd); 155 passwdlen = strlen(passwd);
156 if (passwdlen > MAXICQPASSLEN) 156 if (passwdlen > MAXICQPASSLEN)
157 passwdlen = MAXICQPASSLEN; 157 passwdlen = MAXICQPASSLEN;
158 bslen = 2+4+2+2+2+2+passwdlen+1; 158 bslen = 2+4+2+2+2+2+passwdlen+1;
159 159
160 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen))) 160 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen)))
161 return -ENOMEM; 161 return -ENOMEM;
162 162
163 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0); 163 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0);
164 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid); 164 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid);
165 165
195 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015))) 195 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015)))
196 return -EINVAL; 196 return -EINVAL;
197 197
198 bslen = 2 + 4 + 2 + 2 + 2 + 4; 198 bslen = 2 + 4 + 2 + 2 + 2 + 4;
199 199
200 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen))) 200 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen)))
201 return -ENOMEM; 201 return -ENOMEM;
202 202
203 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0); 203 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0);
204 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid); 204 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid);
205 205
240 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015))) 240 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015)))
241 return -EINVAL; 241 return -EINVAL;
242 242
243 bslen = 2 + 4 + 2 + 2 + 2 + 4; 243 bslen = 2 + 4 + 2 + 2 + 2 + 4;
244 244
245 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen))) 245 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen)))
246 return -ENOMEM; 246 return -ENOMEM;
247 247
248 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0); 248 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0);
249 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid); 249 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid);
250 250
284 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015))) 284 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015)))
285 return -EINVAL; 285 return -EINVAL;
286 286
287 bslen = 2 + 4 + 2 + 2 + 2 + 4; 287 bslen = 2 + 4 + 2 + 2 + 2 + 4;
288 288
289 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen))) 289 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen)))
290 return -ENOMEM; 290 return -ENOMEM;
291 291
292 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0); 292 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0);
293 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid); 293 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid);
294 294
322 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015))) 322 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015)))
323 return -EINVAL; 323 return -EINVAL;
324 324
325 bslen = 2 + 10 + 2 + strlen(xml) + 1; 325 bslen = 2 + 10 + 2 + strlen(xml) + 1;
326 326
327 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen))) 327 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen)))
328 return -ENOMEM; 328 return -ENOMEM;
329 329
330 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0); 330 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0);
331 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid); 331 aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid);
332 332
404 "</icq_sms_message>\n", 404 "</icq_sms_message>\n",
405 name, msg, sess->sn, alias, timestr); 405 name, msg, sess->sn, alias, timestr);
406 406
407 bslen = 37 + xmllen; 407 bslen = 37 + xmllen;
408 408
409 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen))) { 409 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen))) {
410 free(xml); 410 free(xml);
411 return -ENOMEM; 411 return -ENOMEM;
412 } 412 }
413 413
414 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0); 414 snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0);