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

diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c
index 8dac713..e650edf 100644
--- a/utils/faimtest/faimtest.c
+++ b/utils/faimtest/faimtest.c
@@ -65,6 +65,14 @@ int faimtest_chat_infoupdate(struct aim_session_t *sess, struct command_rx_struc
 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, ...)
 {
@@ -81,18 +89,11 @@ int main(void)
 {
   struct aim_session_t aimsess;
   struct aim_conn_t *authconn = NULL, *waitingconn = NULL;
-  int keepgoing = 1, stayconnected = 1;
+  int keepgoing = 1;
 
-#if 1
-  /* Use something like this for AIM */
-  struct client_info_s info = {"Boo", 2, 1, 0, "us", "en"};
-#else
-  /* or something exactly like this for ICQ and AIM */
-  struct client_info_s info = {"Random String (libfaim)", 4, 30, 3141, "us", "en"};
-#endif
-  int selstat = 0;
+  struct client_info_s info = {"FAIMtest (Hi guys!)", 4, 3, 3141, "us", "en", 0x0004, 0x0001, 0x00000055};
 
-  aim_session_init(&aimsess);
+  int selstat = 0;
 
   if ( !(screenname = getenv("SCREENNAME")) ||
        !(password = getenv("PASSWORD")))
@@ -103,11 +104,8 @@ 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) {
@@ -120,27 +118,28 @@ int main(void)
       fprintf(stderr, "faimtest: could not connect to authorizer\n");
     aim_conn_kill(&aimsess, &authconn);
     return -1;
-  } else {
+  }
 #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);
+  /* 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);
+  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 */
@@ -151,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:
@@ -168,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);
 }
@@ -226,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");
     }
@@ -558,7 +568,7 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str
 	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);
+	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);
@@ -570,6 +580,10 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str
       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);
@@ -667,6 +681,32 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str
       aim_chat_join(sess, command->conn, 0x0004, roominfo->name);
       break;
     }	
+    case AIM_CAPS_IMIMAGE: {
+      struct aim_directim_priv *priv;
+      struct aim_conn_t *newconn;
+
+      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;
+    }
     default:
       printf("faimtest: icbm: unknown reqclass (%d)\n", reqclass);
     } /* switch */
@@ -677,6 +717,105 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str
   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);
@@ -979,6 +1118,23 @@ int faimtest_parse_connerr(struct aim_session_t *sess, struct command_rx_struct
   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;
 }