X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/871e2fd07a6381b9e2dcacc27608541ca826e3d6..ee49b735a9cbcb7b15f86e0e3dc69118ba2a4607:/utils/faimtest/faimtest.c diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c index ac8d18f..9fffe47 100644 --- a/utils/faimtest/faimtest.c +++ b/utils/faimtest/faimtest.c @@ -56,6 +56,7 @@ int faimtest_handleredirect(struct aim_session_t *, struct command_rx_struct *co int faimtest_authsvrready(struct aim_session_t *, struct command_rx_struct *command, ...); int faimtest_pwdchngdone(struct aim_session_t *, struct command_rx_struct *command, ...); int faimtest_serverready(struct aim_session_t *, struct command_rx_struct *command, ...); +int faimtest_hostversions(struct aim_session_t *sess, struct command_rx_struct *command, ...); int faimtest_parse_misses(struct aim_session_t *, struct command_rx_struct *command, ...); int faimtest_parse_msgack(struct aim_session_t *, struct command_rx_struct *command, ...); int faimtest_parse_motd(struct aim_session_t *, struct command_rx_struct *command, ...); @@ -116,6 +117,9 @@ static char *msgerrreasons[] = { "Not while on AOL"}; static int msgerrreasonslen = 25; +static char *screenname,*password,*server=NULL; +static int connected = 0; + int faimtest_reportinterval(struct aim_session_t *sess, struct command_rx_struct *command, ...) { if (command->data) { @@ -125,6 +129,49 @@ int faimtest_reportinterval(struct aim_session_t *sess, struct command_rx_struct return 1; } +int faimtest_flapversion(struct aim_session_t *sess, struct command_rx_struct *command, ...) +{ + + printf("faimtest: using FLAP version %u\n", aimutil_get32(command->data)); + +#if 0 + /* + * This is an alternate location for starting the login process. + */ + /* XXX should do more checking to make sure its really the right AUTH conn */ + if (command->conn->type == AIM_CONN_TYPE_AUTH) { + /* do NOT send a connack/flapversion, request_login will send it if needed */ + aim_request_login(sess, command->conn, screenname); + printf("faimtest: login request sent\n"); + } +#endif + + return 1; +} + +/* + * This is a frivilous callback. You don't need it. I only used it for + * debugging non-blocking connects. + * + * If packets are sent to a conn before its fully connected, they + * will be queued and then transmitted when the connection completes. + * + */ +int faimtest_conncomplete(struct aim_session_t *sess, struct command_rx_struct *command, ...) +{ + va_list ap; + struct aim_conn_t *conn; + + va_start(ap, command); + conn = va_arg(ap, struct aim_conn_t *); + va_end(ap); + + if (conn) + printf("faimtest: connection on %d completed\n", conn->fd); + + return 1; +} + #ifdef _WIN32 /* * This is really all thats needed to link against libfaim on win32. @@ -142,8 +189,6 @@ int initwsa(void) } #endif /* _WIN32 */ -static char *screenname,*password,*server=NULL; - int main(void) { struct aim_session_t aimsess; @@ -183,7 +228,8 @@ int main(void) } #endif /* _WIN32 */ - aim_session_init(&aimsess); + /* Pass zero as flags if you want blocking connects */ + aim_session_init(&aimsess, AIM_SESS_FLAGS_NONBLOCKCONNECT); #ifdef FILESUPPORT if(listingpath) { @@ -221,14 +267,15 @@ int main(void) return -1; } + aim_conn_addhandler(&aimsess, authconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, faimtest_flapversion, 0); + aim_conn_addhandler(&aimsess, authconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0); aim_conn_addhandler(&aimsess, authconn, 0x0017, 0x0007, faimtest_parse_login, 0); - aim_conn_addhandler(&aimsess, authconn, 0x0017, 0x0003, faimtest_parse_authresp, 0); - - aim_sendconnack(&aimsess, authconn); - aim_request_login(&aimsess, authconn, screenname); + aim_conn_addhandler(&aimsess, authconn, 0x0017, 0x0003, faimtest_parse_authresp, 0); aim_conn_addhandler(&aimsess, authconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_DEBUGCONN_CONNECT, faimtest_debugconn_connect, 0); + /* If the connection is in progress, this will just be queued */ + aim_request_login(&aimsess, authconn, screenname); printf("faimtest: login request sent\n"); while (keepgoing) { @@ -256,7 +303,12 @@ int main(void) aim_rxdispatch(&aimsess); } else { printf("connection error (type 0x%04x:0x%04x)\n", waitingconn->type, waitingconn->subtype); - aim_conn_kill(&aimsess, &waitingconn); + if(waitingconn->type == AIM_CONN_TYPE_RENDEZVOUS) { + /* we should have callbacks for all these, else the library will do the conn_kill for us. */ + printf("connection error: rendezvous connection. you forgot register a disconnect callback, right?\n"); + } + else + aim_conn_kill(&aimsess, &waitingconn); if (!aim_getconn_type(&aimsess, AIM_CONN_TYPE_BOS)) { printf("major connection error\n"); keepgoing = 0; @@ -286,7 +338,7 @@ int faimtest_rateresp(struct aim_session_t *sess, struct command_rx_struct *comm switch(command->conn->type) { case AIM_CONN_TYPE_BOS: { /* this is the new buddy list */ - char buddies[] = "Buddy1&Buddy2&ThisHereIsAName2&"; + char buddies[] = "Buddy1&Buddy2&ThisHereIsAName2&midendian&ewarmenhoven&"; /* this is the new profile */ char profile[] = "Hello"; @@ -319,54 +371,90 @@ int faimtest_rateresp(struct aim_session_t *sess, struct command_rx_struct *comm return 1; } +int faimtest_hostversions(struct aim_session_t *sess, struct command_rx_struct *command, ...) +{ + int vercount, i; + unsigned char *versions; + va_list ap; + + va_start(ap, command); + vercount = va_arg(ap, int); /* number of family/version pairs */ + versions = va_arg(ap, unsigned char *); + va_end(ap); + + printf("faimtest: SNAC versions supported by this host: "); + for (i = 0; i < vercount*4; i += 4) + printf("0x%04x:0x%04x ", + aimutil_get16(versions+i), /* SNAC family */ + aimutil_get16(versions+i+2) /* Version number */); + printf("\n"); + + return 1; +} + int faimtest_serverready(struct aim_session_t *sess, struct command_rx_struct *command, ...) { - switch (command->conn->type) - { - case AIM_CONN_TYPE_BOS: + int famcount, i; + unsigned short *families; + va_list ap; - aim_setversions(sess, command->conn); - aim_bos_reqrate(sess, command->conn); /* request rate info */ + va_start(ap, command); + famcount = va_arg(ap, int); + families = va_arg(ap, unsigned short *); + va_end(ap); - fprintf(stderr, "faimtest: done with BOS ServerReady\n"); - break; + printf("faimtest: SNAC families supported by this host (type %d): ", command->conn->type); + for (i = 0; i < famcount; i++) + printf("0x%04x ", families[i]); + printf("\n"); - case AIM_CONN_TYPE_CHATNAV: - fprintf(stderr, "faimtest: chatnav: got server ready\n"); - aim_conn_addhandler(sess, command->conn, AIM_CB_FAM_CTN, AIM_CB_CTN_INFO, faimtest_chatnav_info, 0); - aim_bos_reqrate(sess, command->conn); - aim_bos_ackrateresp(sess, command->conn); - aim_chatnav_clientready(sess, command->conn); - aim_chatnav_reqrights(sess, command->conn); + switch (command->conn->type) { + case AIM_CONN_TYPE_BOS: - break; - case AIM_CONN_TYPE_CHAT: - aim_conn_addhandler(sess, command->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_USERJOIN, faimtest_chat_join, 0); - aim_conn_addhandler(sess, command->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_USERLEAVE, faimtest_chat_leave, 0); - aim_conn_addhandler(sess, command->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_ROOMINFOUPDATE, faimtest_chat_infoupdate, 0); - aim_conn_addhandler(sess, command->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_INCOMINGMSG, faimtest_chat_incomingmsg, 0); - aim_bos_reqrate(sess, command->conn); - aim_bos_ackrateresp(sess, command->conn); - aim_chat_clientready(sess, command->conn); - break; + aim_setversions(sess, command->conn); + aim_bos_reqrate(sess, command->conn); /* request rate info */ - case AIM_CONN_TYPE_RENDEZVOUS: /* empty */ - break; + fprintf(stderr, "faimtest: done with BOS ServerReady\n"); + break; + + case AIM_CONN_TYPE_CHATNAV: + fprintf(stderr, "faimtest: chatnav: got server ready\n"); + aim_conn_addhandler(sess, command->conn, AIM_CB_FAM_CTN, AIM_CB_CTN_INFO, faimtest_chatnav_info, 0); + aim_bos_reqrate(sess, command->conn); + aim_bos_ackrateresp(sess, command->conn); + aim_chatnav_clientready(sess, command->conn); + aim_chatnav_reqrights(sess, command->conn); + + break; + + case AIM_CONN_TYPE_CHAT: + aim_conn_addhandler(sess, command->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_USERJOIN, faimtest_chat_join, 0); + aim_conn_addhandler(sess, command->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_USERLEAVE, faimtest_chat_leave, 0); + aim_conn_addhandler(sess, command->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_ROOMINFOUPDATE, faimtest_chat_infoupdate, 0); + aim_conn_addhandler(sess, command->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_INCOMINGMSG, faimtest_chat_incomingmsg, 0); + aim_bos_reqrate(sess, command->conn); + aim_bos_ackrateresp(sess, command->conn); + aim_chat_clientready(sess, command->conn); + break; + + case AIM_CONN_TYPE_RENDEZVOUS: /* empty */ + break; + + default: + fprintf(stderr, "faimtest: unknown connection type on Server Ready\n"); + } - default: - fprintf(stderr, "faimtest: unknown connection type on Server Ready\n"); - } return 1; } int faimtest_parse_buddyrights(struct aim_session_t *sess, struct command_rx_struct *command, ...) -{ +{ va_list ap; unsigned short maxbuddies, maxwatchers; va_start(ap, command); - maxbuddies = va_arg(ap, unsigned short); - maxwatchers = va_arg(ap, unsigned short); + maxbuddies = va_arg(ap, int); + maxwatchers = va_arg(ap, int); va_end(ap); printf("faimtest: buddy list rights: Max buddies = %d / Max watchers = %d\n", maxbuddies, maxwatchers); @@ -380,8 +468,8 @@ int faimtest_bosrights(struct aim_session_t *sess, struct command_rx_struct *com va_list ap; va_start(ap, command); - maxpermits = va_arg(ap, unsigned short); - maxdenies = va_arg(ap, unsigned short); + maxpermits = va_arg(ap, int); + maxdenies = va_arg(ap, int); va_end(ap); printf("faimtest: BOS rights: Max permit = %d / Max deny = %d\n", maxpermits, maxdenies); @@ -427,11 +515,14 @@ int faimtest_handleredirect(struct aim_session_t *sess, struct command_rx_struct struct aim_conn_t *tstconn; /* Open a connection to the Auth */ tstconn = aim_newconn(sess, AIM_CONN_TYPE_AUTH, ip); - if ( (tstconn==NULL) || (tstconn->status >= AIM_CONN_STATUS_RESOLVERR) ) + if ( (tstconn==NULL) || (tstconn->status & AIM_CONN_STATUS_RESOLVERR) ) fprintf(stderr, "faimtest: unable to reconnect with authorizer\n"); - else + else { + aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, faimtest_flapversion, 0); + aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0); /* Send the cookie to the Auth */ aim_auth_sendcookie(sess, tstconn, cookie); + } } break; @@ -439,7 +530,7 @@ int faimtest_handleredirect(struct aim_session_t *sess, struct command_rx_struct { struct aim_conn_t *tstconn = NULL; tstconn = aim_newconn(sess, AIM_CONN_TYPE_CHATNAV, ip); - if ( (tstconn==NULL) || (tstconn->status >= AIM_CONN_STATUS_RESOLVERR)) { + if ( (tstconn==NULL) || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) { fprintf(stderr, "faimtest: unable to connect to chatnav server\n"); if (tstconn) aim_conn_kill(sess, &tstconn); return 1; @@ -449,6 +540,7 @@ int faimtest_handleredirect(struct aim_session_t *sess, struct command_rx_struct aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_GEN, AIM_CB_SPECIAL_DEFAULT, aim_parse_unknown, 0); #endif aim_conn_addhandler(sess, tstconn, 0x0001, 0x0003, faimtest_serverready, 0); + aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0); aim_auth_sendcookie(sess, tstconn, cookie); fprintf(stderr, "\achatnav: connected\n"); } @@ -456,18 +548,20 @@ int faimtest_handleredirect(struct aim_session_t *sess, struct command_rx_struct case 0x000e: /* Chat */ { char *roomname = NULL; + int exchange; struct aim_conn_t *tstconn = NULL; roomname = va_arg(ap, char *); + exchange = va_arg(ap, int); tstconn = aim_newconn(sess, AIM_CONN_TYPE_CHAT, ip); - if ( (tstconn==NULL) || (tstconn->status >= AIM_CONN_STATUS_RESOLVERR)) + if ( (tstconn==NULL) || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) { fprintf(stderr, "faimtest: unable to connect to chat server\n"); if (tstconn) aim_conn_kill(sess, &tstconn); return 1; } - printf("faimtest: chat: connected\n"); + printf("faimtest: chat: connected to %s on exchange %d\n", roomname, exchange); /* * We must do this to attach the stored name to the connection! @@ -475,6 +569,7 @@ int faimtest_handleredirect(struct aim_session_t *sess, struct command_rx_struct aim_chat_attachname(tstconn, roomname); aim_conn_addhandler(sess, tstconn, 0x0001, 0x0003, faimtest_serverready, 0); + aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0); aim_auth_sendcookie(sess, tstconn, cookie); } break; @@ -490,62 +585,99 @@ int faimtest_handleredirect(struct aim_session_t *sess, struct command_rx_struct int faimtest_parse_authresp(struct aim_session_t *sess, struct command_rx_struct *command, ...) { + va_list ap; struct aim_conn_t *bosconn = NULL; - + char *sn = NULL, *bosip = NULL, *errurl = NULL, *email = NULL; + unsigned char *cookie = NULL; + int errorcode = 0, regstatus = 0; + int latestbuild = 0, latestbetabuild = 0; + char *latestrelease = NULL, *latestbeta = NULL; + char *latestreleaseurl = NULL, *latestbetaurl = NULL; + char *latestreleaseinfo = NULL, *latestbetainfo = NULL; + + va_start(ap, command); + sn = va_arg(ap, char *); + errorcode = va_arg(ap, int); + errurl = va_arg(ap, char *); + regstatus = va_arg(ap, int); + email = va_arg(ap, char *); + bosip = va_arg(ap, char *); + cookie = va_arg(ap, unsigned char *); + + latestrelease = va_arg(ap, char *); + latestbuild = va_arg(ap, int); + latestreleaseurl = va_arg(ap, char *); + latestreleaseinfo = va_arg(ap, char *); + + latestbeta = va_arg(ap, char *); + latestbetabuild = va_arg(ap, int); + latestbetaurl = va_arg(ap, char *); + latestbetainfo = va_arg(ap, char *); - printf("Screen name: %s\n", sess->logininfo.screen_name); + va_end(ap); + + printf("Screen name: %s\n", sn); /* * Check for error. */ - if (sess->logininfo.errorcode) - { - printf("Login Error Code 0x%04x\n", sess->logininfo.errorcode); - printf("Error URL: %s\n", sess->logininfo.errorurl); - aim_conn_kill(sess, &command->conn); - exit(0); /* XXX: should return in order to let the above things get free()'d. */ - } + if (errorcode || !bosip || !cookie) { + printf("Login Error Code 0x%04x\n", errorcode); + printf("Error URL: %s\n", errurl); + aim_conn_kill(sess, &command->conn); + return 1; + } + + printf("Reg status: %2d\n", regstatus); + printf("Email: %s\n", email); + printf("BOS IP: %s\n", bosip); + + if (latestbeta) + printf("Latest beta version: %s, build %d, at %s (more info at %s)\n", latestbeta, latestbetabuild, latestbetaurl, latestbetainfo); - printf("Reg status: %2d\n", sess->logininfo.regstatus); - printf("Email: %s\n", sess->logininfo.email); - printf("BOS IP: %s\n", sess->logininfo.BOSIP); + if (latestrelease) + printf("Latest released version: %s, build %d, at %s (more info at %s)\n", latestrelease, latestbuild, latestreleaseurl, latestreleaseinfo); printf("Closing auth connection...\n"); aim_conn_kill(sess, &command->conn); - bosconn = aim_newconn(sess, AIM_CONN_TYPE_BOS, sess->logininfo.BOSIP); - if (bosconn == NULL) { + if (!(bosconn = aim_newconn(sess, AIM_CONN_TYPE_BOS, bosip))) { fprintf(stderr, "faimtest: could not connect to BOS: internal error\n"); - } else if (bosconn->status != 0) { + return 1; + } else if (bosconn->status & AIM_CONN_STATUS_CONNERR) { fprintf(stderr, "faimtest: could not connect to BOS\n"); aim_conn_kill(sess, &bosconn); - } else { - aim_conn_addhandler(sess, bosconn, 0x0009, 0x0003, faimtest_bosrights, 0); - aim_conn_addhandler(sess, bosconn, 0x0001, 0x0007, faimtest_rateresp, 0); /* rate info */ - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_ACK, AIM_CB_ACK_ACK, NULL, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_SERVERREADY, faimtest_serverready, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_RATEINFO, NULL, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_REDIRECT, faimtest_handleredirect, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_STS, AIM_CB_STS_SETREPORTINTERVAL, faimtest_reportinterval, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_RIGHTSINFO, faimtest_parse_buddyrights, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_ONCOMING, faimtest_parse_oncoming, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_OFFGOING, faimtest_parse_offgoing, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_INCOMING, faimtest_parse_incoming_im, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_ERROR, faimtest_parse_locerr, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_MISSEDCALL, faimtest_parse_misses, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_RATECHANGE, faimtest_parse_ratechange, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_EVIL, faimtest_parse_evilnotify, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_ERROR, faimtest_parse_msgerr, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_USERINFO, faimtest_parse_userinfo, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_ACK, faimtest_parse_msgack, 0); - - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_CTN, AIM_CB_CTN_DEFAULT, aim_parse_unknown, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_DEFAULT, aim_parse_unknown, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_MOTD, faimtest_parse_motd, 0); + return 1; + } + + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0); + aim_conn_addhandler(sess, bosconn, 0x0009, 0x0003, faimtest_bosrights, 0); + aim_conn_addhandler(sess, bosconn, 0x0001, 0x0007, faimtest_rateresp, 0); /* rate info */ + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_ACK, AIM_CB_ACK_ACK, NULL, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, 0x0018, faimtest_hostversions, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_SERVERREADY, faimtest_serverready, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_RATEINFO, NULL, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_REDIRECT, faimtest_handleredirect, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_STS, AIM_CB_STS_SETREPORTINTERVAL, faimtest_reportinterval, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_RIGHTSINFO, faimtest_parse_buddyrights, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_ONCOMING, faimtest_parse_oncoming, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_OFFGOING, faimtest_parse_offgoing, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_INCOMING, faimtest_parse_incoming_im, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_ERROR, faimtest_parse_locerr, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_MISSEDCALL, faimtest_parse_misses, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_RATECHANGE, faimtest_parse_ratechange, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_EVIL, faimtest_parse_evilnotify, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_ERROR, faimtest_parse_msgerr, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_USERINFO, faimtest_parse_userinfo, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_ACK, faimtest_parse_msgack, 0); + + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_CTN, AIM_CB_CTN_DEFAULT, aim_parse_unknown, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_DEFAULT, aim_parse_unknown, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_MOTD, faimtest_parse_motd, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNERR, faimtest_parse_connerr, 0); + aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNERR, faimtest_parse_connerr, 0); - aim_auth_sendcookie(sess, bosconn, sess->logininfo.cookie); - } + aim_auth_sendcookie(sess, bosconn, cookie); + return 1; } @@ -582,7 +714,7 @@ int faimtest_parse_userinfo(struct aim_session_t *sess, struct command_rx_struct userinfo = va_arg(ap, struct aim_userinfo_s *); prof_encoding = va_arg(ap, char *); prof = va_arg(ap, char *); - inforeq = va_arg(ap, unsigned short); + inforeq = va_arg(ap, int); va_end(ap); printf("faimtest: userinfo: sn: %s\n", userinfo->sn); @@ -638,13 +770,13 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str char *msg = NULL; u_int icbmflags = 0; char *tmpstr = NULL; - u_short flag1, flag2; + unsigned short flag1, flag2; userinfo = va_arg(ap, struct aim_userinfo_s *); msg = va_arg(ap, char *); icbmflags = va_arg(ap, u_int); - flag1 = va_arg(ap, u_short); - flag2 = va_arg(ap, u_short); + flag1 = va_arg(ap, int); + flag2 = va_arg(ap, int); va_end(ap); printf("faimtest: icbm: sn = \"%s\"\n", userinfo->sn); @@ -721,7 +853,10 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str } else if (!strncmp(tmpstr, "open directim", 13)) { struct aim_conn_t *newconn; newconn = aim_directim_initiate(sess, command->conn, NULL, userinfo->sn); - //aim_conn_addhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINITIATE, faimtest_directim_initiate, 0); + } else if (!strncmp(tmpstr, "openauth", 8)) { + aim_bos_reqservice(sess, command->conn, AIM_CONN_TYPE_AUTH); + } else if (!strncmp(tmpstr, "auth", 4)) { + aim_genericreq_n(sess, aim_getconn_type(sess, AIM_CONN_TYPE_AUTH), 0x0007, 0x0002); } else if (!strncmp(tmpstr, "reqsendmsg", 10)) { aim_send_im(sess, command->conn, "vaxherder", 0, "sendmsg 7900"); } else if (!strncmp(tmpstr, "sendmsg", 7)) { @@ -753,7 +888,7 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str struct aim_userinfo_s *userinfo; unsigned short reqclass; - reqclass = va_arg(ap, unsigned short); + reqclass = va_arg(ap, int); switch (reqclass) { case AIM_CAPS_VOICE: { userinfo = va_arg(ap, struct aim_userinfo_s *); @@ -858,10 +993,10 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str aim_conn_addhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMDISCONNECT, faimtest_directim_disconnect, 0); aim_conn_addhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMTYPING, faimtest_directim_typing, 0); - aim_send_im_direct(sess, newconn, "goodday"); - printf("faimtest: OFT: DirectIM: connected to %s\n", userinfo->sn); + aim_send_im_direct(sess, newconn, "goodday"); + break; } default: @@ -880,7 +1015,7 @@ int faimtest_directim_initiate(struct aim_session_t *sess, struct command_rx_str struct aim_directim_priv *priv; struct aim_conn_t *newconn; - ap = va_start(ap, command); + va_start(ap, command); newconn = va_arg(ap, struct aim_conn_t *); va_end(ap); @@ -904,7 +1039,7 @@ int faimtest_directim_connect(struct aim_session_t *sess, struct command_rx_stru va_list ap; struct aim_directim_priv *priv; - ap = va_start(ap, command); + va_start(ap, command); priv = va_arg(ap, struct aim_directim_priv *); va_end(ap); @@ -920,7 +1055,7 @@ int faimtest_directim_incoming(struct aim_session_t *sess, struct command_rx_str char *sn = NULL, *msg = NULL; struct aim_conn_t *conn; - ap = va_start(ap, command); + va_start(ap, command); conn = va_arg(ap, struct aim_conn_t *); sn = va_arg(ap, char *); msg = va_arg(ap, char *); @@ -958,14 +1093,14 @@ int faimtest_directim_disconnect(struct aim_session_t *sess, struct command_rx_s struct aim_conn_t *conn; char *sn; - ap = va_start(ap, command); + va_start(ap, command); conn = va_arg(ap, struct aim_conn_t *); sn = va_arg(ap, char *); va_end(ap); - aim_conn_kill(sess, &conn); - printf("faimtest: directim: disconnected from %s\n", sn); + + aim_conn_kill(sess, &conn); return 1; } @@ -974,7 +1109,7 @@ int faimtest_directim_typing(struct aim_session_t *sess, struct command_rx_struc va_list ap; char *sn; - ap = va_start(ap, command); + va_start(ap, command); sn = va_arg(ap, char *); va_end(ap); @@ -1017,7 +1152,8 @@ int faimtest_parse_oncoming(struct aim_session_t *sess, struct command_rx_struct userinfo = va_arg(ap, struct aim_userinfo_s *); va_end(ap); - printf("\n%s is now online (flags: %04x = %s%s%s%s%s%s%s%s) (caps = 0x%04x)\n", + printf("%ld %s is now online (flags: %04x = %s%s%s%s%s%s%s%s) (caps = 0x%04x)\n", + time(NULL), userinfo->sn, userinfo->flags, (userinfo->flags&AIM_FLAG_UNCONFIRMED)?" UNCONFIRMED":"", (userinfo->flags&AIM_FLAG_ADMINISTRATOR)?" ADMINISTRATOR":"", @@ -1060,13 +1196,16 @@ int faimtest_parse_motd(struct aim_session_t *sess, struct command_rx_struct *co va_list ap; va_start(ap, command); - id = va_arg(ap, unsigned short); + id = va_arg(ap, int); msg = va_arg(ap, char *); va_end(ap); printf("faimtest: motd: %s (%d / %s)\n", msg, id, (id < codeslen)?codes[id]:"unknown"); + if (!connected) + connected++; + return 1; } @@ -1078,7 +1217,7 @@ int faimtest_parse_msgerr(struct aim_session_t *sess, struct command_rx_struct * va_start(ap, command); destsn = va_arg(ap, char *); - reason = va_arg(ap, unsigned short); + reason = va_arg(ap, int); va_end(ap); printf("faimtest: message to %s bounced (reason 0x%04x: %s)\n", destsn, reason, (reasonsn, reason, (reasonconn->priv); @@ -1243,7 +1382,7 @@ int faimtest_chat_incomingmsg(struct aim_session_t *sess, struct command_rx_stru /* * Do an echo for testing purposes. But not for ourselves ("oops!") */ - if (strcmp(userinfo->sn, sess->logininfo.screen_name) != 0) + if (strcmp(userinfo->sn, sess->sn) != 0) { sprintf(tmpbuf, "(%s said \"%s\")", userinfo->sn, msg); aim_chat_send_im(sess, command->conn, tmpbuf); @@ -1254,11 +1393,11 @@ int faimtest_chat_incomingmsg(struct aim_session_t *sess, struct command_rx_stru int faimtest_chatnav_info(struct aim_session_t *sess, struct command_rx_struct *command, ...) { - u_short type; + unsigned short type; va_list ap; - ap = va_start(ap, command); - type = va_arg(ap, u_short); + va_start(ap, command); + type = va_arg(ap, int); switch(type) { case 0x0002: { @@ -1266,7 +1405,7 @@ int faimtest_chatnav_info(struct aim_session_t *sess, struct command_rx_struct * struct aim_chat_exchangeinfo *exchanges; int exchangecount,i = 0; - maxrooms = va_arg(ap, u_char); + maxrooms = va_arg(ap, int); exchangecount = va_arg(ap, int); exchanges = va_arg(ap, struct aim_chat_exchangeinfo *); va_end(ap); @@ -1288,23 +1427,24 @@ int faimtest_chatnav_info(struct aim_session_t *sess, struct command_rx_struct * break; case 0x0008: { char *fqcn, *name, *ck; - unsigned short instance, flags, maxmsglen, maxoccupancy, unknown; + unsigned short instance, flags, maxmsglen, maxoccupancy, unknown, exchange; unsigned char createperms; unsigned long createtime; fqcn = va_arg(ap, char *); - instance = va_arg(ap, unsigned short); - flags = va_arg(ap, unsigned short); + instance = va_arg(ap, int); + exchange = va_arg(ap, int); + flags = va_arg(ap, int); createtime = va_arg(ap, unsigned long); - maxmsglen = va_arg(ap, unsigned short); - maxoccupancy = va_arg(ap, unsigned short); - createperms = va_arg(ap, unsigned char); - unknown = va_arg(ap, unsigned short); + maxmsglen = va_arg(ap, int); + maxoccupancy = va_arg(ap, int); + createperms = va_arg(ap, int); + unknown = va_arg(ap, int); name = va_arg(ap, char *); ck = va_arg(ap, char *); va_end(ap); - printf("faimtest: recieved room create reply for %s\n", fqcn); + printf("faimtest: recieved room create reply for %s/0x%04x\n", fqcn, exchange); } break; default: @@ -1320,8 +1460,8 @@ int faimtest_parse_connerr(struct aim_session_t *sess, struct command_rx_struct unsigned short code; char *msg = NULL; - ap = va_start(ap, command); - code = va_arg(ap, unsigned short); + va_start(ap, command); + code = va_arg(ap, int); msg = va_arg(ap, char *); va_end(ap); @@ -1356,8 +1496,8 @@ int faimtest_parse_msgack(struct aim_session_t *sess, struct command_rx_struct * unsigned short type; char *sn = NULL; - ap = va_start(ap, command); - type = va_arg(ap, unsigned short); + va_start(ap, command); + type = va_arg(ap, int); sn = va_arg(ap, char *); va_end(ap); @@ -1374,7 +1514,7 @@ int faimtest_getfile_filereq(struct aim_session_t *ses, struct command_rx_struct struct aim_fileheader_t *fh; char *cookie; - ap = va_start(ap, command); + va_start(ap, command); oftconn = va_arg(ap, struct aim_conn_t *); fh = va_arg(ap, struct aim_fileheader_t *); cookie = va_arg(ap, char *); @@ -1395,7 +1535,7 @@ int faimtest_getfile_filesend(struct aim_session_t *sess, struct command_rx_stru FILE *file; - ap = va_start(ap, command); + va_start(ap, command); oftconn = va_arg(ap, struct aim_conn_t *); fh = va_arg(ap, struct aim_fileheader_t *); cookie = va_arg(ap, char *); @@ -1433,7 +1573,7 @@ int faimtest_getfile_complete(struct aim_session_t *sess, struct command_rx_stru struct aim_conn_t *conn; struct aim_fileheader_t *fh; - ap = va_start(ap, command); + va_start(ap, command); conn = va_arg(ap, struct aim_conn_t *); fh = va_arg(ap, struct aim_fileheader_t *); va_end(ap); @@ -1450,7 +1590,7 @@ int faimtest_getfile_disconnect(struct aim_session_t *sess, struct command_rx_st struct aim_conn_t *conn; char *sn; - ap = va_start(ap, command); + va_start(ap, command); conn = va_arg(ap, struct aim_conn_t *); sn = va_arg(ap, char *); va_end(ap);