X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/d2698e035898b59fdff9e49da05904152cdedd03..7a449b5dde046df20a1af32bdf74e110a1c2721e:/utils/faimtest/faimtest.c diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c index f01d265..c3b9dfc 100644 --- a/utils/faimtest/faimtest.c +++ b/utils/faimtest/faimtest.c @@ -39,6 +39,7 @@ */ #include "faimtest.h" +#include static char *dprintf_ctime(void) { @@ -160,6 +161,11 @@ int keepgoing = 1; static FILE *listingfile; static char *listingpath; +static unsigned char *buddyicon = NULL; +static int buddyiconlen = 0; +static time_t buddyiconstamp = 0; +static unsigned short buddyiconsum = 0; + static void faimtest_debugcb(struct aim_session_t *sess, int level, const char *format, va_list va) { @@ -260,7 +266,7 @@ 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_send_im(&aimsess, aim_getconn_type(&aimsess, AIM_CONN_TYPE_BOS), ohcaptainmycaptain, 0, "ta ta..."); aim_session_kill(&aimsess); @@ -322,6 +328,7 @@ int main(int argc, char **argv) static int faimtest_mode = 0; struct timeval tv; time_t lastnop = 0; + const char *buddyiconpath = NULL; screenname = getenv("SCREENNAME"); password = getenv("PASSWORD"); @@ -332,7 +339,7 @@ int main(int argc, char **argv) listingpath = getenv("LISTINGPATH"); - while ((i = getopt(argc, argv, "u:p:a:U:P:A:l:c:hoOb:")) != EOF) { + while ((i = getopt(argc, argv, "u:p:a:U:P:A:l:c:hoOb:i:")) != EOF) { switch (i) { case 'u': screenname = optarg; break; case 'p': password = optarg; break; @@ -345,6 +352,7 @@ int main(int argc, char **argv) case 'o': faimtest_mode = 1; break; /* half old interface */ case 'O': faimtest_mode = 2; break; /* full old interface */ case 'b': aimbinarypath = optarg; break; + case 'i': buddyiconpath = optarg; break; case 'h': default: printf("faimtest\n"); @@ -359,6 +367,8 @@ int main(int argc, char **argv) printf(" -c name Screen name of owner\n"); printf(" -o Login at startup, then prompt\n"); printf(" -O Login, never give prompt\n"); + printf(" -b path Path to AIM 3.5.1670 binaries\n"); + printf(" -i file Buddy Icon to send\n"); exit(0); } } @@ -388,6 +398,28 @@ int main(int argc, char **argv) free(listingname); } + if (buddyiconpath) { + struct stat st; + FILE *f; + + if ((stat(buddyiconpath, &st) != -1) && (st.st_size <= MAXICONLEN) && (f = fopen(buddyiconpath, "r"))) { + + buddyiconlen = st.st_size; + buddyiconstamp = st.st_mtime; + buddyicon = malloc(buddyiconlen); + fread(buddyicon, 1, st.st_size, f); + + buddyiconsum = aim_iconsum(buddyicon, buddyiconlen); + + dvprintf("read %d bytes of %s for buddy icon (sum 0x%08x)\n", buddyiconlen, buddyiconpath, buddyiconsum); + + fclose(f); + + } else + dvprintf("could not open buddy icon %s\n", buddyiconpath); + + } + faimtest_init(); if (faimtest_mode < 2) @@ -458,6 +490,8 @@ int main(int argc, char **argv) cmd_uninit(); } + free(buddyicon); + /* Get out */ exit(0); } @@ -471,6 +505,7 @@ int faimtest_rateresp(struct aim_session_t *sess, struct command_rx_struct *comm char buddies[128]; /* this is the new profile */ char profile[256]; + char awaymsg[] = {"blah blah blah Ole! blah blah blah"}; /* Caution: Buddy1 and Buddy2 are real people! (who I don't know) */ snprintf(buddies, sizeof(buddies), "Buddy1&Buddy2&%s&", ohcaptainmycaptain?ohcaptainmycaptain:"blah"); @@ -479,7 +514,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, awaymsg, AIM_CAPS_BUDDYICON | AIM_CAPS_CHAT | 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) */ @@ -517,11 +552,11 @@ static int faimtest_icbmparaminfo(struct aim_session_t *sess, struct command_rx_ va_list ap; va_start(ap, command); - maxchannel = va_arg(ap, unsigned short); + maxchannel = va_arg(ap, unsigned int); defflags = va_arg(ap, unsigned long); - maxicbmlen = va_arg(ap, unsigned short); - maxsenderwarn = va_arg(ap, unsigned short); - maxrecverwarn = va_arg(ap, unsigned short); + maxicbmlen = va_arg(ap, unsigned int); + maxsenderwarn = va_arg(ap, unsigned int); + maxrecverwarn = va_arg(ap, unsigned int); minmsginterval = va_arg(ap, unsigned long); va_end(ap); @@ -661,6 +696,20 @@ int faimtest_bosrights(struct aim_session_t *sess, struct command_rx_struct *com return 1; } +int faimtest_locrights(struct aim_session_t *sess, struct command_rx_struct *command, ...) +{ + unsigned short maxsiglen; + va_list ap; + + va_start(ap, command); + maxsiglen = va_arg(ap, int); + va_end(ap); + + dvprintf("faimtest: locate rights: max signature length = %d\n", maxsiglen); + + return 1; +} + int faimtest_parse_unknown(struct aim_session_t *sess, struct command_rx_struct *command, ...) { int i = 0; @@ -797,13 +846,37 @@ int faimtest_handleredirect(struct aim_session_t *sess, struct command_rx_struct return 1; } -static int getaimdata(unsigned char *buf, int buflen, unsigned long offset, const char *modname) +/* + * This is a little more complicated than it looks. The module + * name (proto, boscore, etc) may or may not be given. If it is + * not given, then use aim.exe. If it is given, put ".ocm" on the + * end of it. + * + * Now, if the offset or length requested would cause a read past + * the end of the file, then the request is considered invalid. Invalid + * requests are processed specially. The value hashed is the + * the request, put into little-endian (eight bytes: offset followed + * by length). + * + * Additionally, if the request is valid, the length is mod 4096. It is + * important that the length is checked for validity first before doing + * the mod. + * + * Note to Bosco's Brigade: if you'd like to break this, put the + * module name on an invalid request. + * + */ +static int getaimdata(unsigned char **bufret, int *buflenret, unsigned long offset, unsigned long len, const char *modname) { FILE *f; static const char defaultmod[] = "aim.exe"; char *filename = NULL; + struct stat st; + unsigned char *buf; + int invalid = 0; - memset(buf, 0, buflen); + if (!bufret || !buflenret) + return -1; if (modname) { @@ -825,33 +898,101 @@ static int getaimdata(unsigned char *buf, int buflen, unsigned long offset, cons } - dvprintf("memrequest: loading %d bytes from 0x%08lx in \"%s\"...\n", buflen, offset, filename); + if (stat(filename, &st) == -1) { + if (!modname) { + dperror("memrequest: stat"); + free(filename); + return -1; + } + invalid = 1; + } - if (!(f = fopen(filename, "r"))) { - dperror("memrequest: fopen"); - free(filename); - return -1; + if (!invalid) { + if ((offset > st.st_size) || (len > st.st_size)) + invalid = 1; + else if ((st.st_size - offset) < len) + len = st.st_size - offset; + else if ((st.st_size - len) < len) + len = st.st_size - len; } - free(filename); + if (!invalid && len) + len %= 4096; + + if (invalid) { + int i; + + free(filename); /* not needed */ + + dvprintf("memrequest: recieved invalid request for 0x%08lx bytes at 0x%08lx (file %s)\n", len, offset, modname); + + i = 8; + if (modname) + i += strlen(modname); + + if (!(buf = malloc(i))) + return -1; + + i = 0; + + if (modname) { + memcpy(buf, modname, strlen(modname)); + i += strlen(modname); + } + + /* Damn endianness. This must be little (LSB first) endian. */ + buf[i++] = offset & 0xff; + buf[i++] = (offset >> 8) & 0xff; + buf[i++] = (offset >> 16) & 0xff; + buf[i++] = (offset >> 24) & 0xff; + buf[i++] = len & 0xff; + buf[i++] = (len >> 8) & 0xff; + buf[i++] = (len >> 16) & 0xff; + buf[i++] = (len >> 24) & 0xff; + + *bufret = buf; + *buflenret = i; + + } else { + + if (!(buf = malloc(len))) { + free(filename); + return -1; + } + + dvprintf("memrequest: loading %ld bytes from 0x%08lx in \"%s\"...\n", len, offset, filename); + + if (!(f = fopen(filename, "r"))) { + dperror("memrequest: fopen"); + free(filename); + free(buf); + return -1; + } + + free(filename); - if (buflen) { if (fseek(f, offset, SEEK_SET) == -1) { dperror("memrequest: fseek"); fclose(f); + free(buf); return -1; } - if (fread(buf, buflen, 1, f) != 1) { + if (fread(buf, len, 1, f) != 1) { dperror("memrequest: fread"); fclose(f); + free(buf); return -1; } - } - fclose(f); + fclose(f); + + *bufret = buf; + *buflenret = len; + + } - return buflen; + return 0; /* success! */ } /* @@ -865,8 +1006,9 @@ static int faimtest_memrequest(struct aim_session_t *sess, struct command_rx_str { va_list ap; unsigned long offset, len; - unsigned char *buf; char *modname; + unsigned char *buf; + int buflen; va_start(ap, command); offset = va_arg(ap, unsigned long); @@ -874,14 +1016,11 @@ static int faimtest_memrequest(struct aim_session_t *sess, struct command_rx_str modname = va_arg(ap, char *); va_end(ap); - if (!(buf = malloc(len))) { - dperror("memrequest: malloc"); - return 0; - } + if (aimbinarypath && (getaimdata(&buf, &buflen, offset, len, modname) == 0)) { - if (aimbinarypath && (getaimdata(buf, len, offset, modname) == len)) { + aim_sendmemblock(sess, command->conn, offset, buflen, buf, AIM_SENDMEMBLOCK_FLAG_ISREQUEST); - aim_sendmemblock(sess, command->conn, offset, len, buf, AIM_SENDMEMBLOCK_FLAG_ISREQUEST); + free(buf); } else { @@ -891,8 +1030,6 @@ static int faimtest_memrequest(struct aim_session_t *sess, struct command_rx_str } - free(buf); - return 1; } @@ -983,6 +1120,7 @@ static int faimtest_parse_authresp(struct aim_session_t *sess, struct command_rx aim_conn_addhandler(sess, bosconn, 0x000a, 0x0003, faimtest_parse_searchreply, 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_LOC, AIM_CB_LOC_RIGHTSINFO, faimtest_locrights, 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_GEN, AIM_CB_GEN_MOTD, faimtest_parse_motd, 0); @@ -1068,7 +1206,25 @@ static int faimtest_handlecmd(struct aim_session_t *sess, struct command_rx_stru } 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.")); + aim_send_im(sess, command->conn, userinfo->sn, AIM_IMFLAGS_ACK, "Good day to you too."); + + } else if (strstr(tmpstr, "haveicon") && buddyicon) { + struct aim_sendimext_args args; + static const char iconmsg[] = {"I have an icon"}; + + args.destsn = userinfo->sn; + args.flags = AIM_IMFLAGS_HASICON; + args.msg = iconmsg; + args.msglen = strlen(iconmsg); + args.iconlen = buddyiconlen; + args.iconstamp = buddyiconstamp; + args.iconsum = buddyiconsum; + + aim_send_im_ext(sess, command->conn, &args); + + } else if (strstr(tmpstr, "sendicon") && buddyicon) { + + aim_send_icon(sess, command->conn, userinfo->sn, buddyicon, buddyiconlen, buddyiconstamp, buddyiconsum); } else if (strstr(tmpstr, "warnme")) { @@ -1094,7 +1250,7 @@ static int faimtest_handlecmd(struct aim_session_t *sess, struct command_rx_stru if (!ohcaptainmycaptain) { - aim_send_im(sess, command->conn, userinfo->sn, AIM_IMFLAGS_ACK, "I have no owner!", strlen("I have no owner!")); + aim_send_im(sess, command->conn, userinfo->sn, AIM_IMFLAGS_ACK, "I have no owner!"); } else { struct aim_conn_t *newconn; @@ -1148,7 +1304,7 @@ static int faimtest_handlecmd(struct aim_session_t *sess, struct command_rx_stru } else if (!strncmp(tmpstr, "reqsendmsg", 10)) { - aim_send_im(sess, command->conn, ohcaptainmycaptain, 0, "sendmsg 7900", strlen("sendmsg 7900")); + aim_send_im(sess, command->conn, ohcaptainmycaptain, 0, "sendmsg 7900"); } else if (!strncmp(tmpstr, "reqauth", 7)) { @@ -1182,7 +1338,7 @@ static int faimtest_handlecmd(struct aim_session_t *sess, struct command_rx_stru newbuf[z] = (z % 10)+0x30; } newbuf[i] = '\0'; - aim_send_im(sess, command->conn, userinfo->sn, 0, newbuf, strlen(newbuf)); + aim_send_im(sess, command->conn, userinfo->sn, 0, newbuf); free(newbuf); } @@ -1203,34 +1359,26 @@ static int faimtest_handlecmd(struct aim_session_t *sess, struct command_rx_stru int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_struct *command, ...) { int channel; + struct aim_userinfo_s *userinfo; va_list ap; va_start(ap, command); channel = va_arg(ap, int); + userinfo = va_arg(ap, struct aim_userinfo_s *); /* * Channel 1: Standard Message */ if (channel == 1) { - struct aim_userinfo_s *userinfo; - char *msg = NULL; - u_int icbmflags = 0; - char *tmpstr = NULL; - unsigned short flag1, flag2; - int finlen = 0; - unsigned char *fingerprint = NULL; + char *tmpstr; + struct aim_incomingim_ch1_args *args; int clienttype = AIM_CLIENTTYPE_UNKNOWN; - - userinfo = va_arg(ap, struct aim_userinfo_s *); - msg = va_arg(ap, char *); - icbmflags = va_arg(ap, u_int); - flag1 = va_arg(ap, int); - flag2 = va_arg(ap, int); - finlen = va_arg(ap, int); - fingerprint = va_arg(ap, unsigned char *); + char realmsg[8192+1] = {""}; + + args = va_arg(ap, struct aim_incomingim_ch1_args *); va_end(ap); - clienttype = aim_fingerprintclient(fingerprint, finlen); + clienttype = aim_fingerprintclient(args->fingerprint, args->finlen); dvprintf("faimtest: icbm: sn = \"%s\"\n", userinfo->sn); dvprintf("faimtest: icbm: probable client type: %d\n", clienttype); @@ -1245,27 +1393,82 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str dvprintf("faimtest: icbm: capabilities = 0x%04x\n", userinfo->capabilities); dprintf("faimtest: icbm: icbmflags = "); - if (icbmflags & AIM_IMFLAGS_AWAY) + if (args->icbmflags & AIM_IMFLAGS_AWAY) dinlineprintf("away "); - if (icbmflags & AIM_IMFLAGS_ACK) + if (args->icbmflags & AIM_IMFLAGS_ACK) dinlineprintf("ackrequest "); + if (args->icbmflags & AIM_IMFLAGS_BUDDYREQ) + dinlineprintf("buddyreq "); + if (args->icbmflags & AIM_IMFLAGS_HASICON) + dinlineprintf("hasicon "); dinlineprintf("\n"); - dvprintf("faimtest: icbm: encoding flags = {%04x, %04x}\n", flag1, flag2); - - dvprintf("faimtest: icbm: message: %s\n", msg); - - if (msg) { + dvprintf("faimtest: icbm: encoding flags = {%04x, %04x}\n", args->flag1, args->flag2); + + /* + * Quickly convert it to eight bit format, replacing non-ASCII UNICODE + * characters with their equivelent HTML entity. + */ + if (args->icbmflags & AIM_IMFLAGS_UNICODE) { + int i; + + for (i = 0; i < args->msglen; i += 2) { + unsigned short uni; + + uni = ((args->msg[i] & 0xff) << 8) | (args->msg[i+1] & 0xff); + + if ((uni < 128) || ((uni >= 160) && (uni <= 255))) { /* ISO 8859-1 */ + + snprintf(realmsg+strlen(realmsg), sizeof(realmsg)-strlen(realmsg), + "%c", uni); + + } else { /* something else, do UNICODE entity */ + + snprintf(realmsg+strlen(realmsg), sizeof(realmsg)-strlen(realmsg), + "&#%04x;", uni); + + } + + } + + } else { + + /* + * For non-UNICODE encodings (ASCII and ISO 8859-1), there is no + * need to do anything special here. Most terminals/whatever will + * be able to display such characters unmodified. + * + * Beware that PC-ASCII 128 through 159 are _not_ actually defined in + * ASCII or ISO 8859-1, and you should send them as UNICODE. WinAIM + * will send these characters in a UNICODE message, so you need + * to do so as well. + * + * You may not think it necessary to handle UNICODE messages. You're + * probably wrong. For one thing, Microsoft "Smart Quotes" will + * be sent by WinAIM as UNICODE (not HTML UNICODE, but real UNICODE). + * If you don't parse UNICODE at all, your users will get a blank + * message instead of the message containing Smart Quotes. + * + */ + strncpy(realmsg, args->msg, sizeof(realmsg)); + } + + dvprintf("faimtest: icbm: message: %s\n", realmsg); + + if (args->icbmflags & AIM_IMFLAGS_HASICON) + aim_send_im(sess, command->conn, userinfo->sn, AIM_IMFLAGS_BUDDYREQ, "You have an icon"); + + if (realmsg) { int i = 0; - while (msg[i] == '<') { - if (msg[i] == '<') { - while (msg[i] != '>') + while (realmsg[i] == '<') { + if (realmsg[i] == '<') { + while (realmsg[i] != '>') i++; i++; } } - tmpstr = msg+i; + tmpstr = realmsg+i; faimtest_handlecmd(sess, command, userinfo, tmpstr); @@ -1275,14 +1478,13 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str * Channel 2: Rendevous Request */ else if (channel == 2) { - struct aim_userinfo_s *userinfo; - unsigned short reqclass; + struct aim_incomingim_ch2_args *args; - reqclass = va_arg(ap, int); - switch (reqclass) { + args = va_arg(ap, struct aim_incomingim_ch2_args *); + va_end(ap); + + switch (args->reqclass) { case AIM_CAPS_VOICE: { - userinfo = va_arg(ap, struct aim_userinfo_s *); - va_end(ap); dvprintf("faimtest: voice invitation: source sn = %s\n", userinfo->sn); dvprintf("faimtest: voice invitation: \twarnlevel = 0x%04x\n", userinfo->warnlevel); @@ -1297,22 +1499,16 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str break; } case AIM_CAPS_GETFILE: { - char *ip, *cookie; struct aim_conn_t *newconn; struct aim_fileheader_t *fh; - userinfo = va_arg(ap, struct aim_userinfo_s *); - ip = va_arg(ap, char *); - cookie = va_arg(ap, char *); - va_end(ap); - - dvprintf("faimtest: get file request from %s (at %s) %x\n", userinfo->sn, ip, reqclass); + dvprintf("faimtest: get file request from %s (at %s) %x\n", userinfo->sn, args->info.getfile.ip, args->reqclass); - fh = aim_getlisting(sess, listingfile); + fh = aim_getlisting(sess, listingfile); - newconn = aim_accepttransfer(sess, command->conn, userinfo->sn, cookie, ip, fh->totfiles, fh->totsize, fh->size, fh->checksum, reqclass); + newconn = aim_accepttransfer(sess, command->conn, userinfo->sn, args->info.getfile.cookie, args->info.getfile.ip, fh->totfiles, fh->totsize, fh->size, fh->checksum, args->reqclass); - if( (!newconn) || (newconn->fd == -1) ) { + if ( (!newconn) || (newconn->fd == -1) ) { dprintf("faimtest: getfile: requestconn: apparent error in accepttransfer\n"); if(newconn) aim_conn_kill(sess, &newconn); @@ -1337,15 +1533,6 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str break; } case AIM_CAPS_CHAT: { - char *msg,*encoding,*lang; - struct aim_chat_roominfo *roominfo; - - userinfo = va_arg(ap, struct aim_userinfo_s *); - roominfo = va_arg(ap, struct aim_chat_roominfo *); - msg = va_arg(ap, char *); - encoding = va_arg(ap, char *); - lang = va_arg(ap, char *); - va_end(ap); dvprintf("faimtest: chat invitation: source sn = %s\n", userinfo->sn); dvprintf("faimtest: chat invitation: \twarnlevel = 0x%04x\n", userinfo->warnlevel); @@ -1357,32 +1544,28 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str dvprintf("faimtest: chat invitation: \tonlinesince = %lu\n", userinfo->onlinesince); dvprintf("faimtest: chat invitation: \tidletime = 0x%04x\n", userinfo->idletime); - dvprintf("faimtest: chat invitation: message = %s\n", msg); - dvprintf("faimtest: chat invitation: room name = %s\n", roominfo->name); - dvprintf("faimtest: chat invitation: encoding = %s\n", encoding); - dvprintf("faimtest: chat invitation: language = %s\n", lang); - dvprintf("faimtest: chat invitation: exchange = 0x%04x\n", roominfo->exchange); - dvprintf("faimtest: chat invitation: instance = 0x%04x\n", roominfo->instance); - dvprintf("faimtest: chat invitiation: autojoining %s...\n", roominfo->name); + dvprintf("faimtest: chat invitation: message = %s\n", args->info.chat.msg); + dvprintf("faimtest: chat invitation: room name = %s\n", args->info.chat.roominfo.name); + dvprintf("faimtest: chat invitation: encoding = %s\n", args->info.chat.encoding); + dvprintf("faimtest: chat invitation: language = %s\n", args->info.chat.lang); + dvprintf("faimtest: chat invitation: exchange = 0x%04x\n", args->info.chat.roominfo.exchange); + dvprintf("faimtest: chat invitation: instance = 0x%04x\n", args->info.chat.roominfo.instance); + dvprintf("faimtest: chat invitiation: autojoining %s...\n", args->info.chat.roominfo.name); + /* * Automatically join room... */ - aim_chat_join(sess, command->conn, 0x0004, roominfo->name); + aim_chat_join(sess, command->conn, args->info.chat.roominfo.exchange, args->info.chat.roominfo.name); break; } case AIM_CAPS_IMIMAGE: { - struct aim_directim_priv *priv; struct aim_conn_t *newconn; dprintf("faimtest: icbm: rendezvous imimage\n"); - - userinfo = va_arg(ap, struct aim_userinfo_s *); - priv = va_arg(ap, struct aim_directim_priv *); - va_end(ap); - dvprintf("faimtest: OFT: DirectIM: request from %s (%s)\n", userinfo->sn, priv->ip); + dvprintf("faimtest: OFT: DirectIM: request from %s (%s)\n", userinfo->sn, args->info.directim->ip); - newconn = aim_directim_connect(sess, command->conn, priv); + newconn = aim_directim_connect(sess, command->conn, args->info.directim); if ( (!newconn) || (newconn->fd == -1) ) { dprintf("faimtest: icbm: imimage: could not connect\n"); @@ -1403,11 +1586,17 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str break; } + case AIM_CAPS_BUDDYICON: { + + dvprintf("faimtest: Buddy Icon from %s, length = %u\n", userinfo->sn, args->info.icon.length); + break; + } default: - dvprintf("faimtest: icbm: unknown reqclass (%d)\n", reqclass); + dvprintf("faimtest: icbm: unknown reqclass (%d)\n", args->reqclass); } /* switch */ } else dvprintf("faimtest does not support channels > 2 (chan = %02x)\n", channel); + dprintf("faimtest: icbm: done with ICBM handling\n"); return 1;