comparison: src/protocols/oscar/peer.c
src/protocols/oscar/peer.c
- changeset 13254
- 3fbb3f3efba7
- parent 13253
- 5ad8373f2d1e
- child 13255
- b318f395092d
equal
deleted
inserted
replaced
| 13253:5ad8373f2d1e | 13254:3fbb3f3efba7 |
|---|---|
| 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; |
