Menu
▾
▴
pidgin-commits
|
From: <the...@us...> - 2006-09-14 00:56:39
|
Revision: 17272
http://svn.sourceforge.net/gaim/?rev=17272&view=rev
Author: thekingant
Date: 2006-09-13 17:56:36 -0700 (Wed, 13 Sep 2006)
Log Message:
-----------
Comment cleanup
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/family_locate.c
Modified: trunk/libgaim/protocols/oscar/family_locate.c
===================================================================
--- trunk/libgaim/protocols/oscar/family_locate.c 2006-09-13 23:08:14 UTC (rev 17271)
+++ trunk/libgaim/protocols/oscar/family_locate.c 2006-09-14 00:56:36 UTC (rev 17272)
@@ -181,18 +181,18 @@
0x88, 0x6f, 0xea, 0x35, 0x95, 0xfd, 0xb6, 0xdf}},
/*
+ {OSCAR_CAPABILITY_ICQ2GO,
+ {0x56, 0x3f, 0xc8, 0x09, 0x0b, 0x6f, 0x41, 0xbd,
+ 0x9f, 0x79, 0x42, 0x26, 0x09, 0xdf, 0xa2, 0xf3}},
+ */
+
+ /*
* Chat is oddball.
*/
{OSCAR_CAPABILITY_CHAT,
{0x74, 0x8f, 0x24, 0x20, 0x62, 0x87, 0x11, 0xd1,
0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
- /*
- {OSCAR_CAPABILITY_ICQ2GO,
- {0x56, 0x3f, 0xc8, 0x09, 0x0b, 0x6f, 0x41, 0xbd,
- 0x9f, 0x79, 0x42, 0x26, 0x09, 0xdf, 0xa2, 0xf3}},
- */
-
{OSCAR_CAPABILITY_ICQRTF,
{0x97, 0xb1, 0x27, 0x51, 0x24, 0x3c, 0x43, 0x34,
0xad, 0x22, 0xd6, 0xab, 0xf7, 0x3f, 0x14, 0x92}},
@@ -611,7 +611,7 @@
if (type == 0x0001) {
/*
- * Type = 0x0001: User flags
+ * User flags
*
* Specified as any of the following ORed together:
* 0x0001 Trial (user less than 60days)
@@ -621,14 +621,13 @@
* 0x0010 Free (AIM) user
* 0x0020 Away
* 0x0400 ActiveBuddy
- *
*/
outinfo->flags = byte_stream_get16(bs);
outinfo->present |= AIM_USERINFO_PRESENT_FLAGS;
} else if (type == 0x0002) {
/*
- * Type = 0x0002: Account creation time.
+ * Account creation time
*
* The time/date that the user originally registered for
* the service, stored in time_t format.
@@ -645,7 +644,7 @@
} else if (type == 0x0003) {
/*
- * Type = 0x0003: On-Since date.
+ * On-Since date
*
* The time/date that the user started their current
* session, stored in time_t format.
@@ -655,7 +654,7 @@
} else if (type == 0x0004) {
/*
- * Type = 0x0004: Idle time.
+ * Idle time
*
* Number of minutes since the user actively used the
* service.
@@ -669,7 +668,7 @@
} else if (type == 0x0005) {
/*
- * Type = 0x0005: Member since date.
+ * Member since date
*
* The time/date that the user originally registered for
* the service, stored in time_t format.
@@ -683,7 +682,7 @@
} else if (type == 0x0006) {
/*
- * Type = 0x0006: ICQ Online Status
+ * ICQ Online Status
*
* ICQ's Away/DND/etc "enriched" status. Some decoding
* of values done by Scott <da...@pc...>
@@ -694,16 +693,13 @@
} else if (type == 0x0008) {
/*
- * Type = 0x0008
- *
* Client type, or some such.
*/
} else if (type == 0x000a) {
/*
- * Type = 0x000a
+ * ICQ User IP Address
*
- * ICQ User IP Address.
* Ahh, the joy of ICQ security.
*/
outinfo->icqinfo.ipaddr = byte_stream_get32(bs);
@@ -711,35 +707,25 @@
} else if (type == 0x000c) {
/*
- * Type = 0x000c
- *
- * random crap containing the IP address,
+ * Random crap containing the IP address,
* apparently a port number, and some Other Stuff.
*
* Format is:
* 4 bytes - Our IP address, 0xc0 a8 01 2b for 192.168.1.43
- *
- *
*/
byte_stream_getrawbuf(bs, outinfo->icqinfo.crap, 0x25);
outinfo->present |= AIM_USERINFO_PRESENT_ICQDATA;
} else if (type == 0x000d) {
/*
- * Type = 0x000d
- *
- * OSCAR Capability information.
- *
+ * OSCAR Capability information
*/
outinfo->capabilities |= aim_locate_getcaps(od, bs, length);
outinfo->present |= AIM_USERINFO_PRESENT_CAPABILITIES;
} else if (type == 0x000e) {
/*
- * Type = 0x000e
- *
- * AOL capability information.
- *
+ * AOL capability information
*/
} else if ((type == 0x000f) || (type == 0x0010)) {
@@ -752,22 +738,19 @@
*
* Which TLV type this comes in depends on the
* service the user is using (AIM or AOL).
- *
*/
outinfo->sessionlen = byte_stream_get32(bs);
outinfo->present |= AIM_USERINFO_PRESENT_SESSIONLEN;
} else if (type == 0x0019) {
/*
- * Type = 0x0019
- *
* OSCAR short capability information. A shortened
* form of the normal capabilities.
*/
outinfo->capabilities |= aim_locate_getcaps_short(od, bs, length);
outinfo->present |= AIM_USERINFO_PRESENT_CAPABILITIES;
- } else if (type == 0x001b) {
+ } else if (type == 0x001a) {
/*
* Type = 0x001a
*
@@ -777,15 +760,11 @@
} else if (type == 0x001b) {
/*
- * Type = 0x0019
- *
* Encryption certification MD5 checksum.
*/
} else if (type == 0x001d) {
/*
- * Type = 0x001d
- *
* Buddy icon information and status/available messages.
*
* This almost seems like the AIM protocol guys gave
@@ -852,15 +831,11 @@
} else if (type == 0x001e) {
/*
- * Type 30: Unknown.
- *
* Always four bytes, but it doesn't look like an int.
*/
} else if (type == 0x001f) {
/*
- * Type 31: Unknown.
- *
* Seen on a buddy using DeadAIM. Data was 4 bytes:
* 0x00 00 00 10
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-10-24 22:09:58
|
Revision: 17578
http://svn.sourceforge.net/gaim/?rev=17578&view=rev
Author: thekingant
Date: 2006-10-24 15:09:56 -0700 (Tue, 24 Oct 2006)
Log Message:
-----------
Some of these were out of order
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/family_locate.c
Modified: trunk/libgaim/protocols/oscar/family_locate.c
===================================================================
--- trunk/libgaim/protocols/oscar/family_locate.c 2006-10-24 19:57:20 UTC (rev 17577)
+++ trunk/libgaim/protocols/oscar/family_locate.c 2006-10-24 22:09:56 UTC (rev 17578)
@@ -94,18 +94,6 @@
{0x09, 0x46, 0x01, 0xff, 0x4c, 0x7f, 0x11, 0xd1,
0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
- {OSCAR_CAPABILITY_GENERICUNKNOWN,
- {0x09, 0x46, 0xf0, 0x03, 0x4c, 0x7f, 0x11, 0xd1,
- 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
-
- {OSCAR_CAPABILITY_GENERICUNKNOWN,
- {0x09, 0x46, 0xf0, 0x04, 0x4c, 0x7f, 0x11, 0xd1,
- 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
-
- {OSCAR_CAPABILITY_GENERICUNKNOWN,
- {0x09, 0x46, 0xf0, 0x05, 0x4c, 0x7f, 0x11, 0xd1,
- 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
-
{OSCAR_CAPABILITY_HIPTOP,
{0x09, 0x46, 0x13, 0x23, 0x4c, 0x7f, 0x11, 0xd1,
0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
@@ -176,6 +164,18 @@
{0x09, 0x46, 0x13, 0x4e, 0x4c, 0x7f, 0x11, 0xd1,
0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
+ {OSCAR_CAPABILITY_GENERICUNKNOWN,
+ {0x09, 0x46, 0xf0, 0x03, 0x4c, 0x7f, 0x11, 0xd1,
+ 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
+
+ {OSCAR_CAPABILITY_GENERICUNKNOWN,
+ {0x09, 0x46, 0xf0, 0x04, 0x4c, 0x7f, 0x11, 0xd1,
+ 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
+
+ {OSCAR_CAPABILITY_GENERICUNKNOWN,
+ {0x09, 0x46, 0xf0, 0x05, 0x4c, 0x7f, 0x11, 0xd1,
+ 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
+
{OSCAR_CAPABILITY_UNICODEOLD,
{0x2e, 0x7a, 0x64, 0x75, 0xfa, 0xdf, 0x4d, 0xc8,
0x88, 0x6f, 0xea, 0x35, 0x95, 0xfd, 0xb6, 0xdf}},
@@ -193,15 +193,15 @@
{0x74, 0x8f, 0x24, 0x20, 0x62, 0x87, 0x11, 0xd1,
0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
- {OSCAR_CAPABILITY_ICQRTF,
- {0x97, 0xb1, 0x27, 0x51, 0x24, 0x3c, 0x43, 0x34,
- 0xad, 0x22, 0xd6, 0xab, 0xf7, 0x3f, 0x14, 0x92}},
-
/* This is added by the servers and it only shows up for ourselves... */
{OSCAR_CAPABILITY_GENERICUNKNOWN,
{0x97, 0xb1, 0x27, 0x51, 0x24, 0x3c, 0x43, 0x34,
0xad, 0x22, 0xd6, 0xab, 0xf7, 0x3f, 0x14, 0x09}},
+ {OSCAR_CAPABILITY_ICQRTF,
+ {0x97, 0xb1, 0x27, 0x51, 0x24, 0x3c, 0x43, 0x34,
+ 0xad, 0x22, 0xd6, 0xab, 0xf7, 0x3f, 0x14, 0x92}},
+
{OSCAR_CAPABILITY_APINFO,
{0xaa, 0x4a, 0x32, 0xb5, 0xf8, 0x84, 0x48, 0xc6,
0xa3, 0xd7, 0x8c, 0x50, 0x97, 0x19, 0xfd, 0x5b}},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ev...@us...> - 2006-12-22 08:33:17
|
Revision: 18046
http://svn.sourceforge.net/gaim/?rev=18046&view=rev
Author: evands
Date: 2006-12-22 00:33:12 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
When there is no away message specified in the info block and the contact is no longer away, clear the cached away message if there is one.
Previously, when a contact did the following:
1. Away with Message 1
2. Available
3. Away with Message 2
the 3rd event would lead to setting away first with Message 1 (cached in the old user_info object) and then with Message 2 (using a newly created user_info object).
I also changed 2 "#if 0" directives which together controlled logging unknown TLVs into "#ifdef LOG_UNKNOWN_TLV" and added a commented-out #define at the top of the file.
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/family_locate.c
Modified: trunk/libgaim/protocols/oscar/family_locate.c
===================================================================
--- trunk/libgaim/protocols/oscar/family_locate.c 2006-12-22 08:29:28 UTC (rev 18045)
+++ trunk/libgaim/protocols/oscar/family_locate.c 2006-12-22 08:33:12 UTC (rev 18046)
@@ -31,6 +31,9 @@
#include "win32dep.h"
#endif
+/* Define to log unknown TLVs */
+/* #define LOG_UNKNOWN_TLV */
+
/*
* Capability blocks.
*
@@ -301,6 +304,21 @@
cur->away = NULL;
cur->away_encoding = strdup(userinfo->away_encoding);
cur->away_len = userinfo->away_len;
+
+ } else if (!(userinfo->flags & AIM_FLAG_AWAY)) {
+ /*
+ * We don't have an away message specified in this user_info block.
+ * If the user is not away, clear any cached away message now.
+ */
+ if (cur->away) {
+ free(cur->away);
+ cur->away = NULL;
+ }
+ if (cur->away_encoding) {
+ free(cur->away_encoding);
+ cur->away_encoding = NULL;
+ }
+ cur->away_len = 0;
}
/*
@@ -525,7 +543,7 @@
return 0;
}
-#if 0
+#ifdef LOG_UNKNOWN_TLV
static void
dumptlv(OscarData *od, guint16 type, ByteStream *bs, guint8 len)
{
@@ -851,7 +869,7 @@
* recovery.
*
*/
-#if 0
+#ifdef LOG_UNKNOWN_TLV
gaim_debug_misc("oscar", "userinfo: **warning: unexpected TLV:\n");
gaim_debug_misc("oscar", "userinfo: sn =%s\n", outinfo->sn);
dumptlv(od, type, bs, length);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X