Changeset e374dee for libfaim/chat.c

Timestamp:

Oct 10, 2003, 5:12:30 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

fe6f1d3

Parents:

f4d0975

Message:

*** empty log message ***

File:

• libfaim/chat.c (modified) (14 diffs)

libfaim/chat.c

@@ -6 +6 @@
 #define FAIM_INTERNAL
 #include <aim.h> 
+
+#include <string.h>
 
 /* Stored in the ->priv of chat connections */
@@ -205 +207 @@
         aim_putsnac(&fr->data, 0x0004, 0x0006, 0x0000, snacid);
 
-
         /*
          * Cookie
          */
-        for (i = 0; i < sizeof(ckstr); i++)
-                aimutil_put8(ckstr, (fu8_t) rand());
+        for (i = 0; i < 8; i++)
+                ckstr[i] = (fu8_t)rand();
 
         /* XXX should be uncached by an unwritten 'invite accept' handler */
@@ -225 +226 @@
                 free(priv);
 
-        for (i = 0; i < sizeof(ckstr); i++)
-                aimbs_put8(&fr->data, ckstr[i]);
-
-
-        /*
-         * Channel (2)
-         */
-        aimbs_put16(&fr->data, 0x0002);
-
-        /*
-         * Dest sn
-         */
-        aimbs_put8(&fr->data, strlen(sn));
-        aimbs_putraw(&fr->data, sn, strlen(sn));
+        /* ICBM Header */
+        aimbs_putraw(&fr->data, ckstr, 8); /* Cookie */
+        aimbs_put16(&fr->data, 0x0002); /* Channel */
+        aimbs_put8(&fr->data, strlen(sn)); /* Screename length */
+        aimbs_putraw(&fr->data, sn, strlen(sn)); /* Screenname */
 
         /*
@@ -346 +338 @@
 
                 while (curoccupant < usercount)
-                        aim_extractuserinfo(sess, &occbs, &userinfo[curoccupant++]);
+                        aim_info_extract(sess, &occbs, &userinfo[curoccupant++]);
         }
 
@@ -424 +416 @@
         if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype))) {
                 ret = userfunc(sess,
-                                rx, 
+                                rx,
                                 &roominfo,
                                 roomname,
                                 usercount,
-                                userinfo,       
+                                userinfo,
                                 roomdesc,
                                 flags,
@@ -439 +431 @@
 
         free(roominfo.name);
+
+        while (usercount > 0)
+                aim_info_free(&userinfo[--usercount]);
+
         free(userinfo);
         free(roomname);
@@ -457 +453 @@
                 curcount++;
                 userinfo = realloc(userinfo, curcount * sizeof(aim_userinfo_t));
-                aim_extractuserinfo(sess, bs, &userinfo[curcount-1]);
+                aim_info_extract(sess, bs, &userinfo[curcount-1]);
         }
 
@@ -463 +459 @@
                 ret = userfunc(sess, rx, curcount, userinfo);
 
+        aim_info_free(userinfo);
         free(userinfo);
 
@@ -498 +495 @@
         aim_putsnac(&fr->data, 0x000e, 0x0005, 0x0000, snacid);
 
-
-        /* 
-         * Generate a random message cookie.
+        /*
+         * Cookie
          *
          * XXX mkcookie should generate the cookie and cache it in one
          * operation to preserve uniqueness.
-         *
-         */
-        for (i = 0; i < sizeof(ckstr); i++)
-                aimutil_put8(ckstr+i, (fu8_t) rand());
+         */
+        for (i = 0; i < 8; i++)
+                ckstr[i] = (fu8_t)rand();
 
         cookie = aim_mkcookie(ckstr, AIM_COOKIETYPE_CHAT, NULL);
@@ -514 +509 @@
         aim_cachecookie(sess, cookie);
 
-        for (i = 0; i < sizeof(ckstr); i++)
-                aimbs_put8(&fr->data, ckstr[i]);
-
-
-        /*
-         * Channel ID. 
-         */
-        aimbs_put16(&fr->data, 0x0003);
-
+        /* ICBM Header */
+        aimbs_putraw(&fr->data, ckstr, 8); /* Cookie */
+        aimbs_put16(&fr->data, 0x0003); /* Channel */
 
         /*
@@ -544 +533 @@
          * SubTLV: Type 1: Message
          */
-        aim_addtlvtochain_raw(&itl, 0x0001, strlen(msg), msg);
+        aim_addtlvtochain_raw(&itl, 0x0001, msglen, msg);
 
         /*
@@ -644 +633 @@
 
                 aim_bstream_init(&tbs, userinfotlv->value, userinfotlv->length);
-                aim_extractuserinfo(sess, &tbs, &userinfo);
+                aim_info_extract(sess, &tbs, &userinfo);
         }
 
@@ -678 +667 @@
                 ret = userfunc(sess, rx, &userinfo, msg);
 
+        aim_info_free(&userinfo);
         free(cookie);
         free(msg);
@@ -703 +693 @@
         mod->family = 0x000e;
         mod->version = 0x0001;
-        mod->toolid = 0x0004; /* XXX this doesn't look right */
-        mod->toolversion = 0x0001; /* nor does this */
+        mod->toolid = 0x0010;
+        mod->toolversion = 0x0629;
         mod->flags = 0;
         strncpy(mod->name, "chat", sizeof(mod->name));