Changeset cf02dd6 for libfaim/chatnav.c

Timestamp:

Dec 10, 2003, 3:20:45 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:

b1fe407

Parents:

8c46404

Message:

*** empty log message ***

File:

• libfaim/chatnav.c (modified) (25 diffs)

libfaim/chatnav.c

@@ -68 +68 @@
         aimbs_put8(&fr->data, 0x01);
 
-        aim_addtlvtochain_raw(&tl, 0x00d3, strlen(name), name);
-        aim_addtlvtochain_raw(&tl, 0x00d6, strlen(charset), charset);
-        aim_addtlvtochain_raw(&tl, 0x00d7, strlen(lang), lang);
+        aim_tlvlist_add_raw(&tl, 0x00d3, strlen(name), name);
+        aim_tlvlist_add_raw(&tl, 0x00d6, strlen(charset), charset);
+        aim_tlvlist_add_raw(&tl, 0x00d7, strlen(lang), lang);
 
         /* tlvcount */
-        aimbs_put16(&fr->data, aim_counttlvchain(&tl));
-        aim_writetlvchain(&fr->data, &tl);
-
-        aim_freetlvchain(&tl);
+        aimbs_put16(&fr->data, aim_tlvlist_count(&tl));
+        aim_tlvlist_write(&fr->data, &tl);
+
+        aim_tlvlist_free(&tl);
 
         aim_tx_enqueue(sess, fr);
@@ -93 +93 @@
         aim_tlvlist_t *tlvlist, *innerlist;
 
-        tlvlist = aim_readtlvchain(bs);
+        tlvlist = aim_tlvlist_read(bs);
 
         /* 
          * Type 0x0002: Maximum concurrent rooms.
          */ 
-        if (aim_gettlv(tlvlist, 0x0002, 1))
-                maxrooms = aim_gettlv8(tlvlist, 0x0002, 1);
+        if (aim_tlv_gettlv(tlvlist, 0x0002, 1))
+                maxrooms = aim_tlv_get8(tlvlist, 0x0002, 1);
 
         /* 
@@ -108 +108 @@
          * 
          */
-        for (curexchange = 0; ((exchangetlv = aim_gettlv(tlvlist, 0x0003, curexchange+1))); ) {
+        for (curexchange = 0; ((exchangetlv = aim_tlv_gettlv(tlvlist, 0x0003, curexchange+1))); ) {
                 aim_bstream_t tbs;
 
@@ -119 +119 @@
                 /* exchange number */
                 exchanges[curexchange-1].number = aimbs_get16(&tbs);
-                innerlist = aim_readtlvchain(&tbs);
+                innerlist = aim_tlvlist_read(&tbs);
 
                 /* 
@@ -127 +127 @@
                  *
                  */
-                if (aim_gettlv(innerlist, 0x000a, 1))
+                if (aim_tlv_gettlv(innerlist, 0x000a, 1))
                         ;
 
@@ -133 +133 @@
                  * Type 0x000d: Unknown.
                  */
-                if (aim_gettlv(innerlist, 0x000d, 1))
+                if (aim_tlv_gettlv(innerlist, 0x000d, 1))
                         ;
 
@@ -139 +139 @@
                  * Type 0x0004: Unknown
                  */
-                if (aim_gettlv(innerlist, 0x0004, 1))
+                if (aim_tlv_gettlv(innerlist, 0x0004, 1))
                         ;
 
@@ -145 +145 @@
                  * Type 0x0002: Unknown
                  */
-                if (aim_gettlv(innerlist, 0x0002, 1)) {
+                if (aim_tlv_gettlv(innerlist, 0x0002, 1)) {
                         fu16_t classperms;
 
-                        classperms = aim_gettlv16(innerlist, 0x0002, 1);
+                        classperms = aim_tlv_get16(innerlist, 0x0002, 1);
                         
                         faimdprintf(sess, 1, "faim: class permissions %x\n", classperms);
@@ -162 +162 @@
                  *
                  */ 
-                if (aim_gettlv(innerlist, 0x00c9, 1))
-                        exchanges[curexchange-1].flags = aim_gettlv16(innerlist, 0x00c9, 1);
+                if (aim_tlv_gettlv(innerlist, 0x00c9, 1))
+                        exchanges[curexchange-1].flags = aim_tlv_get16(innerlist, 0x00c9, 1);
                       
                 /*
                  * Type 0x00ca: Creation Date 
                  */
-                if (aim_gettlv(innerlist, 0x00ca, 1))
+                if (aim_tlv_gettlv(innerlist, 0x00ca, 1))
                         ;
                       
@@ -174 +174 @@
                  * Type 0x00d0: Mandatory Channels?
                  */
-                if (aim_gettlv(innerlist, 0x00d0, 1))
+                if (aim_tlv_gettlv(innerlist, 0x00d0, 1))
                         ;
 
@@ -180 +180 @@
                  * Type 0x00d1: Maximum Message length
                  */
-                if (aim_gettlv(innerlist, 0x00d1, 1))
+                if (aim_tlv_gettlv(innerlist, 0x00d1, 1))
                         ;
 
@@ -186 +186 @@
                  * Type 0x00d2: Maximum Occupancy?
                  */
-                if (aim_gettlv(innerlist, 0x00d2, 1))   
+                if (aim_tlv_gettlv(innerlist, 0x00d2, 1))       
                         ;
 
@@ -192 +192 @@
                  * Type 0x00d3: Exchange Description
                  */
-                if (aim_gettlv(innerlist, 0x00d3, 1))   
-                        exchanges[curexchange-1].name = aim_gettlv_str(innerlist, 0x00d3, 1);
+                if (aim_tlv_gettlv(innerlist, 0x00d3, 1))       
+                        exchanges[curexchange-1].name = aim_tlv_getstr(innerlist, 0x00d3, 1);
                 else
                         exchanges[curexchange-1].name = NULL;
@@ -200 +200 @@
                  * Type 0x00d4: Exchange Description URL
                  */
-                if (aim_gettlv(innerlist, 0x00d4, 1))   
+                if (aim_tlv_gettlv(innerlist, 0x00d4, 1))       
                         ;
 
@@ -211 +211 @@
                  * 
                  */
-                if (aim_gettlv(innerlist, 0x00d5, 1)) {
+                if (aim_tlv_gettlv(innerlist, 0x00d5, 1)) {
                         fu8_t createperms;
 
-                        createperms = aim_gettlv8(innerlist, 0x00d5, 1);
+                        createperms = aim_tlv_get8(innerlist, 0x00d5, 1);
                 }
 
@@ -220 +220 @@
                  * Type 0x00d6: Character Set (First Time)
                  */           
-                if (aim_gettlv(innerlist, 0x00d6, 1))   
-                        exchanges[curexchange-1].charset1 = aim_gettlv_str(innerlist, 0x00d6, 1);
+                if (aim_tlv_gettlv(innerlist, 0x00d6, 1))       
+                        exchanges[curexchange-1].charset1 = aim_tlv_getstr(innerlist, 0x00d6, 1);
                 else
                         exchanges[curexchange-1].charset1 = NULL;
@@ -228 +228 @@
                  * Type 0x00d7: Language (First Time)
                  */           
-                if (aim_gettlv(innerlist, 0x00d7, 1))   
-                        exchanges[curexchange-1].lang1 = aim_gettlv_str(innerlist, 0x00d7, 1);
+                if (aim_tlv_gettlv(innerlist, 0x00d7, 1))       
+                        exchanges[curexchange-1].lang1 = aim_tlv_getstr(innerlist, 0x00d7, 1);
                 else
                         exchanges[curexchange-1].lang1 = NULL;
@@ -236 +236 @@
                  * Type 0x00d8: Character Set (Second Time)
                  */           
-                if (aim_gettlv(innerlist, 0x00d8, 1))   
-                        exchanges[curexchange-1].charset2 = aim_gettlv_str(innerlist, 0x00d8, 1);
+                if (aim_tlv_gettlv(innerlist, 0x00d8, 1))       
+                        exchanges[curexchange-1].charset2 = aim_tlv_getstr(innerlist, 0x00d8, 1);
                 else
                         exchanges[curexchange-1].charset2 = NULL;
@@ -244 +244 @@
                  * Type 0x00d9: Language (Second Time)
                  */           
-                if (aim_gettlv(innerlist, 0x00d9, 1))   
-                        exchanges[curexchange-1].lang2 = aim_gettlv_str(innerlist, 0x00d9, 1);
+                if (aim_tlv_gettlv(innerlist, 0x00d9, 1))       
+                        exchanges[curexchange-1].lang2 = aim_tlv_getstr(innerlist, 0x00d9, 1);
                 else
                         exchanges[curexchange-1].lang2 = NULL;
@@ -252 +252 @@
                  * Type 0x00da: Unknown
                  */
-                if (aim_gettlv(innerlist, 0x00da, 1))   
-                        ;
-
-                aim_freetlvchain(&innerlist);
+                if (aim_tlv_gettlv(innerlist, 0x00da, 1))       
+                        ;
+
+                aim_tlvlist_free(&innerlist);
         }
 
@@ -272 +272 @@
         }
         free(exchanges);
-        aim_freetlvchain(&tlvlist);
+        aim_tlvlist_free(&tlvlist);
 
         return ret;
@@ -290 +290 @@
         aim_bstream_t bbbs;
 
-        tlvlist = aim_readtlvchain(bs);
-
-        if (!(bigblock = aim_gettlv(tlvlist, 0x0004, 1))) {
+        tlvlist = aim_tlvlist_read(bs);
+
+        if (!(bigblock = aim_tlv_gettlv(tlvlist, 0x0004, 1))) {
                 faimdprintf(sess, 0, "no bigblock in top tlv in create room response\n");
-                aim_freetlvchain(&tlvlist);
+                aim_tlvlist_free(&tlvlist);
                 return 0;
         }
@@ -308 +308 @@
         if (detaillevel != 0x02) {
                 faimdprintf(sess, 0, "unknown detaillevel in create room response (0x%02x)\n", detaillevel);
-                aim_freetlvchain(&tlvlist);
+                aim_tlvlist_free(&tlvlist);
                 free(ck);
                 return 0;
@@ -315 +315 @@
         unknown = aimbs_get16(&bbbs);
 
-        innerlist = aim_readtlvchain(&bbbs);
-
-        if (aim_gettlv(innerlist, 0x006a, 1))
-                fqcn = aim_gettlv_str(innerlist, 0x006a, 1);
-
-        if (aim_gettlv(innerlist, 0x00c9, 1))
-                flags = aim_gettlv16(innerlist, 0x00c9, 1);
-
-        if (aim_gettlv(innerlist, 0x00ca, 1))
-                createtime = aim_gettlv32(innerlist, 0x00ca, 1);
-
-        if (aim_gettlv(innerlist, 0x00d1, 1))
-                maxmsglen = aim_gettlv16(innerlist, 0x00d1, 1);
-
-        if (aim_gettlv(innerlist, 0x00d2, 1))
-                maxoccupancy = aim_gettlv16(innerlist, 0x00d2, 1);
-
-        if (aim_gettlv(innerlist, 0x00d3, 1))
-                name = aim_gettlv_str(innerlist, 0x00d3, 1);
-
-        if (aim_gettlv(innerlist, 0x00d5, 1))
-                createperms = aim_gettlv8(innerlist, 0x00d5, 1);
+        innerlist = aim_tlvlist_read(&bbbs);
+
+        if (aim_tlv_gettlv(innerlist, 0x006a, 1))
+                fqcn = aim_tlv_getstr(innerlist, 0x006a, 1);
+
+        if (aim_tlv_gettlv(innerlist, 0x00c9, 1))
+                flags = aim_tlv_get16(innerlist, 0x00c9, 1);
+
+        if (aim_tlv_gettlv(innerlist, 0x00ca, 1))
+                createtime = aim_tlv_get32(innerlist, 0x00ca, 1);
+
+        if (aim_tlv_gettlv(innerlist, 0x00d1, 1))
+                maxmsglen = aim_tlv_get16(innerlist, 0x00d1, 1);
+
+        if (aim_tlv_gettlv(innerlist, 0x00d2, 1))
+                maxoccupancy = aim_tlv_get16(innerlist, 0x00d2, 1);
+
+        if (aim_tlv_gettlv(innerlist, 0x00d3, 1))
+                name = aim_tlv_getstr(innerlist, 0x00d3, 1);
+
+        if (aim_tlv_gettlv(innerlist, 0x00d5, 1))
+                createperms = aim_tlv_get8(innerlist, 0x00d5, 1);
 
         if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype))) {
@@ -345 +345 @@
         free(name);
         free(fqcn);
-        aim_freetlvchain(&innerlist);
-        aim_freetlvchain(&tlvlist);
+        aim_tlvlist_free(&innerlist);
+        aim_tlvlist_free(&tlvlist);
 
         return ret;