X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/b69540e3cf15a403137cb89bbc36ef7450945f83..9797852cb1854c00f6d3caffb5a21b500fafe9bd:/aim_chatnav.c

diff --git a/aim_chatnav.c b/aim_chatnav.c
index 1bc8c33..a7ef779 100644
--- a/aim_chatnav.c
+++ b/aim_chatnav.c
@@ -68,6 +68,7 @@ int aim_chatnav_parse_info(struct aim_session_t *sess, struct command_rx_struct
   struct aim_snac_t *snac;
   u_long snacid;
   rxcallback_t userfunc;
+  int ret=1;
   
   snacid = aimutil_get32(command->data+6);
   snac = aim_remsnac(sess, snacid);
@@ -96,7 +97,6 @@ int aim_chatnav_parse_info(struct aim_session_t *sess, struct command_rx_struct
 	  int curexchange = 0;
 	  struct aim_tlv_t *exchangetlv;
 	  u_char maxrooms = 0;
-	  int ret = 1;
 	  struct aim_tlvlist_t *innerlist;
 	 
 	  tlvlist = aim_readtlvchain(command->data+10, command->commandlen-10);
@@ -124,6 +124,7 @@ int aim_chatnav_parse_info(struct aim_session_t *sess, struct command_rx_struct
 	      curexchange++;
 	      exchanges = realloc(exchanges, curexchange * sizeof(struct aim_chat_exchangeinfo));
 	      
+
 	      /* exchange number */
 	      exchanges[curexchange-1].number = aimutil_get16(exchangetlv->value);
 	      innerlist = aim_readtlvchain(exchangetlv->value+2, exchangetlv->length-2);
@@ -140,6 +141,19 @@ int aim_chatnav_parse_info(struct aim_session_t *sess, struct command_rx_struct
 	      if (aim_gettlv(innerlist, 0x0004, 1))
 		;
 
+	      /* 
+	       * Type 0x0002: Unknown
+	       */
+	      if (aim_gettlv(innerlist, 0x0002, 1)) {
+		struct aim_tlv_t *tmptlv;
+		unsigned short classperms = 0;
+
+		tmptlv = aim_gettlv(innerlist, 0x0002, 1);
+		classperms = aimutil_get16(tmptlv->value);
+		
+		printf("faim: class permissions %x\n", classperms);
+	      }
+
 	      /*
 	       * Type 0x00c9: Unknown
 	       */ 
@@ -153,7 +167,7 @@ int aim_chatnav_parse_info(struct aim_session_t *sess, struct command_rx_struct
 		;
 	      
 	      /*
-	       * Type 0x00d0: Unknown
+	       * Type 0x00d0: Mandatory Channels?
 	       */
 	      if (aim_gettlv(innerlist, 0x00d0, 1))
 		;
@@ -165,7 +179,7 @@ int aim_chatnav_parse_info(struct aim_session_t *sess, struct command_rx_struct
 		;
 
 	      /*
-	       * Type 0x00d2: Unknown
+	       * Type 0x00d2: Maximum Occupancy?
 	       */
 	      if (aim_gettlv(innerlist, 0x00d2, 1))	
 		;	
@@ -179,10 +193,22 @@ int aim_chatnav_parse_info(struct aim_session_t *sess, struct command_rx_struct
 		exchanges[curexchange-1].name = NULL;
 
 	      /*
-	       * Type 0x00d5: Unknown
+	       * Type 0x00d5: Creation Permissions
+	       *
+	       * 0  Creation not allowed
+	       * 1  Room creation allowed
+	       * 2  Exchange creation allowed
+	       * 
 	       */
-	      if (aim_gettlv(innerlist, 0x00d5, 1))
-		;
+	      if (aim_gettlv(innerlist, 0x00d5, 1)) {
+		struct aim_tlv_t *tmptlv;
+		unsigned char createperms = 0;
+
+		tmptlv = aim_gettlv(innerlist, 0x00d5, 1);
+		createperms = aimutil_get8(tmptlv->value);
+		
+		printf("faim: creation permissions %x\n", createperms);
+	      }
 
 	      /*
 	       * Type 0x00d6: Character Set (First Time)
@@ -215,7 +241,8 @@ int aim_chatnav_parse_info(struct aim_session_t *sess, struct command_rx_struct
 		exchanges[curexchange-1].lang2 = aim_gettlv_str(innerlist, 0x00d9, 1);
 	      else
 		exchanges[curexchange-1].lang2 = NULL;
-
+	      
+	      aim_freetlvchain(&innerlist);
 	    }
 	  
 	  /*
@@ -230,7 +257,7 @@ int aim_chatnav_parse_info(struct aim_session_t *sess, struct command_rx_struct
 			   curexchange, 
 			   exchanges);
 	  curexchange--;
-	  while(curexchange)
+	  while(curexchange >= 0)
 	    {
 	      if (exchanges[curexchange].name)
 		free(exchanges[curexchange].name);
@@ -245,33 +272,38 @@ int aim_chatnav_parse_info(struct aim_session_t *sess, struct command_rx_struct
 	      curexchange--;
 	    }
 	  free(exchanges);
-	  aim_freetlvchain(&innerlist);
 	  aim_freetlvchain(&tlvlist);
-	  return ret;
+	  
+	  break;
       }
     case 0x0003: /* request exchange info */
       printf("faim: chatnav_parse_info: resposne to exchange info\n");
-      return 1;
+      break;
     case 0x0004: /* request room info */
       printf("faim: chatnav_parse_info: response to room info\n");
-      return 1;
+      break;
     case 0x0005: /* request more room info */
       printf("faim: chatnav_parse_info: response to more room info\n");
-      return 1;
+      break;
     case 0x0006: /* request occupant list */
       printf("faim: chatnav_parse_info: response to occupant info\n");
-      return 1;
+      break;
     case 0x0007: /* search for a room */
       printf("faim: chatnav_parse_info: search results\n");
-      return 1;
+      break;
     case 0x0008: /* create room */
       printf("faim: chatnav_parse_info: response to create room\n");
-      return 1;
+      break;
     default: /* unknown */
       printf("faim: chatnav_parse_info: unknown request subtype (%04x)\n", snac->type);
     }
 
-  return 1; /* shouldn't get here */
+  if (snac && snac->data)
+    free(snac->data);
+  if (snac)
+    free(snac);
+  
+  return ret;
 }
 
 u_long aim_chatnav_createroom(struct aim_session_t *sess,