Mercurial > pidgin.yaz

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 2871c385c45a
children e9802db22b06
comparison
equal deleted inserted replaced
13252:2871c385c45a 13253:87a7c3077c19
283 int hdrlen = 0x44; 283 int hdrlen = 0x44;
284 284
285 if (!sess || !conn || (conn->type != AIM_CONN_TYPE_RENDEZVOUS)) 285 if (!sess || !conn || (conn->type != AIM_CONN_TYPE_RENDEZVOUS))
286 return -EINVAL; 286 return -EINVAL;
287 287
288 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_OFT, 0x0001, 0))) 288 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_OFT, 0x0001, 0)))
289 return -ENOMEM; 289 return -ENOMEM;
290 memcpy(fr->hdr.rend.magic, "ODC2", 4); 290 memcpy(fr->hdr.rend.magic, "ODC2", 4);
291 fr->hdr.rend.hdrlen = hdrlen + 8; 291 fr->hdr.rend.hdrlen = hdrlen + 8;
292 292
293 if (!(hdr = calloc(1, hdrlen))) { 293 if (!(hdr = calloc(1, hdrlen))) {
362 guint8 *hdr; 362 guint8 *hdr;
363 363
364 if (!sess || !conn || (conn->type != AIM_CONN_TYPE_RENDEZVOUS) || !msg) 364 if (!sess || !conn || (conn->type != AIM_CONN_TYPE_RENDEZVOUS) || !msg)
365 return -EINVAL; 365 return -EINVAL;
366 366
367 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_OFT, 0x01, 0))) 367 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_OFT, 0x01, 0)))
368 return -ENOMEM; 368 return -ENOMEM;
369 369
370 memcpy(fr->hdr.rend.magic, "ODC2", 4); 370 memcpy(fr->hdr.rend.magic, "ODC2", 4);
371 fr->hdr.rend.hdrlen = hdrlen + 8; 371 fr->hdr.rend.hdrlen = hdrlen + 8;
372 372
941 fh->nlanguage = 0x0000; 941 fh->nlanguage = 0x0000;
942 #endif 942 #endif
943 943
944 aim_oft_dirconvert_tostupid(peer_connection->fh.name); 944 aim_oft_dirconvert_tostupid(peer_connection->fh.name);
945 945
946 if (!(fr = aim_tx_new(sess, peer_connection->conn, AIM_FRAMETYPE_OFT, type, 0))) 946 if (!(fr = flap_frame_new(sess, peer_connection->conn, AIM_FRAMETYPE_OFT, type, 0)))
947 return -ENOMEM; 947 return -ENOMEM;
948 948
949 if (aim_oft_buildheader(&fr->data, &peer_connection->fh) == -1) { 949 if (aim_oft_buildheader(&fr->data, &peer_connection->fh) == -1) {
950 aim_frame_destroy(fr); 950 aim_frame_destroy(fr);
951 return -ENOMEM; 951 return -ENOMEM;