X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/9d83220cefa5bf6e22fbabae688b151c107780cd..d2587300fe3ca6bf664c93b5f6258d275fe75155:/utils/faimtest/faimtest.c

diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c
index 57593b6..e10d494 100644
--- a/utils/faimtest/faimtest.c
+++ b/utils/faimtest/faimtest.c
@@ -23,10 +23,10 @@
  *  please contact me at the address below.
  *
  *  Most everything:
- *  (c) 1998 Adam Fritzler, PST, afritz@iname.com
+ *  (c) 1998 Adam Fritzler, PST, mid@zigamoprh.net
  *
  *  The password algorithms
- *  (c) 1998 Brock Wilcox, awwaiid@iname.com
+ *  (c) 1998 Brock Wilcox, awwaiid@zigamorph.net
  *
  *  THERE IS NO CODE FROM AOL'S AIM IN THIS CODE, NOR
  *  WAS THERE ANY DISASSEMBLAGE TO DEFINE PROTOCOL.  All
@@ -38,12 +38,7 @@
  *
  */
 
-/*
-  Current status:
-
- */
-
-#include <aim.h> 
+#include "faimtest.h"
 
 static char *dprintf_ctime(void)
 {
@@ -58,21 +53,22 @@ static char *dprintf_ctime(void)
   return retbuf;
 }
 
+#define DPRINTF_OUTSTREAM stdout
 #define dprintf(x) { \
-  printf("%s  %s: " x, dprintf_ctime(), "faimtest"); \
-  fflush(stdout); \
+  fprintf(DPRINTF_OUTSTREAM, "%s  %s: " x, dprintf_ctime(), "faimtest"); \
+  fflush(DPRINTF_OUTSTREAM); \
 }
 #define dvprintf(x, y...) { \
-  printf("%s  %s: " x, dprintf_ctime(), "faimtest", y); \
-  fflush(stdout); \
+  fprintf(DPRINTF_OUTSTREAM, "%s  %s: " x, dprintf_ctime(), "faimtest", y); \
+  fflush(DPRINTF_OUTSTREAM); \
 }
 #define dinlineprintf(x) { \
-  printf(x); \
-  fflush(stdout); \
+  fprintf(DPRINTF_OUTSTREAM, x); \
+  fflush(DPRINTF_OUTSTREAM); \
 }
 #define dvinlineprintf(x, y...) { \
-  printf(x, y); \
-  fflush(stdout); \
+  fprintf(DPRINTF_OUTSTREAM, x, y); \
+  fflush(DPRINTF_OUTSTREAM); \
 }
 #define dperror(x) dvprintf("%s: %s\n", x, strerror(errno));
 
@@ -104,8 +100,7 @@ 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, ...);
 int faimtest_directim_disconnect(struct aim_session_t *sess, struct command_rx_struct *command, ...);
 int faimtest_directim_typing(struct aim_session_t *sess, struct command_rx_struct *command, ...);
-#define FILESUPPORT
-#ifdef FILESUPPORT
+
 int faimtest_getfile_filereq(struct aim_session_t *sess, struct command_rx_struct *command, ...);
 int faimtest_getfile_filesend(struct aim_session_t *sess, struct command_rx_struct *command, ...);
 int faimtest_getfile_complete(struct aim_session_t *sess, struct command_rx_struct *command, ...);
@@ -113,8 +108,8 @@ int faimtest_getfile_disconnect(struct aim_session_t *sess, struct command_rx_st
 int faimtest_getfile_initiate(struct aim_session_t *sess, struct command_rx_struct *command, ...);
 int faimtest_getfile_listing(struct aim_session_t *sess, struct command_rx_struct *command, ...);
 int faimtest_getfile_listingreq(struct aim_session_t *sess, struct command_rx_struct *command, ...);
-int faimtest_getfile_recieve(struct aim_session_t *sess, struct command_rx_struct *command, ...);
-#endif
+int faimtest_getfile_receive(struct aim_session_t *sess, struct command_rx_struct *command, ...);
+int faimtest_getfile_state4(struct aim_session_t *sess, struct command_rx_struct *command, ...);
 
 int faimtest_parse_ratechange(struct aim_session_t *sess, struct command_rx_struct *command, ...);
 int faimtest_parse_evilnotify(struct aim_session_t *sess, struct command_rx_struct *command, ...);
@@ -154,13 +149,23 @@ static char *msgerrreasons[] = {
 static int msgerrreasonslen = 25;
 
 static char *screenname,*password,*server=NULL;
+static char *proxy = NULL, *proxyusername = NULL, *proxypass = NULL;
 static char *ohcaptainmycaptain = NULL;
 static int connected = 0;
 
-#ifdef FILESUPPORT
-FILE *listingfile;
-char *listingpath;
-#endif
+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)
+{
+
+  vfprintf(stderr, format, va);
+
+  return;
+}
 
 int faimtest_reportinterval(struct aim_session_t *sess, struct command_rx_struct *command, ...)
 {
@@ -231,12 +236,81 @@ 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...");
+
+  aim_logoff(&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;
 
@@ -247,9 +321,7 @@ int main(int argc, char **argv)
   proxyusername = getenv("SOCKSNAME");
   proxypass = getenv("SOCKSPASS");
 
-#ifdef FILESUPPORT
   listingpath = getenv("LISTINGPATH");
-#endif
 
   while ((i = getopt(argc, argv, "u:p:a:U:P:A:l:c:h")) != EOF) {
     switch (i) {
@@ -263,7 +335,6 @@ int main(int argc, char **argv)
     case 'c': ohcaptainmycaptain = optarg; break;
     case 'h':
     default:
-    usage:
       printf("faimtest\n");
       printf(" Options: \n");
       printf("    -u name       Screen name ($SCREENNAME)\n");
@@ -278,9 +349,6 @@ int main(int argc, char **argv)
     }
   }
 
-  if (!screenname || !password)
-    goto usage;
-
 #ifdef _WIN32
   if (initwsa() != 0) {
     dprintf("faimtest: could not initialize windows sockets\n");
@@ -289,9 +357,9 @@ 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);
+  aim_session_init(&aimsess, AIM_SESS_FLAGS_NONBLOCKCONNECT, 0);
+  aim_setdebuggingcb(&aimsess, faimtest_debugcb); /* still needed even if debuglevel = 0 ! */
 
-#ifdef FILESUPPORT
   if(listingpath) {
     char *listingname;
     if(!(listingname = (char *)calloc(1, strlen(listingpath)+strlen("/listing.txt")))) {
@@ -306,90 +374,55 @@ int main(int argc, char **argv)
 
     free(listingname);
   }
-#endif
 
-  if (proxy)
-    aim_setupproxy(&aimsess, proxy, proxyusername, proxypass);
+  faimtest_init();
 
-  authconn = aim_newconn(&aimsess, AIM_CONN_TYPE_AUTH, server?server:FAIM_LOGIN_SERVER);
-
-  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");
-    }
-    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");
+  cmd_init();
 
   while (keepgoing) {
     waitingconn = aim_select(&aimsess, NULL, &selstat);
 
-    switch(selstat) {
-    case -1: /* error */
+    if (selstat == -1) { /* error */
       keepgoing = 0; /* fall through and hit the aim_logoff() */
-      break;
-
-    case 0: /* no events pending */
-      break;
-
-    case 1: /* outgoing data pending */
+    } else if (selstat == 0) { /* no events pending */
+      keepgoing = 0;
+    } else if (selstat == 1) { /* outgoing data pending */
       aim_tx_flushqueue(&aimsess);
-      break;
-
-    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);
+    } else if (selstat == 2) { /* incoming data pending */
+      if (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");
+	    }
+	  }
 	}
       }
-      
-      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); 
 
+  printf("\n");
+  cmd_uninit();
+
   /* Get out */
   exit(0);
 }
@@ -580,7 +613,7 @@ int faimtest_parse_unknown(struct aim_session_t *sess, struct command_rx_struct
   if (!sess || !command)
     return 1;
 
-  dprintf("\nRecieved unknown packet:");
+  dprintf("\nReceived unknown packet:");
   for (i = 0; i < command->commandlen; i++) {
     if ((i % 8) == 0)
       dinlineprintf("\n\t");
@@ -882,20 +915,144 @@ 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.");
+
+  } 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);
+
+  }  
+
+  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, ...)
 {
@@ -964,89 +1121,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;
-	newconn = aim_directim_initiate(sess, command->conn, NULL, userinfo->sn);
-      } 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);
+
     }
   }
   /*
@@ -1075,7 +1151,6 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str
       break;
     }
     case AIM_CAPS_GETFILE: {
-#ifdef FILESUPPORT
       char *ip, *cookie;
       struct aim_conn_t *newconn;
       struct aim_fileheader_t *fh;
@@ -1085,12 +1160,16 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str
       cookie = va_arg(ap, char *);
       va_end(ap);
       
-      dvprintf("faimtest: get file request from %s (at %s)\n", userinfo->sn, ip);
+      dvprintf("faimtest: get file request from %s (at %s) %x\n", userinfo->sn, ip, reqclass);
 
-      fh = aim_getlisting(listingfile);      
+      fh = aim_getlisting(sess, listingfile);      
 
-      if( (newconn = aim_accepttransfer(sess, command->conn, userinfo->sn, cookie, ip, fh->totfiles, fh->totsize, fh->size, fh->checksum, reqclass)) == NULL ) {
+      newconn = aim_accepttransfer(sess, command->conn, userinfo->sn, cookie, ip, fh->totfiles, fh->totsize, fh->size, fh->checksum, reqclass);
+
+      if( (!newconn) || (newconn->fd == -1) ) {
 	dprintf("faimtest: getfile: requestconn: apparent error in accepttransfer\n");
+	if(newconn)
+	  aim_conn_kill(sess, &newconn);
 	break;
       }
 
@@ -1106,7 +1185,6 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str
       dprintf("faimtest: getfile connect succeeded, handlers added.\n");
 
       break;
-#endif
     }
     case AIM_CAPS_SENDFILE: {
       dprintf("faimtest: send file!\n");
@@ -1158,10 +1236,17 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str
 
       dvprintf("faimtest: OFT: DirectIM: request from %s (%s)\n", userinfo->sn, priv->ip);
       
-      if (!(newconn = aim_directim_connect(sess, command->conn, priv))) {
+      newconn = aim_directim_connect(sess, command->conn, priv);
+
+      if ( (!newconn) || (newconn->fd == -1) ) {
 	dprintf("faimtest: icbm: imimage: could not connect\n");
+
+	if (newconn)
+	  aim_conn_kill(sess, &newconn);
+
 	break;
       }
+
       aim_conn_addhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINCOMING, faimtest_directim_incoming, 0);
       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);
@@ -1186,12 +1271,16 @@ int faimtest_directim_initiate(struct aim_session_t *sess, struct command_rx_str
 {
   va_list ap;
   struct aim_directim_priv *priv;
-  struct aim_conn_t *newconn;
+  struct aim_conn_t *newconn, *listenerconn;
 
   va_start(ap, command);
   newconn = va_arg(ap, struct aim_conn_t *);
+  listenerconn = va_arg(ap, struct aim_conn_t *);
   va_end(ap);
 
+  aim_conn_close(listenerconn);
+  aim_conn_kill(sess, &listenerconn);
+
   priv = (struct aim_directim_priv *)newconn->priv;
 
   dvprintf("faimtest: OFT: DirectIM: intitiate success to %s\n", priv->ip);
@@ -1225,16 +1314,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);
@@ -1280,13 +1374,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;
 }
 
@@ -1627,7 +1727,7 @@ int faimtest_chatnav_info(struct aim_session_t *sess, struct command_rx_struct *
     ck = va_arg(ap, char *);
     va_end(ap);
 
-    dvprintf("faimtest: recieved room create reply for %s/0x%04x\n", fqcn, exchange);
+    dvprintf("faimtest: received room create reply for %s/0x%04x\n", fqcn, exchange);
   }
   break;
   default:
@@ -1671,7 +1771,7 @@ int faimtest_debugconn_connect(struct aim_session_t *sess, struct command_rx_str
 }
 
 /*
- * Recieved in response to an IM sent with the AIM_IMFLAGS_ACK option.
+ * Received in response to an IM sent with the AIM_IMFLAGS_ACK option.
  */
 int faimtest_parse_msgack(struct aim_session_t *sess, struct command_rx_struct *command, ...)
 {
@@ -1689,7 +1789,6 @@ int faimtest_parse_msgack(struct aim_session_t *sess, struct command_rx_struct *
   return 1;
 }
 
-#ifdef FILESUPPORT
 int faimtest_getfile_filereq(struct aim_session_t *ses, struct command_rx_struct *command, ...)
 {
   va_list ap;
@@ -1715,8 +1814,8 @@ int faimtest_getfile_filesend(struct aim_session_t *sess, struct command_rx_stru
   struct aim_conn_t *oftconn;
   struct aim_fileheader_t *fh;
   char *path, *cookie;
-  int pos, bufpos, bufsize = 2048, i;
-  char buf[2048];
+  int pos, bufpos = 0, bufsize = 2048, i;
+  char *buf;
 
   FILE *file;
 
@@ -1728,6 +1827,9 @@ int faimtest_getfile_filesend(struct aim_session_t *sess, struct command_rx_stru
 
   dvprintf("faimtest: sending file %s(%ld).\n", fh->name, fh->size);
 
+  if(!(buf = malloc(2048)))
+     return -1;
+
   if( (path = (char *)calloc(1, strlen(listingpath) +strlen(fh->name)+2)) == NULL) {
     dperror("calloc");
     dprintf("faimtest: error in calloc of path\n");
@@ -1741,7 +1843,12 @@ int faimtest_getfile_filesend(struct aim_session_t *sess, struct command_rx_stru
     dvprintf("faimtest: getfile_send fopen failed for %s. damn.\n", path);
     return 0;
   }
-  
+
+  /* 
+   * This is a mess. Remember that faimtest is demonstration code
+   * only and for the sake of the gods, don't use this code in any
+   * of your clients. --mid
+   */
   for(pos = 0; pos < fh->size; pos++) {
     bufpos = pos % bufsize;
 
@@ -1770,7 +1877,7 @@ int faimtest_getfile_filesend(struct aim_session_t *sess, struct command_rx_stru
     return -1;
   }
 
-
+  free(buf);
   free(fh);  
   return 1;
 }
@@ -1812,26 +1919,29 @@ int faimtest_getfile_disconnect(struct aim_session_t *sess, struct command_rx_st
 int faimtest_getfile_initiate(struct aim_session_t *sess, struct command_rx_struct *command, ...)
 {
   va_list ap;
-  struct aim_conn_t *conn;
-  char *sn;
+  struct aim_conn_t *conn, *listenerconn;
   struct aim_filetransfer_priv *priv;
 
   va_start(ap, command);
   conn = va_arg(ap, struct aim_conn_t *);
-  sn = va_arg(ap, char *);
+  listenerconn = va_arg(ap, struct aim_conn_t *);
   va_end(ap);
 
+  aim_conn_close(listenerconn);
+  aim_conn_kill(sess, &listenerconn);
+
   aim_conn_addhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILEFILEREQ,  faimtest_getfile_filereq, 0);
   aim_conn_addhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILEFILESEND, faimtest_getfile_filesend, 0);
   aim_conn_addhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILECOMPLETE, faimtest_getfile_complete, 0);      
   aim_conn_addhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILEDISCONNECT, faimtest_getfile_disconnect, 0);      
   aim_conn_addhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILELISTING, faimtest_getfile_listing, 0);
   aim_conn_addhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILELISTINGREQ, faimtest_getfile_listingreq, 0);
-  aim_conn_addhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILERECIEVE, faimtest_getfile_recieve, 0);
+  aim_conn_addhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILERECEIVE, faimtest_getfile_receive, 0);
+  aim_conn_addhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILESTATE4, faimtest_getfile_state4, 0);
   
   priv = (struct aim_filetransfer_priv *)conn->priv;
 
-  dvprintf("faimtest: getfile: %s (%s) connected to us on %d\n", sn, priv->ip, conn->fd);
+  dvprintf("faimtest: getfile: %s (%s) connected to us on %d\n", priv->sn, priv->ip, conn->fd);
   return 1;
 }
 
@@ -1881,9 +1991,8 @@ int faimtest_getfile_listingreq(struct aim_session_t *sess, struct command_rx_st
   va_list ap;
   struct aim_conn_t *oftconn;
   struct aim_fileheader_t *fh;
-  int pos, bufpos, bufsize = 2048, i;
-  char buf[2048];
-
+  int pos, bufpos = 0, bufsize = 2048, i;
+  char *buf;
 
   va_start(ap, command);
   oftconn = va_arg(ap, struct aim_conn_t *);
@@ -1892,6 +2001,9 @@ int faimtest_getfile_listingreq(struct aim_session_t *sess, struct command_rx_st
 
   dvprintf("faimtest: sending listing of size %ld\n", fh->size);
 
+  if(!(buf = malloc(2048)))
+    return -1;
+
   for(pos = 0; pos < fh->size; pos++) {
     bufpos = pos % bufsize;
 
@@ -1920,10 +2032,11 @@ int faimtest_getfile_listingreq(struct aim_session_t *sess, struct command_rx_st
   }
 
   dprintf("faimtest: sent listing\n");
+  free(buf);
   return 0;
 }
 
-int faimtest_getfile_recieve(struct aim_session_t *sess, struct command_rx_struct *command, ...)
+int faimtest_getfile_receive(struct aim_session_t *sess, struct command_rx_struct *command, ...)
 {
   va_list ap;
   struct aim_conn_t *conn;
@@ -1940,17 +2053,31 @@ int faimtest_getfile_recieve(struct aim_session_t *sess, struct command_rx_struc
 
   for(pos = 0; pos < ft->fh.size; pos++) {
     read(conn->fd, &data, 1);
-    dvprintf("%c(%02x) ", data, data);
+    printf("%c(%02x) ", data, data);
   }
    
-  dprintf("\n");
+  printf("\n");
 
-  aim_oft_getfile_ack(sess, conn);
   aim_oft_getfile_end(sess, conn);
 
   return 0;
 }
-#endif
+
+int faimtest_getfile_state4(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);
+
+  aim_conn_close(conn);
+  aim_conn_kill(sess, &conn);
+  return 0;
+}
+
+
 int faimtest_parse_ratechange(struct aim_session_t *sess, struct command_rx_struct *command, ...)
 {
   static char *codes[5] = {"invalid",