Changeset b20b32f for protocols/oscar/rxhandlers.c

Timestamp:

2005-11-28T01:14:06Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

65e2ce1, cfcc587

Parents:

2cdd8ce (diff), dfde8e0 (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 Wilmer

File:

• protocols/oscar/rxhandlers.c (modified) (1 diff)

protocols/oscar/rxhandlers.c

@@ -341 +341 @@
                         continue;
 
-                /*
-                 * This is a debugging/sanity check only and probably 
-                 * could/should be removed for stable code.
-                 */
-                if (((cur->hdrtype == AIM_FRAMETYPE_OFT) && 
-                   (cur->conn->type != AIM_CONN_TYPE_RENDEZVOUS)) || 
-                  ((cur->hdrtype == AIM_FRAMETYPE_FLAP) && 
-                   (cur->conn->type == AIM_CONN_TYPE_RENDEZVOUS))) {
-                        do_error_dialog(sess->aux_data, "incompatible frame type/connection type combination", "Gaim");
-                        cur->handled = 1;
-                        continue;
-                }
-
-                if (cur->conn->type == AIM_CONN_TYPE_RENDEZVOUS) {
-                        if (cur->hdrtype != AIM_FRAMETYPE_OFT) {
-                                do_error_dialog(sess->aux_data, "non-OFT frames on OFT connection", "Gaim");
-                                cur->handled = 1; /* get rid of it */
-                        } else {
-                                /* FIXME: implement this (OFT frame) */
-                                cur->handled = 1; /* get rid of it */
-                        }
-                        continue;
-                }
-
-                if (cur->conn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT) {
-                        /* not possible */
-                        do_error_dialog(sess->aux_data, "RENDEZVOUS packet in rxqueue", "Gaim");
-                        cur->handled = 1;
-                        continue;
-                }
-
                 if (cur->hdr.flap.type == 0x01) {