Mercurial > pidgin
comparison src/protocols/oscar/aim.h @ 8982:a4fd6666bb83
[gaim-migrate @ 9757]
Some Direct IM fixes.
1. Let's send our correct ip. We were usually sending localhost, so the
other side would try to connect to localhost and immediately fail and so
say, hey! I can't connect to you! Connect to me instead!
2. Add some gaim_conversation_writes to keep the user more informed as
to what's going on.
This changes the libfaim API. libfaim users take note.
I removed the util get local ip function, and made the function
that used to use it take an ip as an argument instead, so that oscar.c
could just call gaim's function, which works better.
I also made it possible to specify a cookie to use, because I think I'll
need that later. Probably.
committer: Tailor Script <tailor@pidgin.im>
author | Tim Ringenbach <marv@pidgin.im> |
---|---|
date | Thu, 20 May 2004 00:14:14 +0000 |
parents | 8e69a730885c |
children | 460d02fe03df |
comparison
equal
deleted
inserted
replaced
8981:e40f9afd420e | 8982:a4fd6666bb83 |
---|---|
409 * These are only used when you don't use your own lowlevel | 409 * These are only used when you don't use your own lowlevel |
410 * I/O. I don't suggest that you use libfaim's internal I/O. | 410 * I/O. I don't suggest that you use libfaim's internal I/O. |
411 * Its really bad and the API/event model is quirky at best. | 411 * Its really bad and the API/event model is quirky at best. |
412 * | 412 * |
413 */ | 413 */ |
414 aim_frame_t *queue_outgoing; | 414 aim_frame_t *queue_outgoing; |
415 aim_frame_t *queue_incoming; | 415 aim_frame_t *queue_incoming; |
416 | 416 |
417 /* | 417 /* |
418 * Tx Enqueuing function. | 418 * Tx Enqueuing function. |
419 * | 419 * |
863 /* 0x0006 */ faim_export int aim_im_sendch1_ext(aim_session_t *sess, struct aim_sendimext_args *args); | 863 /* 0x0006 */ faim_export int aim_im_sendch1_ext(aim_session_t *sess, struct aim_sendimext_args *args); |
864 /* 0x0006 */ faim_export int aim_im_sendch1(aim_session_t *, const char *destsn, fu16_t flags, const char *msg); | 864 /* 0x0006 */ faim_export int aim_im_sendch1(aim_session_t *, const char *destsn, fu16_t flags, const char *msg); |
865 /* 0x0006 */ faim_export int aim_im_sendch2_chatinvite(aim_session_t *sess, const char *sn, const char *msg, fu16_t exchange, const char *roomname, fu16_t instance); | 865 /* 0x0006 */ faim_export int aim_im_sendch2_chatinvite(aim_session_t *sess, const char *sn, const char *msg, fu16_t exchange, const char *roomname, fu16_t instance); |
866 /* 0x0006 */ faim_export int aim_im_sendch2_icon(aim_session_t *sess, const char *sn, const fu8_t *icon, int iconlen, time_t stamp, fu16_t iconsum); | 866 /* 0x0006 */ faim_export int aim_im_sendch2_icon(aim_session_t *sess, const char *sn, const fu8_t *icon, int iconlen, time_t stamp, fu16_t iconsum); |
867 /* 0x0006 */ faim_export int aim_im_sendch2_rtfmsg(aim_session_t *sess, struct aim_sendrtfmsg_args *args); | 867 /* 0x0006 */ faim_export int aim_im_sendch2_rtfmsg(aim_session_t *sess, struct aim_sendrtfmsg_args *args); |
868 /* 0x0006 */ faim_export int aim_im_sendch2_odcrequest(aim_session_t *sess, fu8_t *cookie, const char *sn, const fu8_t *ip, fu16_t port); | 868 /* 0x0006 */ faim_export int aim_im_sendch2_odcrequest(aim_session_t *sess, fu8_t *cookie, bool usecookie, const char *sn, const fu8_t *ip, fu16_t port); |
869 /* 0x0006 */ faim_export int aim_im_sendch2_sendfile_ask(aim_session_t *sess, struct aim_oft_info *oft_info); | 869 /* 0x0006 */ faim_export int aim_im_sendch2_sendfile_ask(aim_session_t *sess, struct aim_oft_info *oft_info); |
870 /* 0x0006 */ faim_export int aim_im_sendch2_sendfile_accept(aim_session_t *sess, struct aim_oft_info *info); | 870 /* 0x0006 */ faim_export int aim_im_sendch2_sendfile_accept(aim_session_t *sess, struct aim_oft_info *info); |
871 /* 0x0006 */ faim_export int aim_im_sendch2_sendfile_cancel(aim_session_t *sess, struct aim_oft_info *oft_info); | 871 /* 0x0006 */ faim_export int aim_im_sendch2_sendfile_cancel(aim_session_t *sess, struct aim_oft_info *oft_info); |
872 /* 0x0006 */ faim_export int aim_im_sendch2_geticqaway(aim_session_t *sess, const char *sn, int type); | 872 /* 0x0006 */ faim_export int aim_im_sendch2_geticqaway(aim_session_t *sess, const char *sn, int type); |
873 /* 0x0006 */ faim_export int aim_im_sendch4(aim_session_t *sess, char *sn, fu16_t type, fu8_t *message); | 873 /* 0x0006 */ faim_export int aim_im_sendch4(aim_session_t *sess, char *sn, fu16_t type, fu8_t *message); |
931 faim_export int aim_handlerendconnect(aim_session_t *sess, aim_conn_t *cur); | 931 faim_export int aim_handlerendconnect(aim_session_t *sess, aim_conn_t *cur); |
932 faim_export int aim_odc_send_typing(aim_session_t *sess, aim_conn_t *conn, int typing); | 932 faim_export int aim_odc_send_typing(aim_session_t *sess, aim_conn_t *conn, int typing); |
933 faim_export int aim_odc_send_im(aim_session_t *sess, aim_conn_t *conn, const char *msg, int len, int encoding, int isawaymsg); | 933 faim_export int aim_odc_send_im(aim_session_t *sess, aim_conn_t *conn, const char *msg, int len, int encoding, int isawaymsg); |
934 faim_export const char *aim_odc_getsn(aim_conn_t *conn); | 934 faim_export const char *aim_odc_getsn(aim_conn_t *conn); |
935 faim_export aim_conn_t *aim_odc_getconn(aim_session_t *sess, const char *sn); | 935 faim_export aim_conn_t *aim_odc_getconn(aim_session_t *sess, const char *sn); |
936 faim_export aim_conn_t *aim_odc_initiate(aim_session_t *sess, const char *sn, int listenfd, fu16_t port); | 936 faim_export aim_conn_t *aim_odc_initiate(aim_session_t *sess, const char *sn, int listenfd, |
937 const fu8_t *localip, fu16_t port, const fu8_t *mycookie); | |
937 faim_export aim_conn_t *aim_odc_connect(aim_session_t *sess, const char *sn, const char *addr, const fu8_t *cookie); | 938 faim_export aim_conn_t *aim_odc_connect(aim_session_t *sess, const char *sn, const char *addr, const fu8_t *cookie); |
938 | 939 |
939 faim_export struct aim_oft_info *aim_oft_createinfo(aim_session_t *sess, const fu8_t *cookie, const char *sn, const char *ip, fu16_t port, fu32_t size, fu32_t modtime, char *filename); | 940 faim_export struct aim_oft_info *aim_oft_createinfo(aim_session_t *sess, const fu8_t *cookie, const char *sn, const char *ip, fu16_t port, fu32_t size, fu32_t modtime, char *filename); |
940 faim_export int aim_oft_destroyinfo(struct aim_oft_info *oft_info); | 941 faim_export int aim_oft_destroyinfo(struct aim_oft_info *oft_info); |
941 faim_export int aim_sendfile_listen(aim_session_t *sess, struct aim_oft_info *oft_info, int listenfd); | 942 faim_export int aim_sendfile_listen(aim_session_t *sess, struct aim_oft_info *oft_info, int listenfd); |
1468 (((*((buf)+3)) << 24) & 0xff000000)) | 1469 (((*((buf)+3)) << 24) & 0xff000000)) |
1469 | 1470 |
1470 | 1471 |
1471 faim_export int aimutil_putstr(char *, const char *, int); | 1472 faim_export int aimutil_putstr(char *, const char *, int); |
1472 faim_export fu16_t aimutil_iconsum(const fu8_t *buf, int buflen); | 1473 faim_export fu16_t aimutil_iconsum(const fu8_t *buf, int buflen); |
1473 faim_export int aim_util_getlocalip(fu8_t *ip); | |
1474 faim_export int aimutil_tokslen(char *toSearch, int theindex, char dl); | 1474 faim_export int aimutil_tokslen(char *toSearch, int theindex, char dl); |
1475 faim_export int aimutil_itemcnt(char *toSearch, char dl); | 1475 faim_export int aimutil_itemcnt(char *toSearch, char dl); |
1476 faim_export char *aimutil_itemindex(char *toSearch, int theindex, char dl); | 1476 faim_export char *aimutil_itemindex(char *toSearch, int theindex, char dl); |
1477 | 1477 |
1478 faim_export int aim_snvalid(const char *sn); | 1478 faim_export int aim_snvalid(const char *sn); |