soc.2010.icq-tlc: 19e738d1: Removed '#if 0/endif' blocks. Some of th..
ivan.komarov at soc.pidgin.im
ivan.komarov at soc.pidgin.im
Wed Jul 28 20:00:55 EDT 2010
----------------------------------------------------------------------
Revision: 19e738d1229a8dcd4a13c7807558789866c4692d
Parent: d21452326b182223fa89d6ba81e074c37d57ceff
Author: ivan.komarov at soc.pidgin.im
Date: 07/28/10 15:37:26
Branch: im.pidgin.soc.2010.icq-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/19e738d1229a8dcd4a13c7807558789866c4692d
Changelog:
Removed '#if 0/endif' blocks. Some of them have the form of TODO, but
most of them are years old, so that shouldn't be a big deal.
Changes against parent d21452326b182223fa89d6ba81e074c37d57ceff
patched libpurple/protocols/oscar/family_auth.c
patched libpurple/protocols/oscar/family_chat.c
patched libpurple/protocols/oscar/family_chatnav.c
patched libpurple/protocols/oscar/family_icbm.c
patched libpurple/protocols/oscar/family_locate.c
patched libpurple/protocols/oscar/family_oservice.c
patched libpurple/protocols/oscar/flap_connection.c
patched libpurple/protocols/oscar/oscar.c
patched libpurple/protocols/oscar/rxhandlers.c
patched libpurple/protocols/oscar/tlv.c
-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c f68e1c25f3cab12fd8a3225dcf445a3d7850bffb
+++ libpurple/protocols/oscar/oscar.c 5d8df89eac6b5dbf1890b22cef788e379e7aff3d
@@ -929,34 +929,6 @@ static int purple_memrequest(OscarData *
AIM_SENDMEMBLOCK_FLAG_ISREQUEST);
return 1;
}
- /* uncomment this when you're convinced it's right. remember, it's been wrong before. */
-#if 0
- if (offset > AIM_MAX_FILE_SIZE || len > AIM_MAX_FILE_SIZE) {
- char *buf;
- int i = 8;
- if (modname)
- i += strlen(modname);
- buf = g_malloc(i);
- i = 0;
- if (modname) {
- memcpy(buf, modname, strlen(modname));
- i += strlen(modname);
- }
- buf[i++] = offset & 0xff;
- buf[i++] = (offset >> 8) & 0xff;
- buf[i++] = (offset >> 16) & 0xff;
- buf[i++] = (offset >> 24) & 0xff;
- buf[i++] = len & 0xff;
- buf[i++] = (len >> 8) & 0xff;
- buf[i++] = (len >> 16) & 0xff;
- buf[i++] = (len >> 24) & 0xff;
- purple_debug_misc("oscar", "len + offset is invalid, "
- "hashing request\n");
- aim_sendmemblock(od, command->conn, offset, i, buf, AIM_SENDMEMBLOCK_FLAG_ISREQUEST);
- g_free(buf);
- return 1;
- }
-#endif
pos = g_new0(struct pieceofcrap, 1);
pos->gc = od->gc;
@@ -3352,16 +3324,6 @@ void oscar_get_info(PurpleConnection *gc
aim_locate_getinfoshort(od, name, 0x00000003);
}
-#if 0
-static void oscar_set_dir(PurpleConnection *gc, const char *first, const char *middle, const char *last,
- const char *maiden, const char *city, const char *state, const char *country, int web) {
- /* XXX - some of these things are wrong, but i'm lazy */
- OscarData *od = purple_connection_get_protocol_data(gc);
- aim_locate_setdirinfo(od, first, middle, last,
- maiden, NULL, NULL, city, state, NULL, 0, web);
-}
-#endif
-
void oscar_set_idle(PurpleConnection *gc, int time) {
OscarData *od = purple_connection_get_protocol_data(gc);
aim_srv_setidle(od, time);
@@ -5116,15 +5078,6 @@ oscar_buddy_menu(PurpleBuddy *buddy) {
}
menu = g_list_prepend(menu, act);
}
-#if 0
- /* TODO: This menu item should be added by the core */
- if (userinfo->capabilities & OSCAR_CAPABILITY_GETFILE) {
- act = purple_menu_action_new(_("Get File"),
- PURPLE_CALLBACK(oscar_ask_getfile),
- NULL, NULL);
- menu = g_list_prepend(menu, act);
- }
-#endif
}
if (od->ssi.received_data && purple_buddy_get_group(buddy) != NULL)
@@ -5562,12 +5515,6 @@ oscar_actions(PurplePlugin *plugin, gpoi
oscar_show_find_email);
menu = g_list_prepend(menu, act);
-#if 0
- act = purple_plugin_action_new(_("Search for Buddy by Information"),
- show_find_info);
- menu = g_list_prepend(menu, act);
-#endif
-
menu = g_list_reverse(menu);
return menu;
============================================================
--- libpurple/protocols/oscar/rxhandlers.c 17fea0c5199fd493aee3777341b2b821caee9542
+++ libpurple/protocols/oscar/rxhandlers.c 39fa235b8be986848882c0add9171ebc225f1e28
@@ -95,194 +95,3 @@ void aim__shutdownmodules(OscarData *od)
return;
}
-
-#if 0
-/*
- * Bleck functions get called when there's no non-bleck functions
- * around to cleanup the mess...
- */
-static int bleck(OscarData *od, FlapFrame *frame, ...)
-{
- guint16 family, subtype;
- guint16 maxf, maxs;
-
- static const char *channels[6] = {
- "Invalid (0)",
- "FLAP Version",
- "SNAC",
- "Invalid (3)",
- "Negotiation",
- "FLAP NOP"
- };
- static const int maxchannels = 5;
-
- /* XXX: this is ugly. and big just for debugging. */
- static const char *literals[14][25] = {
- {"Invalid",
- NULL
- },
- {"General",
- "Invalid",
- "Error",
- "Client Ready",
- "Server Ready",
- "Service Request",
- "Redirect",
- "Rate Information Request",
- "Rate Information",
- "Rate Information Ack",
- NULL,
- "Rate Information Change",
- "Server Pause",
- NULL,
- "Server Resume",
- "Request Personal User Information",
- "Personal User Information",
- "Evil Notification",
- NULL,
- "Migration notice",
- "Message of the Day",
- "Set Privacy Flags",
- "Well Known URL",
- "NOP"
- },
- {"Location",
- "Invalid",
- "Error",
- "Request Rights",
- "Rights Information",
- "Set user information",
- "Request User Information",
- "User Information",
- "Watcher Sub Request",
- "Watcher Notification"
- },
- {"Buddy List Management",
- "Invalid",
- "Error",
- "Request Rights",
- "Rights Information",
- "Add Buddy",
- "Remove Buddy",
- "Watcher List Query",
- "Watcher List Response",
- "Watcher SubRequest",
- "Watcher Notification",
- "Reject Notification",
- "Oncoming Buddy",
- "Offgoing Buddy"
- },
- {"Messeging",
- "Invalid",
- "Error",
- "Add ICBM Parameter",
- "Remove ICBM Parameter",
- "Request Parameter Information",
- "Parameter Information",
- "Outgoing Message",
- "Incoming Message",
- "Evil Request",
- "Evil Reply",
- "Missed Calls",
- "Message Error",
- "Host Ack"
- },
- {"Advertisements",
- "Invalid",
- "Error",
- "Request Ad",
- "Ad Data (GIFs)"
- },
- {"Invitation / Client-to-Client",
- "Invalid",
- "Error",
- "Invite a Friend",
- "Invitation Ack"
- },
- {"Administrative",
- "Invalid",
- "Error",
- "Information Request",
- "Information Reply",
- "Information Change Request",
- "Information Chat Reply",
- "Account Confirm Request",
- "Account Confirm Reply",
- "Account Delete Request",
- "Account Delete Reply"
- },
- {"Popups",
- "Invalid",
- "Error",
- "Display Popup"
- },
- {"BOS",
- "Invalid",
- "Error",
- "Request Rights",
- "Rights Response",
- "Set group permission mask",
- "Add permission list entries",
- "Delete permission list entries",
- "Add deny list entries",
- "Delete deny list entries",
- "Server Error"
- },
- {"User Lookup",
- "Invalid",
- "Error",
- "Search Request",
- "Search Response"
- },
- {"Stats",
- "Invalid",
- "Error",
- "Set minimum report interval",
- "Report Events"
- },
- {"Translate",
- "Invalid",
- "Error",
- "Translate Request",
- "Translate Reply",
- },
- {"Chat Navigation",
- "Invalid",
- "Error",
- "Request rights",
- "Request Exchange Information",
- "Request Room Information",
- "Request Occupant List",
- "Search for Room",
- "Outgoing Message",
- "Incoming Message",
- "Evil Request",
- "Evil Reply",
- "Chat Error",
- }
- };
-
- maxf = sizeof(literals) / sizeof(literals[0]);
- maxs = sizeof(literals[0]) / sizeof(literals[0][0]);
-
- if (frame->channel == 0x02) {
-
- family = byte_stream_get16(&frame->data);
- subtype = byte_stream_get16(&frame->data);
-
- if ((family < maxf) && (subtype+1 < maxs) && (literals[family][subtype] != NULL))
- purple_debug_misc("oscar", "bleck: channel %s: null handler for %04x/%04x (%s)\n", channels[frame->channel], family, subtype, literals[family][subtype+1]);
- else
- purple_debug_misc("oscar", "bleck: channel %s: null handler for %04x/%04x (no literal)\n", channels[frame->channel], family, subtype);
- } else {
-
- if (frame->channel <= maxchannels)
- purple_debug_misc("oscar", "bleck: channel %s (0x%02x)\n", channels[frame->channel], frame->channel);
- else
- purple_debug_misc("oscar", "bleck: unknown channel 0x%02x\n", frame->channel);
-
- }
-
- return 1;
-}
-#endif
============================================================
--- libpurple/protocols/oscar/tlv.c 60f610dd7670110ca106547ae8e945c5cd63f2b3
+++ libpurple/protocols/oscar/tlv.c 3b758fa77fa9e2f1cb6aa61dc4f246e4af7203be
@@ -49,26 +49,6 @@ aim_tlv_read(GSList *list, ByteStream *b
type = byte_stream_get16(bs);
length = byte_stream_get16(bs);
-#if 0
- /*
- * This code hasn't been needed in years. It's been commented
- * out since 2003, at the latest. It seems likely that it was
- * just a bug in their server code that has since been fixed.
- * In any case, here's the orignal comment, kept for historical
- * purposes:
- *
- * 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
- * there's no special cases to this special case.
- * - mid (30jun2000)
- */
- if ((type == 0x0013) && (length != 0x0002)) {
- length = 0x0002;
- return list;
- }
-#endif
if (length > byte_stream_empty(bs)) {
aim_tlvlist_free(list);
return NULL;
============================================================
--- libpurple/protocols/oscar/family_auth.c 3d95778ca33eb660976647f71ea79ee9f5ae918b
+++ libpurple/protocols/oscar/family_auth.c 3c0644508188c7a1e1febc75f52665f9b08b2a38
@@ -56,17 +56,10 @@ aim_encode_password(const char *password
aim_encode_password(const char *password, guint8 *encoded)
{
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 */
0xf3, 0x26, 0x81, 0xc4,
0x39, 0x86, 0xdb, 0x92,
0x71, 0xa3, 0xb9, 0xe6,
0x53, 0x7a, 0x95, 0x7c
-#endif
};
unsigned int i;
@@ -385,12 +378,6 @@ parse(OscarData *od, FlapConnection *con
if (aim_tlv_gettlv(tlvlist, 0x0043, 1))
info->latestbeta.name = aim_tlv_getstr(tlvlist, 0x0043, 1);
-#if 0
- if (aim_tlv_gettlv(tlvlist, 0x0048, 1)) {
- /* beta serial */
- }
-#endif
-
if (aim_tlv_gettlv(tlvlist, 0x0044, 1))
info->latestrelease.build = aim_tlv_get32(tlvlist, 0x0044, 1);
if (aim_tlv_gettlv(tlvlist, 0x0045, 1))
@@ -400,27 +387,12 @@ parse(OscarData *od, FlapConnection *con
if (aim_tlv_gettlv(tlvlist, 0x0047, 1))
info->latestrelease.name = aim_tlv_getstr(tlvlist, 0x0047, 1);
-#if 0
- if (aim_tlv_gettlv(tlvlist, 0x0049, 1)) {
- /* lastest release serial */
- }
-#endif
-
/*
* URL to change password.
*/
if (aim_tlv_gettlv(tlvlist, 0x0054, 1))
info->chpassurl = aim_tlv_getstr(tlvlist, 0x0054, 1);
-#if 0
- /*
- * Unknown. Seen on an @mac.com username with value of 0x003f
- */
- if (aim_tlv_gettlv(tlvlist, 0x0055, 1)) {
- /* Unhandled */
- }
-#endif
-
od->authinfo = info;
if ((userfunc = aim_callhandler(od, snac ? snac->family : SNAC_FAMILY_AUTH, snac ? snac->subtype : 0x0003)))
============================================================
--- libpurple/protocols/oscar/family_chat.c e58b81d1573f775ba029e2d584a6eb654c88f55b
+++ libpurple/protocols/oscar/family_chat.c 2faf894f7457faf6d6e0ffa8a5bf5b07455412ed
@@ -321,17 +321,7 @@ incomingim_ch3(OscarData *od, FlapConnec
aim_info_extract(od, &tbs, &userinfo);
}
-#if 0
/*
- * Type 0x0001: If present, it means it was a message to the
- * room (as opposed to a whisper).
- */
- if (aim_tlv_gettlv(tlvlist, 0x0001, 1)) {
- /* Unhandled */
- }
-#endif
-
- /*
* Type 0x0005: Message Block. Conains more TLVs.
*/
tlv = aim_tlv_gettlv(tlvlist, 0x0005, 1);
============================================================
--- libpurple/protocols/oscar/family_chatnav.c fa27095f49a953dfb6e31ad636ecc3c952183517
+++ libpurple/protocols/oscar/family_chatnav.c 72b8d3269afff43e57006c195fc7b7b16860dc6f
@@ -185,33 +185,7 @@ parseinfo_perms(OscarData *od, FlapConne
exchanges[curexchange-1].number = byte_stream_get16(&tbs);
innerlist = aim_tlvlist_read(&tbs);
-#if 0
/*
- * Type 0x000a: Unknown.
- *
- * Usually three bytes: 0x0114 (exchange 1) or 0x010f (others).
- *
- */
- if (aim_tlv_gettlv(innerlist, 0x000a, 1)) {
- /* Unhandled */
- }
-
- /*
- * Type 0x000d: Unknown.
- */
- if (aim_tlv_gettlv(innerlist, 0x000d, 1)) {
- /* Unhandled */
- }
-
- /*
- * Type 0x0004: Unknown
- */
- if (aim_tlv_gettlv(innerlist, 0x0004, 1)) {
- /* Unhandled */
- }
-#endif
-
- /*
* Type 0x0002: Unknown
*/
if (aim_tlv_gettlv(innerlist, 0x0002, 1)) {
@@ -234,37 +208,7 @@ parseinfo_perms(OscarData *od, FlapConne
if (aim_tlv_gettlv(innerlist, 0x00c9, 1))
exchanges[curexchange-1].flags = aim_tlv_get16(innerlist, 0x00c9, 1);
-#if 0
/*
- * Type 0x00ca: Creation Date
- */
- if (aim_tlv_gettlv(innerlist, 0x00ca, 1)) {
- /* Unhandled */
- }
-
- /*
- * Type 0x00d0: Mandatory Channels?
- */
- if (aim_tlv_gettlv(innerlist, 0x00d0, 1)) {
- /* Unhandled */
- }
-
- /*
- * Type 0x00d1: Maximum Message length
- */
- if (aim_tlv_gettlv(innerlist, 0x00d1, 1)) {
- /* Unhandled */
- }
-
- /*
- * Type 0x00d2: Maximum Occupancy?
- */
- if (aim_tlv_gettlv(innerlist, 0x00d2, 1)) {
- /* Unhandled */
- }
-#endif
-
- /*
* Type 0x00d3: Exchange Description
*/
if (aim_tlv_gettlv(innerlist, 0x00d3, 1))
@@ -272,16 +216,7 @@ parseinfo_perms(OscarData *od, FlapConne
else
exchanges[curexchange-1].name = NULL;
-#if 0
/*
- * Type 0x00d4: Exchange Description URL
- */
- if (aim_tlv_gettlv(innerlist, 0x00d4, 1)) {
- /* Unhandled */
- }
-#endif
-
- /*
* Type 0x00d5: Creation Permissions
*
* 0 Creation not allowed
@@ -327,15 +262,6 @@ parseinfo_perms(OscarData *od, FlapConne
else
exchanges[curexchange-1].lang2 = NULL;
-#if 0
- /*
- * Type 0x00da: Unknown
- */
- if (aim_tlv_gettlv(innerlist, 0x00da, 1)) {
- /* Unhandled */
- }
-#endif
-
aim_tlvlist_free(innerlist);
}
============================================================
--- libpurple/protocols/oscar/family_icbm.c 681be5be83f664d49016245da0ed684e51553bd6
+++ libpurple/protocols/oscar/family_icbm.c be8fe16ec46d89985889a44b20f955b130de2daa
@@ -800,17 +800,6 @@ aim_im_sendch2_sendfile_requestdirect(Os
aim_tlvlist_add_noval(&inner_tlvlist, 0x000f);
/* TODO: Send 0x0016 and 0x0017 */
-#if 0
- /* TODO: If the following is ever enabled, ensure that it is
- * not sent with a receive redirect or stage 3 proxy
- * redirect for a file receive (same conditions for
- * sending 0x000f above)
- */
- aim_tlvlist_add_raw(&inner_tlvlist, 0x000e, 2, "en");
- aim_tlvlist_add_raw(&inner_tlvlist, 0x000d, 8, "us-ascii");
- aim_tlvlist_add_raw(&inner_tlvlist, 0x000c, 24, "Please accept this file.");
-#endif
-
if (filename != NULL)
{
ByteStream inner_bs;
@@ -892,17 +881,6 @@ aim_im_sendch2_sendfile_requestproxy(Osc
aim_tlvlist_add_raw(&inner_tlvlist, 0x0016, 4, ip_comp);
aim_tlvlist_add_16(&inner_tlvlist, 0x0017, ~pin);
-#if 0
- /* TODO: If the following is ever enabled, ensure that it is
- * not sent with a receive redirect or stage 3 proxy
- * redirect for a file receive (same conditions for
- * sending 0x000f above)
- */
- aim_tlvlist_add_raw(&inner_tlvlist, 0x000e, 2, "en");
- aim_tlvlist_add_raw(&inner_tlvlist, 0x000d, 8, "us-ascii");
- aim_tlvlist_add_raw(&inner_tlvlist, 0x000c, 24, "Please accept this file.");
-#endif
-
if (filename != NULL)
{
ByteStream filename_bs;
@@ -1654,21 +1632,7 @@ static int incomingim_ch2(OscarData *od,
if (aim_tlv_gettlv(list2, 0x000e, 1))
args.language = aim_tlv_getstr(list2, 0x000e, 1);
-#if 0
/*
- * Unknown -- no value
- *
- * Maybe means we should connect directly to transfer the file?
- * Also used in ICQ Lite Beta 4.0 URLs. Also empty.
- */
- /* I don't think this indicates a direct transfer; this flag is
- * also present in a stage 1 proxied file send request -- Jonathan */
- if (aim_tlv_gettlv(list2, 0x000f, 1)) {
- /* Unhandled */
- }
-#endif
-
- /*
* Flag meaning we should proxy the file transfer through an AIM server
*/
if (aim_tlv_gettlv(list2, 0x0010, 1))
============================================================
--- libpurple/protocols/oscar/family_locate.c 8101b18aa4faa629e816b7e533d12937dfa6e1ee
+++ libpurple/protocols/oscar/family_locate.c e87b992e46d0c9942e98be243c3df09d5d1c5447
@@ -1165,61 +1165,7 @@ aim_info_extract(OscarData *od, ByteStre
return 0;
}
-/* Apparently, this is never called.
- * If you activate it, figure out a way to know what mood to pass to
- * aim_tlvlist_add_caps() below. --rlaager */
-#if 0
/*
- * Inverse of aim_info_extract()
- */
-int
-aim_putuserinfo(ByteStream *bs, aim_userinfo_t *info)
-{
- GSList *tlvlist = NULL;
-
- if (!bs || !info)
- return -EINVAL;
-
- byte_stream_put8(bs, strlen(info->bn));
- byte_stream_putstr(bs, info->bn);
-
- byte_stream_put16(bs, info->warnlevel);
-
- if (info->present & AIM_USERINFO_PRESENT_FLAGS)
- aim_tlvlist_add_16(&tlvlist, 0x0001, info->flags);
- if (info->present & AIM_USERINFO_PRESENT_MEMBERSINCE)
- aim_tlvlist_add_32(&tlvlist, 0x0002, info->membersince);
- if (info->present & AIM_USERINFO_PRESENT_ONLINESINCE)
- aim_tlvlist_add_32(&tlvlist, 0x0003, info->onlinesince);
- if (info->present & AIM_USERINFO_PRESENT_IDLE)
- aim_tlvlist_add_16(&tlvlist, 0x0004, info->idletime);
-
-/* XXX - So, ICQ_OSCAR_SUPPORT is never defined anywhere... */
-#ifdef ICQ_OSCAR_SUPPORT
- if (atoi(info->bn) != 0) {
- if (info->present & AIM_USERINFO_PRESENT_ICQEXTSTATUS)
- aim_tlvlist_add_16(&tlvlist, 0x0006, info->icqinfo.status);
- if (info->present & AIM_USERINFO_PRESENT_ICQIPADDR)
- aim_tlvlist_add_32(&tlvlist, 0x000a, info->icqinfo.ipaddr);
- }
-#endif
-
- if (info->present & AIM_USERINFO_PRESENT_CAPABILITIES) {
- aim_tlvlist_add_caps(&tlvlist, 0x000d, info->capabilities, NULL);
- }
-
- if (info->present & AIM_USERINFO_PRESENT_SESSIONLEN)
- aim_tlvlist_add_32(&tlvlist, (guint16)((info->flags & AIM_FLAG_AOL) ? 0x0010 : 0x000f), info->sessionlen);
-
- byte_stream_put16(bs, aim_tlvlist_count(tlvlist));
- aim_tlvlist_write(bs, &tlvlist);
- aim_tlvlist_free(tlvlist);
-
- return 0;
-}
-#endif
-
-/*
* Subtype 0x0001
*/
static int
@@ -1564,15 +1510,6 @@ locate_modfirst(OscarData *od, aim_modul
return 0;
}
-#if 0 //rlaager
-const char* aim_get_custom_icon_mood(gint32 no)
-{
- if (no >= G_N_ELEMENTS(aim_custom_icons) || no < 1)
- return NULL;
- return aim_custom_icons[no].mood.mood;
-}
-#endif
-
const char*
icq_get_custom_icon_description(const char *mood)
{
============================================================
--- libpurple/protocols/oscar/family_oservice.c 22fc21a6c32a2fcc95eb18906b1cae82e5b0c6ef
+++ libpurple/protocols/oscar/family_oservice.c d7f64a85d625b9a982c7f8cb8bb611a00ee11cd7
@@ -812,16 +812,6 @@ aim_srv_setextrainfo(OscarData *od,
AIM_ICQ_STATE_HIDEIP | AIM_ICQ_STATE_DIRECTREQUIREAUTH);
}
-#if 0
- if (other_stuff_that_isnt_implemented)
- {
- aim_tlvlist_add_raw(&tlvlist, 0x000c, 0x0025,
- chunk_of_x25_bytes_with_ip_address_etc);
- aim_tlvlist_add_raw(&tlvlist, 0x0011, 0x0005, unknown 0x01 61 10 f6 41);
- aim_tlvlist_add_16(&tlvlist, 0x0012, unknown 0x00 00);
- }
-#endif
-
if (setstatusmsg)
{
size_t statusmsglen, itmsurllen;
============================================================
--- libpurple/protocols/oscar/flap_connection.c 8832cd5983913c675765f2e1f3034344d2e29467
+++ libpurple/protocols/oscar/flap_connection.c 712a6a3fd36aeee991a1d1b61656d12c9d80062b
@@ -931,18 +931,6 @@ flap_connection_recv(FlapConnection *con
break;
}
- /* Verify the sequence number sent by the server. */
-#if 0
- /* TODO: Need to initialize conn->seqnum_in somewhere before we can use this. */
- if (aimutil_get16(&conn->header[1]) != conn->seqnum_in++)
- {
- /* Received an out-of-order FLAP! */
- flap_connection_schedule_destroy(conn,
- OSCAR_DISCONNECT_INVALID_DATA, NULL);
- break;
- }
-#endif
-
/* Initialize a new temporary FlapFrame for incoming data */
conn->buffer_incoming.channel = aimutil_get8(&conn->header[1]);
conn->buffer_incoming.seqnum = aimutil_get16(&conn->header[2]);
More information about the Commits
mailing list