Mercurial > pidgin
comparison src/protocols/oscar/ft.c @ 11253:7d31d61e6438
[gaim-migrate @ 13422]
Get rid of faimdprintf and use gaim_debug functions instead
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sat, 13 Aug 2005 06:43:45 +0000 |
parents | 751de30689ef |
children | ab0fa7cd61cc |
comparison
equal
deleted
inserted
replaced
11252:55356a29cdd1 | 11253:7d31d61e6438 |
---|---|
229 | 229 |
230 if ((userfunc = aim_callhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_ESTABLISHED))) | 230 if ((userfunc = aim_callhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_ESTABLISHED))) |
231 ret = userfunc(sess, NULL, newconn, cur); | 231 ret = userfunc(sess, NULL, newconn, cur); |
232 | 232 |
233 } else { | 233 } else { |
234 faimdprintf(sess, 1,"Got a connection on a listener that's not rendezvous. Closing connection.\n"); | 234 gaim_debug_warning("oscar", "Got a connection on a listener that's not rendezvous. Closing connection.\n"); |
235 aim_conn_close(newconn); | 235 aim_conn_close(newconn); |
236 ret = -1; | 236 ret = -1; |
237 } | 237 } |
238 | 238 |
239 return ret; | 239 return ret; |
601 | 601 |
602 aim_bstream_setpos(bs, 36); | 602 aim_bstream_setpos(bs, 36); |
603 /* XXX - create an aimbs_getnullstr function? */ | 603 /* XXX - create an aimbs_getnullstr function? */ |
604 snptr = aimbs_getstr(bs, 32); /* Next 32 bytes contain the sn, padded with null chars */ | 604 snptr = aimbs_getstr(bs, 32); /* Next 32 bytes contain the sn, padded with null chars */ |
605 | 605 |
606 faimdprintf(sess, 2, "faim: OFT frame: handlehdr_odc: %04x / %04x / %s\n", payloadlength, flags, snptr); | 606 gaim_debug_misc("oscar", "faim: OFT frame: handlehdr_odc: %04x / %04x / %s\n", payloadlength, flags, snptr); |
607 | 607 |
608 if (flags & 0x0008) { | 608 if (flags & 0x0008) { |
609 if ((userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMTYPING))) | 609 if ((userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMTYPING))) |
610 ret = userfunc(sess, &fr, snptr, 2); | 610 ret = userfunc(sess, &fr, snptr, 2); |
611 } else if (flags & 0x0004) { | 611 } else if (flags & 0x0004) { |
917 | 917 |
918 if (conn->subtype == AIM_CONN_SUBTYPE_OFT_DIRECTIM) { | 918 if (conn->subtype == AIM_CONN_SUBTYPE_OFT_DIRECTIM) { |
919 if (fr->hdr.rend.type == 0x0001) | 919 if (fr->hdr.rend.type == 0x0001) |
920 ret = handlehdr_odc(sess, conn, fr, &fr->data); | 920 ret = handlehdr_odc(sess, conn, fr, &fr->data); |
921 else | 921 else |
922 faimdprintf(sess, 0, "faim: ODC directim frame unknown, type is %04x\n", fr->hdr.rend.type); | 922 gaim_debug_info("oscar", "ODC directim frame unknown, type is %04x\n", fr->hdr.rend.type); |
923 | 923 |
924 } else { | 924 } else { |
925 aim_rxcallback_t userfunc; | 925 aim_rxcallback_t userfunc; |
926 struct aim_fileheader_t *header = aim_oft_getheader(&fr->data); | 926 struct aim_fileheader_t *header = aim_oft_getheader(&fr->data); |
927 aim_oft_dirconvert_fromstupid(header->name); /* XXX - This should be client-side */ | 927 aim_oft_dirconvert_fromstupid(header->name); /* XXX - This should be client-side */ |