- Sat Aug 25 19:46:38 PDT 2001

  - Pass "Maximum visible message length" to client in chat info update
    - This is the real maximum message length now.  There is still a
      "complexity" limit that will prevent you from sending messages
      even if they are less than this limit (102 right now), but I don't
      know how that is calculated.

diff --git a/CHANGES b/CHANGES
index aa6fc3870b0b41efa3018a1ca8cb3b2f6b419b88..1e335e391da1b8726e639794a1b33144db5a86ec 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,13 @@
 
 No release numbers
 ------------------
+ - Sat Aug 25 19:46:38 PDT 2001
+  - Pass "Maximum visible message length" to client in chat info update
+    - This is the real maximum message length now.  There is still a
+      "complexity" limit that will prevent you from sending messages 
+      even if they are less than this limit (102 right now), but I don't 
+      know how that is calculated.
+
  - Sat Aug 25 19:19:16 PDT 2001
   - Keep parsing missed calls for entire packet
     - This is really easy to test now.  Just talk to someone with

diff --git a/src/chat.c b/src/chat.c
index 91edf0ed3db54c694597f62bcff213eac5c74637..0a4820561024223ac54d21daf07314d36337253c 100644 (file)
--- a/src/chat.c
+++ b/src/chat.c
@@ -401,130 +401,166 @@ faim_export unsigned long aim_chat_invite(struct aim_session_t *sess,
  */
 static int infoupdate(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  struct aim_userinfo_s *userinfo = NULL;
-  aim_rxcallback_t userfunc=NULL;      
-  int ret = 0, i = 0;
-  int usercount = 0;
-  unsigned char detaillevel = 0;
-  char *roomname = NULL;
-  struct aim_chat_roominfo roominfo;
-  unsigned short tlvcount = 0;
-  struct aim_tlvlist_t *tlvlist;
-  char *roomdesc = NULL;
-  unsigned short unknown_c9 = 0;
-  unsigned long creationtime = 0;
-  unsigned short maxmsglen = 0;
-  unsigned short unknown_d2 = 0, unknown_d5 = 0;
-
-  i += aim_chat_readroominfo(data+i, &roominfo);
-  
-  detaillevel = aimutil_get8(data+i);
-  i++;
-
-  if (detaillevel != 0x02) {
-    if (detaillevel == 0x01)
-      faimdprintf(sess, 0, "faim: chat_roomupdateinfo: detail level 1 not supported\n");
-    else
-      faimdprintf(sess, 0, "faim: chat_roomupdateinfo: unknown detail level %d\n", detaillevel);
-    return 1;
-  }
-  
-  tlvcount = aimutil_get16(data+i);
-  i += 2;
-
-  /*
-   * Everything else are TLVs.
-   */ 
-  tlvlist = aim_readtlvchain(data+i, datalen-i);
-  
-  /*
-   * 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;
-    struct aim_tlv_t *tmptlv;
-    
-    tmptlv = aim_gettlv(tlvlist, 0x0073, 1);
-
-    /* Allocate enough userinfo structs for all occupants */
-    userinfo = calloc(usercount, sizeof(struct aim_userinfo_s));
-    
-    i = 0;
-    while (curoccupant < usercount)
-      i += aim_extractuserinfo(sess, tmptlv->value+i, &userinfo[curoccupant++]);
-  }
-  
-  /* 
-   * Type 0x00c9: Unknown. (2 bytes)
-   */
-  if (aim_gettlv(tlvlist, 0x00c9, 1))
-    unknown_c9 = 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 0x00d5: Unknown. (1 byte)
-   */
-  if (aim_gettlv(tlvlist, 0x00d5, 1))
-    unknown_d5 = aim_gettlv8(tlvlist, 0x00d5, 1);
-
-
-  if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype))) {
-    ret = userfunc(sess,
-                  rx, 
-                  &roominfo,
-                  roomname,
-                  usercount,
-                  userinfo,    
-                  roomdesc,
-                  unknown_c9,
-                  creationtime,
-                  maxmsglen,
-                  unknown_d2,
-                  unknown_d5);
-  }
-
-  free(roominfo.name);
-  free(userinfo);
-  free(roomname);
-  free(roomdesc);
-  aim_freetlvchain(&tlvlist);
- 
-  return ret;
+       struct aim_userinfo_s *userinfo = NULL;
+       aim_rxcallback_t userfunc=NULL; 
+       int ret = 0, i = 0;
+       int usercount = 0;
+       unsigned char detaillevel = 0;
+       char *roomname = NULL;
+       struct aim_chat_roominfo roominfo;
+       unsigned short tlvcount = 0;
+       struct aim_tlvlist_t *tlvlist;
+       char *roomdesc = NULL;
+       unsigned short unknown_c9 = 0;
+       unsigned long creationtime = 0;
+       unsigned short maxmsglen = 0, maxvisiblemsglen = 0;
+       unsigned short unknown_d2 = 0, unknown_d5 = 0;
+
+       i += aim_chat_readroominfo(data+i, &roominfo);
+
+       detaillevel = aimutil_get8(data+i);
+       i++;
+
+       if (detaillevel != 0x02) {
+               if (detaillevel == 0x01)
+                       faimdprintf(sess, 0, "faim: chat_roomupdateinfo: detail level 1 not supported\n");
+               else
+                       faimdprintf(sess, 0, "faim: chat_roomupdateinfo: unknown detail level %d\n", detaillevel);
+               return 1;
+       }
+
+       tlvcount = aimutil_get16(data+i);
+       i += 2;
+
+       /*
+        * Everything else are TLVs.
+        */ 
+       tlvlist = aim_readtlvchain(data+i, datalen-i);
+
+       /*
+        * 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;
+               struct aim_tlv_t *tmptlv;
+
+               tmptlv = aim_gettlv(tlvlist, 0x0073, 1);
+
+               /* Allocate enough userinfo structs for all occupants */
+               userinfo = calloc(usercount, sizeof(struct aim_userinfo_s));
+
+               for (i = 0; curoccupant < usercount; )
+                       i += aim_extractuserinfo(sess, tmptlv->value+i, &userinfo[curoccupant++]);
+       }
+
+       /* 
+        * Type 0x00c9: Unknown. (2 bytes)
+        */
+       if (aim_gettlv(tlvlist, 0x00c9, 1))
+               unknown_c9 = 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,
+                               unknown_c9,
+                               creationtime,
+                               maxmsglen,
+                               unknown_d2,
+                               unknown_d5,
+                               maxvisiblemsglen);
+       }
+
+       free(roominfo.name);
+       free(userinfo);
+       free(roomname);
+       free(roomdesc);
+       aim_freetlvchain(&tlvlist);
+
+       return ret;
 }
 
 static int userlistchange(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)

diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c
index 28dffa39214c0f2b1e6e57e446f777017e0de981..0c8264a0acf835b57cff7cbb8cd5f35769e4cda9 100644 (file)
--- a/utils/faimtest/faimtest.c
+++ b/utils/faimtest/faimtest.c
@@ -1976,7 +1976,7 @@ int faimtest_chat_infoupdate(struct aim_session_t *sess, struct command_rx_struc
        char *roomname;
        int usercount,i;
        char *roomdesc;
-       unsigned short unknown_c9, unknown_d2, unknown_d5, maxmsglen;
+       unsigned short unknown_c9, unknown_d2, unknown_d5, maxmsglen, maxvisiblemsglen;
        unsigned long creationtime;
 
        va_start(ap, command);
@@ -1990,6 +1990,7 @@ int faimtest_chat_infoupdate(struct aim_session_t *sess, struct command_rx_struc
        maxmsglen = va_arg(ap, int);
        unknown_d2 = va_arg(ap, int);
        unknown_d5 = va_arg(ap, int);
+       maxvisiblemsglen = va_arg(ap, int);
        va_end(ap);
 
        dvprintf("faimtest: chat: %s:  info update:\n", (char *)command->conn->priv);
@@ -2003,9 +2004,10 @@ int faimtest_chat_infoupdate(struct aim_session_t *sess, struct command_rx_struc
 
        dvprintf("faimtest: chat: %s:  \tUnknown_c9: 0x%04x\n", (char *)command->conn->priv, unknown_c9);
        dvprintf("faimtest: chat: %s:  \tCreation time: %lu (time_t)\n", (char *)command->conn->priv, creationtime);
-       dvprintf("faimtest: chat: %s:  \tMax message length: %d bytes\n", (char *)command->conn->priv, maxmsglen);
        dvprintf("faimtest: chat: %s:  \tUnknown_d2: 0x%04x\n", (char *)command->conn->priv, unknown_d2);
        dvprintf("faimtest: chat: %s:  \tUnknown_d5: 0x%02x\n", (char *)command->conn->priv, unknown_d5);
+       dvprintf("faimtest: chat: %s:  \tMax message length: %d bytes\n", (char *)command->conn->priv, maxmsglen);
+       dvprintf("faimtest: chat: %s:  \tMax visible message length: %d bytes\n", (char *)command->conn->priv, maxvisiblemsglen);
 
        return 1;
 }