- Fri Jun 2 15:57:27 UTC 2000

[libfaim.git] / utils / faimtest / faimtest.c

diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c
index fc400f504596fe21d6cd5576f920388d65b4c3a0..5c0fba7e60b9929fa2f8aa7d0b24fa90d63fda03 100644 (file)
--- a/utils/faimtest/faimtest.c
+++ b/utils/faimtest/faimtest.c
@@ -65,12 +65,12 @@ 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, ...);
 
-static char *screenname,*password;
+static char *screenname,*password,*server=NULL;
 
 int main(void)
 {
   struct aim_session_t aimsess;
-  struct aim_conn_t *authconn = NULL;
+  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;
@@ -84,12 +84,14 @@ int main(void)
       return -1;
     }
 
+  server = getenv("AUTHSERVER");
+
   /*
    * (I used a goto-based loop here because n wanted quick proof
    *  that reconnecting without restarting was actually possible...)
    */
  enter:
-  authconn = aim_newconn(&aimsess, AIM_CONN_TYPE_AUTH, FAIM_LOGIN_SERVER);
+  authconn = aim_newconn(&aimsess, AIM_CONN_TYPE_AUTH, server?server:FAIM_LOGIN_SERVER);
 
   if (authconn == NULL)
     {
@@ -122,7 +124,7 @@ int main(void)
     }
 
   while (keepgoing) {
-    aim_select(&aimsess, NULL, &selstat);
+    waitingconn = aim_select(&aimsess, NULL, &selstat);
 
     switch(selstat) {
     case -1: /* error */
@@ -137,7 +139,7 @@ int main(void)
       break;
 
     case 2: /* incoming data pending */
-      if (aim_get_command(&aimsess) < 0) {
+      if (aim_get_command(&aimsess, waitingconn) < 0) {
          printf("\afaimtest: connection error!\n");
       } else
        aim_rxdispatch(&aimsess);
@@ -261,7 +263,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_bos_setprofile(sess, command->conn, profile, NULL, AIM_CAPS_CHAT);
 
       /* send final login command (required) */
       aim_bos_clientready(sess, command->conn); /* tell BOS we're ready to go live */
@@ -545,7 +547,10 @@ int faimtest_parse_incoming_im(struct aim_session_t *sess, struct command_rx_str
            }
          else if (!strncmp(tmpstr, "leave", 5))
            aim_chat_leaveroom(sess, "worlddomination");
-         else 
+         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");
@@ -814,6 +819,8 @@ int faimtest_chat_infoupdate(struct aim_session_t *sess, struct command_rx_struc
   char *roomname;
   int usercount,i;
   char *roomdesc;
+  unsigned short unknown_c9, unknown_d2, unknown_d5, maxmsglen;
+  unsigned long creationtime;
 
   va_start(ap, command);
   roominfo = va_arg(ap, struct aim_chat_roominfo *);
@@ -821,6 +828,11 @@ int faimtest_chat_infoupdate(struct aim_session_t *sess, struct command_rx_struc
   usercount= va_arg(ap, int);
   userinfo = va_arg(ap, struct aim_userinfo_s *);
   roomdesc = va_arg(ap, char *);
+  unknown_c9 = va_arg(ap, unsigned short);
+  creationtime = va_arg(ap, unsigned long);
+  maxmsglen = va_arg(ap, unsigned short);
+  unknown_d2 = va_arg(ap, unsigned short);
+  unknown_d5 = va_arg(ap, unsigned short);
   va_end(ap);
 
   printf("faimtest: chat: %s:  info update:\n", (char *)command->conn->priv);
@@ -837,6 +849,12 @@ int faimtest_chat_infoupdate(struct aim_session_t *sess, struct command_rx_struc
   while (i < usercount)
     printf("faimtest: chat: %s:  \t\t%s\n", (char *)command->conn->priv, userinfo[i++].sn);
 
+  printf("faimtest: chat: %s:  \tUnknown_c9: 0x%04x\n", (char *)command->conn->priv, unknown_c9);
+  printf("faimtest: chat: %s:  \tCreation time: %lu (time_t)\n", (char *)command->conn->priv, creationtime);
+  printf("faimtest: chat: %s:  \tMax message length: %d bytes\n", (char *)command->conn->priv, maxmsglen);
+  printf("faimtest: chat: %s:  \tUnknown_d2: 0x%04x\n", (char *)command->conn->priv, unknown_d2);
+  printf("faimtest: chat: %s:  \tUnknown_d5: 0x%02x\n", (char *)command->conn->priv, unknown_d5);
+
   return 1;
 }