[Gaim-commits] SF.net SVN: gaim: [17893] trunk/libgaim/protocols/oscar

[<the...@us...>]

Revision: 17893
          http://svn.sourceforge.net/gaim/?rev=17893&view=rev
Author:   thekingant
Date:     2006-12-04 03:36:31 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
Minor documentation changes

Modified Paths:
--------------
    trunk/libgaim/protocols/oscar/flap_connection.c
    trunk/libgaim/protocols/oscar/oft.c
    trunk/libgaim/protocols/oscar/oscar.h

Modified: trunk/libgaim/protocols/oscar/flap_connection.c
===================================================================
--- trunk/libgaim/protocols/oscar/flap_connection.c	2006-12-04 11:14:11 UTC (rev 17892)
+++ trunk/libgaim/protocols/oscar/flap_connection.c	2006-12-04 11:36:31 UTC (rev 17893)
@@ -817,7 +817,17 @@
 				break;
 			}
 
-			/* TODO: Verify the sequence number sent by the server. */
+			/* 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(&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(&header[1]);
@@ -958,7 +968,7 @@
 void
 flap_connection_send(FlapConnection *conn, FlapFrame *frame)
 {
-	frame->seqnum = ++(conn->seqnum);
+	frame->seqnum = ++(conn->seqnum_out);
 	sendframe_flap(conn, frame);
 	flap_frame_destroy(frame);
 }

Modified: trunk/libgaim/protocols/oscar/oft.c
===================================================================
--- trunk/libgaim/protocols/oscar/oft.c	2006-12-04 11:14:11 UTC (rev 17892)
+++ trunk/libgaim/protocols/oscar/oft.c	2006-12-04 11:36:31 UTC (rev 17893)
@@ -550,7 +550,7 @@
 /* End GaimXfer callbacks for use when sending and receiving       */
 /*******************************************************************/
 
-#if 0
+#ifdef TODOFT
 /*
  * This little area in oscar.c is the nexus of file transfer code,
  * so I wrote a little explanation of what happens.  I am such a

Modified: trunk/libgaim/protocols/oscar/oscar.h
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.h	2006-12-04 11:14:11 UTC (rev 17892)
+++ trunk/libgaim/protocols/oscar/oscar.h	2006-12-04 11:36:31 UTC (rev 17893)
@@ -389,7 +389,8 @@
 
 	guint16 type;
 	guint16 subtype;
-	guint16 seqnum; /**< The sequence number of most recent outgoing packet. */
+	guint16 seqnum_out; /**< The sequence number of most recently sent packet. */
+	guint16 seqnum_in; /**< The sequence number of most recently received packet. */
 	GSList *groups;
 	GSList *rateclasses; /* Contains nodes of struct rateclass. */
 
@@ -502,6 +503,7 @@
 		gboolean in_transaction;
 	} ssi;
 
+	/** Contains pointers to handler functions for each family/subtype. */
 	GHashTable *handlerlist;
 
 	/** A linked list containing FlapConnections. */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.