X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/646c6b5273a2272632e50e7393f090f7c8bf06eb..2d5fd943961c036d5f0686eb15c7f608751eb65b:/src/im.c

diff --git a/src/im.c b/src/im.c
index 58ce8c7..d78ddd8 100644
--- a/src/im.c
+++ b/src/im.c
@@ -65,6 +65,20 @@ faim_export unsigned short aim_fingerprintclient(unsigned char *msghdr, int len)
   return AIM_CLIENTTYPE_UNKNOWN;
 }
 
+/* This should be endian-safe now... but who knows... */
+faim_export unsigned short aim_iconsum(const unsigned char *buf, int buflen)
+{
+  unsigned long sum;
+  int i;
+
+  for (i = 0, sum = 0; i < buflen; i += 2)
+    sum += (buf[i+1] << 8) + buf[i];
+
+  sum = ((sum & 0xffff0000) >> 16) + (sum & 0x0000ffff);
+
+  return sum & 0xffff;
+}
+
 /*
  * Send an ICBM (instant message).  
  *
@@ -73,123 +87,289 @@ 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, 
-				      char *destsn, u_int flags, char *msg)
-{   
+faim_export int 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;
 
-  int curbyte,i;
-  struct command_tx_struct *newpacket;
+	if (!sess || !conn || !args)
+	       	return -EINVAL;
+
+	if (!args->msg || (args->msglen <= 0))
+		return -EINVAL;
+
+	if (args->msglen >= MAXMSGLEN)
+		return -E2BIG;
+
+	if (!(newpacket = aim_tx_new(sess, conn, AIM_FRAMETYPE_OSCAR, 0x0002, args->msglen+512)))
+		return -ENOMEM;
+
+	newpacket->lock = 1; /* lock struct */
+
+	curbyte  = 0;
+	curbyte += aim_putsnac(newpacket->data+curbyte, 
+				0x0004, 0x0006, 0x0000, sess->snac_nextid);
+
+	/* 
+	 * Generate a random message cookie 
+	 *
+	 * We could cache these like we do SNAC IDs.  (In fact, it 
+	 * might be a good idea.)  In the message error functions, 
+	 * the 8byte message cookie is returned as well as the 
+	 * SNAC ID.
+	 *
+	 */
+	for (i = 0; i < 8; i++) {
+		curbyte += aimutil_put8(newpacket->data+curbyte, 
+					(unsigned char) rand());
+	}
+
+	/*
+	 * Channel ID
+	 */
+	curbyte += aimutil_put16(newpacket->data+curbyte, 0x0001);
+
+	/*
+	 * Destination SN (prepended with byte length)
+	 */
+	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, args->msglen + 0x10);
+
+	/*
+	 * Flag data / ICBM Parameters?
+	 *
+	 * I don't know what these are...
+	 *
+	 */
+	curbyte += aimutil_put8(newpacket->data+curbyte, 0x05);
+	curbyte += aimutil_put8(newpacket->data+curbyte, 0x01);
+
+	/* number of bytes to follow */
+	curbyte += aimutil_put16(newpacket->data+curbyte, 0x0004);
+	curbyte += aimutil_put8(newpacket->data+curbyte, 0x01);
+	curbyte += aimutil_put8(newpacket->data+curbyte, 0x01);
+	curbyte += aimutil_put8(newpacket->data+curbyte, 0x01);
+	curbyte += aimutil_put8(newpacket->data+curbyte, 0x02);
+
+	curbyte += aimutil_put16(newpacket->data+curbyte, 0x0101);
+
+	/* 
+	 * Message block length.
+	 */
+	curbyte += aimutil_put16(newpacket->data+curbyte, args->msglen + 0x04);
+
+	/*
+	 * Character set.
+	 */
+	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, 
+					args->msg, args->msglen);
+
+	/*
+	 * Set the Request Acknowledge flag.  
+	 */
+	if (args->flags & AIM_IMFLAGS_ACK) {
+		curbyte += aimutil_put16(newpacket->data+curbyte,0x0003);
+		curbyte += aimutil_put16(newpacket->data+curbyte,0x0000);
+	}
   
-  if (strlen(msg) >= MAXMSGLEN)
-    return -1;
+	/*
+	 * Set the Autoresponse flag.
+	 */
+	if (args->flags & AIM_IMFLAGS_AWAY) {
+		curbyte += aimutil_put16(newpacket->data+curbyte,0x0004);
+		curbyte += aimutil_put16(newpacket->data+curbyte,0x0000);
+	}
 
-  if (!(newpacket = aim_tx_new(sess, conn, AIM_FRAMETYPE_OSCAR, 0x0002, strlen(msg)+256)))
-    return -1;
+	/*
+	 * 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_put16(newpacket->data+curbyte, 0x0001);
+		curbyte += aimutil_put16(newpacket->data+curbyte, args->iconsum);
+		curbyte += aimutil_put32(newpacket->data+curbyte, args->iconstamp);
+	}
 
-  newpacket->lock = 1; /* lock struct */
+	newpacket->commandlen = curbyte;
+	newpacket->lock = 0;
 
-  curbyte  = 0;
-  curbyte += aim_putsnac(newpacket->data+curbyte, 
-			 0x0004, 0x0006, 0x0000, sess->snac_nextid);
+	aim_tx_enqueue(sess, newpacket);
 
-  /* 
-   * Generate a random message cookie 
-   *
-   * We could cache these like we do SNAC IDs.  (In fact, it 
-   * might be a good idea.)  In the message error functions, 
-   * the 8byte message cookie is returned as well as the 
-   * SNAC ID.
-   *
-   */
-  for (i=0;i<8;i++)
-    curbyte += aimutil_put8(newpacket->data+curbyte, (u_char) rand());
+#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
 
-  /*
-   * Channel ID
-   */
-  curbyte += aimutil_put16(newpacket->data+curbyte,0x0001);
+	return 0;
+}
 
-  /* 
-   * Destination SN (prepended with byte length)
-   */
-  curbyte += aimutil_put8(newpacket->data+curbyte,strlen(destsn));
-  curbyte += aimutil_putstr(newpacket->data+curbyte, destsn, strlen(destsn));
+/*
+ * 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 int 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;
 
-  /*
-   * metaTLV start.
-   */
-  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002);
-  curbyte += aimutil_put16(newpacket->data+curbyte, strlen(msg) + 0x10);
+	args.destsn = destsn;
+	args.flags = flags;
+	args.msg = msg;
+	args.msglen = strlen(msg);
 
-  /*
-   * Flag data / ICBM Parameters?
-   *
-   * I don't know what these are...
-   *
-   */
-  curbyte += aimutil_put8(newpacket->data+curbyte, 0x05);
-  curbyte += aimutil_put8(newpacket->data+curbyte, 0x01);
+	return aim_send_im_ext(sess, conn, &args);
+}
 
-  /* number of bytes to follow */
-  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0004);
-  curbyte += aimutil_put8(newpacket->data+curbyte, 0x01);
-  curbyte += aimutil_put8(newpacket->data+curbyte, 0x01);
-  curbyte += aimutil_put8(newpacket->data+curbyte, 0x01);
-  curbyte += aimutil_put8(newpacket->data+curbyte, 0x02);
+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, unsigned short iconsum)
+{
+  struct command_tx_struct *np;
+  int i,curbyte = 0;
+  unsigned char ck[8];
 
-  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0101);
+  if (!sess || !conn || !sn || !icon || (iconlen <= 0) || (iconlen >= MAXICONLEN))
+    return -1;
 
-  /* 
-   * Message block length.
-   */
-  curbyte += aimutil_put16(newpacket->data+curbyte, strlen(msg) + 0x04);
+  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);
 
   /*
-   * Character set data? 
+   * Cookie
    */
-  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
-  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
+  memcpy(np->data+curbyte, ck, 8);
+  curbyte += 8;
 
   /*
-   * Message.  Not terminated.
+   * Channel (2)
    */
-  curbyte += aimutil_putstr(newpacket->data+curbyte,msg, strlen(msg));
+  curbyte += aimutil_put16(np->data+curbyte, 0x0002);
 
   /*
-   * Set the Request Acknowledge flag.  
+   * Dest sn
    */
-  if (flags & AIM_IMFLAGS_ACK) {
-    curbyte += aimutil_put16(newpacket->data+curbyte,0x0003);
-    curbyte += aimutil_put16(newpacket->data+curbyte,0x0000);
-  }
-  
+  curbyte += aimutil_put8(np->data+curbyte, strlen(sn));
+  curbyte += aimutil_putstr(np->data+curbyte, sn, strlen(sn));
+
   /*
-   * Set the Autoresponse flag.
+   * TLV t(0005)
    */
-  if (flags & AIM_IMFLAGS_AWAY) {
-    curbyte += aimutil_put16(newpacket->data+curbyte,0x0004);
-    curbyte += aimutil_put16(newpacket->data+curbyte,0x0000);
-  }
+  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_put16(np->data+curbyte, 0x0000);
+  curbyte += aimutil_put16(np->data+curbyte, iconsum);
+  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);
   
-  newpacket->commandlen = curbyte;
-  newpacket->lock = 0;
-
-  aim_tx_enqueue(sess, newpacket);
-
-  aim_cachesnac(sess, 0x0004, 0x0006, 0x0000, destsn, strlen(destsn)+1);
-  aim_cleansnacs(sess, 60); /* clean out all SNACs over 60sec old */
+  np->commandlen = curbyte;
+  np->lock = 0;
+  aim_tx_enqueue(sess, np);
 
-  return sess->snac_nextid;
+  return 0;
 }
 
-faim_internal int aim_parse_outgoing_im_middle(struct aim_session_t *sess,
-					       struct command_rx_struct *command)
+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 = 0, z;
-  rxcallback_t userfunc = NULL;
+  unsigned int i, ret = 0;
+  aim_rxcallback_t userfunc;
   unsigned char cookie[8];
   int channel;
   struct aim_tlvlist_t *tlvlist;
@@ -198,14 +378,12 @@ faim_internal int aim_parse_outgoing_im_middle(struct aim_session_t *sess,
   unsigned char flag1 = 0, flag2 = 0;
   unsigned char *msgblock = NULL, *msg = NULL;
 
-  i = 10;
-  
   /* ICBM Cookie. */
-  for (z=0; z<8; z++,i++)
-    cookie[z] = command->data[i];
+  for (i = 0; i < 8; i++)
+    cookie[i] = aimutil_get8(data+i);
 
   /* Channel ID */
-  channel = aimutil_get16(command->data+i);
+  channel = aimutil_get16(data+i);
   i += 2;
 
   if (channel != 0x01) {
@@ -213,10 +391,10 @@ faim_internal int aim_parse_outgoing_im_middle(struct aim_session_t *sess,
     return 1;
   }
 
-  strncpy(sn, (char *) command->data+i+1, (int) *(command->data+i));
-  i += 1 + (int) *(command->data+i);
+  strncpy(sn, (char *) data+i+1, (int) *(data+i));
+  i += 1 + (int) *(data+i);
 
-  tlvlist = aim_readtlvchain(command->data+i, command->commandlen-i);
+  tlvlist = aim_readtlvchain(data+i, datalen-i);
 
   if (aim_gettlv(tlvlist, 0x0003, 1))
     icbmflags |= AIM_IMFLAGS_ACK;
@@ -243,136 +421,44 @@ faim_internal int aim_parse_outgoing_im_middle(struct aim_session_t *sess,
     msg = msgblock+j;
   }
 
-  if ((userfunc = aim_callhandler(sess, command->conn, 0x0004, 0x0006)) || (i = 0))
-    i = userfunc(sess, command, channel, sn, msg, icbmflags, flag1, flag2);
+  if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+    ret = userfunc(sess, rx, channel, sn, msg, icbmflags, flag1, flag2);
   
   if (msgblock)
     free(msgblock);
   aim_freetlvchain(&tlvlist);
 
-  return 0;
+  return ret;
 }
 
-/*
- * It can easily be said that parsing ICBMs is THE single
- * most difficult thing to do in the in AIM protocol.  In
- * fact, I think I just did say that.
- *
- * Below is the best damned solution I've come up with
- * over the past sixteen months of battling with it. This
- * can parse both away and normal messages from every client
- * I have access to.  Its not fast, its not clean.  But it works.
- *
- * We should also support at least minimal parsing of 
- * Channel 2, so that we can at least know the name of the
- * room we're invited to, but obviously can't attend...
- *
- */
-faim_internal int aim_parse_incoming_im_middle(struct aim_session_t *sess,
-					       struct command_rx_struct *command)
+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)
 {
-  u_int i = 0,z;
-  rxcallback_t userfunc = NULL;
-  u_char cookie[8];
-  int channel;
-  struct aim_tlvlist_t *tlvlist;
-  struct aim_userinfo_s userinfo;
+  unsigned short type, length;
+  aim_rxcallback_t userfunc;
+  int i, ret = 0;
+  struct aim_incomingim_ch1_args args;
 
-  memset(&userinfo, 0x00, sizeof(struct aim_userinfo_s));
- 
-  i = 10; /* Skip SNAC header */
-
-  /*
-   * Read ICBM Cookie.  And throw away.
-   */
-  for (z=0; z<8; z++,i++)
-    cookie[z] = command->data[i];
-  
-  /*
-   * Channel ID.
-   *
-   * Channel 0x0001 is the message channel.  There are 
-   * other channels for things called "rendevous"
-   * which represent chat and some of the other new
-   * features of AIM2/3/3.5. 
-   *
-   * Channel 0x0002 is the Rendevous channel, which
-   * is where Chat Invitiations and various client-client
-   * connection negotiations come from.
-   * 
-   */
-  channel = aimutil_get16(command->data+i);
-  i += 2;
-  
-  /*
-   *
-   */
-  if ((channel != 0x01) && (channel != 0x02)) {
-    faimdprintf(sess, 0, "icbm: ICBM received on an unsupported channel.  Ignoring.\n (chan = %04x)", channel);
-    return 1;
-  }
-
-  /*
-   * Extract the standard user info block.
-   *
-   * Note that although this contains TLVs that appear contiguous
-   * with the TLVs read below, they are two different pieces.  The
-   * userinfo block contains the number of TLVs that contain user
-   * information, the rest are not even though there is no seperation.
-   * aim_extractuserinfo() returns the number of bytes used by the
-   * userinfo tlvs, so you can start reading the rest of them right
-   * afterward.  
-   *
-   * That also means that TLV types can be duplicated between the
-   * userinfo block and the rest of the message, however there should
-   * never be two TLVs of the same type in one block.
-   * 
-   */
-  i += aim_extractuserinfo(sess, command->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(command->data+i, command->commandlen-i);
+  memset(&args, 0, sizeof(args));
 
   /*
-   * From here on, its depends on what channel we're on.
+   * 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 (channel == 1)
-    {
-     u_int j = 0, y = 0, z = 0;
-      char *msg = NULL;
-      u_int icbmflags = 0;
-      struct aim_tlv_t *msgblocktlv;
-      u_char *msgblock;
-      u_short flag1,flag2;
-      int finlen = 0;
-      unsigned char fingerprint[10];
-      u_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;
+  for (i = 0; i < datalen; ) {
       
-      /*
-       * Check Ack Request status.
-       */
-      if (aim_gettlv(tlvlist, 0x0003, 1))
-	icbmflags |= AIM_IMFLAGS_ACK;
+    type = aimutil_get16(data+i);
+    i += 2;
       
-      /*
-       * Message block.
-       */
-      msgblocktlv = aim_gettlv(tlvlist, 0x0002, 1);
-      if (!msgblocktlv || !msgblocktlv->value) {
-	faimdprintf(sess, 0, "icbm: major error! no message block TLV found!\n");
-	aim_freetlvchain(&tlvlist);
-	return 1;
-      }
+    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;
+
+      msgblock = data+i;
       
       /*
        * Extracting the message from the unknown cruft.
@@ -384,9 +470,7 @@ faim_internal int aim_parse_incoming_im_middle(struct aim_session_t *sess,
        * "Do you believe in magic?"
        *
        */
-      msgblock = msgblocktlv->value;
-      j = 0;
-      
+
       wastebits = aimutil_get8(msgblock+j++);
       wastebits = aimutil_get8(msgblock+j++);
       
@@ -397,399 +481,480 @@ faim_internal int aim_parse_incoming_im_middle(struct aim_session_t *sess,
       wastebits = aimutil_get8(msgblock+j++);
       wastebits = aimutil_get8(msgblock+j++);
 
-      finlen = j;
-      if (finlen > sizeof(fingerprint))
-	finlen = sizeof(fingerprint);
-      memcpy(fingerprint, msgblocktlv->value, finlen);
+      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.
-       */
-      i = aimutil_get16(msgblock+j);
+      /* Message string length, including flag words. */
+      args.msglen = aimutil_get16(msgblock+j);
       j += 2;
-      
-      /*
-       * 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);
+
+      /* 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;
-      flag2 = aimutil_get16(msgblock+j);
+
+      args.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);
-      
-      /* 
-       * Message string. 
-       */
-      i -= 4;
-      msg = (char *)malloc(i+1);
-      memcpy(msg, msgblock+j, i);
-      msg[i] = '\0';
-      
-      /*
-       * Call client.
-       */
-      userfunc = aim_callhandler(sess, command->conn, 0x0004, 0x0007);
-      if (userfunc)
-	i = userfunc(sess, command, channel, &userinfo, msg, icbmflags, flag1, flag2, finlen, fingerprint);
-      else 
-	i = 0;
-      
-      free(msg);
+      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';
+      }
+
+    } else if (type == 0x0003) { /* Server Ack Requested */
+
+      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);
     }
-  else if (channel == 0x0002)
-    {	
-      struct aim_tlv_t *block1;
-      struct aim_tlvlist_t *list2;
-      unsigned short reqclass = 0;
-      unsigned short status = 0;
+
+    i += length;
+  }
+
+
+  if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+    ret = userfunc(sess, rx, channel, userinfo, &args);
+
+  free(args.msg);
+
+  return ret;
+}
+
+static int incomingim_ch2(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)
+{
+  aim_rxcallback_t userfunc;
+  struct aim_tlv_t *block1;
+  struct aim_tlvlist_t *list2;
+  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. 
-       */
-      block1 = aim_gettlv(tlvlist, 0x0005, 1);
-      if (!block1) {
-	faimdprintf(sess, 0, "no tlv 0x0005 in rendezvous transaction!\n");
-	aim_freetlvchain(&tlvlist);
-	return 1; /* major problem */
-      }
+  /*
+   * There's another block of TLVs embedded in the type 5 here. 
+   */
+  block1 = aim_gettlv(tlvlist, 0x0005, 1);
+  if (!block1 || !block1->value) {
+    faimdprintf(sess, 0, "no tlv 0x0005 in rendezvous transaction!\n");
+    return 0;
+  }
 
-      /*
-       * First two bytes represent the status of the connection.
-       *
-       * 0 is a request, 2 is an accept
-       */ 
-      status = aimutil_get16(block1->value+0);
+  /*
+   * First two bytes represent the status of the connection.
+   *
+   * 0 is a request, 2 is an accept
+   */ 
+  args.status = aimutil_get16(block1->value+0);
       
-      /*
-       * Next comes the cookie.  Should match the ICBM cookie.
-       */
-      if (memcmp(block1->value+2, cookie, 8) != 0) 
-	faimdprintf(sess, 0, "rend: warning cookies don't match!\n");
+  /*
+   * Next comes the cookie.  Should match the ICBM cookie.
+   */
+  if (memcmp(block1->value+2, cookie, 8) != 0) 
+    faimdprintf(sess, 0, "rend: warning cookies don't match!\n");
 
-      /*
-       * The next 16bytes are a capability block so we can
-       * identify what type of rendezvous this is.
-       *
-       * Thanks to Eric Warmenhoven <warmenhoven@linux.com> (of GAIM)
-       * for pointing some of this out to me.  In fact, a lot of 
-       * the client-to-client info comes from the work of the GAIM 
-       * developers. Thanks!
-       *
-       * Read off one capability string and we should have it ID'd.
-       * 
-       */
-      reqclass = aim_getcap(sess, block1->value+2+8, 0x10);
-      if (reqclass == 0x0000) {
-	faimdprintf(sess, 0, "rend: no ID block\n");
-	aim_freetlvchain(&tlvlist);
-	return 1;
-      }
+  /*
+   * The next 16bytes are a capability block so we can
+   * identify what type of rendezvous this is.
+   *
+   * Thanks to Eric Warmenhoven <warmenhoven@linux.com> (of GAIM)
+   * for pointing some of this out to me.  In fact, a lot of 
+   * the client-to-client info comes from the work of the GAIM 
+   * developers. Thanks!
+   *
+   * Read off one capability string and we should have it ID'd.
+   * 
+   */
+  if ((args.reqclass = aim_getcap(sess, block1->value+2+8, 0x10)) == 0x0000) {
+    faimdprintf(sess, 0, "rend: no ID block\n");
+    return 0;
+  }
 
-      /* 
-       * What follows may be TLVs or nothing, depending on the
-       * purpose of the message.
-       *
-       * Ack packets for instance have nothing more to them.
-       */
-      list2 = aim_readtlvchain(block1->value+2+8+16, block1->length-2-8-16);
+  /* 
+   * What follows may be TLVs or nothing, depending on the
+   * purpose of the message.
+   *
+   * Ack packets for instance have nothing more to them.
+   */
+  list2 = aim_readtlvchain(block1->value+2+8+16, block1->length-2-8-16);
       
-      if (!list2 || ((reqclass != AIM_CAPS_IMIMAGE) && !(aim_gettlv(list2, 0x2711, 1)))) {
-	struct aim_msgcookie_t *cook;
-	int type;
+  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);
-	  aim_freetlvchain(&list2);
-	  aim_freetlvchain(&tlvlist);
-	  return 1;
-	}
+    if ((cook = aim_checkcookie(sess, cookie, type)) == NULL) {
+      faimdprintf(sess, 0, "non-data rendezvous thats not in cache %d/%s!\n", type, cookie);
+      aim_freetlvchain(&list2);
+      return 0;
+    }
+
+    if (cook->type == AIM_COOKIETYPE_OFTGET) {
+      struct aim_filetransfer_priv *ft;
 
-	if (cook->type == AIM_COOKIETYPE_OFTGET) {
-	  struct aim_filetransfer_priv *ft;
-
-	  if (cook->data) {
-	    int errorcode = -1; /* XXX shouldnt this be 0? */
-
-	    ft = (struct aim_filetransfer_priv *)cook->data;
-
-	    if(status != 0x0002) {
-	      if (aim_gettlv(list2, 0x000b, 1))
-		errorcode = aim_gettlv16(list2, 0x000b, 1);
-	      
-	      if (errorcode)
-		faimdprintf(sess, 0, "transfer from %s (%s) for %s cancelled (error code %d)\n", ft->sn, ft->ip, ft->fh.name, errorcode);
-	    }
-	  } else {
-	    faimdprintf(sess, 0, "no data attached to file transfer\n");
-	  }
-	} else if (cook->type == AIM_CAPS_VOICE) {
-	  faimdprintf(sess, 0, "voice request cancelled\n");
-	} else {
-	  faimdprintf(sess, 0, "unknown cookie cache type %d\n", cook->type);
+      if (cook->data) {
+	int errorcode = -1; /* XXX shouldnt this be 0? */
+
+	ft = (struct aim_filetransfer_priv *)cook->data;
+
+	if (args.status != 0x0002) {
+
+	  if (aim_gettlv(list2, 0x000b, 1))
+	    errorcode = aim_gettlv16(list2, 0x000b, 1);
+
+	  /* XXX this should make it up to the client, you know.. */
+	  if (errorcode)
+	    faimdprintf(sess, 0, "transfer from %s (%s) for %s cancelled (error code %d)\n", ft->sn, ft->ip, ft->fh.name, errorcode);
 	}
-	
-	if (list2)
-	  aim_freetlvchain(&list2);
-	aim_freetlvchain(&tlvlist);
-	return 1;
+      } else {
+	faimdprintf(sess, 0, "no data attached to file transfer\n");
       }
+    } else if (cook->type == AIM_CAPS_VOICE) {
+      faimdprintf(sess, 0, "voice request cancelled\n");
+    } else {
+      faimdprintf(sess, 0, "unknown cookie cache type %d\n", cook->type);
+    }
+	
+    aim_freetlvchain(&list2);
 
-      /*
-       * The rest of the handling depends on what type it is.
-       */
-      if (reqclass & AIM_CAPS_BUDDYICON) {
+    return 1;
+  }
 
-	/*
-	 * Call client.
-	 */
-#if 0
-	userfunc = aim_callhandler(sess, command->conn, 0x0004, 0x0007);
-	if (userfunc || (i = 0))
-	  i = userfunc(sess, 
-		       command, 
-		       channel, 
-		       reqclass,
-		       &userinfo,
-		       ip,
-		       cookie);
-#endif
+  /*
+   * The rest of the handling depends on what type it is.
+   */
+  if (args.reqclass & AIM_CAPS_BUDDYICON) {
+    struct aim_tlv_t *miscinfo;
+    int curpos = 0;
 
-      } else if (reqclass & AIM_CAPS_VOICE) {
-	struct aim_msgcookie_t *cachedcook;
+    miscinfo = aim_gettlv(list2, 0x2711, 1);
 
-	faimdprintf(sess, 0, "rend: voice!\n");
+    /* 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);
 
-	if(!(cachedcook = (struct aim_msgcookie_t*)calloc(1, sizeof(struct aim_msgcookie_t))))
-	  return 1;
+    if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+      ret = userfunc(sess, rx, channel, userinfo, &args);
 
-	memcpy(cachedcook->cookie, cookie, 8);
-	cachedcook->type = AIM_COOKIETYPE_OFTVOICE;
-	cachedcook->data = NULL;
+    free(args.info.icon.icon);
 
-	if (aim_cachecookie(sess, cachedcook) == -1)
-	  faimdprintf(sess, 0, "ERROR caching message cookie\n");
+  } else if (args.reqclass & AIM_CAPS_VOICE) {
+    struct aim_msgcookie_t *cachedcook;
 
-	/* XXX: implement all this */
+    faimdprintf(sess, 0, "rend: voice!\n");
 
-	/*
-	 * Call client.
-	 */
-	userfunc = aim_callhandler(sess, command->conn, 0x0004, 0x0007);
-	if (userfunc || (i = 0)) {
-	  i = userfunc(sess, command, channel, reqclass, &userinfo);
-	}
-      } else if ((reqclass & AIM_CAPS_IMIMAGE) || (reqclass & AIM_CAPS_BUDDYICON)) {
-	char ip[30];
-	struct aim_directim_priv *priv;
+    if(!(cachedcook = (struct aim_msgcookie_t*)calloc(1, sizeof(struct aim_msgcookie_t)))) {
+      aim_freetlvchain(&list2);
+      return 0;
+    }
+
+    memcpy(cachedcook->cookie, cookie, 8);
+    cachedcook->type = AIM_COOKIETYPE_OFTVOICE;
+    cachedcook->data = NULL;
+
+    if (aim_cachecookie(sess, cachedcook) == -1)
+      faimdprintf(sess, 0, "ERROR caching message cookie\n");
+
+    /* XXX: implement all this */
 
-	memset(ip, 0, 30);
+    if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype))) 
+      ret = userfunc(sess, rx, channel, userinfo, &args);
+
+  } else if (args.reqclass & AIM_CAPS_IMIMAGE) {
+    char ip[30];
+    struct aim_directim_priv *priv;
+
+    memset(ip, 0, sizeof(ip));
 	
-	if (aim_gettlv(list2, 0x0003, 1) && aim_gettlv(list2, 0x0005, 1)) {
-	  struct aim_tlv_t *iptlv, *porttlv;
+    if (aim_gettlv(list2, 0x0003, 1) && aim_gettlv(list2, 0x0005, 1)) {
+      struct aim_tlv_t *iptlv, *porttlv;
 	  
-	  iptlv = aim_gettlv(list2, 0x0003, 1);
-	  porttlv = aim_gettlv(list2, 0x0005, 1);
-
-	  snprintf(ip, 30, "%d.%d.%d.%d:%d", 
-		  aimutil_get8(iptlv->value+0),
-		  aimutil_get8(iptlv->value+1),
-		  aimutil_get8(iptlv->value+2),
-		  aimutil_get8(iptlv->value+3),
-		  4443 /*aimutil_get16(porttlv->value)*/);
-	}
+      iptlv = aim_gettlv(list2, 0x0003, 1);
+      porttlv = aim_gettlv(list2, 0x0005, 1);
+
+      snprintf(ip, 30, "%d.%d.%d.%d:%d", 
+	       aimutil_get8(iptlv->value+0),
+	       aimutil_get8(iptlv->value+1),
+	       aimutil_get8(iptlv->value+2),
+	       aimutil_get8(iptlv->value+3),
+	       4443 /*aimutil_get16(porttlv->value)*/);
+    }
 
-	faimdprintf(sess, 0, "rend: directIM request from %s (%s)\n",
-		    userinfo.sn, ip);
+    faimdprintf(sess, 0, "rend: directIM request from %s (%s)\n",
+		userinfo->sn, ip);
 
-       /* XXX: there are a couple of different request packets for
-	*          different things */
-	
-	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));
+    /* 
+     * XXX: there are a couple of different request packets for
+     *          different things 
+     */
 
-	/*
-	 * Call client.
-	 */
-	userfunc = aim_callhandler(sess, command->conn, 0x0004, 0x0007);
-	if (userfunc || (i = 0))
-	  i = userfunc(sess, 
-		       command, 
-		       channel, 
-		       reqclass,
-		       &userinfo, priv);
-
-      } else if (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);
+    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, userinfo, &args);
+
+  } else if (args.reqclass & AIM_CAPS_CHAT) {
+    struct aim_tlv_t *miscinfo;
+
+    miscinfo = aim_gettlv(list2, 0x2711, 1);
+    aim_chat_readroominfo(miscinfo->value, &args.info.chat.roominfo);
 		  
-	if (aim_gettlv(list2, 0x000c, 1))
-	  msg = aim_gettlv_str(list2, 0x000c, 1);
+    if (aim_gettlv(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);
+    if (aim_gettlv(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);
+    if (aim_gettlv(list2, 0x000e, 1))
+      args.info.chat.lang = aim_gettlv_str(list2, 0x000e, 1);
       
-	/*
-	 * Call client.
-	 */
-	userfunc = aim_callhandler(sess, command->conn, 0x0004, 0x0007);
-	if (userfunc || (i = 0))
-	  i = userfunc(sess, 
-		       command, 
-		       channel, 
-		       reqclass,
-		       &userinfo, 
-		       &roominfo, 
-		       msg, 
-		       encoding?encoding+1:NULL, 
-		       lang?lang+1:NULL);
-	  free(roominfo.name);
-	  free(msg);
-	  free(encoding);
-	  free(lang);
-      } else if (reqclass & AIM_CAPS_GETFILE) {
-	char ip[30];
-	struct aim_msgcookie_t *cachedcook;
-	struct aim_tlv_t *miscinfo;
-
-	if (!(cachedcook = calloc(1, sizeof(struct aim_msgcookie_t))))
-	  return 0;
-
-	memset(ip, 0, 30);
-
-	if (!(miscinfo = aim_gettlv(list2, 0x2711, 1))) {
-	  aim_cookie_free(sess, cachedcook);
-	  return 0;
-	}
+    if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+      ret = userfunc(sess, rx, channel, userinfo, &args);
 
-	if (aim_gettlv(list2, 0x0003, 1) && aim_gettlv(list2, 0x0005, 1)) {
-	  struct aim_tlv_t *iptlv, *porttlv;
+    free(args.info.chat.roominfo.name);
+    free(args.info.chat.msg);
+    free(args.info.chat.encoding);
+    free(args.info.chat.lang);
 
-	  if (!(iptlv = aim_gettlv(list2, 0x0003, 1)) || !(porttlv = aim_gettlv(list2, 0x0005, 1))) {
-	    aim_cookie_free(sess, cachedcook);
-	    return 0;
-	  }
+  } else if (args.reqclass & AIM_CAPS_GETFILE) {
+    char ip[30];
+    struct aim_msgcookie_t *cachedcook;
+    struct aim_tlv_t *miscinfo;
+    struct aim_tlv_t *iptlv, *porttlv;
 
-	  snprintf(ip, 30, "%d.%d.%d.%d:%d",
-		   aimutil_get8(iptlv->value+0),
-		   aimutil_get8(iptlv->value+1),
-		   aimutil_get8(iptlv->value+2),
-		   aimutil_get8(iptlv->value+3),
-		   aimutil_get16(porttlv->value));
-	}
+    memset(ip, 0, 30);
 
-	faimdprintf(sess, 0, "rend: file get request from %s (%s)\n", userinfo.sn, ip);
+    if (!(cachedcook = calloc(1, sizeof(struct aim_msgcookie_t)))) {
+      aim_freetlvchain(&list2);
+      return 0;
+    }
 
-	/*
-	 * Call client.
-	 */
-	userfunc = aim_callhandler(sess, command->conn, 0x0004, 0x0007);
-	if (userfunc || (i = 0))
-	  i = userfunc(sess, 
-		       command, 
-		       channel, 
-		       reqclass,
-		       &userinfo,
-		       ip,
-		       cookie);
-
-      } else if (reqclass & AIM_CAPS_SENDFILE) {
+    if (!(miscinfo = aim_gettlv(list2, 0x2711, 1)) || 
+	!(iptlv = aim_gettlv(list2, 0x0003, 1)) || 
+	!(porttlv = aim_gettlv(list2, 0x0005, 1))) {
+      faimdprintf(sess, 0, "rend: badly damaged file get request from %s...\n", userinfo->sn);
+      aim_cookie_free(sess, cachedcook);
+      aim_freetlvchain(&list2);
+      return 0;
+    }
+
+    snprintf(ip, 30, "%d.%d.%d.%d:%d",
+	     aimutil_get8(iptlv->value+0),
+	     aimutil_get8(iptlv->value+1),
+	     aimutil_get8(iptlv->value+2),
+	     aimutil_get8(iptlv->value+3),
+	     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, userinfo, &args);
+
+  } else if (args.reqclass & AIM_CAPS_SENDFILE) {
 #if 0
-       char ip[30];
-       char *desc = NULL;
-       struct aim_msgcookie_t *cachedcook;
-       struct aim_filetransfer_priv *ft;
-       struct aim_tlv_t *miscinfo;
+    char ip[30];
+    struct aim_msgcookie_t *cachedcook;
+    struct aim_tlv_t *miscinfo;
+    struct aim_tlv_t *iptlv, *porttlv;
 
-	memset(ip, 0, sizeof(ip));
-	
-	if (!(miscinfo = aim_gettlv(list2, 0x2711, 1)))
-	  return 0;
+    memset(ip, 0, 30);
 
-	if (aim_gettlv(list2, 0x0003, 1) && aim_gettlv(list2, 0x0003, 1)) {
-	  struct aim_tlv_t *iptlv, *porttlv;
-	  
-	  iptlv = aim_gettlv(list2, 0x0003, 1);
-	  porttlv = aim_gettlv(list2, 0x0005, 1);
-
-	  snprintf(ip, sizeof(ip)-1, "%d.%d.%d.%d:%d", 
-		  aimutil_get8(iptlv->value+0),
-		  aimutil_get8(iptlv->value+1),
-		  aimutil_get8(iptlv->value+2),
-		  aimutil_get8(iptlv->value+3),
-		  aimutil_get16(porttlv->value));
-	}
+    if (!(cachedcook = calloc(1, sizeof(struct aim_msgcookie_t)))) {
+      aim_freetlvchain(&list2);
+      return 0;
+    }
 
-	if (aim_gettlv(list2, 0x000c, 1)) {
-	  desc = aim_gettlv_str(list2, 0x000c, 1);
-	}
+    if (!(miscinfo = aim_gettlv(list2, 0x2711, 1)) || 
+	!(iptlv = aim_gettlv(list2, 0x0003, 1)) || 
+	!(porttlv = aim_gettlv(list2, 0x0005, 1))) {
+      faimdprintf(sess, 0, "rend: badly damaged file get request from %s...\n", userinfo->sn);
+      aim_cookie_free(sess, cachedcook);
+      aim_freetlvchain(&list2);
+      return 0;
+    }
 
-	faimdprintf(sess, 0, "rend: file transfer request from %s for %s: %s (%s)\n",
-		    userinfo.sn,
-		    miscinfo->value+8,
-		    desc, 
-		    ip);
-	
-	memcpy(cachedcook->cookie, cookie, 8);
-	
-	ft = malloc(sizeof(struct aim_filetransfer_priv));
-	strncpy(ft->sn, userinfo.sn, sizeof(ft->sn));
-	strncpy(ft->ip, ip, sizeof(ft->ip));
-	strncpy(ft->fh.name, miscinfo->value+8, sizeof(ft->fh.name));
-	cachedcook->type = AIM_COOKIETYPE_OFTSEND;
-	cachedcook->data = ft;
-
-	if (aim_cachecookie(sess, cachedcook) == -1)
-	  faimdprintf(sess, 0, "ERROR caching message cookie\n");
+    snprintf(ip, 30, "%d.%d.%d.%d:%d",
+	     aimutil_get8(iptlv->value+0),
+	     aimutil_get8(iptlv->value+1),
+	     aimutil_get8(iptlv->value+2),
+	     aimutil_get8(iptlv->value+3),
+	     aimutil_get16(porttlv->value));
+
+    if (aim_gettlv(list2, 0x000c, 1))
+      desc = aim_gettlv_str(list2, 0x000c, 1);
+
+    faimdprintf(sess, 0, "rend: file transfer request from %s for %s: %s (%s)\n",
+		userinfo->sn, miscinfo->value+8,
+		desc, ip);
 	
+    memcpy(cachedcook->cookie, cookie, 8);
 	
-	aim_accepttransfer(sess, command->conn, ft->sn, cookie, AIM_CAPS_SENDFILE);
+    ft = malloc(sizeof(struct aim_filetransfer_priv));
+    strncpy(ft->sn, userinfo.sn, sizeof(ft->sn));
+    strncpy(ft->ip, ip, sizeof(ft->ip));
+    strncpy(ft->fh.name, miscinfo->value+8, sizeof(ft->fh.name));
+    cachedcook->type = AIM_COOKIETYPE_OFTSEND;
+    cachedcook->data = ft;
+
+    if (aim_cachecookie(sess, cachedcook) == -1)
+      faimdprintf(sess, 0, "ERROR caching message cookie\n");
+
+    aim_accepttransfer(sess, rx->conn, ft->sn, cookie, AIM_CAPS_SENDFILE);
 	
-	if (desc)
-	  free(desc);
+    if (desc)
+      free(desc);
+
+    if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+      ret = userfunc(sess, rx, channel, userinfo, &args);
+
 #endif	
-	/*
-	 * Call client.
-	 */
-	userfunc = aim_callhandler(sess, command->conn, 0x0004, 0x0007);
-	if (userfunc || (i = 0))
-	  i = userfunc(sess, 
-		       command, 
-		       channel, 
-		       reqclass,
-		       &userinfo);
-      } else
-	faimdprintf(sess, 0, "rend: unknown rendezvous 0x%04x\n", reqclass);
+  } else
+    faimdprintf(sess, 0, "rend: unknown rendezvous 0x%04x\n", args.reqclass);
 
-      aim_freetlvchain(&list2);
-    }
+  aim_freetlvchain(&list2);
 
+  return ret;
+}
+
+/*
+ * It can easily be said that parsing ICBMs is THE single
+ * most difficult thing to do in the in AIM protocol.  In
+ * fact, I think I just did say that.
+ *
+ * Below is the best damned solution I've come up with
+ * over the past sixteen months of battling with it. This
+ * can parse both away and normal messages from every client
+ * I have access to.  Its not fast, its not clean.  But it works.
+ *
+ */
+static int incomingim(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
+{
+  int i, ret = 0;
+  unsigned char cookie[8];
+  int channel;
+  struct aim_userinfo_s userinfo;
+
+  memset(&userinfo, 0x00, sizeof(struct aim_userinfo_s));
+ 
   /*
-   * Free up the TLV chain.
+   * Read ICBM Cookie.  And throw away.
    */
-  aim_freetlvchain(&tlvlist);
+  for (i = 0; i < 8; i++)
+    cookie[i] = aimutil_get8(data+i);
   
+  /*
+   * Channel ID.
+   *
+   * Channel 0x0001 is the message channel.  There are 
+   * other channels for things called "rendevous"
+   * which represent chat and some of the other new
+   * features of AIM2/3/3.5. 
+   *
+   * Channel 0x0002 is the Rendevous channel, which
+   * is where Chat Invitiations and various client-client
+   * connection negotiations come from.
+   * 
+   */
+  channel = aimutil_get16(data+i);
+  i += 2;
+  
+  /*
+   *
+   */
+  if ((channel != 0x01) && (channel != 0x02)) {
+    faimdprintf(sess, 0, "icbm: ICBM received on an unsupported channel.  Ignoring.\n (chan = %04x)", channel);
+    return 1;
+  }
+
+  /*
+   * Extract the standard user info block.
+   *
+   * Note that although this contains TLVs that appear contiguous
+   * with the TLVs read below, they are two different pieces.  The
+   * userinfo block contains the number of TLVs that contain user
+   * information, the rest are not even though there is no seperation.
+   * aim_extractuserinfo() returns the number of bytes used by the
+   * userinfo tlvs, so you can start reading the rest of them right
+   * afterward.  
+   *
+   * That also means that TLV types can be duplicated between the
+   * userinfo block and the rest of the message, however there should
+   * never be two TLVs of the same type in one block.
+   * 
+   */
+  i += aim_extractuserinfo(sess, data+i, &userinfo);
+  
+  /*
+   * 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, 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);
 
-  return i;
+    ret = incomingim_ch2(sess, mod, rx, snac, channel, &userinfo, tlvlist, cookie);
+
+    /*
+     * Free up the TLV chain.
+     */
+    aim_freetlvchain(&tlvlist);
+  }
+
+  return ret;
 }
 
 /*
@@ -848,14 +1013,10 @@ faim_export unsigned long aim_seticbmparam(struct aim_session_t *sess,
   curbyte = aim_putsnac(newpacket->data, 0x0004, 0x0002, 0x0000, sess->snac_nextid);
   curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
   curbyte += aimutil_put32(newpacket->data+curbyte, 0x00000003);
-  curbyte += aimutil_put8(newpacket->data+curbyte,  0x1f);
-  curbyte += aimutil_put8(newpacket->data+curbyte,  0x40);
-  curbyte += aimutil_put8(newpacket->data+curbyte,  0x03);
-  curbyte += aimutil_put8(newpacket->data+curbyte,  0xe7);
-  curbyte += aimutil_put8(newpacket->data+curbyte,  0x03);
-  curbyte += aimutil_put8(newpacket->data+curbyte,  0xe7);
-  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
-  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
+  curbyte += aimutil_put16(newpacket->data+curbyte,  0x1f40);
+  curbyte += aimutil_put16(newpacket->data+curbyte,  0x03e7);
+  curbyte += aimutil_put16(newpacket->data+curbyte,  0x03e7);
+  curbyte += aimutil_put32(newpacket->data+curbyte, 0x00000000);
 
   newpacket->lock = 0;
   aim_tx_enqueue(sess, newpacket);
@@ -863,66 +1024,44 @@ faim_export unsigned long aim_seticbmparam(struct aim_session_t *sess,
   return (sess->snac_nextid++);
 }
 
-faim_internal int aim_parse_msgerror_middle(struct aim_session_t *sess,
-					    struct command_rx_struct *command)
+static int paraminfo(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  u_long snacid = 0x000000000;
-  struct aim_snac_t *snac = NULL;
-  int ret = 0;
-  rxcallback_t userfunc = NULL;
-  char *dest;
-  unsigned short reason = 0;
+  unsigned long defflags, minmsginterval;
+  unsigned short maxicbmlen, maxsenderwarn, maxrecverwarn, maxchannel;
+  aim_rxcallback_t userfunc;
+  int i = 0;
 
-  /*
-   * Get SNAC from packet and look it up 
-   * the list of unrepliedto/outstanding
-   * SNACs.
-   *
-   * After its looked up, the SN that the
-   * message should've gone to will be 
-   * in the ->data element of the snac struct.
-   *
-   */
-  snacid = aimutil_get32(command->data+6);
-  snac = aim_remsnac(sess, snacid);
+  maxchannel = aimutil_get16(data+i);
+  i += 2;
 
-  if (!snac) {
-    faimdprintf(sess, 0, "msgerr: got an ICBM-failed error on an unknown SNAC ID! (%08lx)\n", snacid);
-    dest = NULL;
-  } else
-    dest = snac->data;
+  defflags = aimutil_get32(data+i);
+  i += 4;
+
+  maxicbmlen = aimutil_get16(data+i);
+  i += 2;
 
-  reason = aimutil_get16(command->data+10);
+  maxsenderwarn = aimutil_get16(data+i);
+  i += 2;
 
-  /*
-   * Call client.
-   */
-  userfunc = aim_callhandler(sess, command->conn, 0x0004, 0x0001);
-  if (userfunc)
-    ret =  userfunc(sess, command, dest, reason);
-  else
-    ret = 0;
-  
-  if (snac) {
-    free(snac->data);
-    free(snac);
-  }
+  maxrecverwarn = aimutil_get16(data+i);
+  i += 2;
 
-  return ret;
-}
+  minmsginterval = aimutil_get32(data+i);
+  i += 4;
 
+  if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+    return userfunc(sess, rx, maxchannel, defflags, maxicbmlen, maxsenderwarn, maxrecverwarn, minmsginterval);
 
-faim_internal int aim_parse_missedcall(struct aim_session_t *sess,
-				       struct command_rx_struct *command)
+  return 0;
+}
+
+static int missedcall(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  int i, ret = 1;
-  rxcallback_t userfunc = NULL;
+  int i = 0;
+  aim_rxcallback_t userfunc;
   unsigned short channel, nummissed, reason;
   struct aim_userinfo_s userinfo;
  
-  i = 10; /* Skip SNAC header */
-
-
   /*
    * XXX: supposedly, this entire packet can repeat as many times
    * as necessary. Should implement that.
@@ -931,28 +1070,78 @@ faim_internal int aim_parse_missedcall(struct aim_session_t *sess,
   /*
    * Channel ID.
    */
-  channel = aimutil_get16(command->data+i);
+  channel = aimutil_get16(data+i);
   i += 2;
   
   /*
    * Extract the standard user info block.
    */
-  i += aim_extractuserinfo(sess, command->data+i, &userinfo);
+  i += aim_extractuserinfo(sess, data+i, &userinfo);
   
-  nummissed = aimutil_get16(command->data+i);
+  nummissed = aimutil_get16(data+i);
   i += 2;
   
-  reason = aimutil_get16(command->data+i);
+  reason = aimutil_get16(data+i);
   i += 2;
 
-  /*
-   * Call client.
-   */
-  userfunc = aim_callhandler(sess, command->conn, 0x0004, 0x000a);
-  if (userfunc)
-    ret =  userfunc(sess, command, channel, &userinfo, nummissed, reason);
-  else
-    ret = 0;
+  if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+    return userfunc(sess, rx, channel, &userinfo, nummissed, reason);
   
-  return ret;
+  return 0;
+}
+
+static int msgack(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
+{
+  aim_rxcallback_t userfunc;
+  char sn[MAXSNLEN];
+  unsigned char ck[8];
+  unsigned short type;
+  int i = 0;
+  unsigned char snlen;
+
+  memcpy(ck, data, 8);
+  i += 8;
+
+  type = aimutil_get16(data+i);
+  i += 2;
+
+  snlen = aimutil_get8(data+i);
+  i++;
+
+  memset(sn, 0, sizeof(sn));
+  strncpy(sn, (char *)data+i, snlen);
+
+  if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+    return userfunc(sess, rx, type, sn);
+
+  return 0;
+}
+
+static int snachandler(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
+{
+
+  if (snac->subtype == 0x0005)
+    return paraminfo(sess, mod, rx, snac, data, datalen);
+  else if (snac->subtype == 0x0006)
+    return outgoingim(sess, mod, rx, snac, data, datalen);
+  else if (snac->subtype == 0x0007)
+    return incomingim(sess, mod, rx, snac, data, datalen);
+  else if (snac->subtype == 0x000a)
+    return missedcall(sess, mod, rx, snac, data, datalen);
+  else if (snac->subtype == 0x000c)
+    return msgack(sess, mod, rx, snac, data, datalen);
+
+  return 0;
+}
+
+faim_internal int msg_modfirst(struct aim_session_t *sess, aim_module_t *mod)
+{
+
+  mod->family = 0x0004;
+  mod->version = 0x0000;
+  mod->flags = 0;
+  strncpy(mod->name, "messaging", sizeof(mod->name));
+  mod->snachandler = snachandler;
+
+  return 0;
 }