- Thu Sep 14 00:54:48 UTC 2000

   - Added create room callback

diff --git a/CHANGES b/CHANGES
index e38f569881dc879a91224bd63906bec6d00790a3..68ba96528e82e690a18a6a8d60f53eca08dce920 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 
 No release numbers
 ------------------
+ - Thu Sep 14 00:54:48 UTC 2000
+   - Added create room callback
+
  - Wed Sep 13 22:01:35 UTC 2000
    - Remove references to "new" and "class" for dumb C++ compilers
    - Renamed userinfo->class to userinfo->flags both for clarity and C++

diff --git a/aim_chatnav.c b/aim_chatnav.c
index 5c6e798d5f0f8cf667c1e2443b2f30ed677c1550..0967d0db1c76e0d19114cdb0f49d9458ba8e05d6 100644 (file)
--- a/aim_chatnav.c
+++ b/aim_chatnav.c
@@ -291,9 +291,114 @@ faim_internal int aim_chatnav_parse_info(struct aim_session_t *sess, struct comm
     case 0x0007: /* search for a room */
       printf("faim: chatnav_parse_info: search results\n");
       break;
-    case 0x0008: /* create room */
-      printf("faim: chatnav_parse_info: response to create room\n");
+    case 0x0008: { /* create room */
+      /*
+       000d 0009 0000 0000 0010 
+       
+       0004 0053 
+            0004 -- exchange
+            0c 7a 6f6f 6f6d 7a6f 6f6f 6d34 32 cookie/name
+            0000 -- instance
+            02 -- detail level
+            0007 -- unknown!
+            006a 000c 7a 6f 6f6f 6d7a 6f6f 6f6d 3432 -- fully qualified name 
+            00c9 0002 0011 -- flags
+            00ca 0004 39c0 0883 -- create time
+            00d1 0002 0200 -- max msg len 
+            00d2 0002 0018 -- max occupants
+            00d3 000c -- name
+                 7a6f 6f6f 6d7a 6f6f 6f6d 3432 
+            00d5 0001 02 -- creation permission
+       */
+      struct aim_tlvlist_t *tlvlist, *innerlist;
+      char *ck = NULL, *fqcn = NULL, *name = NULL;
+      unsigned short exchange, instance, unknown, flags, maxmsglen, maxoccupancy;
+      unsigned long createtime = 0;
+      unsigned char createperms;
+      int i, cklen;
+      struct aim_tlv_t *bigblock, *tmp;
+
+      i = 10;
+      if (!(tlvlist = aim_readtlvchain(command->data+i, command->commandlen-i))) {
+       printf("faim: unable to read top tlv in create room response\n");
+       break;
+      }
+
+      if (!(bigblock = aim_gettlv(tlvlist, 0x0004, 1))) {
+       printf("faim: no bigblock in top tlv in create room response\n");
+       aim_freetlvchain(&tlvlist);
+       break;
+      }
+      i = 0;
+
+      exchange = aimutil_get16(bigblock->value+i);
+      i += 2;
+
+      cklen = aimutil_get8(bigblock->value+i);
+      i++;
+
+      ck = malloc(cklen+1);
+      memcpy(ck, bigblock->value+i, cklen);
+      ck[cklen] = '\0';
+      i += cklen;
+
+      instance = aimutil_get16(bigblock->value+i);
+      i += 2;
+
+      if (aimutil_get8(bigblock->value+i) != 0x02) {
+       printf("faim: unknown detaillevel in create room response (0x%02x)\n", aimutil_get8(bigblock->value+i));
+       aim_freetlvchain(&tlvlist);
+       free(ck);       
+       break;
+      }
+      i += 1;
+      
+      unknown = aimutil_get16(bigblock->value+i);
+      i += 2;
+
+      if (!(innerlist = aim_readtlvchain(bigblock->value+i, bigblock->length-i))) {
+       printf("faim: unable to read inner tlv chain in create room response\n");
+       aim_freetlvchain(&tlvlist);
+       free(ck);
+       break;
+      }
+
+      if (aim_gettlv(innerlist, 0x006a, 1))
+       fqcn = aim_gettlv_str(innerlist, 0x006a, 1);
+
+      if ((tmp = aim_gettlv(innerlist, 0x00c9, 1)))
+       flags = aimutil_get16(tmp->value);
+
+      if ((tmp = aim_gettlv(innerlist, 0x00ca, 1)))
+       createtime = aimutil_get32(tmp->value);
+
+      if ((tmp = aim_gettlv(innerlist, 0x00d1, 1)))
+       maxmsglen = aimutil_get16(tmp->value);
+
+      if ((tmp = aim_gettlv(innerlist, 0x00d2, 1)))
+       maxoccupancy = aimutil_get16(tmp->value);
+
+      if (aim_gettlv(innerlist, 0x00d3, 1))
+       name = aim_gettlv_str(innerlist, 0x00d3, 1);
+
+      if ((tmp = aim_gettlv(innerlist, 0x00d5, 1)))
+       createperms = aimutil_get8(tmp->value);
+
+      if ((userfunc = aim_callhandler(command->conn, 0x000d, 0x0009))) {
+       ret = userfunc(sess, command, snac->type, fqcn, instance, flags, createtime, maxmsglen, maxoccupancy, createperms, unknown, name, ck);
+      }
+     
+      if (ck)
+       free(ck);
+      if (name)
+       free(name);
+      if (fqcn)
+       free(fqcn);
+      aim_freetlvchain(&innerlist);
+      aim_freetlvchain(&tlvlist);
+
       break;
+    }
     default: /* unknown */
       printf("faim: chatnav_parse_info: unknown request subtype (%04x)\n", snac->type);
     }

diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c
index 72e813dda7fcf0576c8d918298e81f2e05be1be6..1e7b2fab1186a73d534e61e2c95bea5242c19620 100644 (file)
--- a/utils/faimtest/faimtest.c
+++ b/utils/faimtest/faimtest.c
@@ -1177,39 +1177,57 @@ int faimtest_chatnav_info(struct aim_session_t *sess, struct command_rx_struct *
   ap = va_start(ap, command);
   type = va_arg(ap, u_short);
 
-  switch(type)
-    {
-    case 0x0002:
-      {
-       int maxrooms;
-       struct aim_chat_exchangeinfo *exchanges;
-       int exchangecount,i = 0;
-       
-       maxrooms = va_arg(ap, u_char);
-       exchangecount = va_arg(ap, int);
-       exchanges = va_arg(ap, struct aim_chat_exchangeinfo *);
-       va_end(ap);
-
-       printf("faimtest: chat info: Chat Rights:\n");
-       printf("faimtest: chat info: \tMax Concurrent Rooms: %d\n", maxrooms);
-       
-       printf("faimtest: chat info: \tExchange List: (%d total)\n", exchangecount);
-       while (i < exchangecount)
-         {
-           printf("faimtest: chat info: \t\t%x: %s (%s/%s)\n", 
-                  exchanges[i].number, 
-                  exchanges[i].name,
-                  exchanges[i].charset1,
-                  exchanges[i].lang1);
-           i++;
-         }
-       
-      }
-      break;
-    default:
-      va_end(ap);
-      printf("faimtest: chatnav info: unknown type (%04x)\n", type);
+  switch(type) {
+  case 0x0002: {
+    int maxrooms;
+    struct aim_chat_exchangeinfo *exchanges;
+    int exchangecount,i = 0;
+    
+    maxrooms = va_arg(ap, u_char);
+    exchangecount = va_arg(ap, int);
+    exchanges = va_arg(ap, struct aim_chat_exchangeinfo *);
+    va_end(ap);
+    
+    printf("faimtest: chat info: Chat Rights:\n");
+    printf("faimtest: chat info: \tMax Concurrent Rooms: %d\n", maxrooms);
+    
+    printf("faimtest: chat info: \tExchange List: (%d total)\n", exchangecount);
+    while (i < exchangecount) {
+      printf("faimtest: chat info: \t\t%x: %s (%s/%s)\n", 
+            exchanges[i].number,       
+            exchanges[i].name,
+            exchanges[i].charset1,
+            exchanges[i].lang1);
+      i++;
     }
+    
+  }
+  break;
+  case 0x0008: {
+    char *fqcn, *name, *ck;
+    unsigned short instance, flags, maxmsglen, maxoccupancy, unknown;
+    unsigned char createperms;
+    unsigned long createtime;
+
+    fqcn = va_arg(ap, char *);
+    instance = va_arg(ap, unsigned short);
+    flags = va_arg(ap, unsigned short);
+    createtime = va_arg(ap, unsigned long);
+    maxmsglen = va_arg(ap, unsigned short);
+    maxoccupancy = va_arg(ap, unsigned short);
+    createperms = va_arg(ap, unsigned char);
+    unknown = va_arg(ap, unsigned short);
+    name = va_arg(ap, char *);
+    ck = va_arg(ap, char *);
+    va_end(ap);
+
+    printf("faimtest: recieved room create reply for %s\n", fqcn);
+  }
+  break;
+  default:
+    va_end(ap);
+    printf("faimtest: chatnav info: unknown type (%04x)\n", type);
+  }
   return 1;
 }