X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/646c6b5273a2272632e50e7393f090f7c8bf06eb..001c9b80011b5cb7de24a181916e939863951234:/utils/faimtest/faimtest.c diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c index c403ab7..b5d9076 100644 --- a/utils/faimtest/faimtest.c +++ b/utils/faimtest/faimtest.c @@ -38,12 +38,7 @@ * */ -/* - Current status: - - */ - -#include +#include "faimtest.h" static char *dprintf_ctime(void) { @@ -80,7 +75,7 @@ static char *dprintf_ctime(void) int faimtest_parse_oncoming(struct aim_session_t *, struct command_rx_struct *, ...); int faimtest_parse_offgoing(struct aim_session_t *, struct command_rx_struct *, ...); int faimtest_parse_login_phase3d_f(struct aim_session_t *, struct command_rx_struct *, ...); -int faimtest_parse_authresp(struct aim_session_t *, struct command_rx_struct *, ...); +static int faimtest_parse_authresp(struct aim_session_t *, struct command_rx_struct *, ...); int faimtest_parse_incoming_im(struct aim_session_t *, struct command_rx_struct *command, ...); int faimtest_parse_userinfo(struct aim_session_t *, struct command_rx_struct *command, ...); int faimtest_handleredirect(struct aim_session_t *, struct command_rx_struct *command, ...); @@ -153,12 +148,17 @@ static char *msgerrreasons[] = { "Not while on AOL"}; static int msgerrreasonslen = 25; +static char *aimbinarypath = NULL; static char *screenname,*password,*server=NULL; +static char *proxy = NULL, *proxyusername = NULL, *proxypass = NULL; static char *ohcaptainmycaptain = NULL; static int connected = 0; -FILE *listingfile; -char *listingpath; +struct aim_session_t aimsess; +int keepgoing = 1; + +static FILE *listingfile; +static char *listingpath; static void faimtest_debugcb(struct aim_session_t *sess, int level, const char *format, va_list va) { @@ -170,10 +170,15 @@ static void faimtest_debugcb(struct aim_session_t *sess, int level, const char * int faimtest_reportinterval(struct aim_session_t *sess, struct command_rx_struct *command, ...) { - if (command->data) { - dvprintf("aim: minimum report interval: %d (seconds?)\n", aimutil_get16(command->data+10)); - } else - dprintf("aim: NULL minimum report interval!\n"); + va_list ap; + unsigned short interval = 0; + + va_start(ap, command); + interval = va_arg(ap, int); + va_end(ap); + + dvprintf("aim: minimum report interval: %d (seconds?)\n", interval); + return 1; } @@ -237,14 +242,86 @@ int initwsa(void) } #endif /* _WIN32 */ +int faimtest_init(void) +{ + struct aim_conn_t *stdinconn = NULL; + + if (!(stdinconn = aim_newconn(&aimsess, 0, NULL))) { + dprintf("unable to create connection for stdin!\n"); + return -1; + } + + stdinconn->fd = STDIN_FILENO; + + return 0; +} + +int logout(void) +{ + + if (ohcaptainmycaptain) + aim_send_im(&aimsess, aim_getconn_type(&aimsess, AIM_CONN_TYPE_BOS), ohcaptainmycaptain, 0, "ta ta...", strlen("ta ta...")); + + aim_session_kill(&aimsess); + + if (faimtest_init() == -1) + dprintf("faimtest_init failed\n"); + + return 0; +} + +int login(const char *sn, const char *passwd) +{ + struct aim_conn_t *authconn; + + if (sn) + screenname = strdup(sn); + if (passwd) + password = strdup(passwd); + + if (proxy) + aim_setupproxy(&aimsess, proxy, proxyusername, proxypass); + + if (!screenname || !password) { + dprintf("need SN and password\n"); + return -1; + } + + if (!(authconn = aim_newconn(&aimsess, AIM_CONN_TYPE_AUTH, server?server:FAIM_LOGIN_SERVER))) { + dprintf("faimtest: internal connection error while in aim_login. bailing out.\n"); + return -1; + } else if (authconn->fd == -1) { + if (authconn->status & AIM_CONN_STATUS_RESOLVERR) { + dprintf("faimtest: could not resolve authorizer name\n"); + } else if (authconn->status & AIM_CONN_STATUS_CONNERR) { + dprintf("faimtest: could not connect to authorizer\n"); + } + aim_conn_kill(&aimsess, &authconn); + 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_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); + dprintf("faimtest: login request sent\n"); + + return 0; +} + int main(int argc, char **argv) { - struct aim_session_t aimsess; - struct aim_conn_t *authconn = NULL, *waitingconn = NULL; - int keepgoing = 1; - char *proxy, *proxyusername, *proxypass; + struct aim_conn_t *waitingconn = NULL; int i; int selstat = 0; + static int faimtest_mode = 0; + struct timeval tv; + time_t lastnop = 0; screenname = getenv("SCREENNAME"); password = getenv("PASSWORD"); @@ -255,7 +332,7 @@ int main(int argc, char **argv) listingpath = getenv("LISTINGPATH"); - while ((i = getopt(argc, argv, "u:p:a:U:P:A:l:c:h")) != EOF) { + while ((i = getopt(argc, argv, "u:p:a:U:P:A:l:c:hoOb:")) != EOF) { switch (i) { case 'u': screenname = optarg; break; case 'p': password = optarg; break; @@ -265,9 +342,11 @@ int main(int argc, char **argv) case 'A': proxy = optarg; break; case 'l': listingpath = optarg; break; case 'c': ohcaptainmycaptain = optarg; break; + case 'o': faimtest_mode = 1; break; /* half old interface */ + case 'O': faimtest_mode = 2; break; /* full old interface */ + case 'b': aimbinarypath = optarg; break; case 'h': default: - usage: printf("faimtest\n"); printf(" Options: \n"); printf(" -u name Screen name ($SCREENNAME)\n"); @@ -278,13 +357,12 @@ int main(int argc, char **argv) printf(" -A host:port Proxy host ($SOCKSPASS)\n"); printf(" -l path Path to listing file ($LISTINGPATH)\n"); printf(" -c name Screen name of owner\n"); + printf(" -o Login at startup, then prompt\n"); + printf(" -O Login, never give prompt\n"); exit(0); } } - if (!screenname || !password) - goto usage; - #ifdef _WIN32 if (initwsa() != 0) { dprintf("faimtest: could not initialize windows sockets\n"); @@ -293,7 +371,7 @@ int main(int argc, char **argv) #endif /* _WIN32 */ /* Pass zero as flags if you want blocking connects */ - aim_session_init(&aimsess, AIM_SESS_FLAGS_NONBLOCKCONNECT, 0); + aim_session_init(&aimsess, AIM_SESS_FLAGS_NONBLOCKCONNECT, 1); aim_setdebuggingcb(&aimsess, faimtest_debugcb); /* still needed even if debuglevel = 0 ! */ if(listingpath) { @@ -304,94 +382,81 @@ int main(int argc, char **argv) } sprintf(listingname, "%s/listing.txt", listingpath); if( (listingfile = fopen(listingname, "r")) == NULL) { - dvprintf("Couldn't open %s... bombing.\n", listingname); - exit(-1); + dvprintf("Couldn't open %s... disabling that shit.\n", listingname); } free(listingname); } - if (proxy) - aim_setupproxy(&aimsess, proxy, proxyusername, proxypass); + faimtest_init(); - authconn = aim_newconn(&aimsess, AIM_CONN_TYPE_AUTH, server?server:FAIM_LOGIN_SERVER); + if (faimtest_mode < 2) + cmd_init(); - if (authconn == NULL) { - dprintf("faimtest: internal connection error while in aim_login. bailing out.\n"); - return -1; - } else if (authconn->fd == -1) { - if (authconn->status & AIM_CONN_STATUS_RESOLVERR) { - dprintf("faimtest: could not resolve authorizer name\n"); - } else if (authconn->status & AIM_CONN_STATUS_CONNERR) { - dprintf("faimtest: could not connect to authorizer\n"); + if (faimtest_mode >= 1) { + if (login(screenname, password) == -1) { + if (faimtest_mode < 2) + cmd_uninit(); + exit(-1); } - aim_conn_kill(&aimsess, &authconn); - 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_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); - dprintf("faimtest: login request sent\n"); - while (keepgoing) { - waitingconn = aim_select(&aimsess, NULL, &selstat); - switch(selstat) { - case -1: /* error */ - keepgoing = 0; /* fall through and hit the aim_logoff() */ - break; + tv.tv_sec = 5; + tv.tv_usec = 0; - case 0: /* no events pending */ - break; + waitingconn = aim_select(&aimsess, &tv, &selstat); - case 1: /* outgoing data pending */ - aim_tx_flushqueue(&aimsess); - break; + if (connected && ((time(NULL) - lastnop) > 30)) { + lastnop = time(NULL); + aim_flap_nop(&aimsess, aim_getconn_type(&aimsess, AIM_CONN_TYPE_BOS)); + } - case 2: /* incoming data pending */ - if (waitingconn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT) { - if (aim_handlerendconnect(&aimsess, waitingconn) < 0) { - dprintf("connection error (rend out)\n"); - aim_conn_kill(&aimsess, &waitingconn); - } - break; - } - - if (aim_get_command(&aimsess, waitingconn) >= 0) { - aim_rxdispatch(&aimsess); + if (selstat == -1) { /* error */ + keepgoing = 0; /* fall through */ + } else if (selstat == 0) { /* no events pending */ + ; + } else if (selstat == 1) { /* outgoing data pending */ + aim_tx_flushqueue(&aimsess); + } else if (selstat == 2) { /* incoming data pending */ + if ((faimtest_mode < 2) && (waitingconn->fd == STDIN_FILENO)) { + cmd_gotkey(); } else { - dvprintf("connection error (type 0x%04x:0x%04x)\n", waitingconn->type, waitingconn->subtype); - /* we should have callbacks for all these, else the library will do the conn_kill for us. */ - if(waitingconn->type == AIM_CONN_TYPE_RENDEZVOUS) { - dprintf("connection error: rendezvous connection. you forgot register a disconnect callback, right?\n"); - aim_conn_kill(&aimsess, &waitingconn); - } else - aim_conn_kill(&aimsess, &waitingconn); - if (!aim_getconn_type(&aimsess, AIM_CONN_TYPE_BOS)) { - dprintf("major connection error\n"); - keepgoing = 0; + if (waitingconn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT) { + if (aim_handlerendconnect(&aimsess, waitingconn) < 0) { + dprintf("connection error (rend out)\n"); + aim_conn_kill(&aimsess, &waitingconn); + } + } else { + if (aim_get_command(&aimsess, waitingconn) >= 0) { + aim_rxdispatch(&aimsess); + } else { + dvprintf("connection error (type 0x%04x:0x%04x)\n", waitingconn->type, waitingconn->subtype); + /* we should have callbacks for all these, else the library will do the conn_kill for us. */ + if(waitingconn->type == AIM_CONN_TYPE_RENDEZVOUS) { + dprintf("connection error: rendezvous connection. you forgot register a disconnect callback, right?\n"); + aim_conn_kill(&aimsess, &waitingconn); + } else + aim_conn_kill(&aimsess, &waitingconn); + if (!aim_getconn_type(&aimsess, AIM_CONN_TYPE_BOS)) { + dprintf("major connection error\n"); + if (faimtest_mode == 2) + break; + } + } } } - - break; - - default: - break; /* invalid */ } } - /* Close up */ - dprintf("AIM just decided we didn't need to be here anymore, closing up...\n"); - /* close up all connections, dead or no */ - aim_logoff(&aimsess); + aim_session_kill(&aimsess); + + if (faimtest_mode < 2) { + printf("\n"); + cmd_uninit(); + } /* Get out */ exit(0); @@ -414,7 +479,7 @@ int faimtest_rateresp(struct aim_session_t *sess, struct command_rx_struct *comm aim_bos_ackrateresp(sess, command->conn); /* ack rate info response */ aim_bos_reqpersonalinfo(sess, command->conn); aim_bos_reqlocaterights(sess, command->conn); - aim_bos_setprofile(sess, command->conn, profile, NULL, AIM_CAPS_BUDDYICON | AIM_CAPS_CHAT | AIM_CAPS_VOICE | AIM_CAPS_GETFILE | AIM_CAPS_SENDFILE | AIM_CAPS_IMIMAGE | AIM_CAPS_GAMES | AIM_CAPS_SAVESTOCKS); + aim_bos_setprofile(sess, command->conn, profile, NULL, AIM_CAPS_BUDDYICON | AIM_CAPS_CHAT | AIM_CAPS_VOICE | AIM_CAPS_GETFILE | AIM_CAPS_SENDFILE | AIM_CAPS_IMIMAGE /*| AIM_CAPS_GAMES | AIM_CAPS_SAVESTOCKS*/); aim_bos_reqbuddyrights(sess, command->conn); /* send the buddy list and profile (required, even if empty) */ @@ -427,7 +492,7 @@ int faimtest_rateresp(struct aim_session_t *sess, struct command_rx_struct *comm aim_bos_reqrights(sess, command->conn); /* set group permissions -- all user classes */ aim_bos_setgroupperm(sess, command->conn, AIM_FLAG_ALLUSERS); - aim_bos_setprivacyflags(sess, command->conn, AIM_PRIVFLAGS_ALLOWIDLE|AIM_PRIVFLAGS_ALLOWMEMBERSINCE); + aim_bos_setprivacyflags(sess, command->conn, AIM_PRIVFLAGS_ALLOWIDLE); break; } @@ -445,6 +510,26 @@ int faimtest_rateresp(struct aim_session_t *sess, struct command_rx_struct *comm return 1; } +static int faimtest_icbmparaminfo(struct aim_session_t *sess, struct command_rx_struct *command, ...) +{ + unsigned long defflags, minmsginterval; + unsigned short maxicbmlen, maxsenderwarn, maxrecverwarn, maxchannel; + va_list ap; + + va_start(ap, command); + maxchannel = va_arg(ap, unsigned short); + defflags = va_arg(ap, unsigned long); + maxicbmlen = va_arg(ap, unsigned short); + maxsenderwarn = va_arg(ap, unsigned short); + maxrecverwarn = va_arg(ap, unsigned short); + minmsginterval = va_arg(ap, unsigned long); + va_end(ap); + + dvprintf("ICBM Parameters: maxchannel = %d, default flags = 0x%08lx, max msg len = %d, max sender evil = %f, max reciever evil = %f, min msg interval = %ld\n", maxchannel, defflags, maxicbmlen, ((float)maxsenderwarn)/10.0, ((float)maxrecverwarn)/10.0, minmsginterval); + + return 1; +} + int faimtest_hostversions(struct aim_session_t *sess, struct command_rx_struct *command, ...) { int vercount, i; @@ -621,108 +706,197 @@ int faimtest_handleredirect(struct aim_session_t *sess, struct command_rx_struct ip = va_arg(ap, char *); cookie = va_arg(ap, unsigned char *); - switch(serviceid) - { - case 0x0005: /* Adverts */ - { - struct aim_conn_t *tstconn; + switch(serviceid) { + case 0x0005: { /* Adverts */ + struct aim_conn_t *tstconn; + + tstconn = aim_newconn(sess, AIM_CONN_TYPE_ADS, ip); + if ((tstconn==NULL) || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) { + dprintf("faimtest: unable to reconnect with authorizer\n"); + } 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); + aim_conn_addhandler(sess, tstconn, 0x0001, 0x0003, faimtest_serverready, 0); + aim_conn_addhandler(sess, tstconn, 0x0001, 0x0007, faimtest_rateresp, 0); /* rate info */ + aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_GEN, 0x0018, faimtest_hostversions, 0); + aim_auth_sendcookie(sess, tstconn, cookie); + dprintf("sent cookie to adverts host\n"); + } + break; + } + case 0x0007: { /* Authorizer */ + 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)) { + dprintf("faimtest: unable to reconnect with authorizer\n"); + } 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); + aim_conn_addhandler(sess, tstconn, 0x0001, 0x0003, faimtest_serverready, 0); + aim_conn_addhandler(sess, tstconn, 0x0001, 0x0007, faimtest_rateresp, 0); /* rate info */ + aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_GEN, 0x0018, faimtest_hostversions, 0); + aim_conn_addhandler(sess, tstconn, 0x0007, 0x0007, faimtest_accountconfirm, 0); + aim_conn_addhandler(sess, tstconn, 0x0007, 0x0003, faimtest_infochange, 0); + aim_conn_addhandler(sess, tstconn, 0x0007, 0x0005, faimtest_infochange, 0); + /* Send the cookie to the Auth */ + aim_auth_sendcookie(sess, tstconn, cookie); + dprintf("sent cookie to authorizer host\n"); + } + break; + } + case 0x000d: { /* ChatNav */ + struct aim_conn_t *tstconn = NULL; + tstconn = aim_newconn(sess, AIM_CONN_TYPE_CHATNAV, ip); + if ( (tstconn==NULL) || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) { + dprintf("faimtest: unable to connect to chatnav server\n"); + if (tstconn) aim_conn_kill(sess, &tstconn); + return 1; + } - tstconn = aim_newconn(sess, AIM_CONN_TYPE_ADS, ip); - if ((tstconn==NULL) || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) { - dprintf("faimtest: unable to reconnect with authorizer\n"); - } 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); - aim_conn_addhandler(sess, tstconn, 0x0001, 0x0003, faimtest_serverready, 0); - aim_conn_addhandler(sess, tstconn, 0x0001, 0x0007, faimtest_rateresp, 0); /* rate info */ - aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_GEN, 0x0018, faimtest_hostversions, 0); - aim_auth_sendcookie(sess, tstconn, cookie); - dprintf("sent cookie to adverts host\n"); - } + 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); + dprintf("\achatnav: connected\n"); + break; + } + case 0x000e: { /* Chat */ + char *roomname = NULL; + int exchange; + struct aim_conn_t *tstconn = NULL; - } - break; - case 0x0007: /* Authorizer */ - { - 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)) { - dprintf("faimtest: unable to reconnect with authorizer\n"); - } 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); - aim_conn_addhandler(sess, tstconn, 0x0001, 0x0003, faimtest_serverready, 0); - aim_conn_addhandler(sess, tstconn, 0x0001, 0x0007, faimtest_rateresp, 0); /* rate info */ - aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_GEN, 0x0018, faimtest_hostversions, 0); - aim_conn_addhandler(sess, tstconn, 0x0007, 0x0007, faimtest_accountconfirm, 0); - aim_conn_addhandler(sess, tstconn, 0x0007, 0x0003, faimtest_infochange, 0); - aim_conn_addhandler(sess, tstconn, 0x0007, 0x0005, faimtest_infochange, 0); - /* Send the cookie to the Auth */ - aim_auth_sendcookie(sess, tstconn, cookie); - dprintf("sent cookie to authorizer host\n"); - } + roomname = va_arg(ap, char *); + exchange = va_arg(ap, int); - } - break; - case 0x000d: /* ChatNav */ - { - struct aim_conn_t *tstconn = NULL; - tstconn = aim_newconn(sess, AIM_CONN_TYPE_CHATNAV, ip); - if ( (tstconn==NULL) || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) { - dprintf("faimtest: unable to connect to chatnav server\n"); - if (tstconn) aim_conn_kill(sess, &tstconn); - return 1; - } -#if 0 - aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_CTN, AIM_CB_SPECIAL_DEFAULT, faimtest_parse_unknown, 0); - aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_GEN, AIM_CB_SPECIAL_DEFAULT, faimtest_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); - dprintf("\achatnav: connected\n"); - } - break; - 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)) - { - dprintf("faimtest: unable to connect to chat server\n"); - if (tstconn) aim_conn_kill(sess, &tstconn); - return 1; - } - dvprintf("faimtest: chat: connected to %s on exchange %d\n", roomname, exchange); - - /* - * We must do this to attach the stored name to the connection! - */ - 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; - default: - dvprintf("uh oh... got redirect for unknown service 0x%04x!!\n", serviceid); - /* dunno */ + tstconn = aim_newconn(sess, AIM_CONN_TYPE_CHAT, ip); + if ( (tstconn==NULL) || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) { + dprintf("faimtest: unable to connect to chat server\n"); + if (tstconn) aim_conn_kill(sess, &tstconn); + return 1; + } + dvprintf("faimtest: chat: connected to %s on exchange %d\n", roomname, exchange); + + /* + * We must do this to attach the stored name to the connection! + */ + 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; + } + default: + dvprintf("uh oh... got redirect for unknown service 0x%04x!!\n", serviceid); + /* dunno */ + } + + va_end(ap); + + return 1; +} + +static int getaimdata(unsigned char *buf, int buflen, unsigned long offset, const char *modname) +{ + FILE *f; + static const char defaultmod[] = "aim.exe"; + char *filename = NULL; + + memset(buf, 0, buflen); + + if (modname) { + + if (!(filename = malloc(strlen(aimbinarypath)+1+strlen(modname)+4+1))) { + dperror("memrequest: malloc"); + return -1; } + sprintf(filename, "%s/%s.ocm", aimbinarypath, modname); + + } else { + + if (!(filename = malloc(strlen(aimbinarypath)+1+strlen(defaultmod)+1))) { + dperror("memrequest: malloc"); + return -1; + } + + sprintf(filename, "%s/%s", aimbinarypath, defaultmod); + + } + + dvprintf("memrequest: loading %d bytes from 0x%08lx in \"%s\"...\n", buflen, offset, filename); + + if (!(f = fopen(filename, "r"))) { + dperror("memrequest: fopen"); + free(filename); + return -1; + } + + free(filename); + + if (buflen) { + if (fseek(f, offset, SEEK_SET) == -1) { + dperror("memrequest: fseek"); + fclose(f); + return -1; + } + + if (fread(buf, buflen, 1, f) != 1) { + dperror("memrequest: fread"); + fclose(f); + return -1; + } + } + + fclose(f); + + return buflen; +} + +/* + * This will get an offset and a length. The client should read this + * data out of whatever AIM.EXE binary the user has provided (hopefully + * it matches the client information thats sent at login) and pass a + * buffer back to libfaim so it can hash the data and send it to AOL for + * inspection by the client police. + */ +static int faimtest_memrequest(struct aim_session_t *sess, struct command_rx_struct *command, ...) +{ + va_list ap; + unsigned long offset, len; + unsigned char *buf; + char *modname; + + va_start(ap, command); + offset = va_arg(ap, unsigned long); + len = va_arg(ap, unsigned long); + modname = va_arg(ap, char *); va_end(ap); + if (!(buf = malloc(len))) { + dperror("memrequest: malloc"); + return 0; + } + + if (aimbinarypath && (getaimdata(buf, len, offset, modname) == len)) { + + aim_sendmemblock(sess, command->conn, offset, len, buf); + + } else { + + dvprintf("memrequest: unable to use AIM binary (\"%s/%s\"), sending defaults...\n", aimbinarypath, modname); + + aim_sendmemblock(sess, command->conn, offset, len, NULL); + + } + + free(buf); + return 1; } -int faimtest_parse_authresp(struct aim_session_t *sess, struct command_rx_struct *command, ...) +static int faimtest_parse_authresp(struct aim_session_t *sess, struct command_rx_struct *command, ...) { va_list ap; struct aim_conn_t *bosconn = NULL; @@ -763,7 +937,7 @@ int faimtest_parse_authresp(struct aim_session_t *sess, struct command_rx_struct if (errorcode || !bosip || !cookie) { dvprintf("Login Error Code 0x%04x\n", errorcode); dvprintf("Error URL: %s\n", errurl); - aim_conn_kill(sess, &command->conn); + aim_conn_kill(sess, &command->conn); return 1; } @@ -811,16 +985,16 @@ int faimtest_parse_authresp(struct aim_session_t *sess, struct command_rx_struct 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, faimtest_parse_unknown, 0); - aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_DEFAULT, faimtest_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, 0x0004, 0x0005, faimtest_icbmparaminfo, 0); aim_conn_addhandler(sess, bosconn, 0x0001, 0x0001, faimtest_parse_genericerr, 0); aim_conn_addhandler(sess, bosconn, 0x0003, 0x0001, faimtest_parse_genericerr, 0); aim_conn_addhandler(sess, bosconn, 0x0009, 0x0001, faimtest_parse_genericerr, 0); aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNERR, faimtest_parse_connerr, 0); - + aim_conn_addhandler(sess, bosconn, 0x0001, 0x001f, faimtest_memrequest, 0); + aim_conn_addhandler(sess, bosconn, 0xffff, 0xffff, faimtest_parse_unknown, 0); aim_auth_sendcookie(sess, bosconn, cookie); @@ -885,20 +1059,146 @@ int faimtest_parse_userinfo(struct aim_session_t *sess, struct command_rx_struct return 1; } +static int faimtest_handlecmd(struct aim_session_t *sess, struct command_rx_struct *command, struct aim_userinfo_s *userinfo, char *tmpstr) +{ + + if (!strncmp(tmpstr, "disconnect", 10)) { + + logout(); + + } else if (strstr(tmpstr, "goodday")) { + + aim_send_im(sess, command->conn, userinfo->sn, AIM_IMFLAGS_ACK, "Good day to you too.", strlen("Good day to you too.")); + + } else if (strstr(tmpstr, "warnme")) { + + dprintf("faimtest: icbm: sending non-anon warning\n"); + aim_send_warning(sess, command->conn, userinfo->sn, 0); + + } else if (strstr(tmpstr, "anonwarn")) { + + dprintf("faimtest: icbm: sending anon warning\n"); + aim_send_warning(sess, command->conn, userinfo->sn, AIM_WARN_ANON); + + } else if (strstr(tmpstr, "setdirectoryinfo")) { + + dprintf("faimtest: icbm: sending backwards profile data\n"); + aim_setdirectoryinfo(sess, command->conn, "tsrif", "elddim", "tsal", "nediam", "emankcin", "teerts", "ytic", "etats", "piz", 0, 1); + + } else if (strstr(tmpstr, "setinterests")) { + + dprintf("faimtest: icbm: setting fun interests\n"); + aim_setuserinterests(sess, command->conn, "interest1", "interest2", "interest3", "interest4", "interest5", 1); + + } else if (!strncmp(tmpstr, "getfile", 7)) { + + if (!ohcaptainmycaptain) { + + aim_send_im(sess, command->conn, userinfo->sn, AIM_IMFLAGS_ACK, "I have no owner!", strlen("I have no owner!")); + + } else { + struct aim_conn_t *newconn; + + newconn = aim_getfile_initiate(sess, command->conn, (strlen(tmpstr) < 8)?ohcaptainmycaptain:tmpstr+8); + dvprintf("faimtest: getting file listing from %s\n", (strlen(tmpstr) < 8)?ohcaptainmycaptain:tmpstr+8); + aim_conn_addhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILEINITIATE, faimtest_getfile_initiate,0); + } + + } else if (!strncmp(tmpstr, "open chatnav", 12)) { + + aim_bos_reqservice(sess, command->conn, AIM_CONN_TYPE_CHATNAV); + + } else if (!strncmp(tmpstr, "create", 6)) { + + aim_chatnav_createroom(sess,aim_getconn_type(sess, AIM_CONN_TYPE_CHATNAV), (strlen(tmpstr) < 7)?"WorldDomination":tmpstr+7, 0x0004); + + } else if (!strncmp(tmpstr, "close chatnav", 13)) { + struct aim_conn_t *chatnavconn; + + chatnavconn = aim_getconn_type(sess, AIM_CONN_TYPE_CHATNAV); + aim_conn_kill(sess, &chatnavconn); + + } else if (!strncmp(tmpstr, "join", 4)) { + + aim_chat_join(sess, command->conn, 0x0004, "worlddomination"); + + } else if (!strncmp(tmpstr, "leave", 5)) { + + aim_chat_leaveroom(sess, "worlddomination"); + + } else if (!strncmp(tmpstr, "getinfo", 7)) { + + aim_getinfo(sess, command->conn, "75784102", AIM_GETINFO_GENERALINFO); + aim_getinfo(sess, command->conn, "15853637", AIM_GETINFO_AWAYMESSAGE); + aim_getinfo(sess, command->conn, "midendian", AIM_GETINFO_GENERALINFO); + aim_getinfo(sess, command->conn, "midendian", AIM_GETINFO_AWAYMESSAGE); + + } else if (!strncmp(tmpstr, "open directim", 13)) { + struct aim_conn_t *newconn; + + printf("faimtest: opening directim to %s\n", (strlen(tmpstr) < 14)?userinfo->sn:tmpstr+14); + newconn = aim_directim_initiate(sess, command->conn, NULL, (strlen(tmpstr) < 14)?userinfo->sn:tmpstr+14); + if(!newconn || newconn->fd == -1) + printf("connection failed!\n"); + aim_conn_addhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINITIATE, faimtest_directim_initiate,0); + + } else if(!(strncmp(tmpstr, "lookup", 6))) { + + aim_usersearch_address(sess, command->conn, tmpstr+7); + + } else if (!strncmp(tmpstr, "reqsendmsg", 10)) { + + aim_send_im(sess, command->conn, ohcaptainmycaptain, 0, "sendmsg 7900", strlen("sendmsg 7900")); + + } else if (!strncmp(tmpstr, "reqauth", 7)) { + + aim_bos_reqservice(sess, command->conn, AIM_CONN_TYPE_AUTH); + + } else if (!strncmp(tmpstr, "reqconfirm", 10)) { + + aim_auth_reqconfirm(sess, aim_getconn_type(sess, AIM_CONN_TYPE_AUTH)); + + } else if (!strncmp(tmpstr, "reqemail", 8)) { + + aim_auth_getinfo(sess, aim_getconn_type(sess, AIM_CONN_TYPE_AUTH), 0x0011); + + } else if (!strncmp(tmpstr, "changepass", 8)) { + + aim_auth_changepasswd(sess, aim_getconn_type(sess, AIM_CONN_TYPE_AUTH), "NEWPASSWORD", "OLDPASSWORD"); + + } else if (!strncmp(tmpstr, "setemail", 8)) { + + aim_auth_setemail(sess, aim_getconn_type(sess, AIM_CONN_TYPE_AUTH), "NEWEMAILADDRESS"); + + } else if (!strncmp(tmpstr, "sendmsg", 7)) { + int i; + i = atoi(tmpstr+8); + if (i < 10000) { + char *newbuf; + int z; + + newbuf = malloc(i+1); + for (z = 0; z < i; z++) { + newbuf[z] = (z % 10)+0x30; + } + newbuf[i] = '\0'; + aim_send_im(sess, command->conn, userinfo->sn, 0, newbuf, strlen(newbuf)); + free(newbuf); + } + + } else { + + dprintf("unknown command.\n"); + aim_add_buddy(sess, command->conn, userinfo->sn); + + } + + return 0; +} + /* * The user-level Incoming ICBM callback. * - * Arguments: - * struct command_rx_struct * command if you feel like doing it yourself - * char * srcsn the source name - * char * msg message - * int warnlevel warning/evil level - * int flags flags - * ulong membersince time_t of date of signup - * ulong onsince time_t of date of singon - * int idletime min (sec?) idle - * u_int icbmflags sets AIM_IMFLAGS_{AWAY,ACK} - * */ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_struct *command, ...) { @@ -967,93 +1267,8 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str } tmpstr = msg+i; - dvprintf("tmpstr = %s\n", tmpstr); - - if ( (strlen(tmpstr) >= 10) && - (!strncmp(tmpstr, "disconnect", 10)) ) { - if (ohcaptainmycaptain) - aim_send_im(sess, command->conn, ohcaptainmycaptain, 0, "ta ta..."); - aim_logoff(sess); - } else if (strstr(tmpstr, "goodday")) { - dprintf("faimtest: icbm: sending response\n"); - aim_send_im(sess, command->conn, userinfo->sn, AIM_IMFLAGS_ACK, "Good day to you too."); - } else if (strstr(tmpstr, "warnme")) { - dprintf("faimtest: icbm: sending non-anon warning\n"); - aim_send_warning(sess, command->conn, userinfo->sn, 0); - } else if (strstr(tmpstr, "anonwarn")) { - dprintf("faimtest: icbm: sending anon warning\n"); - aim_send_warning(sess, command->conn, userinfo->sn, AIM_WARN_ANON); - } else if (strstr(tmpstr, "setdirectoryinfo")) { - dprintf("faimtest: icbm: sending backwards profile data\n"); - aim_setdirectoryinfo(sess, command->conn, "tsrif", "elddim", "tsal", "nediam", "emankcin", "teerts", "ytic", "etats", "piz", 0, 1); - } else if (strstr(tmpstr, "setinterests")) { - dprintf("faimtest: icbm: setting fun interests\n"); - aim_setuserinterests(sess, command->conn, "interest1", "interest2", "interest3", "interest4", "interest5", 1); - } else if (!strncmp(tmpstr, "getfile", 7)) { - if (!ohcaptainmycaptain) { - aim_send_im(sess, command->conn, userinfo->sn, AIM_IMFLAGS_ACK, "I have no owner!"); - } else { - struct aim_conn_t *newconn; - newconn = aim_getfile_initiate(sess, command->conn, (strlen(tmpstr) < 8)?ohcaptainmycaptain:tmpstr+8); - dvprintf("faimtest: getting file listing from %s\n", (strlen(tmpstr) < 8)?ohcaptainmycaptain:tmpstr+8); - aim_conn_addhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILEINITIATE, faimtest_getfile_initiate,0); - } - } else if (!strncmp(tmpstr, "open chatnav", 12)) { - aim_bos_reqservice(sess, command->conn, AIM_CONN_TYPE_CHATNAV); - } else if (!strncmp(tmpstr, "create", 6)) { - aim_chatnav_createroom(sess,aim_getconn_type(sess, AIM_CONN_TYPE_CHATNAV), (strlen(tmpstr) < 7)?"WorldDomination":tmpstr+7, 0x0004); - } else if (!strncmp(tmpstr, "close chatnav", 13)) { - struct aim_conn_t *chatnavconn; - chatnavconn = aim_getconn_type(sess, AIM_CONN_TYPE_CHATNAV); - aim_conn_kill(sess, &chatnavconn); - } else if (!strncmp(tmpstr, "join", 4)) { - aim_chat_join(sess, command->conn, 0x0004, "worlddomination"); - } else if (!strncmp(tmpstr, "leave", 5)) - aim_chat_leaveroom(sess, "worlddomination"); - else if (!strncmp(tmpstr, "getinfo", 7)) { - aim_getinfo(sess, command->conn, "75784102", AIM_GETINFO_GENERALINFO); - aim_getinfo(sess, command->conn, "15853637", AIM_GETINFO_AWAYMESSAGE); - } else if (!strncmp(tmpstr, "open directim", 13)) { - struct aim_conn_t *newconn; - printf("faimtest: opening directim to %s\n", (strlen(tmpstr) < 14)?userinfo->sn:tmpstr+14); - newconn = aim_directim_initiate(sess, command->conn, NULL, (strlen(tmpstr) < 14)?userinfo->sn:tmpstr+14); - if(!newconn || newconn->fd == -1) - printf("connection failed!\n"); - aim_conn_addhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINITIATE, faimtest_directim_initiate,0); - } else if(!(strncmp(tmpstr, "lookup", 6))) { - aim_usersearch_address(sess, command->conn, tmpstr+7); - } else if (!strncmp(tmpstr, "reqsendmsg", 10)) { - aim_send_im(sess, command->conn, ohcaptainmycaptain, 0, "sendmsg 7900"); - } else if (!strncmp(tmpstr, "reqauth", 7)) { - aim_bos_reqservice(sess, command->conn, AIM_CONN_TYPE_AUTH); - } else if (!strncmp(tmpstr, "reqconfirm", 10)) { - aim_auth_reqconfirm(sess, aim_getconn_type(sess, AIM_CONN_TYPE_AUTH)); - } else if (!strncmp(tmpstr, "reqemail", 8)) { - aim_auth_getinfo(sess, aim_getconn_type(sess, AIM_CONN_TYPE_AUTH), 0x0011); - } else if (!strncmp(tmpstr, "changepass", 8)) { - aim_auth_changepasswd(sess, aim_getconn_type(sess, AIM_CONN_TYPE_AUTH), "NEWPASSWORD", "OLDPASSWORD"); - } else if (!strncmp(tmpstr, "setemail", 8)) { - aim_auth_setemail(sess, aim_getconn_type(sess, AIM_CONN_TYPE_AUTH), "NEWEMAILADDRESS"); - } else if (!strncmp(tmpstr, "sendmsg", 7)) { - int i; - i = atoi(tmpstr+8); - if (i < 10000) { - char *newbuf; - int z; - - newbuf = malloc(i+1); - for (z = 0; z < i; z++) { - newbuf[z] = (z % 10)+0x30; - } - newbuf[i] = '\0'; - aim_send_im(sess, command->conn, userinfo->sn, 0, newbuf); - free(newbuf); - } - } else { - dprintf("unknown command.\n"); - aim_add_buddy(sess, command->conn, userinfo->sn); - } - + faimtest_handlecmd(sess, command, userinfo, tmpstr); + } } /* @@ -1245,16 +1460,21 @@ int faimtest_directim_connect(struct aim_session_t *sess, struct command_rx_stru int faimtest_directim_incoming(struct aim_session_t *sess, struct command_rx_struct *command, ...) { va_list ap; - char *sn = NULL, *msg = NULL; + char *msg = NULL; struct aim_conn_t *conn; + struct aim_directim_priv *priv; va_start(ap, command); conn = va_arg(ap, struct aim_conn_t *); - sn = va_arg(ap, char *); msg = va_arg(ap, char *); va_end(ap); - dvprintf("faimtest: Directim from %s: %s\n", sn, msg); + if(!(priv = conn->priv)) { + dvprintf("faimtest: directim: no private struct on conn with fd %d\n", conn->fd); + return -1; + } + + dvprintf("faimtest: Directim from %s: %s\n", priv->sn, msg); if (!strncmp(msg, "sendmsg", 7)) { int i; i = atoi(msg+8); @@ -1300,13 +1520,19 @@ int faimtest_directim_disconnect(struct aim_session_t *sess, struct command_rx_s int faimtest_directim_typing(struct aim_session_t *sess, struct command_rx_struct *command, ...) { va_list ap; - char *sn; - + struct aim_conn_t *conn; + struct aim_directim_priv *priv; + va_start(ap, command); - sn = va_arg(ap, char *); + conn = va_arg(ap, struct aim_conn_t *); va_end(ap); + + if(!(priv = (struct aim_directim_priv *)conn->priv)) { + dvprintf("faimtest: no private struct on conn with fd %d!\n", conn->fd); + return -1; + } - dvprintf("faimtest: ohmigod! %s has started typing (DirectIM). He's going to send you a message! *squeal*\n", sn); + dvprintf("faimtest: ohmigod! %s has started typing (DirectIM). He's going to send you a message! *squeal*\n", priv->sn); return 1; } @@ -1359,15 +1585,25 @@ int faimtest_parse_oncoming(struct aim_session_t *sess, struct command_rx_struct int faimtest_parse_offgoing(struct aim_session_t *sess, struct command_rx_struct *command, ...) { - char *sn; + struct aim_userinfo_s *userinfo; + va_list ap; - va_start(ap, command); - sn = va_arg(ap, char *); + userinfo = va_arg(ap, struct aim_userinfo_s *); va_end(ap); - dvprintf("\n%s has left\n", sn); - + dvprintf("%ld %s is now offline (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":"", + (userinfo->flags&AIM_FLAG_AOL)?" AOL":"", + (userinfo->flags&AIM_FLAG_OSCAR_PAY)?" OSCAR_PAY":"", + (userinfo->flags&AIM_FLAG_FREE)?" FREE":"", + (userinfo->flags&AIM_FLAG_AWAY)?" AWAY":"", + (userinfo->flags&AIM_FLAG_UNKNOWN40)?" UNKNOWN40":"", + (userinfo->flags&AIM_FLAG_UNKNOWN80)?" UNKNOWN80":"", + userinfo->capabilities); return 1; } @@ -1396,6 +1632,15 @@ int faimtest_parse_motd(struct aim_session_t *sess, struct command_rx_struct *co if (!connected) connected++; +#if 0 + aim_bos_reqservice(sess, command->conn, 0x0005); /* adverts */ + aim_bos_reqservice(sess, command->conn, 0x000f); /* user directory */ + + /* Don't know what this does... */ + /* XXX sess->sn should be normalized by the 0001/000f handler */ + aim_0002_000b(sess, command->conn, sess->sn); +#endif + return 1; } @@ -1420,8 +1665,8 @@ int faimtest_parse_msgerr(struct aim_session_t *sess, struct command_rx_struct * unsigned short reason; va_start(ap, command); - destsn = va_arg(ap, char *); reason = va_arg(ap, int); + destsn = va_arg(ap, char *); va_end(ap); dvprintf("faimtest: message to %s bounced (reason 0x%04x: %s)\n", destsn, reason, (reasonsn, sess->sn) != 0) { sprintf(tmpbuf, "(%s said \"%s\")", userinfo->sn, msg); - aim_chat_send_im(sess, command->conn, tmpbuf); + aim_chat_send_im(sess, command->conn, 0, tmpbuf, strlen(tmpbuf)); } return 1; @@ -1671,6 +1916,8 @@ int faimtest_parse_connerr(struct aim_session_t *sess, struct command_rx_struct dvprintf("faimtest: connerr: Code 0x%04x: %s\n", code, msg); aim_conn_kill(sess, &command->conn); /* this will break the main loop */ + connected = 0; + return 1; }