Mercurial > pidgin.yaz
diff src/protocols/oscar/snactypes.h @ 13592:6519aeb66b31
[gaim-migrate @ 15978]
Holy cow this is crazy.
34 files changed, 5760 insertions(+), 8517 deletions(-)
* Non-blocking I/O for all of oscar. That includes normal FLAP
connections as well as file transfers and direct IM.
* Kick-ass file transfer and direct IM. Either party can request
the connection. Gaim will try both the "public" IP and the
"client" IP. It'll fall back to transferring through a proxy
if that fails. Should be relatively few memleaks (I didn't
have a lot of confidence in the non-memleakiness of the old
code). And the code is reasonably generic, so it shouldn't
be too much work to add voice chat. This might still be a
LITTLE buggy, but it shouldn't be too bad. If anything, file
transfer will be more buggy than direct IM. And sending a
file will be more buggy than receiving a file. Bug reports
with a series of steps to reproduce are welcome.
* I merged OscarData and aim_session_t
* Somewhere between 50 and 100 hours of work.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Fri, 07 Apr 2006 05:10:56 +0000 |
| parents | e9802db22b06 |
| children |
line wrap: on
line diff
--- a/src/protocols/oscar/snactypes.h Fri Apr 07 01:05:48 2006 +0000 +++ b/src/protocols/oscar/snactypes.h Fri Apr 07 05:10:56 2006 +0000 @@ -28,26 +28,26 @@ /* * SNAC Families. */ -#define OSCAR_FAMILY_OSERVICE 0x0001 -#define OSCAR_FAMILY_LOCATE 0x0002 -#define OSCAR_FAMILY_BUDDY 0x0003 -#define OSCAR_FAMILY_ICBM 0x0004 -#define OSCAR_FAMILY_ADVERT 0x0005 -#define OSCAR_FAMILY_INVITE 0x0006 -#define OSCAR_FAMILY_ADMIN 0x0007 -#define OSCAR_FAMILY_POPUP 0x0008 -#define OSCAR_FAMILY_BOS 0x0009 -#define OSCAR_FAMILY_USERLOOKUP 0x000a -#define OSCAR_FAMILY_STATS 0x000b -#define OSCAR_FAMILY_TRANSLATE 0x000c -#define OSCAR_FAMILY_CHATNAV 0x000d -#define OSCAR_FAMILY_CHAT 0x000e -#define OSCAR_FAMILY_ODIR 0x000f -#define OSCAR_FAMILY_BART 0x0010 -#define OSCAR_FAMILY_FEEDBAG 0x0013 -#define OSCAR_FAMILY_ICQ 0x0015 -#define OSCAR_FAMILY_AUTH 0x0017 -#define OSCAR_FAMILY_ALERT 0x0018 +#define SNAC_FAMILY_OSERVICE 0x0001 +#define SNAC_FAMILY_LOCATE 0x0002 +#define SNAC_FAMILY_BUDDY 0x0003 +#define SNAC_FAMILY_ICBM 0x0004 +#define SNAC_FAMILY_ADVERT 0x0005 +#define SNAC_FAMILY_INVITE 0x0006 +#define SNAC_FAMILY_ADMIN 0x0007 +#define SNAC_FAMILY_POPUP 0x0008 +#define SNAC_FAMILY_BOS 0x0009 +#define SNAC_FAMILY_USERLOOKUP 0x000a +#define SNAC_FAMILY_STATS 0x000b +#define SNAC_FAMILY_TRANSLATE 0x000c +#define SNAC_FAMILY_CHATNAV 0x000d +#define SNAC_FAMILY_CHAT 0x000e +#define SNAC_FAMILY_ODIR 0x000f +#define SNAC_FAMILY_BART 0x0010 +#define SNAC_FAMILY_FEEDBAG 0x0013 +#define SNAC_FAMILY_ICQ 0x0015 +#define SNAC_FAMILY_AUTH 0x0017 +#define SNAC_FAMILY_ALERT 0x0018 #define AIM_CB_FAM_SPECIAL 0xffff /* Internal libfaim use */ @@ -63,191 +63,190 @@ /* * SNAC Family: General. */ -#define OSCAR_SUBTYPE_OSERVICE_ERROR 0x0001 -#define OSCAR_SUBTYPE_OSERVICE_CLIENTREADY 0x0002 -#define OSCAR_SUBTYPE_OSERVICE_SERVERREADY 0x0003 -#define OSCAR_SUBTYPE_OSERVICE_SERVICEREQ 0x0004 -#define OSCAR_SUBTYPE_OSERVICE_REDIRECT 0x0005 -#define OSCAR_SUBTYPE_OSERVICE_RATEINFOREQ 0x0006 -#define OSCAR_SUBTYPE_OSERVICE_RATEINFO 0x0007 -#define OSCAR_SUBTYPE_OSERVICE_RATEINFOACK 0x0008 -#define OSCAR_SUBTYPE_OSERVICE_RATECHANGE 0x000a -#define OSCAR_SUBTYPE_OSERVICE_SERVERPAUSE 0x000b -#define OSCAR_SUBTYPE_OSERVICE_SERVERRESUME 0x000d -#define OSCAR_SUBTYPE_OSERVICE_REQSELFINFO 0x000e -#define OSCAR_SUBTYPE_OSERVICE_SELFINFO 0x000f -#define OSCAR_SUBTYPE_OSERVICE_EVIL 0x0010 -#define OSCAR_SUBTYPE_OSERVICE_SETIDLE 0x0011 -#define OSCAR_SUBTYPE_OSERVICE_MIGRATIONREQ 0x0012 -#define OSCAR_SUBTYPE_OSERVICE_MOTD 0x0013 -#define OSCAR_SUBTYPE_OSERVICE_SETPRIVFLAGS 0x0014 -#define OSCAR_SUBTYPE_OSERVICE_WELLKNOWNURL 0x0015 -#define OSCAR_SUBTYPE_OSERVICE_NOP 0x0016 -#define OSCAR_SUBTYPE_OSERVICE_DEFAULT 0xffff +#define SNAC_SUBTYPE_OSERVICE_ERROR 0x0001 +#define SNAC_SUBTYPE_OSERVICE_CLIENTREADY 0x0002 +#define SNAC_SUBTYPE_OSERVICE_SERVERREADY 0x0003 +#define SNAC_SUBTYPE_OSERVICE_SERVICEREQ 0x0004 +#define SNAC_SUBTYPE_OSERVICE_REDIRECT 0x0005 +#define SNAC_SUBTYPE_OSERVICE_RATEINFOREQ 0x0006 +#define SNAC_SUBTYPE_OSERVICE_RATEINFO 0x0007 +#define SNAC_SUBTYPE_OSERVICE_RATEINFOACK 0x0008 +#define SNAC_SUBTYPE_OSERVICE_RATECHANGE 0x000a +#define SNAC_SUBTYPE_OSERVICE_SERVERPAUSE 0x000b +#define SNAC_SUBTYPE_OSERVICE_SERVERRESUME 0x000d +#define SNAC_SUBTYPE_OSERVICE_REQSELFINFO 0x000e +#define SNAC_SUBTYPE_OSERVICE_SELFINFO 0x000f +#define SNAC_SUBTYPE_OSERVICE_EVIL 0x0010 +#define SNAC_SUBTYPE_OSERVICE_SETIDLE 0x0011 +#define SNAC_SUBTYPE_OSERVICE_MIGRATIONREQ 0x0012 +#define SNAC_SUBTYPE_OSERVICE_MOTD 0x0013 +#define SNAC_SUBTYPE_OSERVICE_SETPRIVFLAGS 0x0014 +#define SNAC_SUBTYPE_OSERVICE_WELLKNOWNURL 0x0015 +#define SNAC_SUBTYPE_OSERVICE_NOP 0x0016 +#define SNAC_SUBTYPE_OSERVICE_DEFAULT 0xffff /* * SNAC Family: Location Services. */ -#define OSCAR_SUBTYPE_LOCATE_ERROR 0x0001 -#define OSCAR_SUBTYPE_LOCATE_REQRIGHTS 0x0002 -#define OSCAR_SUBTYPE_LOCATE_RIGHTSINFO 0x0003 -#define OSCAR_SUBTYPE_LOCATE_SETUSERINFO 0x0004 -#define OSCAR_SUBTYPE_LOCATE_REQUSERINFO 0x0005 -#define OSCAR_SUBTYPE_LOCATE_USERINFO 0x0006 -#define OSCAR_SUBTYPE_LOCATE_WATCHERSUBREQ 0x0007 -#define OSCAR_SUBTYPE_LOCATE_WATCHERNOT 0x0008 -#define OSCAR_SUBTYPE_LOCATE_GOTINFOBLOCK 0xfffd -#define OSCAR_SUBTYPE_LOCATE_REQUESTINFOTIMEOUT 0xfffe -#define OSCAR_SUBTYPE_LOCATE_DEFAULT 0xffff +#define SNAC_SUBTYPE_LOCATE_ERROR 0x0001 +#define SNAC_SUBTYPE_LOCATE_REQRIGHTS 0x0002 +#define SNAC_SUBTYPE_LOCATE_RIGHTSINFO 0x0003 +#define SNAC_SUBTYPE_LOCATE_SETUSERINFO 0x0004 +#define SNAC_SUBTYPE_LOCATE_REQUSERINFO 0x0005 +#define SNAC_SUBTYPE_LOCATE_USERINFO 0x0006 +#define SNAC_SUBTYPE_LOCATE_WATCHERSUBREQ 0x0007 +#define SNAC_SUBTYPE_LOCATE_WATCHERNOT 0x0008 +#define SNAC_SUBTYPE_LOCATE_GOTINFOBLOCK 0xfffd +#define SNAC_SUBTYPE_LOCATE_DEFAULT 0xffff /* * SNAC Family: Buddy List Management Services. */ -#define OSCAR_SUBTYPE_BUDDY_ERROR 0x0001 -#define OSCAR_SUBTYPE_BUDDY_REQRIGHTS 0x0002 -#define OSCAR_SUBTYPE_BUDDY_RIGHTSINFO 0x0003 -#define OSCAR_SUBTYPE_BUDDY_ADDBUDDY 0x0004 -#define OSCAR_SUBTYPE_BUDDY_REMBUDDY 0x0005 -#define OSCAR_SUBTYPE_BUDDY_REJECT 0x000a -#define OSCAR_SUBTYPE_BUDDY_ONCOMING 0x000b -#define OSCAR_SUBTYPE_BUDDY_OFFGOING 0x000c -#define OSCAR_SUBTYPE_BUDDY_DEFAULT 0xffff +#define SNAC_SUBTYPE_BUDDY_ERROR 0x0001 +#define SNAC_SUBTYPE_BUDDY_REQRIGHTS 0x0002 +#define SNAC_SUBTYPE_BUDDY_RIGHTSINFO 0x0003 +#define SNAC_SUBTYPE_BUDDY_ADDBUDDY 0x0004 +#define SNAC_SUBTYPE_BUDDY_REMBUDDY 0x0005 +#define SNAC_SUBTYPE_BUDDY_REJECT 0x000a +#define SNAC_SUBTYPE_BUDDY_ONCOMING 0x000b +#define SNAC_SUBTYPE_BUDDY_OFFGOING 0x000c +#define SNAC_SUBTYPE_BUDDY_DEFAULT 0xffff /* * SNAC Family: Messaging Services. */ -#define OSCAR_SUBTYPE_ICBM_ERROR 0x0001 -#define OSCAR_SUBTYPE_ICBM_PARAMINFO 0x0005 -#define OSCAR_SUBTYPE_ICBM_INCOMING 0x0007 -#define OSCAR_SUBTYPE_ICBM_EVIL 0x0009 -#define OSCAR_SUBTYPE_ICBM_MISSEDCALL 0x000a -#define OSCAR_SUBTYPE_ICBM_CLIENTAUTORESP 0x000b -#define OSCAR_SUBTYPE_ICBM_ACK 0x000c -#define OSCAR_SUBTYPE_ICBM_MTN 0x0014 -#define OSCAR_SUBTYPE_ICBM_DEFAULT 0xffff +#define SNAC_SUBTYPE_ICBM_ERROR 0x0001 +#define SNAC_SUBTYPE_ICBM_PARAMINFO 0x0005 +#define SNAC_SUBTYPE_ICBM_INCOMING 0x0007 +#define SNAC_SUBTYPE_ICBM_EVIL 0x0009 +#define SNAC_SUBTYPE_ICBM_MISSEDCALL 0x000a +#define SNAC_SUBTYPE_ICBM_CLIENTAUTORESP 0x000b +#define SNAC_SUBTYPE_ICBM_ACK 0x000c +#define SNAC_SUBTYPE_ICBM_MTN 0x0014 +#define SNAC_SUBTYPE_ICBM_DEFAULT 0xffff /* * SNAC Family: Advertisement Services */ -#define OSCAR_SUBTYPE_ADVERT_ERROR 0x0001 -#define OSCAR_SUBTYPE_ADVERT_DEFAULT 0xffff +#define SNAC_SUBTYPE_ADVERT_ERROR 0x0001 +#define SNAC_SUBTYPE_ADVERT_DEFAULT 0xffff /* * SNAC Family: Invitation Services. */ -#define OSCAR_SUBTYPE_INVITE_ERROR 0x0001 -#define OSCAR_SUBTYPE_INVITE_DEFAULT 0xffff +#define SNAC_SUBTYPE_INVITE_ERROR 0x0001 +#define SNAC_SUBTYPE_INVITE_DEFAULT 0xffff /* * SNAC Family: Administrative Services. */ -#define OSCAR_SUBTYPE_ADMIN_ERROR 0x0001 -#define OSCAR_SUBTYPE_ADMIN_INFOCHANGE_REPLY 0x0005 -#define OSCAR_SUBTYPE_ADMIN_DEFAULT 0xffff +#define SNAC_SUBTYPE_ADMIN_ERROR 0x0001 +#define SNAC_SUBTYPE_ADMIN_INFOCHANGE_REPLY 0x0005 +#define SNAC_SUBTYPE_ADMIN_DEFAULT 0xffff /* * SNAC Family: Popup Messages */ -#define OSCAR_SUBTYPE_POPUP_ERROR 0x0001 -#define OSCAR_SUBTYPE_POPUP_DEFAULT 0xffff +#define SNAC_SUBTYPE_POPUP_ERROR 0x0001 +#define SNAC_SUBTYPE_POPUP_DEFAULT 0xffff /* * SNAC Family: Misc BOS Services. */ -#define OSCAR_SUBTYPE_BOS_ERROR 0x0001 -#define OSCAR_SUBTYPE_BOS_RIGHTSQUERY 0x0002 -#define OSCAR_SUBTYPE_BOS_RIGHTS 0x0003 -#define OSCAR_SUBTYPE_BOS_DEFAULT 0xffff +#define SNAC_SUBTYPE_BOS_ERROR 0x0001 +#define SNAC_SUBTYPE_BOS_RIGHTSQUERY 0x0002 +#define SNAC_SUBTYPE_BOS_RIGHTS 0x0003 +#define SNAC_SUBTYPE_BOS_DEFAULT 0xffff /* * SNAC Family: User Lookup Services */ -#define OSCAR_SUBTYPE_USERLOOKUP_ERROR 0x0001 -#define OSCAR_SUBTYPE_USERLOOKUP_DEFAULT 0xffff +#define SNAC_SUBTYPE_USERLOOKUP_ERROR 0x0001 +#define SNAC_SUBTYPE_USERLOOKUP_DEFAULT 0xffff /* * SNAC Family: User Status Services */ -#define OSCAR_SUBTYPE_STATS_ERROR 0x0001 -#define OSCAR_SUBTYPE_STATS_SETREPORTINTERVAL 0x0002 -#define OSCAR_SUBTYPE_STATS_REPORTACK 0x0004 -#define OSCAR_SUBTYPE_STATS_DEFAULT 0xffff +#define SNAC_SUBTYPE_STATS_ERROR 0x0001 +#define SNAC_SUBTYPE_STATS_SETREPORTINTERVAL 0x0002 +#define SNAC_SUBTYPE_STATS_REPORTACK 0x0004 +#define SNAC_SUBTYPE_STATS_DEFAULT 0xffff /* * SNAC Family: Translation Services */ -#define OSCAR_SUBTYPE_TRANSLATE_ERROR 0x0001 -#define OSCAR_SUBTYPE_TRANSLATE_DEFAULT 0xffff +#define SNAC_SUBTYPE_TRANSLATE_ERROR 0x0001 +#define SNAC_SUBTYPE_TRANSLATE_DEFAULT 0xffff /* * SNAC Family: Chat Navigation Services */ -#define OSCAR_SUBTYPE_CHATNAV_ERROR 0x0001 -#define OSCAR_SUBTYPE_CHATNAV_CREATE 0x0008 -#define OSCAR_SUBTYPE_CHATNAV_INFO 0x0009 -#define OSCAR_SUBTYPE_CHATNAV_DEFAULT 0xffff +#define SNAC_SUBTYPE_CHATNAV_ERROR 0x0001 +#define SNAC_SUBTYPE_CHATNAV_CREATE 0x0008 +#define SNAC_SUBTYPE_CHATNAV_INFO 0x0009 +#define SNAC_SUBTYPE_CHATNAV_DEFAULT 0xffff /* * SNAC Family: Chat Services */ -#define OSCAR_SUBTYPE_CHAT_ERROR 0x0001 -#define OSCAR_SUBTYPE_CHAT_ROOMINFOUPDATE 0x0002 -#define OSCAR_SUBTYPE_CHAT_USERJOIN 0x0003 -#define OSCAR_SUBTYPE_CHAT_USERLEAVE 0x0004 -#define OSCAR_SUBTYPE_CHAT_OUTGOINGMSG 0x0005 -#define OSCAR_SUBTYPE_CHAT_INCOMINGMSG 0x0006 -#define OSCAR_SUBTYPE_CHAT_DEFAULT 0xffff +#define SNAC_SUBTYPE_CHAT_ERROR 0x0001 +#define SNAC_SUBTYPE_CHAT_ROOMINFOUPDATE 0x0002 +#define SNAC_SUBTYPE_CHAT_USERJOIN 0x0003 +#define SNAC_SUBTYPE_CHAT_USERLEAVE 0x0004 +#define SNAC_SUBTYPE_CHAT_OUTGOINGMSG 0x0005 +#define SNAC_SUBTYPE_CHAT_INCOMINGMSG 0x0006 +#define SNAC_SUBTYPE_CHAT_DEFAULT 0xffff /* * SNAC Family: "New" Search */ -#define OSCAR_SUBTYPE_ODIR_ERROR 0x0001 -#define OSCAR_SUBTYPE_ODIR_SEARCH 0x0002 -#define OSCAR_SUBTYPE_ODIR_RESULTS 0x0003 +#define SNAC_SUBTYPE_ODIR_ERROR 0x0001 +#define SNAC_SUBTYPE_ODIR_SEARCH 0x0002 +#define SNAC_SUBTYPE_ODIR_RESULTS 0x0003 /* * SNAC Family: Buddy icons */ -#define OSCAR_SUBTYPE_BART_ERROR 0x0001 -#define OSCAR_SUBTYPE_BART_REQUEST 0x0004 -#define OSCAR_SUBTYPE_BART_RESPONSE 0x0005 +#define SNAC_SUBTYPE_BART_ERROR 0x0001 +#define SNAC_SUBTYPE_BART_REQUEST 0x0004 +#define SNAC_SUBTYPE_BART_RESPONSE 0x0005 /* * SNAC Family: Server-Stored Buddy Lists */ -#define OSCAR_SUBTYPE_FEEDBAG_ERROR 0x0001 -#define OSCAR_SUBTYPE_FEEDBAG_REQRIGHTS 0x0002 -#define OSCAR_SUBTYPE_FEEDBAG_RIGHTSINFO 0x0003 -#define OSCAR_SUBTYPE_FEEDBAG_REQDATA 0x0004 -#define OSCAR_SUBTYPE_FEEDBAG_REQIFCHANGED 0x0005 -#define OSCAR_SUBTYPE_FEEDBAG_LIST 0x0006 -#define OSCAR_SUBTYPE_FEEDBAG_ACTIVATE 0x0007 -#define OSCAR_SUBTYPE_FEEDBAG_ADD 0x0008 -#define OSCAR_SUBTYPE_FEEDBAG_MOD 0x0009 -#define OSCAR_SUBTYPE_FEEDBAG_DEL 0x000A -#define OSCAR_SUBTYPE_FEEDBAG_SRVACK 0x000E -#define OSCAR_SUBTYPE_FEEDBAG_NOLIST 0x000F -#define OSCAR_SUBTYPE_FEEDBAG_EDITSTART 0x0011 -#define OSCAR_SUBTYPE_FEEDBAG_EDITSTOP 0x0012 -#define OSCAR_SUBTYPE_FEEDBAG_SENDAUTH 0x0014 -#define OSCAR_SUBTYPE_FEEDBAG_RECVAUTH 0x0015 -#define OSCAR_SUBTYPE_FEEDBAG_SENDAUTHREQ 0x0018 -#define OSCAR_SUBTYPE_FEEDBAG_RECVAUTHREQ 0x0019 -#define OSCAR_SUBTYPE_FEEDBAG_SENDAUTHREP 0x001a -#define OSCAR_SUBTYPE_FEEDBAG_RECVAUTHREP 0x001b -#define OSCAR_SUBTYPE_FEEDBAG_ADDED 0x001c +#define SNAC_SUBTYPE_FEEDBAG_ERROR 0x0001 +#define SNAC_SUBTYPE_FEEDBAG_REQRIGHTS 0x0002 +#define SNAC_SUBTYPE_FEEDBAG_RIGHTSINFO 0x0003 +#define SNAC_SUBTYPE_FEEDBAG_REQDATA 0x0004 +#define SNAC_SUBTYPE_FEEDBAG_REQIFCHANGED 0x0005 +#define SNAC_SUBTYPE_FEEDBAG_LIST 0x0006 +#define SNAC_SUBTYPE_FEEDBAG_ACTIVATE 0x0007 +#define SNAC_SUBTYPE_FEEDBAG_ADD 0x0008 +#define SNAC_SUBTYPE_FEEDBAG_MOD 0x0009 +#define SNAC_SUBTYPE_FEEDBAG_DEL 0x000A +#define SNAC_SUBTYPE_FEEDBAG_SRVACK 0x000E +#define SNAC_SUBTYPE_FEEDBAG_NOLIST 0x000F +#define SNAC_SUBTYPE_FEEDBAG_EDITSTART 0x0011 +#define SNAC_SUBTYPE_FEEDBAG_EDITSTOP 0x0012 +#define SNAC_SUBTYPE_FEEDBAG_SENDAUTH 0x0014 +#define SNAC_SUBTYPE_FEEDBAG_RECVAUTH 0x0015 +#define SNAC_SUBTYPE_FEEDBAG_SENDAUTHREQ 0x0018 +#define SNAC_SUBTYPE_FEEDBAG_RECVAUTHREQ 0x0019 +#define SNAC_SUBTYPE_FEEDBAG_SENDAUTHREP 0x001a +#define SNAC_SUBTYPE_FEEDBAG_RECVAUTHREP 0x001b +#define SNAC_SUBTYPE_FEEDBAG_ADDED 0x001c /* * SNAC Family: ICQ * * Most of these are actually special. */ -#define OSCAR_SUBTYPE_ICQ_ERROR 0x0001 -#define OSCAR_SUBTYPE_ICQ_OFFLINEMSG 0x00f0 -#define OSCAR_SUBTYPE_ICQ_OFFLINEMSGCOMPLETE 0x00f1 -#define OSCAR_SUBTYPE_ICQ_INFO 0x00f2 -#define OSCAR_SUBTYPE_ICQ_ALIAS 0x00f3 -#define OSCAR_SUBTYPE_ICQ_DEFAULT 0xffff +#define SNAC_SUBTYPE_ICQ_ERROR 0x0001 +#define SNAC_SUBTYPE_ICQ_OFFLINEMSG 0x00f0 +#define SNAC_SUBTYPE_ICQ_OFFLINEMSGCOMPLETE 0x00f1 +#define SNAC_SUBTYPE_ICQ_INFO 0x00f2 +#define SNAC_SUBTYPE_ICQ_ALIAS 0x00f3 +#define SNAC_SUBTYPE_ICQ_DEFAULT 0xffff /* * SNAC Family: Authorizer @@ -255,13 +254,13 @@ * Used only in protocol versions three and above. * */ -#define OSCAR_SUBTYPE_AUTH_ERROR 0x0001 -#define OSCAR_SUBTYPE_AUTH_LOGINREQEST 0x0002 -#define OSCAR_SUBTYPE_AUTH_LOGINRESPONSE 0x0003 -#define OSCAR_SUBTYPE_AUTH_AUTHREQ 0x0006 -#define OSCAR_SUBTYPE_AUTH_AUTHRESPONSE 0x0007 -#define OSCAR_SUBTYPE_AUTH_SECURID_REQUEST 0x000a -#define OSCAR_SUBTYPE_AUTH_SECURID_RESPONSE 0x000b +#define SNAC_SUBTYPE_AUTH_ERROR 0x0001 +#define SNAC_SUBTYPE_AUTH_LOGINREQEST 0x0002 +#define SNAC_SUBTYPE_AUTH_LOGINRESPONSE 0x0003 +#define SNAC_SUBTYPE_AUTH_AUTHREQ 0x0006 +#define SNAC_SUBTYPE_AUTH_AUTHRESPONSE 0x0007 +#define SNAC_SUBTYPE_AUTH_SECURID_REQUEST 0x000a +#define SNAC_SUBTYPE_AUTH_SECURID_RESPONSE 0x000b /* * SNAC Family: Email @@ -270,10 +269,10 @@ * associated with your screen name. * */ -#define OSCAR_SUBTYPE_ALERT_ERROR 0x0001 -#define OSCAR_SUBTYPE_ALERT_SENDCOOKIES 0x0006 -#define OSCAR_SUBTYPE_ALERT_MAILSTATUS 0x0007 -#define OSCAR_SUBTYPE_ALERT_INIT 0x0016 +#define SNAC_SUBTYPE_ALERT_ERROR 0x0001 +#define SNAC_SUBTYPE_ALERT_SENDCOOKIES 0x0006 +#define SNAC_SUBTYPE_ALERT_MAILSTATUS 0x0007 +#define SNAC_SUBTYPE_ALERT_INIT 0x0016 /* * SNAC Family: Internal Messages @@ -284,9 +283,7 @@ * */ #define AIM_CB_SPECIAL_CONNERR 0x0003 -#define AIM_CB_SPECIAL_FLAPVER 0x0005 #define AIM_CB_SPECIAL_CONNINITDONE 0x0006 -#define AIM_CB_SPECIAL_IMAGETRANSFER 0x0007 /* SNAC flags */ #define AIM_SNACFLAGS_DESTRUCTOR 0x0001