diff libfaim/aim_im.c @ 445:e4c34ca88d9b

[gaim-migrate @ 455] Hehehehehe Libfaim got updated, gaim got updated. btw, gaim/faim can't sign in yet, don't ask me why. it's not my fault. committer: Tailor Script <[e-mail]>

--- a/libfaim/aim_im.c	Thu Jun 29 19:38:18 2000 +0000
+++ b/libfaim/aim_im.c	Thu Jun 29 20:40:28 2000 +0000
@@ -28,7 +28,7 @@
   if (strlen(msg) >= MAXMSGLEN)
     return -1;
 
-  if (!(newpacket = aim_tx_new(0x0002, conn, strlen(msg)+256)))
+  if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, strlen(msg)+256)))
     return -1;
 
   newpacket->lock = 1; /* lock struct */
@@ -64,15 +64,22 @@
    * metaTLV start.
    */
   curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002);
-  curbyte += aimutil_put16(newpacket->data+curbyte, strlen(msg) + 0x0d);
+  curbyte += aimutil_put16(newpacket->data+curbyte, strlen(msg) + 0x10);
 
   /*
-   * Flag data?
+   * Flag data / ICBM Parameters?
    */
-  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0501);
-  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0001);
+  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);
-  curbyte += aimutil_put8 (newpacket->data+curbyte, 0x01);
 
   /* 
    * Message block length.
@@ -132,6 +139,156 @@
   return (sess->snac_nextid++);
 }
 
+struct aim_directim_priv {
+  unsigned char cookie[8];
+  char sn[MAXSNLEN+1];
+};
+
+int aim_send_im_direct(struct aim_session_t *sess, 
+		       struct aim_conn_t *conn,
+		       char *msg)
+{
+  struct command_tx_struct *newpacket;
+  struct aim_directim_priv *priv = NULL;
+  int i;
+
+  if (strlen(msg) >= MAXMSGLEN)
+    return -1;
+
+  if (!sess || !conn || (conn->type != AIM_CONN_TYPE_RENDEZVOUS) || !conn->priv) {
+    printf("faim: directim: invalid arguments\n");
+    return -1;
+  }
+
+  if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OFT, 0x0001, conn, strlen(msg)))) {
+    printf("faim: directim: tx_new failed\n");
+    return -1;
+  }
+
+  newpacket->lock = 1; /* lock struct */
+
+  priv = (struct aim_directim_priv *)conn->priv;
+
+  newpacket->hdr.oft.hdr2len = 0x44;
+
+  if (!(newpacket->hdr.oft.hdr2 = malloc(newpacket->hdr.oft.hdr2len))) {
+    free(newpacket);
+    return -1;
+  }
+
+  i = 0;
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0006);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+
+  i += aimutil_putstr(newpacket->hdr.oft.hdr2+i, priv->cookie, 8);
+
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+
+  i += aimutil_put32(newpacket->hdr.oft.hdr2+i, strlen(msg));
+
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+
+  i += aimutil_putstr(newpacket->hdr.oft.hdr2+i, sess->logininfo.screen_name, strlen(sess->logininfo.screen_name));
+  
+  i = 52;
+  i += aimutil_put8(newpacket->hdr.oft.hdr2+i, 0x00);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+  i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000);
+
+  memcpy(newpacket->data, msg, strlen(msg));
+
+  newpacket->lock = 0;
+
+  aim_tx_enqueue(sess, newpacket);
+
+  return 0;
+}
+
+int aim_parse_outgoing_im_middle(struct aim_session_t *sess,
+				 struct command_rx_struct *command)
+{
+  unsigned int i = 0, z;
+  rxcallback_t userfunc = NULL;
+  unsigned char cookie[8];
+  int channel;
+  struct aim_tlvlist_t *tlvlist;
+  char sn[MAXSNLEN];
+  unsigned short icbmflags = 0;
+  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];
+
+  /* Channel ID */
+  channel = aimutil_get16(command->data+i);
+  i += 2;
+
+  if (channel != 0x01) {
+    printf("faim: icbm: ICBM recieved on unsupported channel.  Ignoring. (chan = %04x)\n", channel);
+    return 1;
+  }
+
+  strncpy(sn, command->data+i+1, (int) *(command->data+i));
+  i += 1 + (int) *(command->data+i);
+
+  tlvlist = aim_readtlvchain(command->data+i, command->commandlen-i);
+
+  if (aim_gettlv(tlvlist, 0x0003, 1))
+    icbmflags |= AIM_IMFLAGS_ACK;
+  if (aim_gettlv(tlvlist, 0x0004, 1))
+    icbmflags |= AIM_IMFLAGS_AWAY;
+
+  if (aim_gettlv(tlvlist, 0x0002, 1)) {
+    int j = 0;
+
+    msgblock = aim_gettlv_str(tlvlist, 0x0002, 1);
+
+    /* no, this really is correct.  I'm not high or anything either. */
+    j += 2;
+    j += 2 + aimutil_get16(msgblock+j);
+    j += 2;
+    
+    j += 2; /* final block length */
+
+    flag1 = aimutil_get16(msgblock);
+    j += 2;
+    flag2 = aimutil_get16(msgblock);
+    j += 2;
+    
+    msg = msgblock+j;
+  }
+
+  if ((userfunc = aim_callhandler(command->conn, 0x0004, 0x0006)) || (i = 0))
+    i = userfunc(sess, command, channel, sn, msg, icbmflags, flag1, flag2);
+  
+  if (msgblock)
+    free(msgblock);
+  aim_freetlvchain(&tlvlist);
+
+  return 0;
+}
+
 /*
  * It can easily be said that parsing ICBMs is THE single
  * most difficult thing to do in the in AIM protocol.  In
@@ -194,27 +351,26 @@
     }
 
   /*
-   * Source screen name.
-   */
-  memcpy(userinfo.sn, command->data+i+1, (int)command->data[i]);
-  userinfo.sn[(int)command->data[i]] = '\0';
-  i += 1 + (int)command->data[i];
-
-  /*
-   * Warning Level
+   * 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.
+   * 
    */
-  userinfo.warnlevel = aimutil_get16(command->data+i); /* guess */
-  i += 2;
-
-  /*
-   * Number of TLVs that follow.  Not needed.
-   */
-  wastebits = aimutil_get16(command->data+i);
-  i += 2;
+  i += aim_extractuserinfo(command->data+i, &userinfo);
   
   /*
-   * Read block of TLVs.  All further data is derived
-   * from what is parsed here.
+   * 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);
 
@@ -232,55 +388,26 @@
            
       /*
        * Check Autoresponse status.  If it is an autoresponse,
-       * it will contain a second type 0x0004 TLV, with zero length.
+       * it will contain a type 0x0004 TLV, with zero length.
        */
-      if (aim_gettlv(tlvlist, 0x0004, 2))
+      if (aim_gettlv(tlvlist, 0x0004, 1))
 	icbmflags |= AIM_IMFLAGS_AWAY;
       
       /*
        * Check Ack Request status.
        */
-      if (aim_gettlv(tlvlist, 0x0003, 2))
+      if (aim_gettlv(tlvlist, 0x0003, 1))
 	icbmflags |= AIM_IMFLAGS_ACK;
       
       /*
-       * Extract the various pieces of the userinfo struct.
-       */
-      /* Class. */
-      if ((tmptlv = aim_gettlv(tlvlist, 0x0001, 1)))
-	userinfo.class = aimutil_get16(tmptlv->value);
-      /* Member-since date. */
-      if ((tmptlv = aim_gettlv(tlvlist, 0x0002, 1)))
-	{
-	  /* If this is larger than 4, its probably the message block, skip */
-	  if (tmptlv->length <= 4)
-	    userinfo.membersince = aimutil_get32(tmptlv->value);
-	}
-      /* On-since date */
-      if ((tmptlv = aim_gettlv(tlvlist, 0x0003, 1)))
-	userinfo.onlinesince = aimutil_get32(tmptlv->value);
-      /* Idle-time */
-      if ((tmptlv = aim_gettlv(tlvlist, 0x0004, 1)))
-	userinfo.idletime = aimutil_get16(tmptlv->value);
-      /* Session Length (AIM) */
-      if ((tmptlv = aim_gettlv(tlvlist, 0x000f, 1)))
-	userinfo.sessionlen = aimutil_get16(tmptlv->value);
-      /* Session Length (AOL) */
-      if ((tmptlv = aim_gettlv(tlvlist, 0x0010, 1)))
-	userinfo.sessionlen = aimutil_get16(tmptlv->value);
-      
-      /*
        * Message block.
-       *
-       * XXX: Will the msgblock always be the second 0x0002? 
        */
       msgblocktlv = aim_gettlv(tlvlist, 0x0002, 1);
-      if (!msgblocktlv)
-	{
-	  printf("faim: icbm: major error! no message block TLV found!\n");
-	  aim_freetlvchain(&tlvlist);
-	  return 1;
-	}
+      if (!msgblocktlv || !msgblocktlv->value) {
+	printf("faim: icbm: major error! no message block TLV found!\n");
+	aim_freetlvchain(&tlvlist);
+	return 1;
+      }
       
       /*
        * Extracting the message from the unknown cruft.
@@ -353,26 +480,9 @@
       struct aim_tlv_t *block1;
       struct aim_tlvlist_t *list2;
       struct aim_tlv_t *tmptlv;
-      struct aim_tlv_t *miscinfo;
       unsigned short reqclass = 0;
-      int a;
+      unsigned short status = 0;
       
-      /* Class. */
-      if ((tmptlv = aim_gettlv(tlvlist, 0x0001, 1)))
-	userinfo.class = aimutil_get16(tmptlv->value);
-      /* On-since date */
-      if ((tmptlv = aim_gettlv(tlvlist, 0x0003, 1)))
-	userinfo.onlinesince = aimutil_get32(tmptlv->value);
-      /* Idle-time */
-      if ((tmptlv = aim_gettlv(tlvlist, 0x0004, 1)))
-	userinfo.idletime = aimutil_get16(tmptlv->value);
-      /* Session Length (AIM) */
-      if ((tmptlv = aim_gettlv(tlvlist, 0x000f, 1)))
-	userinfo.sessionlen = aimutil_get16(tmptlv->value);
-      /* Session Length (AOL) */
-      if ((tmptlv = aim_gettlv(tlvlist, 0x0010, 1)))
-	userinfo.sessionlen = aimutil_get16(tmptlv->value);
-
       /*
        * There's another block of TLVs embedded in the type 5 here. 
        */
@@ -383,32 +493,57 @@
 	return 1; /* major problem */
       }
 
-      a = 0x1a; /* skip -- not sure what this information is! */
+      /*
+       * First two bytes represent the status of the connection.
+       *
+       * 0 is a request, 2 is an accept
+       */ 
+      status = aimutil_get16(block1->value+0);
+      
+      /*
+       * Next comes the cookie.  Should match the ICBM cookie.
+       */
+      if (memcmp(block1->value+2, cookie, 8) != 0) 
+	printf("faim: rend: warning cookies don't match!\n");
 
       /*
-       * XXX: Ignore if there's no data, only cookie information.
+       * The next 16bytes are a capability block so we can
+       * identify what type of rendezvous this is.
        *
-       * Its probably just an accepted invitation or something.
-       *  
+       * Thanks to Eric Warmenhoven <[e-mail]> (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 (block1->length <= 0x1a) {
+      reqclass = aim_getcap(block1->value+2+8, 0x10);
+      if (reqclass == 0x0000) {
+	printf("faim: rend: no ID block\n");
 	aim_freetlvchain(&tlvlist);
 	return 1;
       }
 
-      list2 = aim_readtlvchain(block1->value+a, block1->length-a);
-
-      if (!(miscinfo = aim_gettlv(list2, 0x2711, 1))) {
+      /* 
+       * 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;
 
 	if ((cook = aim_uncachecookie(sess, cookie)) == NULL) {
-	  printf("faim: no 0x2711 info TLV in rendezvous and its not in cache!\n");
+	  printf("faim: non-data rendezvous thats not in cache!\n");
 	  aim_freetlvchain(&list2);
 	  aim_freetlvchain(&tlvlist);
 	  return 1;
 	}
 
-	if (cook->type == 1) {
+	if (cook->type == AIM_CAPS_SENDFILE) {
 	  struct aim_filetransfer_t *ft;
 
 	  if (cook->data) {
@@ -420,40 +555,54 @@
 	    if ((errortlv = aim_gettlv(list2, 0x000b, 1))) {
 	      errorcode = aimutil_get16(errortlv->value);
 	    }
-	    printf("faim: transfer from %s (%s) for %s cancelled (error code %d)\n", ft->sender, ft->ip, ft->filename, errorcode);
+	    if (errorcode) {
+	      printf("faim: transfer from %s (%s) for %s cancelled (error code %d)\n", ft->sender, ft->ip, ft->filename, errorcode);
+	    } else if (status == 0x0002) { /* connection accepted */
+	      printf("faim: transfer from %s (%s) for %s accepted\n", ft->sender, ft->ip, ft->filename);
+	    }
 	    free(cook->data);
 	  } else {
 	    printf("faim: not data attached to file transfer\n");
 	  }
-
+	} else if (cook->type == AIM_CAPS_VOICE) {
+	  printf("faim: voice request cancelled\n");
 	} else {
 	  printf("faim: unknown cookie cache type %d\n", cook->type);
 	}
 
 	free(cook);
+	if (list2)
+	  aim_freetlvchain(&list2);
+	aim_freetlvchain(&tlvlist);
 	return 1;
       }
 
+      /*
+       * The rest of the handling depends on what type it is.
+       */
+      if (reqclass & AIM_CAPS_BUDDYICON) {
 
-      /*
-       * Parse the first two bytes of the 0x2711 TLV.  
-       *
-       * This can be interpretted in a couple ways.  
-       *
-       * It could be said that its a service type or some such and
-       * that voice is 0, file transfer is 1, and chat is 4 (and 5).
-       *
-       * Or it could be said that its an exchange value.  Exchanges
-       * four and five are for chat, voice is on exchange zero and
-       * file transfer is done on exchange 1.  
-       *
-       * It should work out the same no how its thought of.
-       *
-       */
-      reqclass = aimutil_get16(miscinfo->value+0);
-   
-      switch (reqclass) {	
-      case AIM_RENDEZVOUS_VOICE: {
+	/*
+	 * Call client.
+	 */
+	userfunc = aim_callhandler(command->conn, 0x0004, 0x0007);
+	if (userfunc || (i = 0))
+	  i = userfunc(sess, 
+		       command, 
+		       channel, 
+		       reqclass,
+		       &userinfo);
+
+      } else if (reqclass & AIM_CAPS_VOICE) {
+	struct aim_msgcookie_t cachedcook;
+
+	printf("faim: rend: voice!\n");
+
+	memcpy(cachedcook.cookie, cookie, 8);
+	cachedcook.type = AIM_CAPS_VOICE;
+	cachedcook.data = NULL;
+	if (aim_cachecookie(sess, &cachedcook) != 0)
+	  printf("faim: ERROR caching message cookie\n");
 
 	/* XXX: implement all this */
 
@@ -468,16 +617,145 @@
 		       reqclass,
 		       &userinfo);
 	}
-	break;
-      }
-      case AIM_RENDEZVOUS_FILETRANSFER: {
+      } else if (reqclass & AIM_CAPS_IMIMAGE) {
+	char ip[30];
+	struct aim_msgcookie_t cachedcook;
+
+	memset(ip, 0, sizeof(ip));
+	
+	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),
+		  4443 /*aimutil_get16(porttlv->value)*/);
+	}
+
+	printf("faim: rend: directIM request from %s (%s)\n",
+	       userinfo.sn,
+	       ip);
+
+#if 0
+	{
+	  struct aim_conn_t *newconn;
+	  
+	  newconn = aim_newconn(sess, AIM_CONN_TYPE_RENDEZVOUS, ip);
+	  if (!newconn || (newconn->fd == -1)) { 
+	    printf("could not connect to %s\n", ip);
+	    perror("aim_newconn");
+	    aim_conn_kill(sess, &newconn);
+	  } else {
+	    struct aim_directim_priv *priv;
+	    priv = (struct aim_directim_priv *)malloc(sizeof(struct aim_directim_priv));
+	    memcpy(priv->cookie, cookie, 8);
+	    strncpy(priv->sn, userinfo.sn, MAXSNLEN);
+	    newconn->priv = priv;
+	    printf("faim: connected to peer (fd = %d)\n", newconn->fd);
+	  }
+	}
+#endif
+	
+#if 0
+	memcpy(cachedcook.cookie, cookie, 8);
+	
+	ft = malloc(sizeof(struct aim_filetransfer_t));
+	strncpy(ft->sender, userinfo.sn, sizeof(ft->sender));
+	strncpy(ft->ip, ip, sizeof(ft->ip));
+	ft->filename = strdup(miscinfo->value+8);
+	cachedcook.type = AIM_CAPS_SENDFILE; 
+	cachedcook.data = ft;
+
+	if (aim_cachecookie(sess, &cachedcook) != 0)
+	  printf("faim: ERROR caching message cookie\n");
+#endif	
+
+	/*
+	 * Call client.
+	 */
+	userfunc = aim_callhandler(command->conn, 0x0004, 0x0007);
+	if (userfunc || (i = 0))
+	  i = userfunc(sess, 
+		       command, 
+		       channel, 
+		       reqclass,
+		       &userinfo);
+
+      } 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);
+		  
+	if (aim_gettlv(list2, 0x000c, 1))
+	  msg = aim_gettlv_str(list2, 0x000c, 1);
+	  
+	if (aim_gettlv(list2, 0x000d, 1))
+	  encoding = aim_gettlv_str(list2, 0x000d, 1);
+	  
+	if (aim_gettlv(list2, 0x000e, 1))
+	  lang = aim_gettlv_str(list2, 0x000e, 1);
+      
+	/*
+	 * Call client.
+	 */
+	userfunc = aim_callhandler(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) {
+
+	/*
+	 * Call client.
+	 */
+	userfunc = aim_callhandler(command->conn, 0x0004, 0x0007);
+	if (userfunc || (i = 0))
+	  i = userfunc(sess, 
+		       command, 
+		       channel, 
+		       reqclass,
+		       &userinfo);
+
+      } else if (reqclass & AIM_CAPS_SENDFILE) {
+	/*
+	 * Call client.
+	 */
+	userfunc = aim_callhandler(command->conn, 0x0004, 0x0007);
+	if (userfunc || (i = 0))
+	  i = userfunc(sess, 
+		       command, 
+		       channel, 
+		       reqclass,
+		       &userinfo);
+#if 0
 	char ip[30];
 	char *desc = NULL;
 	struct aim_msgcookie_t cachedcook;
 	struct aim_filetransfer_t *ft;
+	struct aim_tlv_t *miscinfo;
 
 	memset(ip, 0, sizeof(ip));
 	
+	miscinfo = aim_gettlv(list2, 0x2711, 1);
+
 	if (aim_gettlv(list2, 0x0003, 1) && aim_gettlv(list2, 0x0003, 1)) {
 	  struct aim_tlv_t *iptlv, *porttlv;
 	  
@@ -503,74 +781,26 @@
 	       ip);
 	
 	memcpy(cachedcook.cookie, cookie, 8);
-	memcpy(cachedcook.extended, block1->value+10, 16);
 	
 	ft = malloc(sizeof(struct aim_filetransfer_t));
 	strncpy(ft->sender, userinfo.sn, sizeof(ft->sender));
 	strncpy(ft->ip, ip, sizeof(ft->ip));
 	ft->filename = strdup(miscinfo->value+8);
-	cachedcook.type = 1; 
+	cachedcook.type = AIM_CAPS_SENDFILE; 
 	cachedcook.data = ft;
 
 	if (aim_cachecookie(sess, &cachedcook) != 0)
 	  printf("faim: ERROR caching message cookie\n");
 	
 	
-	aim_denytransfer(sess, command->conn, ft->sender, cookie, 0);
+	aim_accepttransfer(sess, command->conn, ft->sender, cookie, AIM_CAPS_SENDFILE);
 
 	free(desc);
-	
+#endif	
 	i = 1;
-	break;
-      }
-      case AIM_RENDEZVOUS_FILETRANSFER_GET: {
-	printf("faim: file get request (unsupported)\n");
-	i = 1;
-	break;
+      } else {
+	printf("faim: rend: unknown rendezvous 0x%04x\n", reqclass);
       }
-      case AIM_RENDEZVOUS_CHAT_EX3:
-      case AIM_RENDEZVOUS_CHAT_EX4:
-      case AIM_RENDEZVOUS_CHAT_EX5: {
-	struct aim_chat_roominfo roominfo;
-	char *msg=NULL,*encoding=NULL,*lang=NULL;
-
-	aim_chat_readroominfo(miscinfo->value, &roominfo);
-		  
-	if (aim_gettlv(list2, 0x000c, 1))
-	  msg = aim_gettlv_str(list2, 0x000c, 1);
-	  
-	if (aim_gettlv(list2, 0x000d, 1))
-	  encoding = aim_gettlv_str(list2, 0x000d, 1);
-	  
-	if (aim_gettlv(list2, 0x000e, 1))
-	  lang = aim_gettlv_str(list2, 0x000e, 1);
-      
-	/*
-	 * Call client.
-	 */
-	userfunc = aim_callhandler(command->conn, 0x0004, 0x0007);
-	if (userfunc || (i = 0))
-	  i = userfunc(sess, 
-		       command, 
-		       channel, 
-		       reqclass, /* == roominfo->exchange */
-		       &userinfo, 
-		       &roominfo, 
-		       msg, 
-		       encoding?encoding+1:NULL, 
-		       lang?lang+1:NULL);
-	  free(roominfo.name);
-	  free(msg);
-	  free(encoding);
-	  free(lang);
-	  break;
-      }
-      default: {
-	printf("faim: rendezvous: unknown rend class 0x%04x\n", reqclass);
-	i = 1;
-	break;
-      }
-      } /* switch */
 
       aim_freetlvchain(&list2);
     }
@@ -584,6 +814,39 @@
   return i;
 }
 
+u_long aim_accepttransfer(struct aim_session_t *sess,
+			  struct aim_conn_t *conn, 
+			  char *sender,
+			  char *cookie,
+			  unsigned short rendid)
+{
+  struct command_tx_struct *newpacket;
+  int curbyte, i;
+
+  if(!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 10+8+2+1+strlen(sender)+4+2+8+16)))
+    return -1;
+
+  newpacket->lock = 1;
+
+  curbyte = aim_putsnac(newpacket->data, 0x0004, 0x0006, 0x0000, sess->snac_nextid);
+  for (i = 0; i < 8; i++)
+    curbyte += aimutil_put8(newpacket->data+curbyte, cookie[i]);
+  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002);
+  curbyte += aimutil_put8(newpacket->data+curbyte, strlen(sender));
+  curbyte += aimutil_putstr(newpacket->data+curbyte, sender, strlen(sender));
+  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0005);
+  curbyte += aimutil_put16(newpacket->data+curbyte, 0x001a);
+  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002 /* accept */);
+  for (i = 0; i < 8; i++)
+    curbyte += aimutil_put8(newpacket->data+curbyte, cookie[i]);
+  curbyte += aim_putcap(newpacket->data+curbyte, 0x10, rendid);
+
+  newpacket->lock = 0;
+  aim_tx_enqueue(sess, newpacket);
+
+  return (sess->snac_nextid++);
+}
+
 /*
  * Possible codes:
  *    AIM_TRANSFER_DENY_NOTSUPPORTED -- "client does not support"
@@ -600,7 +863,7 @@
   struct command_tx_struct *newpacket;
   int curbyte, i;
 
-  if(!(newpacket = aim_tx_new(0x0002, conn, 10+8+2+1+strlen(sender)+6)))
+  if(!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 10+8+2+1+strlen(sender)+6)))
     return -1;
 
   newpacket->lock = 1;
@@ -632,7 +895,7 @@
   struct command_tx_struct *newpacket;
   int curbyte;
 
-  if(!(newpacket = aim_tx_new(0x0002, conn, 10+16)))
+  if(!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 10+16)))
     return -1;
 
   newpacket->lock = 1;