From: mid <mid>
Date: Sat, 26 May 2001 08:58:32 +0000 (+0000)
Subject:  - Sat May 26 01:37:39 PDT 2001
X-Git-Tag: rel_0_99_2~40
X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/commitdiff_plain/7b91722d789da202fff87325dfb136c5bacd0846

 - Sat May 26 01:37:39 PDT 2001
  - So this is my big merge with the ActiveBuddy version...
    - Remove use of tlvchains from IM parsing for better performance
    - Add in buddy icon support
    - Add support for sending UNICODE messages.
  - Split up the more complicated options to aim_send_im into a structure
      that is passed to aim_send_im_ext().  This makes it easier to send
      simple messages, and only slightly harder to send complex ones.
     - aim_send_im_ext() must be used if you're using buddy icons and/or you
         are sending UNICODE messages.
  - UNICODE is fully explained in commentary above aim_send_im_ext() in im.c.
  - The ISO-8859-1 option is also added.  Use when necessary, to avoid making
      WinAIM barf.
  - This removes the msglen parameter to aim_send_im because that was only
      needed to do UNICODE, which can now only be done by aim_send_im_ext.
---

diff --git a/CHANGES b/CHANGES
index 8392901..322f083 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,22 @@
 
 No release numbers
 ------------------
+ - Sat May 26 01:37:39 PDT 2001
+  - So this is my big merge with the ActiveBuddy version...
+    - Remove use of tlvchains from IM parsing for better performance
+    - Add in buddy icon support
+    - Add support for sending UNICODE messages.
+  - Split up the more complicated options to aim_send_im into a structure
+      that is passed to aim_send_im_ext().  This makes it easier to send
+      simple messages, and only slightly harder to send complex ones.
+     - aim_send_im_ext() must be used if you're using buddy icons and/or you
+         are sending UNICODE messages.
+  - UNICODE is fully explained in commentary above aim_send_im_ext() in im.c.
+  - The ISO-8859-1 option is also added.  Use when necessary, to avoid making
+      WinAIM barf.
+  - This removes the msglen parameter to aim_send_im because that was only
+      needed to do UNICODE, which can now only be done by aim_send_im_ext.
+
  - Wed May 23 18:05:46 PDT 2001
   - I upgraded libtool.  Which broke the faimtest makefile.
   - Parse locate rights
diff --git a/include/aim.h b/include/aim.h
index 244e4b3..1a49324 100644
--- a/include/aim.h
+++ b/include/aim.h
@@ -131,6 +131,12 @@
  */
 #define MAXMSGLEN 7987
 
+/*
+ * Maximum size of a Buddy Icon.
+ */
+#define MAXICONLEN 7168
+#define AIM_ICONIDENT "AVT1picture.id"
+
 /*
  * Current Maximum Length for Chat Room Messages
  *
@@ -633,11 +639,69 @@ struct aim_filetransfer_priv {
   struct aim_fileheader_t fh;
 };
 
+struct aim_chat_roominfo {
+  u_short exchange;
+  char *name;
+  u_short instance;
+};
 
 #define AIM_IMFLAGS_AWAY 0x01 /* mark as an autoreply */
 #define AIM_IMFLAGS_ACK  0x02 /* request a receipt notice */
+#define AIM_IMFLAGS_UNICODE    0x04
+#define AIM_IMFLAGS_ISO_8859_1 0x08
+#define AIM_IMFLAGS_BUDDYREQ   0x10 /* buddy icon requested */
+#define AIM_IMFLAGS_HASICON    0x20 /* already has icon (timestamp included) */
+
+struct aim_sendimext_args {
+  const char *destsn;
+  unsigned short flags;
+  const char *msg;
+  int msglen;
+  int iconlen;
+  time_t iconstamp;
+};
+
+struct aim_incomingim_ch1_args {
+  char *msg;
+  int msglen;
+  unsigned long icbmflags;
+  unsigned short flag1;
+  unsigned short flag2;
+  int finlen;
+  unsigned char fingerprint[10];
+  time_t iconstamp;
+};
 
-faim_export unsigned long aim_send_im(struct aim_session_t *, struct aim_conn_t *, const char *destsn, unsigned short flags, const char *msg, int msglen);
+struct aim_incomingim_ch2_args {
+  unsigned short reqclass;
+  unsigned short status;
+  union {
+    struct {
+      unsigned int length;
+      time_t timestamp;
+      unsigned char *icon;
+    } icon;
+    struct {
+    } voice;
+    struct aim_directim_priv *directim;
+    struct {
+      char *msg;
+      char *encoding;
+      char *lang;
+      struct aim_chat_roominfo roominfo;
+    } chat;
+    struct {
+      char *ip;
+      unsigned char *cookie;
+    } getfile;
+    struct {
+    } sendfile;
+  } info;
+};
+
+faim_export unsigned long aim_send_im_ext(struct aim_session_t *sess, struct aim_conn_t *conn, struct aim_sendimext_args *args);
+faim_export unsigned long aim_send_im(struct aim_session_t *, struct aim_conn_t *, const char *destsn, unsigned short flags, const char *msg);
+faim_export int aim_send_icon(struct aim_session_t *sess, struct aim_conn_t *conn, const char *sn, const unsigned char *icon, int iconlen, time_t stamp);
 faim_export int aim_send_im_direct(struct aim_session_t *, struct aim_conn_t *, char *);
 faim_export struct aim_conn_t * aim_directim_initiate(struct aim_session_t *, struct aim_conn_t *, struct aim_directim_priv *, char *destsn);
 faim_export struct aim_conn_t *aim_directim_connect(struct aim_session_t *, struct aim_conn_t *, struct aim_directim_priv *);
@@ -728,12 +792,6 @@ faim_export unsigned long aim_remove_buddy(struct aim_session_t *, struct aim_co
 /* aim_search.c */
 faim_export u_long aim_usersearch_address(struct aim_session_t *, struct aim_conn_t *, char *);
 
-struct aim_chat_roominfo {
-  u_short exchange;
-  char *name;
-  u_short instance;
-};
-
 struct aim_chat_exchangeinfo {
   u_short number;
   char *name;
diff --git a/src/im.c b/src/im.c
index 0f2fbe7..10b849b 100644
--- a/src/im.c
+++ b/src/im.c
@@ -73,20 +73,49 @@ faim_export unsigned short aim_fingerprintclient(unsigned char *msghdr, int len)
  *   AIM_IMFLAGS_AWAY  -- Marks the message as an autoresponse
  *   AIM_IMFLAGS_ACK   -- Requests that the server send an ack
  *                        when the message is received (of type 0x0004/0x000c)
+ *   AIM_IMFLAGS_UNICODE--Instead of ASCII7, the passed message is
+ *                        made up of UNICODE duples.  If you set
+ *                        this, you'd better be damn sure you know
+ *                        what you're doing.
+ *   AIM_IMFLAGS_ISO_8859_1 -- The message contains the ASCII8 subset
+ *                        known as ISO-8859-1.  
+ *
+ * Generally, you should use the lowest encoding possible to send
+ * your message.  If you only use basic punctuation and the generic
+ * Latin alphabet, use ASCII7 (no flags).  If you happen to use non-ASCII7
+ * characters, but they are all clearly defined in ISO-8859-1, then 
+ * use that.  Keep in mind that not all characters in the PC ASCII8
+ * character set are defined in the ISO standard. For those cases (most
+ * notably when the (r) symbol is used), you must use the full UNICODE
+ * encoding for your message.  In UNICODE mode, _all_ characters must
+ * occupy 16bits, including ones that are not special.  (Remember that
+ * the first 128 UNICODE symbols are equivelent to ASCII7, however they
+ * must be prefixed with a zero high order byte.)
+ *
+ * I strongly discourage the use of UNICODE mode, mainly because none
+ * of the clients I use can parse those messages (and besides that,
+ * wchars are difficult and non-portable to handle in most UNIX environments).
+ * If you really need to include special characters, use the HTML UNICODE 
+ * entities.  These are of the form &#2026; where 2026 is the hex 
+ * representation of the UNICODE index (in this case, UNICODE 
+ * "Horizontal Ellipsis", or 133 in in ASCII8).
  *
  */
-faim_export unsigned long aim_send_im(struct aim_session_t *sess, struct aim_conn_t *conn, const char *destsn, unsigned short flags, const char *msg, int msglen)
+faim_export unsigned long aim_send_im_ext(struct aim_session_t *sess, struct aim_conn_t *conn, struct aim_sendimext_args *args)
 {
   int curbyte,i;
   struct command_tx_struct *newpacket;
 
-  if (!msg || (msglen <= 0))
+  if (!sess || !conn || !args)
+    return -1;
+
+  if (!args->msg || (args->msglen <= 0))
     return -1;
 
-  if (msglen >= MAXMSGLEN)
+  if (args->msglen >= MAXMSGLEN)
     return -1;
 
-  if (!(newpacket = aim_tx_new(sess, conn, AIM_FRAMETYPE_OSCAR, 0x0002, msglen+256)))
+  if (!(newpacket = aim_tx_new(sess, conn, AIM_FRAMETYPE_OSCAR, 0x0002, args->msglen+512)))
     return -1;
 
   newpacket->lock = 1; /* lock struct */
@@ -104,7 +133,7 @@ faim_export unsigned long aim_send_im(struct aim_session_t *sess, struct aim_con
    * SNAC ID.
    *
    */
-  for (i=0;i<8;i++)
+  for (i = 0; i < 8; i++)
     curbyte += aimutil_put8(newpacket->data+curbyte, (u_char) rand());
 
   /*
@@ -115,14 +144,14 @@ faim_export unsigned long aim_send_im(struct aim_session_t *sess, struct aim_con
   /* 
    * Destination SN (prepended with byte length)
    */
-  curbyte += aimutil_put8(newpacket->data+curbyte,strlen(destsn));
-  curbyte += aimutil_putstr(newpacket->data+curbyte, destsn, strlen(destsn));
+  curbyte += aimutil_put8(newpacket->data+curbyte, strlen(args->destsn));
+  curbyte += aimutil_putstr(newpacket->data+curbyte, args->destsn, strlen(args->destsn));
 
   /*
    * metaTLV start.
    */
   curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002);
-  curbyte += aimutil_put16(newpacket->data+curbyte, msglen + 0x10);
+  curbyte += aimutil_put16(newpacket->data+curbyte, args->msglen + 0x10);
 
   /*
    * Flag data / ICBM Parameters?
@@ -145,23 +174,29 @@ faim_export unsigned long aim_send_im(struct aim_session_t *sess, struct aim_con
   /* 
    * Message block length.
    */
-  curbyte += aimutil_put16(newpacket->data+curbyte, msglen + 0x04);
+  curbyte += aimutil_put16(newpacket->data+curbyte, args->msglen + 0x04);
 
   /*
-   * Character set data? 
+   * Character set.
    */
-  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
+  if (args->flags & AIM_IMFLAGS_UNICODE)
+    curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002);
+  else if (args->flags & AIM_IMFLAGS_ISO_8859_1)
+    curbyte += aimutil_put16(newpacket->data+curbyte, 0x0003);
+  else
+    curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
+
   curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
 
   /*
    * Message.  Not terminated.
    */
-  curbyte += aimutil_putstr(newpacket->data+curbyte,msg, msglen);
+  curbyte += aimutil_putstr(newpacket->data+curbyte, args->msg, args->msglen);
 
   /*
    * Set the Request Acknowledge flag.  
    */
-  if (flags & AIM_IMFLAGS_ACK) {
+  if (args->flags & AIM_IMFLAGS_ACK) {
     curbyte += aimutil_put16(newpacket->data+curbyte,0x0003);
     curbyte += aimutil_put16(newpacket->data+curbyte,0x0000);
   }
@@ -169,22 +204,148 @@ faim_export unsigned long aim_send_im(struct aim_session_t *sess, struct aim_con
   /*
    * Set the Autoresponse flag.
    */
-  if (flags & AIM_IMFLAGS_AWAY) {
+  if (args->flags & AIM_IMFLAGS_AWAY) {
     curbyte += aimutil_put16(newpacket->data+curbyte,0x0004);
     curbyte += aimutil_put16(newpacket->data+curbyte,0x0000);
   }
   
+  /*
+   * Set the Buddy Icon Requested flag.
+   */
+  if (args->flags & AIM_IMFLAGS_BUDDYREQ) {
+    curbyte += aimutil_put16(newpacket->data+curbyte,0x0009);
+    curbyte += aimutil_put16(newpacket->data+curbyte,0x0000);
+  }
+
+  /*
+   * Set the I HAVE A REALLY PURTY ICON flag (with timestamp).
+   */
+  if (args->flags & AIM_IMFLAGS_HASICON) {
+    curbyte += aimutil_put16(newpacket->data+curbyte, 0x0008);
+    curbyte += aimutil_put16(newpacket->data+curbyte, 0x000c);
+    curbyte += aimutil_put32(newpacket->data+curbyte, args->iconlen);
+    curbyte += aimutil_put32(newpacket->data+curbyte, 0x00000001);
+    curbyte += aimutil_put32(newpacket->data+curbyte, args->iconstamp);
+  }
+
   newpacket->commandlen = curbyte;
   newpacket->lock = 0;
 
   aim_tx_enqueue(sess, newpacket);
 
-  aim_cachesnac(sess, 0x0004, 0x0006, 0x0000, destsn, strlen(destsn)+1);
+#if 1 /* XXX do this with autoconf or something... */
+  aim_cachesnac(sess, 0x0004, 0x0006, 0x0000, args->destsn, strlen(args->destsn)+1);
   aim_cleansnacs(sess, 60); /* clean out all SNACs over 60sec old */
+#endif
 
   return sess->snac_nextid;
 }
 
+/*
+ * Simple wrapper for aim_send_im_ext() 
+ *
+ * You cannot use aim_send_im if you need the HASICON flag.  You must
+ * use aim_send_im_ext directly for that.
+ *
+ * aim_send_im also cannot be used if you require UNICODE messages, because
+ * that requires an explicit message length.  Use aim_send_im_ext().
+ *
+ */
+faim_export unsigned long aim_send_im(struct aim_session_t *sess, struct aim_conn_t *conn, const char *destsn, unsigned short flags, const char *msg)
+{
+  struct aim_sendimext_args args;
+
+  args.destsn = destsn;
+  args.flags = flags;
+  args.msg = msg;
+  args.msglen = strlen(msg);
+
+  return aim_send_im_ext(sess, conn, &args);
+}
+
+faim_export int aim_send_icon(struct aim_session_t *sess, struct aim_conn_t *conn, const char *sn, const unsigned char *icon, int iconlen, time_t stamp)
+{
+  struct command_tx_struct *np;
+  int i,curbyte = 0;
+  unsigned char ck[8];
+
+  if (!sess || !conn || !sn || !icon || (iconlen <= 0) || (iconlen >= MAXICONLEN))
+    return -1;
+
+  if (conn->type != AIM_CONN_TYPE_BOS)
+    return -1;
+
+  for (i = 0, curbyte = 0; i < 8; i++)
+    curbyte += aimutil_put8(ck+curbyte, (u_char)rand());
+
+  if (!(np = aim_tx_new(sess, conn, AIM_FRAMETYPE_OSCAR, 0x0002, 10+8+2+1+strlen(sn)+2+2+2+8+16+2+2+2+2+2+2+2+4+4+4+iconlen+strlen(AIM_ICONIDENT)+2+2)))
+    return -1;
+
+  np->lock = 1;
+
+  curbyte = aim_putsnac(np->data, 0x0004, 0x0006, 0x0000, sess->snac_nextid);
+
+  /*
+   * Cookie
+   */
+  memcpy(np->data+curbyte, ck, 8);
+  curbyte += 8;
+
+  /*
+   * Channel (2)
+   */
+  curbyte += aimutil_put16(np->data+curbyte, 0x0002);
+
+  /*
+   * Dest sn
+   */
+  curbyte += aimutil_put8(np->data+curbyte, strlen(sn));
+  curbyte += aimutil_putstr(np->data+curbyte, sn, strlen(sn));
+
+  /*
+   * TLV t(0005)
+   */
+  curbyte += aimutil_put16(np->data+curbyte, 0x0005);
+  curbyte += aimutil_put16(np->data+curbyte, 2+8+16+6+4+4+iconlen+4+4+4+strlen(AIM_ICONIDENT));
+
+  curbyte += aimutil_put16(np->data+curbyte, 0x0000);
+
+  memcpy(np->data+curbyte, ck, 8);
+  curbyte += 8;
+
+  curbyte += aim_putcap(np->data+curbyte, 16, AIM_CAPS_BUDDYICON);
+
+  /* TLV t(000a) */
+  curbyte += aimutil_put16(np->data+curbyte, 0x000a);
+  curbyte += aimutil_put16(np->data+curbyte, 0x0002);
+  curbyte += aimutil_put16(np->data+curbyte, 0x0001);
+
+  /* TLV t(000f) */
+  curbyte += aimutil_put16(np->data+curbyte, 0x000f);
+  curbyte += aimutil_put16(np->data+curbyte, 0x0000);
+
+  /* TLV t(2711) */
+  curbyte += aimutil_put16(np->data+curbyte, 0x2711);
+  curbyte += aimutil_put16(np->data+curbyte, 4+4+4+iconlen+strlen(AIM_ICONIDENT));
+  curbyte += aimutil_put32(np->data+curbyte, 0x00000000/*0x0000d92c*/);
+  curbyte += aimutil_put32(np->data+curbyte, iconlen);
+  curbyte += aimutil_put32(np->data+curbyte, stamp);
+  memcpy(np->data+curbyte, icon, iconlen);
+  curbyte += iconlen;
+  memcpy(np->data+curbyte, AIM_ICONIDENT, strlen(AIM_ICONIDENT));
+  curbyte += strlen(AIM_ICONIDENT);
+
+  /* TLV t(0003) */
+  curbyte += aimutil_put16(np->data+curbyte, 0x0003);
+  curbyte += aimutil_put16(np->data+curbyte, 0x0000);
+  
+  np->commandlen = curbyte;
+  np->lock = 0;
+  aim_tx_enqueue(sess, np);
+
+  return 0;
+}
+
 static int outgoingim(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
   unsigned int i, ret = 0;
@@ -250,103 +411,122 @@ static int outgoingim(struct aim_session_t *sess, aim_module_t *mod, struct comm
   return ret;
 }
 
-static int incomingim_ch1(struct aim_session_t *sess, aim_module_t *mod,  struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned short channel, struct aim_userinfo_s *userinfo, struct aim_tlvlist_t *tlvlist, unsigned char *cookie)
+static int incomingim_ch1(struct aim_session_t *sess, aim_module_t *mod,  struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned short channel, struct aim_userinfo_s *userinfo, unsigned char *data, int datalen, unsigned char *cookie)
 {
+  unsigned short type, length;
   aim_rxcallback_t userfunc;
-  int i, j = 0, y = 0, z = 0, ret = 0;
-  char *msg = NULL;
-  unsigned long icbmflags = 0;
-  struct aim_tlv_t *msgblocktlv;
-  unsigned char *msgblock;
-  unsigned short flag1, flag2;
-  int finlen = 0;
-  unsigned char fingerprint[10];
-  unsigned short wastebits;
-           
-  /*
-   * Check Autoresponse status.  If it is an autoresponse,
-   * it will contain a type 0x0004 TLV, with zero length.
-   */
-  if (aim_gettlv(tlvlist, 0x0004, 1))
-    icbmflags |= AIM_IMFLAGS_AWAY;
-      
+  int i, ret = 0;
+  struct aim_incomingim_ch1_args args;
+
+  memset(&args, 0, sizeof(args));
+
   /*
-   * Check Ack Request status.
+   * This used to be done using tlvchains.  For performance reasons,
+   * I've changed it to process the TLVs in-place.  This avoids lots
+   * of per-IM memory allocations.
    */
-  if (aim_gettlv(tlvlist, 0x0003, 1))
-    icbmflags |= AIM_IMFLAGS_ACK;
+  for (i = 0; i < datalen; ) {
       
-  /*
-   * Message block.
-   */
-  msgblocktlv = aim_gettlv(tlvlist, 0x0002, 1);
-  if (!msgblocktlv || !(msgblock = msgblocktlv->value)) {
-    faimdprintf(sess, 0, "icbm: major error! no message block TLV found!\n");
-    return 0;
-  }
+    type = aimutil_get16(data+i);
+    i += 2;
       
-  /*
-   * Extracting the message from the unknown cruft.
-   * 
-   * This is a bit messy, and I'm not really qualified,
-   * even as the author, to comment on it.  At least
-   * its not as bad as a while loop shooting into infinity.
-   *
-   * "Do you believe in magic?"
-   *
-   */
+    length = aimutil_get16(data+i);
+    i += 2;
+
+    if (type == 0x0002) { /* Message Block */
+      unsigned short wastebits;
+      unsigned char *msgblock;
+      int j = 0, y = 0, z = 0;
 
-  wastebits = aimutil_get8(msgblock+j++);
-  wastebits = aimutil_get8(msgblock+j++);
+      msgblock = data+i;
       
-  y = aimutil_get16(msgblock+j);
-  j += 2;
-  for (z = 0; z < y; z++)
-    wastebits = aimutil_get8(msgblock+j++);
-  wastebits = aimutil_get8(msgblock+j++);
-  wastebits = aimutil_get8(msgblock+j++);
-
-  finlen = j;
-  if (finlen > sizeof(fingerprint))
-    finlen = sizeof(fingerprint);
-  memcpy(fingerprint, msgblocktlv->value, finlen);
+      /*
+       * Extracting the message from the unknown cruft.
+       * 
+       * This is a bit messy, and I'm not really qualified,
+       * even as the author, to comment on it.  At least
+       * its not as bad as a while loop shooting into infinity.
+       *
+       * "Do you believe in magic?"
+       *
+       */
+
+      wastebits = aimutil_get8(msgblock+j++);
+      wastebits = aimutil_get8(msgblock+j++);
+      
+      y = aimutil_get16(msgblock+j);
+      j += 2;
+      for (z = 0; z < y; z++)
+	wastebits = aimutil_get8(msgblock+j++);
+      wastebits = aimutil_get8(msgblock+j++);
+      wastebits = aimutil_get8(msgblock+j++);
+
+      args.finlen = j;
+      if (args.finlen > sizeof(args.fingerprint))
+	args.finlen = sizeof(args.fingerprint);
+      memcpy(args.fingerprint, msgblock, args.finlen);
+
+      /* Message string length, including flag words. */
+      args.msglen = aimutil_get16(msgblock+j);
+      j += 2;
+
+      /* Flag words. */
+      args.flag1 = aimutil_get16(msgblock+j);
+      if (args.flag1 == 0x0002)
+	args.icbmflags |= AIM_IMFLAGS_UNICODE;
+      else if (args.flag1 == 0x0003)
+	args.icbmflags |= AIM_IMFLAGS_ISO_8859_1;
+      j += 2;
+
+      args.flag2 = aimutil_get16(msgblock+j);
+      j += 2;
+      
+      if ((args.flag1 && (args.flag1 != 0x0002) && (args.flag1 != 0x0003)) || args.flag2)
+	faimdprintf(sess, 0, "icbm: **warning: encoding flags are being used! {%04x, %04x}\n", args.flag1, args.flag2);
+
+      /* Message string. */
+      args.msglen -= 4;
+      if (args.icbmflags & AIM_IMFLAGS_UNICODE) {
+	args.msg = malloc(args.msglen+2);
+	memcpy(args.msg, msgblock+j, args.msglen);
+	args.msg[args.msglen] = '\0'; /* wide NULL */
+	args.msg[args.msglen+1] = '\0';
+      } else {
+	args.msg = malloc(args.msglen+1);
+	memcpy(args.msg, msgblock+j, args.msglen);
+	args.msg[args.msglen] = '\0';
+      }
 
-  /* 
-   * Message string length, including flag words.
-   */
-  i = aimutil_get16(msgblock+j);
-  j += 2;
+    } else if (type == 0x0003) { /* Server Ack Requested */
 
-  /*
-   * Flag words.
-   *
-   * Its rumored that these can kick in some funky
-   * 16bit-wide char stuff that used to really kill
-   * libfaim.  Hopefully the latter is no longer true.
-   *
-   * Though someone should investiagte the former.
-   *
-   */
-  flag1 = aimutil_get16(msgblock+j);
-  j += 2;
-  flag2 = aimutil_get16(msgblock+j);
-  j += 2;
-      
-  if (flag1 || flag2)
-    faimdprintf(sess, 0, "icbm: **warning: encoding flags are being used! {%04x, %04x}\n", flag1, flag2);
+      args.icbmflags |= AIM_IMFLAGS_ACK;
+
+    } else if (type == 0x0004) { /* Message is Auto Response */
+
+      args.icbmflags |= AIM_IMFLAGS_AWAY;
+
+    } else if ((type == 0x0008) && 
+	       (length == 0x000c)) { /* I-HAVE-A-REALLY-PURTY-ICON Flag */
+
+      args.iconstamp = aimutil_get32(data+i+8);
+      args.icbmflags |= AIM_IMFLAGS_HASICON;
+
+    } else if (type == 0x0009) {
+
+      args.icbmflags |= AIM_IMFLAGS_BUDDYREQ;
+
+    } else {
+      fprintf(stderr, "incomingim_ch1: unknown TLV 0x%04x (len %d)\n", type, length);
+    }
+
+    i += length;
+  }
 
-  /* 
-   * Message string. 
-   */
-  i -= 4;
-  msg = (char *)malloc(i+1);
-  memcpy(msg, msgblock+j, i);
-  msg[i] = '\0';
 
   if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-    ret = userfunc(sess, rx, channel, userinfo, msg, icbmflags, flag1, flag2, finlen, fingerprint);
+    ret = userfunc(sess, rx, channel, userinfo, &args);
 
-  free(msg);
+  free(args.msg);
 
   return ret;
 }
@@ -356,9 +536,10 @@ static int incomingim_ch2(struct aim_session_t *sess, aim_module_t *mod,  struct
   aim_rxcallback_t userfunc;
   struct aim_tlv_t *block1;
   struct aim_tlvlist_t *list2;
-  unsigned short reqclass = 0;
-  unsigned short status = 0;
   int ret = 0;
+  struct aim_incomingim_ch2_args args;
+
+  memset(&args, 0, sizeof(args));
       
   /*
    * There's another block of TLVs embedded in the type 5 here. 
@@ -374,7 +555,7 @@ static int incomingim_ch2(struct aim_session_t *sess, aim_module_t *mod,  struct
    *
    * 0 is a request, 2 is an accept
    */ 
-  status = aimutil_get16(block1->value+0);
+  args.status = aimutil_get16(block1->value+0);
       
   /*
    * Next comes the cookie.  Should match the ICBM cookie.
@@ -394,8 +575,7 @@ static int incomingim_ch2(struct aim_session_t *sess, aim_module_t *mod,  struct
    * Read off one capability string and we should have it ID'd.
    * 
    */
-  reqclass = aim_getcap(sess, block1->value+2+8, 0x10);
-  if (reqclass == 0x0000) {
+  if ((args.reqclass = aim_getcap(sess, block1->value+2+8, 0x10)) == 0x0000) {
     faimdprintf(sess, 0, "rend: no ID block\n");
     return 0;
   }
@@ -408,11 +588,11 @@ static int incomingim_ch2(struct aim_session_t *sess, aim_module_t *mod,  struct
    */
   list2 = aim_readtlvchain(block1->value+2+8+16, block1->length-2-8-16);
       
-  if (!list2 || ((reqclass != AIM_CAPS_IMIMAGE) && !(aim_gettlv(list2, 0x2711, 1)))) {
+  if (!list2 || ((args.reqclass != AIM_CAPS_IMIMAGE) && !(aim_gettlv(list2, 0x2711, 1)))) {
     struct aim_msgcookie_t *cook;
     int type;
 	
-    type = aim_msgcookie_gettype(reqclass); /* XXX: fix this shitty code */
+    type = aim_msgcookie_gettype(args.reqclass); /* XXX: fix this shitty code */
 
     if ((cook = aim_checkcookie(sess, cookie, type)) == NULL) {
       faimdprintf(sess, 0, "non-data rendezvous thats not in cache %d/%s!\n", type, cookie);
@@ -428,7 +608,8 @@ static int incomingim_ch2(struct aim_session_t *sess, aim_module_t *mod,  struct
 
 	ft = (struct aim_filetransfer_priv *)cook->data;
 
-	if(status != 0x0002) {
+	if (args.status != 0x0002) {
+
 	  if (aim_gettlv(list2, 0x000b, 1))
 	    errorcode = aim_gettlv16(list2, 0x000b, 1);
 
@@ -453,13 +634,27 @@ static int incomingim_ch2(struct aim_session_t *sess, aim_module_t *mod,  struct
   /*
    * The rest of the handling depends on what type it is.
    */
-  if (reqclass & AIM_CAPS_BUDDYICON) {
+  if (args.reqclass & AIM_CAPS_BUDDYICON) {
+    struct aim_tlv_t *miscinfo;
+    int curpos = 0;
+
+    miscinfo = aim_gettlv(list2, 0x2711, 1);
+
+    /* aimutil_get32(miscinfo->value+curpos); i don't know what this is */
+    curpos += 4;
+    args.info.icon.length = aimutil_get32(miscinfo->value+curpos);
+    curpos += 4;
+    args.info.icon.timestamp = aimutil_get32(miscinfo->value+curpos);
+    curpos += 4;
+    args.info.icon.icon = malloc(args.info.icon.length);
+    memcpy(args.info.icon.icon, miscinfo->value+curpos, args.info.icon.length);
 
-    /* XXX implement this (its in ActiveBuddy...) */
     if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-      ret = userfunc(sess, rx, channel, reqclass, userinfo);
+      ret = userfunc(sess, rx, channel, userinfo, &args);
 
-  } else if (reqclass & AIM_CAPS_VOICE) {
+    free(args.info.icon.icon);
+
+  } else if (args.reqclass & AIM_CAPS_VOICE) {
     struct aim_msgcookie_t *cachedcook;
 
     faimdprintf(sess, 0, "rend: voice!\n");
@@ -479,10 +674,9 @@ static int incomingim_ch2(struct aim_session_t *sess, aim_module_t *mod,  struct
     /* XXX: implement all this */
 
     if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype))) 
-      ret = userfunc(sess, rx, channel, reqclass, &userinfo);
+      ret = userfunc(sess, rx, channel, userinfo, &args);
 
-  } else if ((reqclass & AIM_CAPS_IMIMAGE) || 
-	     (reqclass & AIM_CAPS_BUDDYICON)) {
+  } else if (args.reqclass & AIM_CAPS_IMIMAGE) {
     char ip[30];
     struct aim_directim_priv *priv;
 
@@ -510,40 +704,38 @@ static int incomingim_ch2(struct aim_session_t *sess, aim_module_t *mod,  struct
      *          different things 
      */
 
-    priv = (struct aim_directim_priv *)calloc(1, sizeof(struct aim_directim_priv));
+    args.info.directim = priv = (struct aim_directim_priv *)calloc(1, sizeof(struct aim_directim_priv));
     memcpy(priv->ip, ip, sizeof(priv->ip));
     memcpy(priv->sn, userinfo->sn, sizeof(priv->sn));
     memcpy(priv->cookie, cookie, sizeof(priv->cookie));
 
     if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-      ret = userfunc(sess, rx, channel, reqclass, userinfo, priv);
+      ret = userfunc(sess, rx, channel, userinfo, &args);
 
-  } else if (reqclass & AIM_CAPS_CHAT) {
+  } else if (args.reqclass & AIM_CAPS_CHAT) {
     struct aim_tlv_t *miscinfo;
-    struct aim_chat_roominfo roominfo;
-    char *msg=NULL,*encoding=NULL,*lang=NULL;
 
     miscinfo = aim_gettlv(list2, 0x2711, 1);
-    aim_chat_readroominfo(miscinfo->value, &roominfo);
+    aim_chat_readroominfo(miscinfo->value, &args.info.chat.roominfo);
 		  
     if (aim_gettlv(list2, 0x000c, 1))
-      msg = aim_gettlv_str(list2, 0x000c, 1);
+      args.info.chat.msg = aim_gettlv_str(list2, 0x000c, 1);
 	  
     if (aim_gettlv(list2, 0x000d, 1))
-      encoding = aim_gettlv_str(list2, 0x000d, 1);
+      args.info.chat.encoding = aim_gettlv_str(list2, 0x000d, 1);
 	  
     if (aim_gettlv(list2, 0x000e, 1))
-      lang = aim_gettlv_str(list2, 0x000e, 1);
+      args.info.chat.lang = aim_gettlv_str(list2, 0x000e, 1);
       
     if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-      ret = userfunc(sess, rx, channel, reqclass, userinfo, &roominfo, msg, encoding?encoding+1:NULL, lang?lang+1:NULL);
+      ret = userfunc(sess, rx, channel, userinfo, &args);
 
-    free(roominfo.name);
-    free(msg);
-    free(encoding);
-    free(lang);
+    free(args.info.chat.roominfo.name);
+    free(args.info.chat.msg);
+    free(args.info.chat.encoding);
+    free(args.info.chat.lang);
 
-  } else if (reqclass & AIM_CAPS_GETFILE) {
+  } else if (args.reqclass & AIM_CAPS_GETFILE) {
     char ip[30];
     struct aim_msgcookie_t *cachedcook;
     struct aim_tlv_t *miscinfo;
@@ -573,10 +765,14 @@ static int incomingim_ch2(struct aim_session_t *sess, aim_module_t *mod,  struct
 	     aimutil_get16(porttlv->value));
 
     faimdprintf(sess, 0, "rend: file get request from %s (%s)\n", userinfo->sn, ip);
+
+    args.info.getfile.ip = ip;
+    args.info.getfile.cookie = cookie;
+
     if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-      ret = userfunc(sess, rx, channel, reqclass, userinfo, ip, cookie);
+      ret = userfunc(sess, rx, channel, userinfo, &args);
 
-  } else if (reqclass & AIM_CAPS_SENDFILE) {
+  } else if (args.reqclass & AIM_CAPS_SENDFILE) {
 #if 0
     char ip[30];
     struct aim_msgcookie_t *cachedcook;
@@ -631,11 +827,11 @@ static int incomingim_ch2(struct aim_session_t *sess, aim_module_t *mod,  struct
       free(desc);
 
     if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-      ret = userfunc(sess, rx, channel, reqclass, userinfo);
+      ret = userfunc(sess, rx, channel, userinfo, &args);
 
 #endif	
   } else
-    faimdprintf(sess, 0, "rend: unknown rendezvous 0x%04x\n", reqclass);
+    faimdprintf(sess, 0, "rend: unknown rendezvous 0x%04x\n", args.reqclass);
 
   aim_freetlvchain(&list2);
 
@@ -658,7 +854,6 @@ static int incomingim(struct aim_session_t *sess, aim_module_t *mod, struct comm
   int i, ret = 0;
   unsigned char cookie[8];
   int channel;
-  struct aim_tlvlist_t *tlvlist;
   struct aim_userinfo_s userinfo;
 
   memset(&userinfo, 0x00, sizeof(struct aim_userinfo_s));
@@ -711,24 +906,33 @@ static int incomingim(struct aim_session_t *sess, aim_module_t *mod, struct comm
    */
   i += aim_extractuserinfo(sess, data+i, &userinfo);
   
-  /*
-   * Read block of TLVs (not including the userinfo data).  All 
-   * further data is derived from what is parsed here.
-   */
-  tlvlist = aim_readtlvchain(data+i, datalen-i);
-
   /*
    * From here on, its depends on what channel we're on.
+   *
+   * Technically all channels have a TLV list have this, however,
+   * for the common channel 1 case, in-place parsing is used for
+   * performance reasons (less memory allocation).
    */
-  if (channel == 1)
-    ret = incomingim_ch1(sess, mod, rx, snac, channel, &userinfo, tlvlist, cookie);
-  else if (channel == 0x0002)
+  if (channel == 1) {
+
+    ret = incomingim_ch1(sess, mod, rx, snac, channel, &userinfo, data+i, datalen-i, cookie);
+
+  } else if (channel == 0x0002) {
+    struct aim_tlvlist_t *tlvlist;
+
+    /*
+     * Read block of TLVs (not including the userinfo data).  All 
+     * further data is derived from what is parsed here.
+     */
+    tlvlist = aim_readtlvchain(data+i, datalen-i);
+
     ret = incomingim_ch2(sess, mod, rx, snac, channel, &userinfo, tlvlist, cookie);
 
-  /*
-   * Free up the TLV chain.
-   */
-  aim_freetlvchain(&tlvlist);
+    /*
+     * Free up the TLV chain.
+     */
+    aim_freetlvchain(&tlvlist);
+  }
 
   return ret;
 }
diff --git a/utils/faimtest/commands.c b/utils/faimtest/commands.c
index f306d73..ec57c82 100644
--- a/utils/faimtest/commands.c
+++ b/utils/faimtest/commands.c
@@ -48,7 +48,7 @@ static char *stripwhite (char *string)
   return s;
 }
 
-static char *cmdgenerator(char *text, int state)
+static char *cmdgenerator(const char *text, int state)
 {
   static int list_index, len;
   char *name;
@@ -68,7 +68,7 @@ static char *cmdgenerator(char *text, int state)
   return (char *)NULL;
 }
 
-static char **cmdcomplete(char *text, int start, int end)
+static char **cmdcomplete(const char *text, int start, int end)
 {
   char **matches;
 
@@ -128,7 +128,7 @@ static int cmdexec(char *line)
   return cmd(word);
 }
 
-static void fullline(void) 
+static void fullline(char *x) 
 {
   char *stripped;
 
@@ -219,7 +219,7 @@ static int cmd_connlist(char *arg)
 static int cmd_goodday(char *arg)
 {
   if (arg && strlen(arg) && (strlen(arg) < MAXSNLEN))
-    aim_send_im(&aimsess, aim_getconn_type(&aimsess, AIM_CONN_TYPE_BOS), arg, AIM_IMFLAGS_ACK, "Good day to you too.",  strlen("Good day to you too."));
+    aim_send_im(&aimsess, aim_getconn_type(&aimsess, AIM_CONN_TYPE_BOS), arg, AIM_IMFLAGS_ACK, "Good day to you too.");
   else
     printf("no one to say hello to!\n");
 
@@ -266,7 +266,7 @@ static int cmd_sendmsg(char *arg)
     newbuf[z] = (z % 10)+0x30;
   newbuf[len] = '\0';
 
-  aim_send_im(&aimsess, aim_getconn_type(&aimsess, AIM_CONN_TYPE_BOS), sn, AIM_IMFLAGS_ACK, newbuf, strlen(newbuf));
+  aim_send_im(&aimsess, aim_getconn_type(&aimsess, AIM_CONN_TYPE_BOS), sn, AIM_IMFLAGS_ACK, newbuf);
 
   free(newbuf);
 
diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c
index 7e94e56..e246c8b 100644
--- a/utils/faimtest/faimtest.c
+++ b/utils/faimtest/faimtest.c
@@ -161,6 +161,10 @@ int keepgoing = 1;
 static FILE *listingfile;
 static char *listingpath;
 
+static unsigned char *buddyicon = NULL;
+static int buddyiconlen = 0;
+static time_t buddyiconstamp = 0;
+
 static void faimtest_debugcb(struct aim_session_t *sess, int level, const char *format, va_list va)
 {
 
@@ -261,7 +265,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);
 
@@ -323,6 +327,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");
@@ -333,7 +338,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;
@@ -346,6 +351,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");
@@ -361,6 +367,7 @@ int main(int argc, char **argv)
       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);
     }
   }
@@ -390,6 +397,26 @@ 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);
+
+      dvprintf("read %d bytes of %s for buddy icon\n", buddyiconlen, buddyiconpath);
+
+      fclose(f);
+
+    } else
+      dvprintf("could not open buddy icon %s\n", buddyiconpath);
+
+  }
+
   faimtest_init();
 
   if (faimtest_mode < 2)
@@ -460,6 +487,8 @@ int main(int argc, char **argv)
     cmd_uninit();
   }
 
+  free(buddyicon);
+
   /* Get out */
   exit(0);
 }
@@ -481,7 +510,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, NULL, 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) */
@@ -1173,7 +1202,24 @@ 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;
+
+    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);
 
   } else if (strstr(tmpstr, "warnme")) {
 
@@ -1199,7 +1245,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;
@@ -1253,7 +1299,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)) {
 
@@ -1287,7 +1333,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);
     }
 
@@ -1308,34 +1354,25 @@ 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 *);
+
+    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);
@@ -1350,27 +1387,34 @@ 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);
+
+    dvprintf("faimtest: icbm: message: %s\n", args->msg);
+
+    if (args->icbmflags & AIM_IMFLAGS_HASICON)
+      aim_send_im(sess, command->conn, userinfo->sn, AIM_IMFLAGS_BUDDYREQ, "You have an icon");
+
+    if (args->msg) {
       int i = 0;
 
-      while (msg[i] == '<') {
-	if (msg[i] == '<') {
-	  while (msg[i] != '>')
+      while (args->msg[i] == '<') {
+	if (args->msg[i] == '<') {
+	  while (args->msg[i] != '>')
 	    i++;
 	  i++;
 	}
       }
-      tmpstr = msg+i;
+      tmpstr = args->msg+i;
 
       faimtest_handlecmd(sess, command, userinfo, tmpstr);
 
@@ -1380,14 +1424,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);
@@ -1402,22 +1445,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);
@@ -1442,15 +1479,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);
@@ -1462,32 +1490,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");
@@ -1508,11 +1532,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;