Changeset 862371b for libfaim/chat.c

Timestamp:

Jun 29, 2003, 1:47:04 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:

e016fc2

Parents:

03ad7b2

Message:

*** empty log message ***

File:

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

libfaim/chat.c

@@ -1 +1 @@
 /*
- * aim_chat.c
- *
- * Routines for the Chat service.
+ * Family 0x000e - Routines for the Chat service.
  *
  */
@@ -16 +14 @@
 };
 
-static void dumpbox(aim_session_t *sess, unsigned char *buf, int len)
-{
-        int i;
-
-        if (!sess || !buf || !len)
-                return;
-
-        faimdprintf(sess, 1, "\nDump of %d bytes at %p:", len, buf);
-
-        for (i = 0; i < len; i++) {
-                if ((i % 8) == 0)
-                        faimdprintf(sess, 1, "\n\t");
-
-                faimdprintf(sess, 1, "0x%2x ", buf[i]);
-        }
-
-        faimdprintf(sess, 1, "\n\n");
-
-        return;
-}
-
 faim_internal void aim_conn_kill_chat(aim_session_t *sess, aim_conn_t *conn)
 {
@@ -107 +84 @@
 }
 
+static int aim_addtlvtochain_chatroom(aim_tlvlist_t **list, fu16_t type, fu16_t exchange, const char *roomname, fu16_t instance)
+{
+        fu8_t *buf;
+        int buflen;
+        aim_bstream_t bs;
+
+        buflen = 2 + 1 + strlen(roomname) + 2;
+        
+        if (!(buf = malloc(buflen)))
+                return 0;
+
+        aim_bstream_init(&bs, buf, buflen);
+
+        aimbs_put16(&bs, exchange);
+        aimbs_put8(&bs, strlen(roomname));
+        aimbs_putraw(&bs, roomname, strlen(roomname));
+        aimbs_put16(&bs, instance);
+
+        aim_addtlvtochain_raw(list, type, aim_bstream_curpos(&bs), buf);
+
+        free(buf);
+
+        return 0;
+}
+
 /*
- * Send a Chat Message.
+ * Join a room of name roomname.  This is the first step to joining an 
+ * already created room.  It's basically a Service Request for 
+ * family 0x000e, with a little added on to specify the exchange and room 
+ * name.
+ */
+faim_export int aim_chat_join(aim_session_t *sess, aim_conn_t *conn, fu16_t exchange, const char *roomname, fu16_t instance)
+{
+        aim_frame_t *fr;
+        aim_snacid_t snacid;
+        aim_tlvlist_t *tl = NULL;
+        struct chatsnacinfo csi;
+        
+        if (!sess || !conn || !roomname || !strlen(roomname))
+                return -EINVAL;
+
+        if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 512)))
+                return -ENOMEM;
+
+        memset(&csi, 0, sizeof(csi));
+        csi.exchange = exchange;
+        strncpy(csi.name, roomname, sizeof(csi.name));
+        csi.instance = instance;
+
+        snacid = aim_cachesnac(sess, 0x0001, 0x0004, 0x0000, &csi, sizeof(csi));
+        aim_putsnac(&fr->data, 0x0001, 0x0004, 0x0000, snacid);
+
+        /*
+         * Requesting service chat (0x000e)
+         */
+        aimbs_put16(&fr->data, 0x000e);
+
+        aim_addtlvtochain_chatroom(&tl, 0x0001, exchange, roomname, instance);
+        aim_writetlvchain(&fr->data, &tl);
+        aim_freetlvchain(&tl);
+
+        aim_tx_enqueue(sess, fr);
+
+        return 0; 
+}
+
+faim_internal int aim_chat_readroominfo(aim_bstream_t *bs, struct aim_chat_roominfo *outinfo)
+{
+        int namelen;
+
+        if (!bs || !outinfo)
+                return 0;
+
+        outinfo->exchange = aimbs_get16(bs);
+        namelen = aimbs_get8(bs);
+        outinfo->name = aimbs_getstr(bs, namelen);
+        outinfo->instance = aimbs_get16(bs);
+
+        return 0;
+}
+
+faim_export int aim_chat_leaveroom(aim_session_t *sess, const char *name)
+{
+        aim_conn_t *conn;
+
+        if (!(conn = aim_chat_getconn(sess, name)))
+                return -ENOENT;
+
+        aim_conn_close(conn);
+
+        return 0;
+}
+
+/*
+ * conn must be a BOS connection!
+ */
+faim_export int aim_chat_invite(aim_session_t *sess, aim_conn_t *conn, const char *sn, const char *msg, fu16_t exchange, const char *roomname, fu16_t instance)
+{
+        int i;
+        aim_frame_t *fr;
+        aim_msgcookie_t *cookie;
+        struct aim_invite_priv *priv;
+        fu8_t ckstr[8];
+        aim_snacid_t snacid;
+        aim_tlvlist_t *otl = NULL, *itl = NULL;
+        fu8_t *hdr;
+        int hdrlen;
+        aim_bstream_t hdrbs;
+        
+        if (!sess || !conn || !sn || !msg || !roomname)
+                return -EINVAL;
+
+        if (conn->type != AIM_CONN_TYPE_BOS)
+                return -EINVAL;
+
+        if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 1152+strlen(sn)+strlen(roomname)+strlen(msg))))
+                return -ENOMEM;
+
+        snacid = aim_cachesnac(sess, 0x0004, 0x0006, 0x0000, sn, strlen(sn)+1);
+        aim_putsnac(&fr->data, 0x0004, 0x0006, 0x0000, snacid);
+
+
+        /*
+         * Cookie
+         */
+        for (i = 0; i < sizeof(ckstr); i++)
+                aimutil_put8(ckstr, (fu8_t) rand());
+
+        /* XXX should be uncached by an unwritten 'invite accept' handler */
+        if ((priv = malloc(sizeof(struct aim_invite_priv)))) {
+                priv->sn = strdup(sn);
+                priv->roomname = strdup(roomname);
+                priv->exchange = exchange;
+                priv->instance = instance;
+        }
+
+        if ((cookie = aim_mkcookie(ckstr, AIM_COOKIETYPE_INVITE, priv)))
+                aim_cachecookie(sess, cookie);
+        else
+                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));
+
+        /*
+         * TLV t(0005)
+         *
+         * Everything else is inside this TLV.
+         *
+         * Sigh.  AOL was rather inconsistent right here.  So we have
+         * to play some minor tricks.  Right inside the type 5 is some
+         * raw data, followed by a series of TLVs.  
+         *
+         */
+        hdrlen = 2+8+16+6+4+4+strlen(msg)+4+2+1+strlen(roomname)+2;
+        hdr = malloc(hdrlen);
+        aim_bstream_init(&hdrbs, hdr, hdrlen);
+        
+        aimbs_put16(&hdrbs, 0x0000); /* Unknown! */
+        aimbs_putraw(&hdrbs, ckstr, sizeof(ckstr)); /* I think... */
+        aim_putcap(&hdrbs, AIM_CAPS_CHAT);
+
+        aim_addtlvtochain16(&itl, 0x000a, 0x0001);
+        aim_addtlvtochain_noval(&itl, 0x000f);
+        aim_addtlvtochain_raw(&itl, 0x000c, strlen(msg), msg);
+        aim_addtlvtochain_chatroom(&itl, 0x2711, exchange, roomname, instance);
+        aim_writetlvchain(&hdrbs, &itl);
+        
+        aim_addtlvtochain_raw(&otl, 0x0005, aim_bstream_curpos(&hdrbs), hdr);
+
+        aim_writetlvchain(&fr->data, &otl);
+
+        free(hdr);
+        aim_freetlvchain(&itl);
+        aim_freetlvchain(&otl);
+        
+        aim_tx_enqueue(sess, fr);
+
+        return 0;
+}
+
+/*
+ * Subtype 0x0002 - General room information.  Lots of stuff.
+ *
+ * Values I know are in here but I havent attached
+ * them to any of the 'Unknown's:
+ *      - Language (English)
+ *
+ */
+static int infoupdate(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
+{
+        aim_userinfo_t *userinfo = NULL;
+        aim_rxcallback_t userfunc;
+        int ret = 0;
+        int usercount = 0;
+        fu8_t detaillevel = 0;
+        char *roomname = NULL;
+        struct aim_chat_roominfo roominfo;
+        fu16_t tlvcount = 0;
+        aim_tlvlist_t *tlvlist;
+        char *roomdesc = NULL;
+        fu16_t flags = 0;
+        fu32_t creationtime = 0;
+        fu16_t maxmsglen = 0, maxvisiblemsglen = 0;
+        fu16_t unknown_d2 = 0, unknown_d5 = 0;
+
+        aim_chat_readroominfo(bs, &roominfo);
+
+        detaillevel = aimbs_get8(bs);
+
+        if (detaillevel != 0x02) {
+                faimdprintf(sess, 0, "faim: chat_roomupdateinfo: detail level %d not supported\n", detaillevel);
+                return 1;
+        }
+
+        tlvcount = aimbs_get16(bs);
+
+        /*
+         * Everything else are TLVs.
+         */ 
+        tlvlist = aim_readtlvchain(bs);
+
+        /*
+         * TLV type 0x006a is the room name in Human Readable Form.
+         */
+        if (aim_gettlv(tlvlist, 0x006a, 1))
+                roomname = aim_gettlv_str(tlvlist, 0x006a, 1);
+
+        /*
+         * Type 0x006f: Number of occupants.
+         */
+        if (aim_gettlv(tlvlist, 0x006f, 1))
+                usercount = aim_gettlv16(tlvlist, 0x006f, 1);
+
+        /*
+         * Type 0x0073:  Occupant list.
+         */
+        if (aim_gettlv(tlvlist, 0x0073, 1)) {   
+                int curoccupant = 0;
+                aim_tlv_t *tmptlv;
+                aim_bstream_t occbs;
+
+                tmptlv = aim_gettlv(tlvlist, 0x0073, 1);
+
+                /* Allocate enough userinfo structs for all occupants */
+                userinfo = calloc(usercount, sizeof(aim_userinfo_t));
+
+                aim_bstream_init(&occbs, tmptlv->value, tmptlv->length);
+
+                while (curoccupant < usercount)
+                        aim_extractuserinfo(sess, &occbs, &userinfo[curoccupant++]);
+        }
+
+        /* 
+         * Type 0x00c9: Flags. (AIM_CHATROOM_FLAG)
+         */
+        if (aim_gettlv(tlvlist, 0x00c9, 1))
+                flags = aim_gettlv16(tlvlist, 0x00c9, 1);
+
+        /* 
+         * Type 0x00ca: Creation time (4 bytes)
+         */
+        if (aim_gettlv(tlvlist, 0x00ca, 1))
+                creationtime = aim_gettlv32(tlvlist, 0x00ca, 1);
+
+        /* 
+         * Type 0x00d1: Maximum Message Length
+         */
+        if (aim_gettlv(tlvlist, 0x00d1, 1))
+                maxmsglen = aim_gettlv16(tlvlist, 0x00d1, 1);
+
+        /* 
+         * Type 0x00d2: Unknown. (2 bytes)
+         */
+        if (aim_gettlv(tlvlist, 0x00d2, 1))
+                unknown_d2 = aim_gettlv16(tlvlist, 0x00d2, 1);
+
+        /* 
+         * Type 0x00d3: Room Description
+         */
+        if (aim_gettlv(tlvlist, 0x00d3, 1))
+                roomdesc = aim_gettlv_str(tlvlist, 0x00d3, 1);
+
+        /*
+         * Type 0x000d4: Unknown (flag only)
+         */
+        if (aim_gettlv(tlvlist, 0x000d4, 1))
+                ;
+
+        /* 
+         * Type 0x00d5: Unknown. (1 byte)
+         */
+        if (aim_gettlv(tlvlist, 0x00d5, 1))
+                unknown_d5 = aim_gettlv8(tlvlist, 0x00d5, 1);
+
+
+        /*
+         * Type 0x00d6: Encoding 1 ("us-ascii")
+         */
+        if (aim_gettlv(tlvlist, 0x000d6, 1))
+                ;
+        
+        /*
+         * Type 0x00d7: Language 1 ("en")
+         */
+        if (aim_gettlv(tlvlist, 0x000d7, 1))
+                ;
+
+        /*
+         * Type 0x00d8: Encoding 2 ("us-ascii")
+         */
+        if (aim_gettlv(tlvlist, 0x000d8, 1))
+                ;
+        
+        /*
+         * Type 0x00d9: Language 2 ("en")
+         */
+        if (aim_gettlv(tlvlist, 0x000d9, 1))
+                ;
+
+        /*
+         * Type 0x00da: Maximum visible message length
+         */
+        if (aim_gettlv(tlvlist, 0x000da, 1))
+                maxvisiblemsglen = aim_gettlv16(tlvlist, 0x00da, 1);
+
+        if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype))) {
+                ret = userfunc(sess,
+                                rx, 
+                                &roominfo,
+                                roomname,
+                                usercount,
+                                userinfo,       
+                                roomdesc,
+                                flags,
+                                creationtime,
+                                maxmsglen,
+                                unknown_d2,
+                                unknown_d5,
+                                maxvisiblemsglen);
+        }
+
+        free(roominfo.name);
+        free(userinfo);
+        free(roomname);
+        free(roomdesc);
+        aim_freetlvchain(&tlvlist);
+
+        return ret;
+}
+
+/* Subtypes 0x0003 and 0x0004 */
+static int userlistchange(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
+{
+        aim_userinfo_t *userinfo = NULL;
+        aim_rxcallback_t userfunc;
+        int curcount = 0, ret = 0;
+
+        while (aim_bstream_empty(bs)) {
+                curcount++;
+                userinfo = realloc(userinfo, curcount * sizeof(aim_userinfo_t));
+                aim_extractuserinfo(sess, bs, &userinfo[curcount-1]);
+        }
+
+        if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+                ret = userfunc(sess, rx, curcount, userinfo);
+
+        free(userinfo);
+
+        return ret;
+}
+
+/*
+ * Subtype 0x0005 - Send a Chat Message.
  *
  * Possible flags:
@@ -204 +565 @@
 }
 
-static int aim_addtlvtochain_chatroom(aim_tlvlist_t **list, fu16_t type, fu16_t exchange, const char *roomname, fu16_t instance)
-{
-        fu8_t *buf;
-        int buflen;
-        aim_bstream_t bs;
-
-        buflen = 2 + 1 + strlen(roomname) + 2;
-        
-        if (!(buf = malloc(buflen)))
-                return 0;
-
-        aim_bstream_init(&bs, buf, buflen);
-
-        aimbs_put16(&bs, exchange);
-        aimbs_put8(&bs, strlen(roomname));
-        aimbs_putraw(&bs, roomname, strlen(roomname));
-        aimbs_put16(&bs, instance);
-
-        aim_addtlvtochain_raw(list, type, aim_bstream_curpos(&bs), buf);
-
-        free(buf);
-
-        return 0;
-}
-
 /*
- * Join a room of name roomname.  This is the first step to joining an 
- * already created room.  It's basically a Service Request for 
- * family 0x000e, with a little added on to specify the exchange and room 
- * name.
- */
-faim_export int aim_chat_join(aim_session_t *sess, aim_conn_t *conn, fu16_t exchange, const char *roomname, fu16_t instance)
-{
-        aim_frame_t *fr;
-        aim_snacid_t snacid;
-        aim_tlvlist_t *tl = NULL;
-        struct chatsnacinfo csi;
-        
-        if (!sess || !conn || !roomname || !strlen(roomname))
-                return -EINVAL;
-
-        if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 512)))
-                return -ENOMEM;
-
-        memset(&csi, 0, sizeof(csi));
-        csi.exchange = exchange;
-        strncpy(csi.name, roomname, sizeof(csi.name));
-        csi.instance = instance;
-
-        snacid = aim_cachesnac(sess, 0x0001, 0x0004, 0x0000, &csi, sizeof(csi));
-        aim_putsnac(&fr->data, 0x0001, 0x0004, 0x0000, snacid);
-
-        /*
-         * Requesting service chat (0x000e)
-         */
-        aimbs_put16(&fr->data, 0x000e);
-
-        aim_addtlvtochain_chatroom(&tl, 0x0001, exchange, roomname, instance);
-        aim_writetlvchain(&fr->data, &tl);
-        aim_freetlvchain(&tl);
-
-        aim_tx_enqueue(sess, fr);
-
-        return 0; 
-}
-
-faim_internal int aim_chat_readroominfo(aim_bstream_t *bs, struct aim_chat_roominfo *outinfo)
-{
-        int namelen;
-
-        if (!bs || !outinfo)
-                return 0;
-
-        outinfo->exchange = aimbs_get16(bs);
-        namelen = aimbs_get8(bs);
-        outinfo->name = aimbs_getstr(bs, namelen);
-        outinfo->instance = aimbs_get16(bs);
-
-        return 0;
-}
-
-faim_export int aim_chat_leaveroom(aim_session_t *sess, const char *name)
-{
-        aim_conn_t *conn;
-
-        if (!(conn = aim_chat_getconn(sess, name)))
-                return -ENOENT;
-
-        aim_conn_close(conn);
-
-        return 0;
-}
-
-/*
- * conn must be a BOS connection!
- */
-faim_export int aim_chat_invite(aim_session_t *sess, aim_conn_t *conn, const char *sn, const char *msg, fu16_t exchange, const char *roomname, fu16_t instance)
-{
-        int i;
-        aim_frame_t *fr;
-        aim_msgcookie_t *cookie;
-        struct aim_invite_priv *priv;
-        fu8_t ckstr[8];
-        aim_snacid_t snacid;
-        aim_tlvlist_t *otl = NULL, *itl = NULL;
-        fu8_t *hdr;
-        int hdrlen;
-        aim_bstream_t hdrbs;
-        
-        if (!sess || !conn || !sn || !msg || !roomname)
-                return -EINVAL;
-
-        if (conn->type != AIM_CONN_TYPE_BOS)
-                return -EINVAL;
-
-        if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 1152+strlen(sn)+strlen(roomname)+strlen(msg))))
-                return -ENOMEM;
-
-        snacid = aim_cachesnac(sess, 0x0004, 0x0006, 0x0000, sn, strlen(sn)+1);
-        aim_putsnac(&fr->data, 0x0004, 0x0006, 0x0000, snacid);
-
-
-        /*
-         * Cookie
-         */
-        for (i = 0; i < sizeof(ckstr); i++)
-                aimutil_put8(ckstr, (fu8_t) rand());
-
-        /* XXX should be uncached by an unwritten 'invite accept' handler */
-        if ((priv = malloc(sizeof(struct aim_invite_priv)))) {
-                priv->sn = strdup(sn);
-                priv->roomname = strdup(roomname);
-                priv->exchange = exchange;
-                priv->instance = instance;
-        }
-
-        if ((cookie = aim_mkcookie(ckstr, AIM_COOKIETYPE_INVITE, priv)))
-                aim_cachecookie(sess, cookie);
-        else
-                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));
-
-        /*
-         * TLV t(0005)
-         *
-         * Everything else is inside this TLV.
-         *
-         * Sigh.  AOL was rather inconsistent right here.  So we have
-         * to play some minor tricks.  Right inside the type 5 is some
-         * raw data, followed by a series of TLVs.  
-         *
-         */
-        hdrlen = 2+8+16+6+4+4+strlen(msg)+4+2+1+strlen(roomname)+2;
-        hdr = malloc(hdrlen);
-        aim_bstream_init(&hdrbs, hdr, hdrlen);
-        
-        aimbs_put16(&hdrbs, 0x0000); /* Unknown! */
-        aimbs_putraw(&hdrbs, ckstr, sizeof(ckstr)); /* I think... */
-        aim_putcap(&hdrbs, AIM_CAPS_CHAT);
-
-        aim_addtlvtochain16(&itl, 0x000a, 0x0001);
-        aim_addtlvtochain_noval(&itl, 0x000f);
-        aim_addtlvtochain_raw(&itl, 0x000c, strlen(msg), msg);
-        aim_addtlvtochain_chatroom(&itl, 0x2711, exchange, roomname, instance);
-        aim_writetlvchain(&hdrbs, &itl);
-        
-        aim_addtlvtochain_raw(&otl, 0x0005, aim_bstream_curpos(&hdrbs), hdr);
-
-        aim_writetlvchain(&fr->data, &otl);
-
-        free(hdr);
-        aim_freetlvchain(&itl);
-        aim_freetlvchain(&otl);
-        
-        aim_tx_enqueue(sess, fr);
-
-        return 0;
-}
-
-/*
- * General room information.  Lots of stuff.
+ * Subtype 0x0006
  *
- * Values I know are in here but I havent attached
- * them to any of the 'Unknown's:
- *      - Language (English)
- *
- * SNAC 000e/0002
- */
-static int infoupdate(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
-{
-        aim_userinfo_t *userinfo = NULL;
-        aim_rxcallback_t userfunc;
-        int ret = 0;
-        int usercount = 0;
-        fu8_t detaillevel = 0;
-        char *roomname = NULL;
-        struct aim_chat_roominfo roominfo;
-        fu16_t tlvcount = 0;
-        aim_tlvlist_t *tlvlist;
-        char *roomdesc = NULL;
-        fu16_t flags = 0;
-        fu32_t creationtime = 0;
-        fu16_t maxmsglen = 0, maxvisiblemsglen = 0;
-        fu16_t unknown_d2 = 0, unknown_d5 = 0;
-
-        dumpbox(sess, bs->data + bs->offset, aim_bstream_empty(bs));
-
-        aim_chat_readroominfo(bs, &roominfo);
-
-        detaillevel = aimbs_get8(bs);
-
-        if (detaillevel != 0x02) {
-                faimdprintf(sess, 0, "faim: chat_roomupdateinfo: detail level %d not supported\n", detaillevel);
-                return 1;
-        }
-
-        tlvcount = aimbs_get16(bs);
-
-        /*
-         * Everything else are TLVs.
-         */ 
-        tlvlist = aim_readtlvchain(bs);
-
-        /*
-         * TLV type 0x006a is the room name in Human Readable Form.
-         */
-        if (aim_gettlv(tlvlist, 0x006a, 1))
-                roomname = aim_gettlv_str(tlvlist, 0x006a, 1);
-
-        /*
-         * Type 0x006f: Number of occupants.
-         */
-        if (aim_gettlv(tlvlist, 0x006f, 1))
-                usercount = aim_gettlv16(tlvlist, 0x006f, 1);
-
-        /*
-         * Type 0x0073:  Occupant list.
-         */
-        if (aim_gettlv(tlvlist, 0x0073, 1)) {   
-                int curoccupant = 0;
-                aim_tlv_t *tmptlv;
-                aim_bstream_t occbs;
-
-                tmptlv = aim_gettlv(tlvlist, 0x0073, 1);
-
-                /* Allocate enough userinfo structs for all occupants */
-                userinfo = calloc(usercount, sizeof(aim_userinfo_t));
-
-                aim_bstream_init(&occbs, tmptlv->value, tmptlv->length);
-
-                while (curoccupant < usercount)
-                        aim_extractuserinfo(sess, &occbs, &userinfo[curoccupant++]);
-        }
-
-        /* 
-         * Type 0x00c9: Flags. (AIM_CHATROOM_FLAG)
-         */
-        if (aim_gettlv(tlvlist, 0x00c9, 1))
-                flags = aim_gettlv16(tlvlist, 0x00c9, 1);
-
-        /* 
-         * Type 0x00ca: Creation time (4 bytes)
-         */
-        if (aim_gettlv(tlvlist, 0x00ca, 1))
-                creationtime = aim_gettlv32(tlvlist, 0x00ca, 1);
-
-        /* 
-         * Type 0x00d1: Maximum Message Length
-         */
-        if (aim_gettlv(tlvlist, 0x00d1, 1))
-                maxmsglen = aim_gettlv16(tlvlist, 0x00d1, 1);
-
-        /* 
-         * Type 0x00d2: Unknown. (2 bytes)
-         */
-        if (aim_gettlv(tlvlist, 0x00d2, 1))
-                unknown_d2 = aim_gettlv16(tlvlist, 0x00d2, 1);
-
-        /* 
-         * Type 0x00d3: Room Description
-         */
-        if (aim_gettlv(tlvlist, 0x00d3, 1))
-                roomdesc = aim_gettlv_str(tlvlist, 0x00d3, 1);
-
-        /*
-         * Type 0x000d4: Unknown (flag only)
-         */
-        if (aim_gettlv(tlvlist, 0x000d4, 1))
-                ;
-
-        /* 
-         * Type 0x00d5: Unknown. (1 byte)
-         */
-        if (aim_gettlv(tlvlist, 0x00d5, 1))
-                unknown_d5 = aim_gettlv8(tlvlist, 0x00d5, 1);
-
-
-        /*
-         * Type 0x00d6: Encoding 1 ("us-ascii")
-         */
-        if (aim_gettlv(tlvlist, 0x000d6, 1))
-                ;
-        
-        /*
-         * Type 0x00d7: Language 1 ("en")
-         */
-        if (aim_gettlv(tlvlist, 0x000d7, 1))
-                ;
-
-        /*
-         * Type 0x00d8: Encoding 2 ("us-ascii")
-         */
-        if (aim_gettlv(tlvlist, 0x000d8, 1))
-                ;
-        
-        /*
-         * Type 0x00d9: Language 2 ("en")
-         */
-        if (aim_gettlv(tlvlist, 0x000d9, 1))
-                ;
-
-        /*
-         * Type 0x00da: Maximum visible message length
-         */
-        if (aim_gettlv(tlvlist, 0x000da, 1))
-                maxvisiblemsglen = aim_gettlv16(tlvlist, 0x00da, 1);
-
-        if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype))) {
-                ret = userfunc(sess,
-                                rx, 
-                                &roominfo,
-                                roomname,
-                                usercount,
-                                userinfo,       
-                                roomdesc,
-                                flags,
-                                creationtime,
-                                maxmsglen,
-                                unknown_d2,
-                                unknown_d5,
-                                maxvisiblemsglen);
-        }
-
-        free(roominfo.name);
-        free(userinfo);
-        free(roomname);
-        free(roomdesc);
-        aim_freetlvchain(&tlvlist);
-
-        return ret;
-}
-
-static int userlistchange(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
-{
-        aim_userinfo_t *userinfo = NULL;
-        aim_rxcallback_t userfunc;
-        int curcount = 0, ret = 0;
-
-        while (aim_bstream_empty(bs)) {
-                curcount++;
-                userinfo = realloc(userinfo, curcount * sizeof(aim_userinfo_t));
-                aim_extractuserinfo(sess, bs, &userinfo[curcount-1]);
-        }
-
-        if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-                ret = userfunc(sess, rx, curcount, userinfo);
-
-        free(userinfo);
-
-        return ret;
-}
-
-/*
  * We could probably include this in the normal ICBM parsing 
  * code as channel 0x0003, however, since only the start
@@ -734 +711 @@
         return 0;
 }
-
-