- Sun Feb 11 01:07:36 UTC 2001

[libfaim.git] / aim_im.c

diff --git a/aim_im.c b/aim_im.c
index 216d2c040306f00d5202b47205148e16b1c4d191..89b2c5fa24cbeed848fa6c5508ac0de6af644496 100644 (file)
--- a/aim_im.c
+++ b/aim_im.c
@@ -5,6 +5,7 @@
  *
  */
 
+#define FAIM_INTERNAL
 #include <faim/aim.h>
 
 /*
@@ -118,25 +119,10 @@ faim_export unsigned long aim_send_im(struct aim_session_t *sess,
 
   aim_tx_enqueue(sess, newpacket);
 
-#ifdef USE_SNAC_FOR_IMS
- {
-    struct aim_snac_t snac;
+  aim_cachesnac(sess, 0x0004, 0x0006, 0x0000, destsn, strlen(destsn)+1);
+  aim_cleansnacs(sess, 60); /* clean out all SNACs over 60sec old */
 
-    snac.id = sess->snac_nextid;
-    snac.family = 0x0004;
-    snac.type = 0x0006;
-    snac.flags = 0x0000;
-
-    snac.data = malloc(strlen(destsn)+1);
-    memcpy(snac.data, destsn, strlen(destsn)+1);
-
-    aim_newsnac(sess, &snac);
-  }
-
- aim_cleansnacs(sess, 60); /* clean out all SNACs over 60sec old */
-#endif
-
-  return (sess->snac_nextid++);
+  return sess->snac_nextid;
 }
 
 faim_internal int aim_parse_outgoing_im_middle(struct aim_session_t *sess,
@@ -456,41 +442,39 @@ faim_internal int aim_parse_incoming_im_middle(struct aim_session_t *sess,
        
        type = aim_msgcookie_gettype(reqclass); /* XXX: fix this shitty code */
 
-       if ((cook = aim_uncachecookie(sess, cookie, type)) == NULL) {
-         printf("faim: non-data rendezvous thats not in cache!\n");
-         aim_freetlvchain(&list2);
-         aim_freetlvchain(&tlvlist);
-         return 1;
+       if(type != 17) {
+         if ((cook = aim_uncachecookie(sess, cookie, type)) == NULL) {
+           printf("faim: non-data rendezvous thats not in cache!\n");
+           aim_freetlvchain(&list2);
+           aim_freetlvchain(&tlvlist);
+           return 1;
+         }
        }
 
-       if (cook->type == AIM_CAPS_SENDFILE) {
+       if (cook->type == AIM_COOKIETYPE_OFTGET) {
          struct aim_filetransfer_priv *ft;
 
          if (cook->data) {
-           struct aim_tlv_t *errortlv;
-           int errorcode = -1;
+           int errorcode = -1; /* XXX shouldnt this be 0? */
 
            ft = (struct aim_filetransfer_priv *)cook->data;
 
-           if ((errortlv = aim_gettlv(list2, 0x000b, 1))) {
-             errorcode = aimutil_get16(errortlv->value);
+           if(status != 0x0002) {
+             if (aim_gettlv(list2, 0x000b, 1))
+               errorcode = aim_gettlv16(list2, 0x000b, 1);
+             
+             if (errorcode)
+               printf("faim: transfer from %s (%s) for %s cancelled (error code %d)\n", ft->sn, ft->ip, ft->fh.name, errorcode);
            }
-           if (errorcode) {
-             printf("faim: transfer from %s (%s) for %s cancelled (error code %d)\n", ft->sn, ft->ip, ft->fh.name, errorcode);
-           } else if (status == 0x0002) { /* connection accepted */
-             printf("faim: transfer from %s (%s) for %s accepted\n", ft->sn, ft->ip, ft->fh.name);
-           }
-           free(cook->data);
          } else {
-           printf("faim: not data attached to file transfer\n");
+           printf("faim: no 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);