Changeset c998255 for protocols/oscar

Timestamp:

2005-11-15T14:57:38Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

2cdd8ce, cc9079e

Parents:

b135438 (diff), 9cb9868 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from Jelmer

Location:

protocols/oscar

Files:

• auth.c (modified) (1 diff)
• oscar.c (modified) (2 diffs)
• oscar_util.c (modified) (1 diff)
• tlv.c (modified) (4 diffs)

protocols/oscar/auth.c

@@ -352 +352 @@
 {
         guint8 encoding_table[] = {
-#if 0 /* old v1 table */
-                0xf3, 0xb3, 0x6c, 0x99,
-                0x95, 0x3f, 0xac, 0xb6,
-                0xc5, 0xfa, 0x6b, 0x63,
-                0x69, 0x6c, 0xc3, 0x9f
-#else /* v2.1 table, also works for ICQ */
+        /* v2.1 table, also works for ICQ */
                 0xf3, 0x26, 0x81, 0xc4,
                 0x39, 0x86, 0xdb, 0x92,
                 0x71, 0xa3, 0xb9, 0xe6,
                 0x53, 0x7a, 0x95, 0x7c
-#endif
         };
         int i;

protocols/oscar/oscar.c

@@ -1208 +1208 @@
         return 1;
 }
-/*
-int handle_cmp_aim(const char * a, const char * b) {
-        return handle_cmp(a, b, PROTO_TOC);
-}
-*/
+
 static int gaim_parse_incoming_im(aim_session_t *sess, aim_frame_t *fr, ...) {
         int channel, ret = 0;
@@ -2484 +2480 @@
         ret->set_permit_deny = oscar_set_permit_deny;
         ret->keepalive = oscar_keepalive;
+        ret->cmp_buddynames = aim_sncmp;
         ret->get_status_string = oscar_get_status_string;
 

protocols/oscar/oscar_util.c

@@ -1 @@
-/*
- *
- *
- *
- */
-
 #include <aim.h>
 #include <ctype.h>

protocols/oscar/tlv.c

@@ -1 +1 @@
 #include <aim.h>
 
-static aim_tlv_t *createtlv(void)
-{
-        return g_new0(aim_tlv_t, 1);
-}
-
 static void freetlv(aim_tlv_t **oldtlv)
 {
-
         if (!oldtlv || !*oldtlv)
                 return;
@@ -15 +9 @@
         g_free(*oldtlv);
         *oldtlv = NULL;
-
-        return;
 }
 
@@ -46 +38 @@
                 length = aimbs_get16(bs);
 
-#if 0 /* temporarily disabled until I know if they're still doing it or not */
-                /*
-                 * Okay, so now AOL has decided that any TLV of
-                 * type 0x0013 can only be two bytes, despite
-                 * what the actual given length is.  So here 
-                 * we dump any invalid TLVs of that sort.  Hopefully
-                 * theres no special cases to this special case.
-                 *   - mid (30jun2000)
-                 */
-                if ((type == 0x0013) && (length != 0x0002))
-                        length = 0x0002;
-#else
-                if (0)
-                        ;
-#endif
-                else {
-
-                        cur = g_new0(aim_tlvlist_t, 1);
-
-                        cur->tlv = createtlv(); 
-                        cur->tlv->type = type;
-                        if ((cur->tlv->length = length))
-                               cur->tlv->value = aimbs_getraw(bs, length);      
-
-                        cur->next = list;
-                        list = cur;
-                }
+                cur = g_new0(aim_tlvlist_t, 1);
+
+                cur->tlv = g_new0(aim_tlv_t, 1);
+                cur->tlv->type = type;
+                if ((cur->tlv->length = length))
+                        cur->tlv->value = aimbs_getraw(bs, length);     
+
+                cur->next = list;
+                list = cur;
         }
 
@@ -173 +147 @@
                 return 0;
 
-        if (!(newtlv->tlv = createtlv())) {
+        if (!(newtlv->tlv = g_new0(aim_tlv_t, 1))) {
                 g_free(newtlv);
                 return 0;