X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/aa6efcfde1e9630866e98b4987bf2d9e6aba02fc..7392c79fff9e408331844fcfb9dc6e6533ebe3e4:/utils/faimtest/faimtest.c

diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c
index 5c0fba7..e650edf 100644
--- a/utils/faimtest/faimtest.c
+++ b/utils/faimtest/faimtest.c
@@ -64,6 +64,24 @@ int faimtest_chat_incomingmsg(struct aim_session_t *sess, struct command_rx_stru
 int faimtest_chat_infoupdate(struct aim_session_t *sess, struct command_rx_struct *command, ...);
 int faimtest_chat_leave(struct aim_session_t *sess, struct command_rx_struct *command, ...);
 int faimtest_chat_join(struct aim_session_t *sess, struct command_rx_struct *command, ...);
+int faimtest_parse_connerr(struct aim_session_t *sess, struct command_rx_struct *command, ...);
+int faimtest_debugconn_connect(struct aim_session_t *sess, struct command_rx_struct *command, ...);
+
+int faimtest_directim_request(struct aim_session_t *sess, struct command_rx_struct *command, ...);
+int faimtest_directim_initiate(struct aim_session_t *sess, struct command_rx_struct *command, ...);
+int faimtest_directim_connect(struct aim_session_t *sess, struct command_rx_struct *command, ...);
+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, ...);
+
+int faimtest_reportinterval(struct aim_session_t *sess, struct command_rx_struct *command, ...)
+{
+  if (command->data) {
+    printf("aim: minimum report interval: %d (seconds?)\n", aimutil_get16(command->data+10));
+  } else
+    printf("aim: NULL minimum report interval!\n");
+  return 1;
+}
 
 static char *screenname,*password,*server=NULL;
 
@@ -71,11 +89,11 @@ int main(void)
 {
   struct aim_session_t aimsess;
   struct aim_conn_t *authconn = NULL, *waitingconn = NULL;
-  int keepgoing = 1, stayconnected = 1;
-  struct client_info_s info = {"FAIMtest (Hi guys!)", 3, 5, 1670, "us", "en"};
-  int selstat = 0;
+  int keepgoing = 1;
 
-  aim_session_init(&aimsess);
+  struct client_info_s info = {"FAIMtest (Hi guys!)", 4, 3, 3141, "us", "en", 0x0004, 0x0001, 0x00000055};
+
+  int selstat = 0;
 
   if ( !(screenname = getenv("SCREENNAME")) ||
        !(password = getenv("PASSWORD")))
@@ -86,49 +104,42 @@ int main(void)
 
   server = getenv("AUTHSERVER");
 
-  /*
-   * (I used a goto-based loop here because n wanted quick proof
-   *  that reconnecting without restarting was actually possible...)
-   */
- enter:
+  aim_session_init(&aimsess);
+
   authconn = aim_newconn(&aimsess, AIM_CONN_TYPE_AUTH, server?server:FAIM_LOGIN_SERVER);
 
-  if (authconn == NULL)
-    {
-      fprintf(stderr, "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)
-	fprintf(stderr, "faimtest: could not resolve authorizer name\n");
-      else if (authconn->status & AIM_CONN_STATUS_CONNERR)
-	fprintf(stderr, "faimtest: could not connect to authorizer\n");
-      return -1;
-    }
-  else
-    {
+  if (authconn == NULL) {
+    fprintf(stderr, "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)
+      fprintf(stderr, "faimtest: could not resolve authorizer name\n");
+    else if (authconn->status & AIM_CONN_STATUS_CONNERR)
+      fprintf(stderr, "faimtest: could not connect to authorizer\n");
+    aim_conn_kill(&aimsess, &authconn);
+    return -1;
+  }
 #ifdef SNACLOGIN
-      /* new login code -- not default -- pending new password encryption algo */
-      aim_conn_addhandler(&aimsess, authconn, 0x0017, 0x0007, faimtest_parse_login, 0);
-      aim_conn_addhandler(&aimsess, authconn, 0x0017, 0x0003, faimtest_parse_authresp, 0);
-
-      aim_sendconnack(&aimsess, authconn);
-      aim_request_login(&aimsess, authconn, FAIMTEST_SCREENNAME);
+  /* new login code -- not default -- pending new password encryption algo */
+  aim_conn_addhandler(&aimsess, authconn, 0x0017, 0x0007, faimtest_parse_login, 0);
+  aim_conn_addhandler(&aimsess, authconn, 0x0017, 0x0003, faimtest_parse_authresp, 0);
+    
+  aim_sendconnack(&aimsess, authconn);
+  aim_request_login(&aimsess, authconn, FAIMTEST_SCREENNAME);
 #else
-      aim_conn_addhandler(&aimsess, authconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_AUTHSUCCESS, faimtest_parse_authresp, 0);
-      aim_conn_addhandler(&aimsess, authconn, AIM_CB_FAM_GEN, AIM_CB_GEN_SERVERREADY, faimtest_authsvrready, 0);
-      aim_send_login(&aimsess, authconn, screenname, password, &info);
- 
+  aim_conn_addhandler(&aimsess, authconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_AUTHSUCCESS, faimtest_parse_authresp, 0);
+  aim_conn_addhandler(&aimsess, authconn, AIM_CB_FAM_GEN, AIM_CB_GEN_SERVERREADY, faimtest_authsvrready, 0);
+  aim_send_login(&aimsess, authconn, screenname, password, &info);
 #endif
-    }
+  aim_conn_addhandler(&aimsess, authconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_DEBUGCONN_CONNECT, faimtest_debugconn_connect, 0);
+  printf("faimtest: login sent\n");
 
   while (keepgoing) {
     waitingconn = aim_select(&aimsess, NULL, &selstat);
 
     switch(selstat) {
     case -1: /* error */
-      keepgoing = 0;
+      keepgoing = 0; /* fall through and hit the aim_logoff() */
       break;
 
     case 0: /* no events pending */
@@ -139,10 +150,21 @@ int main(void)
       break;
 
     case 2: /* incoming data pending */
-      if (aim_get_command(&aimsess, waitingconn) < 0) {
-	  printf("\afaimtest: connection error!\n");
-      } else
-	aim_rxdispatch(&aimsess);
+      if (waitingconn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT) {
+	if (aim_handlerendconnect(&aimsess, waitingconn) < 0) {
+	  printf("connection error (rend)\n");
+	}
+      } else {
+	if (aim_get_command(&aimsess, waitingconn) >= 0) {
+	  aim_rxdispatch(&aimsess);
+	} else {
+	  printf("connection error\n");
+	  if (!aim_getconn_type(&aimsess, AIM_CONN_TYPE_BOS)) {
+	    printf("major connetion error\n");
+	    keepgoing = 0;
+	  }
+	}
+      }
       break;
       
     default:
@@ -156,12 +178,6 @@ int main(void)
   /* close up all connections, dead or no */
   aim_logoff(&aimsess); 
 
-  if (stayconnected) {
-      printf("\nTrying to reconnect in 2 seconds...\n");
-      sleep(2);
-      goto enter;
-    }
-
   /* Get out */
   exit(0);
 }
@@ -214,6 +230,12 @@ int faimtest_serverready(struct aim_session_t *sess, struct command_rx_struct *c
       aim_bos_ackrateresp(sess, command->conn);
       aim_chat_clientready(sess, command->conn);
       break;
+
+    case AIM_CONN_TYPE_RENDEZVOUS: /* this is an overloaded function?? - mid */
+      aim_conn_addhandler(sess, command->conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINCOMING, faimtest_directim_incoming, 0);
+      aim_conn_addhandler(sess, command->conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMDISCONNECT, faimtest_directim_disconnect, 0);
+      break;
+
     default:
       fprintf(stderr, "faimtest: unknown connection type on Server Ready\n");
     }
@@ -263,7 +285,7 @@ int faimtest_handleredirect(struct aim_session_t *sess, struct command_rx_struct
 
       /* send the buddy list and profile (required, even if empty) */
       aim_bos_setbuddylist(sess, command->conn, buddies);
-      aim_bos_setprofile(sess, command->conn, profile, NULL, AIM_CAPS_CHAT);
+      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);
 
       /* send final login command (required) */
       aim_bos_clientready(sess, command->conn); /* tell BOS we're ready to go live */
@@ -289,11 +311,11 @@ int faimtest_handleredirect(struct aim_session_t *sess, struct command_rx_struct
       {
 	struct aim_conn_t *tstconn = NULL;
 	tstconn = aim_newconn(sess, AIM_CONN_TYPE_CHATNAV, ip);
-	if ( (tstconn==NULL) || (tstconn->status >= AIM_CONN_STATUS_RESOLVERR))
-	  {
-	    fprintf(stderr, "faimtest: unable to connect to chatnav server\n");
-	    return 1;
-	  }
+	if ( (tstconn==NULL) || (tstconn->status >= AIM_CONN_STATUS_RESOLVERR)) {
+	  fprintf(stderr, "faimtest: unable to connect to chatnav server\n");
+	  if (tstconn) aim_conn_kill(sess, &tstconn);
+	  return 1;
+	}
 #if 0
 	aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_CTN, AIM_CB_SPECIAL_DEFAULT, aim_parse_unknown, 0);
 	aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_GEN, AIM_CB_SPECIAL_DEFAULT, aim_parse_unknown, 0);
@@ -314,6 +336,7 @@ int faimtest_handleredirect(struct aim_session_t *sess, struct command_rx_struct
 	if ( (tstconn==NULL) || (tstconn->status >= AIM_CONN_STATUS_RESOLVERR))
 	  {
 	    fprintf(stderr, "faimtest: unable to connect to chat server\n");
+	    if (tstconn) aim_conn_kill(sess, &tstconn);
 	    return 1;
 	  }		
 	printf("faimtest: chat: connected\n");
@@ -351,7 +374,7 @@ int faimtest_parse_authresp(struct aim_session_t *sess, struct command_rx_struct
     {
       printf("Login Error Code 0x%04x\n", sess->logininfo.errorcode);
       printf("Error URL: %s\n", sess->logininfo.errorurl);
-      aim_conn_close(command->conn);
+      aim_conn_kill(sess, &command->conn);
       exit(0); /* XXX: should return in order to let the above things get free()'d. */
     }
 
@@ -360,37 +383,36 @@ int faimtest_parse_authresp(struct aim_session_t *sess, struct command_rx_struct
   printf("BOS IP: %s\n", sess->logininfo.BOSIP);
 
   printf("Closing auth connection...\n");
-  aim_conn_close(command->conn);
+  aim_conn_kill(sess, &command->conn);
   bosconn = aim_newconn(sess, AIM_CONN_TYPE_BOS, sess->logininfo.BOSIP);
-  if (bosconn == NULL)
-    {
-      fprintf(stderr, "faimtest: could not connect to BOS: internal error\n");
-    }
-  else if (bosconn->status != 0)
-    {
-      fprintf(stderr, "faimtest: could not connect to BOS\n");
-    }
-  else
-    {
-      aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_ACK, AIM_CB_ACK_ACK, NULL, 0);
-      aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_SERVERREADY, faimtest_serverready, 0);
-      aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_RATEINFO, NULL, 0);
-      aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_REDIRECT, faimtest_handleredirect, 0);
-      aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_STS, AIM_CB_STS_SETREPORTINTERVAL, NULL, 0);
-      aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_ONCOMING, faimtest_parse_oncoming, 0);
-      aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_OFFGOING, faimtest_parse_offgoing, 0);
-      aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_INCOMING, faimtest_parse_incoming_im, 0);
-      aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_ERROR, faimtest_parse_misses, 0);
-      aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_MISSEDCALL, faimtest_parse_misses, 0);
-      aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_RATECHANGE, faimtest_parse_misses, 0);
-      aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_ERROR, faimtest_parse_misses, 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_CTN, AIM_CB_CTN_DEFAULT, aim_parse_unknown, 0);
-      aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_DEFAULT, aim_parse_unknown, 0);
-      aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_MOTD, faimtest_parse_motd, 0);
-      aim_auth_sendcookie(sess, bosconn, sess->logininfo.cookie);
-    }
+  if (bosconn == NULL) {
+    fprintf(stderr, "faimtest: could not connect to BOS: internal error\n");
+  } else if (bosconn->status != 0) {	
+    fprintf(stderr, "faimtest: could not connect to BOS\n");
+    aim_conn_kill(sess, &bosconn);
+  } else {
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_ACK, AIM_CB_ACK_ACK, NULL, 0);
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_SERVERREADY, faimtest_serverready, 0);
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_RATEINFO, NULL, 0);
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_REDIRECT, faimtest_handleredirect, 0);
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_STS, AIM_CB_STS_SETREPORTINTERVAL, faimtest_reportinterval, 0);
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_ONCOMING, faimtest_parse_oncoming, 0);
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_OFFGOING, faimtest_parse_offgoing, 0);
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_INCOMING, faimtest_parse_incoming_im, 0);
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_ERROR, faimtest_parse_misses, 0);
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_MISSEDCALL, faimtest_parse_misses, 0);
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_RATECHANGE, faimtest_parse_misses, 0);
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_ERROR, faimtest_parse_misses, 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_CTN, AIM_CB_CTN_DEFAULT, aim_parse_unknown, 0);
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_DEFAULT, aim_parse_unknown, 0);
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_MOTD, faimtest_parse_motd, 0);
+    
+    aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNERR, faimtest_parse_connerr, 0);
+    
+    aim_auth_sendcookie(sess, bosconn, sess->logininfo.cookie);
+  }
   return 1;
 }
 
@@ -399,12 +421,14 @@ int faimtest_parse_userinfo(struct aim_session_t *sess, struct command_rx_struct
   struct aim_userinfo_s *userinfo;
   char *prof_encoding = NULL;
   char *prof = NULL;
+  unsigned short inforeq = 0;
 
   va_list ap;
   va_start(ap, command);
   userinfo = va_arg(ap, struct aim_userinfo_s *);
   prof_encoding = va_arg(ap, char *);
   prof = va_arg(ap, char *);
+  inforeq = va_arg(ap, unsigned short);
   va_end(ap);
   
   printf("faimtest: userinfo: sn: %s\n", userinfo->sn);
@@ -433,14 +457,22 @@ int faimtest_parse_userinfo(struct aim_session_t *sess, struct command_rx_struct
     printf("UNKNOWN_BIT4 ");
   if (userinfo->class & 0x0010)
     printf("FREE ");
+  if (userinfo->class & 0x0040)
+    printf("ICQ? ");
   printf("\n");
   
   printf("faimtest: userinfo: membersince: %lu\n", userinfo->membersince);
   printf("faimtest: userinfo: onlinesince: %lu\n", userinfo->onlinesince);
   printf("faimtest: userinfo: idletime: 0x%04x\n", userinfo->idletime);
   
-  printf("faimtest: userinfo: profile_encoding: %s\n", prof_encoding ? prof_encoding : "[none]");
-  printf("faimtest: userinfo: prof: %s\n", prof ? prof : "[none]");
+  if (inforeq == AIM_GETINFO_GENERALINFO) {
+    printf("faimtest: userinfo: profile_encoding: %s\n", prof_encoding ? prof_encoding : "[none]");
+    printf("faimtest: userinfo: prof: %s\n", prof ? prof : "[none]");
+  } else if (inforeq == AIM_GETINFO_AWAYMESSAGE) {
+    printf("faimtest: userinfo: awaymsg_encoding: %s\n", prof_encoding ? prof_encoding : "[none]");
+    printf("faimtest: userinfo: awaymsg: %s\n", prof ? prof : "[none]");
+  } else 
+    printf("faimtest: userinfo: unknown info request\n");
   
   return 1;
 }
@@ -471,24 +503,125 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str
   /*
    * Channel 1: Standard Message
    */
-  if (channel == 1)
-    {
-      struct aim_userinfo_s *userinfo;
-      char *msg = NULL;
-      u_int icbmflags = 0;
-      char *tmpstr = NULL;
-      u_short flag1, flag2;
-  
+  if (channel == 1) {
+    struct aim_userinfo_s *userinfo;
+    char *msg = NULL;
+    u_int icbmflags = 0;
+    char *tmpstr = NULL;
+    u_short flag1, flag2;
+    
+    userinfo = va_arg(ap, struct aim_userinfo_s *);
+    msg = va_arg(ap, char *);
+    icbmflags = va_arg(ap, u_int);
+    flag1 = va_arg(ap, u_short);
+    flag2 = va_arg(ap, u_short);
+    va_end(ap);
+    
+    printf("faimtest: icbm: sn = \"%s\"\n", userinfo->sn);
+    printf("faimtest: icbm: warnlevel = 0x%04x\n", userinfo->warnlevel);
+    printf("faimtest: icbm: class = 0x%04x ", userinfo->class);
+    if (userinfo->class & 0x0010)
+      printf("(FREE) ");
+    if (userinfo->class & 0x0001)
+      printf("(TRIAL) ");
+    if (userinfo->class & 0x0004)
+      printf("(AOL) ");
+    printf("\n");
+    printf("faimtest: icbm: membersince = %lu\n", userinfo->membersince);
+    printf("faimtest: icbm: onlinesince = %lu\n", userinfo->onlinesince);
+    printf("faimtest: icbm: idletime = 0x%04x\n", userinfo->idletime);
+    printf("faimtest: icbm: capabilities = 0x%04x\n", userinfo->capabilities);
+    
+    printf("faimtest: icbm: icbmflags = ");
+    if (icbmflags & AIM_IMFLAGS_AWAY)
+      printf("away ");
+    if (icbmflags & AIM_IMFLAGS_ACK)
+      printf("ackrequest ");
+    printf("\n");
+    
+    printf("faimtest: icbm: encoding flags = {%04x, %04x}\n", flag1, flag2);
+    
+    printf("faimtest: icbm: message: %s\n", msg);
+    
+    if (msg) {
+      int i = 0;
+
+      while (msg[i] == '<') {
+	if (msg[i] == '<') {
+	  while (msg[i] != '>')
+	    i++;
+	  i++;
+	}
+      }
+      tmpstr = msg+i;
+
+      printf("tmpstr = %s\n", tmpstr);
+      
+      if ( (strlen(tmpstr) >= 10) &&
+	   (!strncmp(tmpstr, "disconnect", 10)) ) {
+	  aim_send_im(sess, command->conn, "midendian", 0, "ta ta...");
+	  aim_logoff(sess);
+      } else if (strstr(tmpstr, "goodday")) {
+	printf("faimtest: icbm: sending response\n");
+	aim_send_im(sess, command->conn, userinfo->sn, 0, "Good day to you too.");
+      } else if (!strncmp(tmpstr, "open chatnav", 12)) {
+	aim_bos_reqservice(sess, command->conn, AIM_CONN_TYPE_CHATNAV);
+	//aim_chat_join(sess, command->conn, "thishereisaname2_chat85");
+      } 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);
+	//aim_conn_addhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINITIATE, faimtest_directim_initiate, 0);
+      } 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 {
+	printf("unknown command.\n");
+	aim_add_buddy(sess, command->conn, userinfo->sn);
+      }
+      
+    }
+  }
+  /*
+   * Channel 2: Rendevous Request
+   */
+  else if (channel == 2) {
+    struct aim_userinfo_s *userinfo;
+    unsigned short reqclass;
+    
+    reqclass = va_arg(ap, unsigned short);
+    switch (reqclass) {
+    case AIM_CAPS_VOICE: {
       userinfo = va_arg(ap, struct aim_userinfo_s *);
-      msg = va_arg(ap, char *);
-      icbmflags = va_arg(ap, u_int);
-      flag1 = va_arg(ap, u_short);
-      flag2 = va_arg(ap, u_short);
       va_end(ap);
       
-      printf("faimtest: icbm: sn = \"%s\"\n", userinfo->sn);
-      printf("faimtest: icbm: warnlevel = 0x%04x\n", userinfo->warnlevel);
-      printf("faimtest: icbm: class = 0x%04x ", userinfo->class);
+      printf("faimtest: voice invitation: source sn = %s\n", userinfo->sn);
+      printf("faimtest: voice invitation: \twarnlevel = 0x%04x\n", userinfo->warnlevel);
+      printf("faimtest: voice invitation: \tclass = 0x%04x ", userinfo->class);
       if (userinfo->class & 0x0010)
 	printf("(FREE) ");
       if (userinfo->class & 0x0001)
@@ -496,149 +629,193 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str
       if (userinfo->class & 0x0004)
 	printf("(AOL) ");
       printf("\n");
-      printf("faimtest: icbm: membersince = %lu\n", userinfo->membersince);
-      printf("faimtest: icbm: onlinesince = %lu\n", userinfo->onlinesince);
-      printf("faimtest: icbm: idletime = 0x%04x\n", userinfo->idletime);
+      /* we dont get membersince on chat invites! */
+      printf("faimtest: voice invitation: \tonlinesince = %lu\n", userinfo->onlinesince);
+      printf("faimtest: voice invitation: \tidletime = 0x%04x\n", userinfo->idletime);
       
-      printf("faimtest: icbm: icbmflags = ");
-      if (icbmflags & AIM_IMFLAGS_AWAY)
-	printf("away ");
-      if (icbmflags & AIM_IMFLAGS_ACK)
-	printf("ackrequest ");
-      printf("\n");
+      break;
+    }
+    case AIM_CAPS_GETFILE: {
+      printf("faimtset: get file!\n");
+      break;
+    }
+    case AIM_CAPS_SENDFILE: {
+      printf("faimtest: send file!\n");
+      break;
+    }
+    case AIM_CAPS_CHAT: {
+      char *msg,*encoding,*lang;
+      struct aim_chat_roominfo *roominfo;
       
-      printf("faimtest: icbm: encoding flags = {%04x, %04x}\n", flag1, flag2);
+      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);
       
-      printf("faimtest: icbm: message: %s\n", msg);
+      printf("faimtest: chat invitation: source sn = %s\n", userinfo->sn);
+      printf("faimtest: chat invitation: \twarnlevel = 0x%04x\n", userinfo->warnlevel);
+      printf("faimtest: chat invitation: \tclass = 0x%04x ", userinfo->class);
+      if (userinfo->class & 0x0010)
+	printf("(FREE) ");
+      if (userinfo->class & 0x0001)
+	printf("(TRIAL) ");
+      if (userinfo->class & 0x0004)
+	printf("(AOL) ");
+      printf("\n");
+      /* we dont get membersince on chat invites! */
+      printf("faimtest: chat invitation: \tonlinesince = %lu\n", userinfo->onlinesince);
+      printf("faimtest: chat invitation: \tidletime = 0x%04x\n", userinfo->idletime);
       
-      if (msg)
-	{
-	  tmpstr = index(msg, '>');
-	  if (tmpstr != NULL)
-	    tmpstr+=1;
-	  else
-	    tmpstr = msg;
-	  
-	  if ( (strlen(tmpstr) >= 10) &&
-	       (!strncmp(tmpstr, "disconnect", 10)) )
-	    {
-	      aim_send_im(sess, command->conn, "midendian", 0, "ta ta...");
-	      aim_logoff(sess);
-	    }
-	  else if (strstr(tmpstr, "goodday"))
-	    {
-	      printf("faimtest: icbm: sending response\n");
-	      aim_send_im(sess, command->conn, userinfo->sn, 0, "Good day to you too.");
-	    }
-	  else if (!strncmp(tmpstr, "open chatnav", 12))
-	    {
-	      aim_bos_reqservice(sess, command->conn, AIM_CONN_TYPE_CHATNAV);
-	      //aim_chat_join(sess, command->conn, "thishereisaname2_chat85");
-	    }
-	  else if (!strncmp(tmpstr, "create", 6))
-	    {
-	      aim_chatnav_createroom(sess, aim_getconn_type(sess, AIM_CONN_TYPE_CHATNAV), "WorldDomination", 0x0004);
-	    }
-	  else if (!strncmp(tmpstr, "close chatnav", 13))
-	    aim_conn_close(aim_getconn_type(sess, AIM_CONN_TYPE_CHATNAV));
-	  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, "midendian", AIM_GETINFO_GENERALINFO);
-	    aim_getinfo(sess, command->conn, "midendian", AIM_GETINFO_AWAYMESSAGE);
-	  } else 
-	    {
-#if 0
-	      printf("faimtest: icbm:  starting chat...\n");
-	      aim_bos_reqservice(sess, command->conn, AIM_CONN_TYPE_CHATNAV);
-#else
-	      aim_bos_setidle(sess, command->conn, 0x0ffffffe);
-#endif
-	    }
-	  
-	}
-    }
-  /*
-   * Channel 2: Rendevous Request
-   */
-  else if (channel == 2)
-    {
-      struct aim_userinfo_s *userinfo;
-      int rendtype = 0;
+      printf("faimtest: chat invitation: message = %s\n", msg);
+      printf("faimtest: chat invitation: room name = %s\n", roominfo->name);
+      printf("faimtest: chat invitation: encoding = %s\n", encoding);
+      printf("faimtest: chat invitation: language = %s\n", lang);
+      printf("faimtest: chat invitation: exchange = 0x%04x\n", roominfo->exchange);
+      printf("faimtest: chat invitation: instance = 0x%04x\n", roominfo->instance);
+      printf("faimtest: chat invitiation: autojoining %s...\n", roominfo->name);
+      /*
+       * Automatically join room...
+       */ 
+      aim_chat_join(sess, command->conn, 0x0004, roominfo->name);
+      break;
+    }	
+    case AIM_CAPS_IMIMAGE: {
+      struct aim_directim_priv *priv;
+      struct aim_conn_t *newconn;
 
-      rendtype = va_arg(ap, int);
-      if (rendtype == 0)
-	{
-	  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);
-	  
-	  printf("faimtest: chat invitation: source sn = %s\n", userinfo->sn);
-	  printf("faimtest: chat invitation: \twarnlevel = 0x%04x\n", userinfo->warnlevel);
-	  printf("faimtest: chat invitation: \tclass = 0x%04x ", userinfo->class);
-	  if (userinfo->class & 0x0010)
-	    printf("(FREE) ");
-	  if (userinfo->class & 0x0001)
-	    printf("(TRIAL) ");
-	  if (userinfo->class & 0x0004)
-	    printf("(AOL) ");
-	  printf("\n");
-	  /* we dont get membersince on chat invites! */
-	  printf("faimtest: chat invitation: \tonlinesince = %lu\n", userinfo->onlinesince);
-	  printf("faimtest: chat invitation: \tidletime = 0x%04x\n", userinfo->idletime);
-	  
-	  printf("faimtest: chat invitation: message = %s\n", msg);
-	  printf("faimtest: chat invitation: room name = %s\n", roominfo->name);
-	  printf("faimtest: chat invitation: encoding = %s\n", encoding);
-	  printf("faimtest: chat invitation: language = %s\n", lang);
-	  printf("faimtest: chat invitation: exchange = 0x%04x\n", roominfo->exchange);
-	  printf("faimtest: chat invitation: instance = 0x%04x\n", roominfo->instance);
-	  printf("faimtest: chat invitiation: autojoining %s...\n", roominfo->name);
-	  /*
-	   * Automatically join room...
-	   */ 
-	  aim_chat_join(sess, command->conn, 0x0004, roominfo->name);
-	}	
-      else if (rendtype == 1)
-	{
-	  userinfo = va_arg(ap, struct aim_userinfo_s *);
-	  va_end(ap);
-	  
-	  printf("faimtest: voice invitation: source sn = %s\n", userinfo->sn);
-	  printf("faimtest: voice invitation: \twarnlevel = 0x%04x\n", userinfo->warnlevel);
-	  printf("faimtest: voice invitation: \tclass = 0x%04x ", userinfo->class);
-	  if (userinfo->class & 0x0010)
-	    printf("(FREE) ");
-	  if (userinfo->class & 0x0001)
-	    printf("(TRIAL) ");
-	  if (userinfo->class & 0x0004)
-	    printf("(AOL) ");
-	  printf("\n");
-	  /* we dont get membersince on chat invites! */
-	  printf("faimtest: voice invitation: \tonlinesince = %lu\n", userinfo->onlinesince);
-	  printf("faimtest: voice invitation: \tidletime = 0x%04x\n", userinfo->idletime);
-	  
-	}
-      else
-	printf("faimtest: icbm: unknown rendtype (%d)\n", rendtype);
+      printf("faimtest: icbm: rendezvous imimage\n");
+     
+      userinfo = va_arg(ap, struct aim_userinfo_s *);
+      priv = va_arg(ap, struct aim_directim_priv *);
+      va_end(ap);
+
+      printf("faimtest: OFT: DirectIM: request from %s (%s)\n", userinfo->sn, priv->ip);
+      
+      if (!(newconn = aim_directim_connect(sess, command->conn, priv))) {
+	printf("faimtest: icbm: imimage: could not connect\n");
+	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);
+
+      aim_send_im_direct(sess, newconn, "goodday");
+
+      printf("faimtest: OFT: DirectIM: connected to %s\n", userinfo->sn);
+
+      break;
     }
-  else
+    default:
+      printf("faimtest: icbm: unknown reqclass (%d)\n", reqclass);
+    } /* switch */
+  } else
     printf("faimtest does not support channels > 2 (chan = %02x)\n", channel);
   printf("faimtest: icbm: done with ICBM handling\n");
 
   return 1;
 }
 
+#if 0
+int faimtest_directim_initiate(struct aim_session_t *sess, struct command_rx_struct *command, ...)
+{
+  va_list ap;
+  struct aim_directim_priv *priv;
+  struct aim_conn_t *newconn;
+
+  ap = va_start(ap, command);
+  newconn = va_arg(ap, struct aim_conn_t *);
+  va_end(ap);
+
+  priv = (struct aim_directim_priv *)newconn->priv;
+
+  printf("faimtest: OFT: DirectIM: intitiate success to %s\n", priv->ip);
+  
+  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);
+
+  aim_send_im_direct(sess, newconn, "goodday");
+
+  printf("faimtest: OFT: DirectIM: connected to %s\n", priv->sn);
+
+  return 1;
+}
+#endif
+
+int faimtest_directim_connect(struct aim_session_t *sess, struct command_rx_struct *command, ...)
+{
+  va_list ap;
+  struct aim_directim_priv *priv;
+  
+  ap = va_start(ap, command);
+  priv = va_arg(ap, struct aim_directim_priv *);
+
+  va_end(ap);
+  
+  printf("faimtest: directim_connect\n");
+
+  return 1;
+}
+
+int faimtest_directim_incoming(struct aim_session_t *sess, struct command_rx_struct *command, ...)
+{
+  va_list ap;
+  char *sn = NULL, *msg = NULL;
+  struct aim_conn_t *conn;
+
+  ap = 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);
+
+  printf("faimtest: Directim from %s: %s\n", sn, msg);
+  if (!strncmp(msg, "sendmsg", 7)) {
+    int i;
+    i = atoi(msg+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_direct(sess, conn, newbuf);
+      free(newbuf);
+    }
+  } else if (!strncmp(msg, "goodday", 7)) {
+    aim_send_im_direct(sess, conn, "Good day to you, too");
+  } else {
+    char newmsg[1024];
+    snprintf(newmsg, sizeof(newmsg), "unknown (%s)\n", msg);
+    aim_send_im_direct(sess, conn, newmsg);
+  }
+  return 1;
+}
+
+int faimtest_directim_disconnect(struct aim_session_t *sess, struct command_rx_struct *command, ...)
+{
+  printf("faimtest: directim_disconnect\n");
+  return 1;
+}
+
+int faimtest_directim_typing(struct aim_session_t *sess, struct command_rx_struct *command, ...)
+{
+  va_list ap;
+  char *sn;
+  
+  ap = va_start(ap, command);
+  sn = va_arg(ap, char *);
+  va_end(ap);
+
+  printf("faimtest: ohmigod! %s has started typing (DirectIM). He's going to send you a message! *squeal*\n", sn);
+  return 1;
+}
+
 int faimtest_authsvrready(struct aim_session_t *sess, struct command_rx_struct *command, ...)
 {
   printf("faimtest_authsvrready: called (contype: %d)\n", command->conn->type);
@@ -674,7 +851,8 @@ int faimtest_parse_oncoming(struct aim_session_t *sess, struct command_rx_struct
   userinfo = va_arg(ap, struct aim_userinfo_s *);
   va_end(ap);
 
-  printf("\n%s is now online (class: %04x = %s%s%s%s%s%s%s%s)\n", userinfo->sn, userinfo->class,
+  printf("\n%s is now online (class: %04x = %s%s%s%s%s%s%s%s) (caps = 0x%04x)\n",
+	 userinfo->sn, userinfo->class,
 	 (userinfo->class&AIM_CLASS_TRIAL)?" TRIAL":"",
 	 (userinfo->class&AIM_CLASS_UNKNOWN2)?" UNKNOWN2":"",
 	 (userinfo->class&AIM_CLASS_AOL)?" AOL":"",
@@ -682,8 +860,8 @@ int faimtest_parse_oncoming(struct aim_session_t *sess, struct command_rx_struct
 	 (userinfo->class&AIM_CLASS_FREE)?" FREE":"",
 	 (userinfo->class&AIM_CLASS_AWAY)?" AWAY":"",
 	 (userinfo->class&AIM_CLASS_UNKNOWN40)?" UNKNOWN40":"",
-	 (userinfo->class&AIM_CLASS_UNKNOWN80)?" UNKNOWN80":"");
-
+	 (userinfo->class&AIM_CLASS_UNKNOWN80)?" UNKNOWN80":"",
+	 userinfo->capabilities);
   return 1;
 }
 
@@ -927,3 +1105,36 @@ int faimtest_chatnav_info(struct aim_session_t *sess, struct command_rx_struct *
     }
   return 1;
 }
+
+int faimtest_parse_connerr(struct aim_session_t *sess, struct command_rx_struct *command, ...)
+{
+  va_list ap;
+  unsigned short code;
+  char *msg = NULL;
+
+  ap = va_start(ap, command);
+  code = va_arg(ap, unsigned short);
+  msg = va_arg(ap, char *);
+  va_end(ap);
+
+  printf("faimtest: connerr: Code 0x%04x: %s\n", code, msg);
+  aim_conn_kill(sess, &command->conn); /* this will break the main loop */
+
+  return 1;
+}
+
+int faimtest_debugconn_connect(struct aim_session_t *sess, struct command_rx_struct *command, ...)
+{	
+  printf("faimtest: connecting to an aimdebugd!\n");
+
+  /* convert the authorizer connection to a BOS connection */
+  command->conn->type = AIM_CONN_TYPE_BOS;
+
+  aim_conn_addhandler(sess, command->conn, AIM_CB_FAM_MSG, AIM_CB_MSG_INCOMING, faimtest_parse_incoming_im, 0);
+
+  /* tell the aimddebugd we're ready */
+  aim_debugconn_sendconnect(sess, command->conn); 
+
+  /* go right into main loop (don't open a BOS connection, etc) */
+  return 1;
+}