comparison src/protocols/oscar/oscar.h @ 13609:5796551db930

[gaim-migrate @ 15995] Inline FlapConnection->inside and change some functions to return void instead of a meaningless int committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 10 Apr 2006 03:53:05 +0000
parents 6c34fbb75bbd
children 060835af7634
comparison
equal deleted inserted replaced
13608:6c34fbb75bbd 13609:5796551db930
374 374
375 guint16 type; 375 guint16 type;
376 guint16 subtype; 376 guint16 subtype;
377 flap_seqnum_t seqnum; 377 flap_seqnum_t seqnum;
378 guint32 status; 378 guint32 status;
379 struct snacgroup *groups;
380 struct rateclass *rates;
381
379 void *internal; /* internal conn-specific libfaim data */ 382 void *internal; /* internal conn-specific libfaim data */
380 void *inside; /* only accessible from inside libfaim */
381 }; 383 };
382 384
383 struct _IcbmCookie 385 struct _IcbmCookie
384 { 386 {
385 guchar cookie[8]; 387 guchar cookie[8];
547 const char *room; 549 const char *room;
548 guint16 instance; 550 guint16 instance;
549 } chat; 551 } chat;
550 }; 552 };
551 553
552 int aim_clientready(OscarData *od, FlapConnection *conn); 554 void aim_clientready(OscarData *od, FlapConnection *conn);
553 int aim_request_login(OscarData *od, FlapConnection *conn, const char *sn); 555 int aim_request_login(OscarData *od, FlapConnection *conn, const char *sn);
554 int aim_send_login(OscarData *, FlapConnection *, const char *, const char *, ClientInfo *, const char *key); 556 int aim_send_login(OscarData *, FlapConnection *, const char *, const char *, ClientInfo *, const char *key);
555 /* 0x000b */ int aim_auth_securid_send(OscarData *od, const char *securid); 557 /* 0x000b */ int aim_auth_securid_send(OscarData *od, const char *securid);
556 558
557 void aim_cleansnacs(OscarData *, int maxage); 559 void aim_cleansnacs(OscarData *, int maxage);
594 #define AIM_PRIVFLAGS_ALLOWIDLE 0x01 596 #define AIM_PRIVFLAGS_ALLOWIDLE 0x01
595 #define AIM_PRIVFLAGS_ALLOWMEMBERSINCE 0x02 597 #define AIM_PRIVFLAGS_ALLOWMEMBERSINCE 0x02
596 598
597 #define AIM_WARN_ANON 0x01 599 #define AIM_WARN_ANON 0x01
598 600
599 int aim_sendpauseack(OscarData *od, FlapConnection *conn);
600 int aim_nop(OscarData *, FlapConnection *); 601 int aim_nop(OscarData *, FlapConnection *);
601 int aim_bos_changevisibility(OscarData *, FlapConnection *, int, const char *); 602 int aim_bos_changevisibility(OscarData *, FlapConnection *, int, const char *);
602 int aim_bos_setgroupperm(OscarData *, FlapConnection *, guint32 mask); 603 int aim_bos_setgroupperm(OscarData *, FlapConnection *, guint32 mask);
603 int aim_bos_setprivacyflags(OscarData *, FlapConnection *, guint32); 604 int aim_bos_setprivacyflags(OscarData *, FlapConnection *, guint32);
604 int aim_reqpersonalinfo(OscarData *, FlapConnection *); 605 void aim_reqpersonalinfo(OscarData *, FlapConnection *);
605 int aim_reqservice(OscarData *, guint16); 606 int aim_reqservice(OscarData *, guint16);
606 int aim_bos_reqrights(OscarData *, FlapConnection *); 607 void aim_bos_reqrights(OscarData *, FlapConnection *);
607 int aim_setextstatus(OscarData *od, guint32 status); 608 int aim_setextstatus(OscarData *od, guint32 status);
608 609
609 #define AIM_CLIENTTYPE_UNKNOWN 0x0000 610 #define AIM_CLIENTTYPE_UNKNOWN 0x0000
610 #define AIM_CLIENTTYPE_MC 0x0001 611 #define AIM_CLIENTTYPE_MC 0x0001
611 #define AIM_CLIENTTYPE_WINAIM 0x0002 612 #define AIM_CLIENTTYPE_WINAIM 0x0002
1006 int aim_putuserinfo(ByteStream *bs, aim_userinfo_t *info); 1007 int aim_putuserinfo(ByteStream *bs, aim_userinfo_t *info);
1007 1008
1008 1009
1009 1010
1010 /* 0x0003 - family_buddy.c */ 1011 /* 0x0003 - family_buddy.c */
1011 /* 0x0002 */ int aim_buddylist_reqrights(OscarData *, FlapConnection *); 1012 /* 0x0002 */ void aim_buddylist_reqrights(OscarData *, FlapConnection *);
1012 /* 0x0004 */ int aim_buddylist_set(OscarData *, FlapConnection *, const char *); 1013 /* 0x0004 */ int aim_buddylist_set(OscarData *, FlapConnection *, const char *);
1013 /* 0x0004 */ int aim_buddylist_addbuddy(OscarData *, FlapConnection *, const char *); 1014 /* 0x0004 */ int aim_buddylist_addbuddy(OscarData *, FlapConnection *, const char *);
1014 /* 0x0005 */ int aim_buddylist_removebuddy(OscarData *, FlapConnection *, const char *); 1015 /* 0x0005 */ int aim_buddylist_removebuddy(OscarData *, FlapConnection *, const char *);
1015 1016
1016 1017
1045 int aim_chat_join(OscarData *od, guint16 exchange, const char *roomname, guint16 instance); 1046 int aim_chat_join(OscarData *od, guint16 exchange, const char *roomname, guint16 instance);
1046 int aim_chat_attachname(FlapConnection *conn, guint16 exchange, const char *roomname, guint16 instance); 1047 int aim_chat_attachname(FlapConnection *conn, guint16 exchange, const char *roomname, guint16 instance);
1047 char *aim_chat_getname(FlapConnection *conn); 1048 char *aim_chat_getname(FlapConnection *conn);
1048 FlapConnection *aim_chat_getconn(OscarData *, const char *name); 1049 FlapConnection *aim_chat_getconn(OscarData *, const char *name);
1049 1050
1050 int aim_chatnav_reqrights(OscarData *od, FlapConnection *conn); 1051 void aim_chatnav_reqrights(OscarData *od, FlapConnection *conn);
1051 1052
1052 int aim_chatnav_createroom(OscarData *od, FlapConnection *conn, const char *name, guint16 exchange); 1053 int aim_chatnav_createroom(OscarData *od, FlapConnection *conn, const char *name, guint16 exchange);
1053 int aim_chat_leaveroom(OscarData *od, const char *name); 1054 int aim_chat_leaveroom(OscarData *od, const char *name);
1054 1055
1055 1056
1457 int ssi_modfirst(OscarData *od, aim_module_t *mod); 1458 int ssi_modfirst(OscarData *od, aim_module_t *mod);
1458 int icq_modfirst(OscarData *od, aim_module_t *mod); 1459 int icq_modfirst(OscarData *od, aim_module_t *mod);
1459 int email_modfirst(OscarData *od, aim_module_t *mod); 1460 int email_modfirst(OscarData *od, aim_module_t *mod);
1460 1461
1461 int aim_genericreq_n(OscarData *, FlapConnection *conn, guint16 family, guint16 subtype); 1462 int aim_genericreq_n(OscarData *, FlapConnection *conn, guint16 family, guint16 subtype);
1462 int aim_genericreq_n_snacid(OscarData *, FlapConnection *conn, guint16 family, guint16 subtype); 1463 void aim_genericreq_n_snacid(OscarData *, FlapConnection *conn, guint16 family, guint16 subtype);
1463 int aim_genericreq_l(OscarData *, FlapConnection *conn, guint16 family, guint16 subtype, guint32 *); 1464 int aim_genericreq_l(OscarData *, FlapConnection *conn, guint16 family, guint16 subtype, guint32 *);
1464 int aim_genericreq_s(OscarData *, FlapConnection *conn, guint16 family, guint16 subtype, guint16 *); 1465 int aim_genericreq_s(OscarData *, FlapConnection *conn, guint16 family, guint16 subtype, guint16 *);
1465 1466
1466 /* bstream.c */ 1467 /* bstream.c */
1467 int byte_stream_init(ByteStream *bs, guint8 *data, int len); 1468 int byte_stream_init(ByteStream *bs, guint8 *data, int len);
1546 guint8 unknown[5]; /* only present in versions >= 3 */ 1547 guint8 unknown[5]; /* only present in versions >= 3 */
1547 struct snacpair *members; 1548 struct snacpair *members;
1548 struct rateclass *next; 1549 struct rateclass *next;
1549 }; 1550 };
1550 1551
1551 /*
1552 * This is inside every connection. But it is a void * to anything
1553 * outside of libfaim. It should remain that way. It's called data
1554 * abstraction. Maybe you've heard of it. (Probably not if you're a
1555 * libfaim user.)
1556 *
1557 */
1558 typedef struct aim_conn_inside_s {
1559 struct snacgroup *groups;
1560 struct rateclass *rates;
1561 } aim_conn_inside_t;
1562
1563 int aim_cachecookie(OscarData *od, IcbmCookie *cookie); 1552 int aim_cachecookie(OscarData *od, IcbmCookie *cookie);
1564 IcbmCookie *aim_uncachecookie(OscarData *od, guint8 *cookie, int type); 1553 IcbmCookie *aim_uncachecookie(OscarData *od, guint8 *cookie, int type);
1565 IcbmCookie *aim_mkcookie(guint8 *, int, void *); 1554 IcbmCookie *aim_mkcookie(guint8 *, int, void *);
1566 IcbmCookie *aim_checkcookie(OscarData *, const unsigned char *, const int); 1555 IcbmCookie *aim_checkcookie(OscarData *, const unsigned char *, const int);
1567 int aim_freecookie(OscarData *od, IcbmCookie *cookie); 1556 int aim_freecookie(OscarData *od, IcbmCookie *cookie);
1571 int aim_chat_readroominfo(ByteStream *bs, struct aim_chat_roominfo *outinfo); 1560 int aim_chat_readroominfo(ByteStream *bs, struct aim_chat_roominfo *outinfo);
1572 1561
1573 void flap_connection_destroy_chat(OscarData *od, FlapConnection *conn); 1562 void flap_connection_destroy_chat(OscarData *od, FlapConnection *conn);
1574 1563
1575 /* These are all handled internally now. */ 1564 /* These are all handled internally now. */
1576 int aim_setversions(OscarData *od, FlapConnection *conn); 1565 void aim_setversions(OscarData *od, FlapConnection *conn);
1577 int aim_reqrates(OscarData *, FlapConnection *); 1566 void aim_reqrates(OscarData *, FlapConnection *);
1578 int aim_rates_addparam(OscarData *, FlapConnection *); 1567 void aim_rates_addparam(OscarData *, FlapConnection *);
1579 int aim_rates_delparam(OscarData *, FlapConnection *); 1568 void aim_rates_delparam(OscarData *, FlapConnection *);
1569 void aim_sendpauseack(OscarData *od, FlapConnection *conn);
1580 1570
1581 1571
1582 1572
1583 1573
1584 1574