[Sumover-dev] [svn commit] r4374 - in vic/branches/cc: rtp

[sumover-dev at cs.ucl.ac.uk]

Author: soohyunc
Date: Thu Jan 29 18:08:34 2009
New Revision: 4374

Modified:
   vic/branches/cc/cc/tfwc_rcvr.cpp
   vic/branches/cc/cc/tfwc_rcvr.h
   vic/branches/cc/rtp/session.cpp

Log:
o  Major bug fixed in rtp/session.cpp +1251
   -  Moving the head pointer of the RTP data packet should be done after
      checking that the next buffer is NOT null. (i.e., moving head pointer
      should've placed inside of if(pb != 0) statement.)

o  Some minor change on cc/tfwc_rcvr.[h,cpp]


Modified: vic/branches/cc/cc/tfwc_rcvr.cpp
==============================================================================
--- vic/branches/cc/cc/tfwc_rcvr.cpp	(original)
+++ vic/branches/cc/cc/tfwc_rcvr.cpp	Thu Jan 29 18:08:34 2009
@@ -114,7 +114,7 @@
 void TfwcRcvr::print_ackvec(u_int16_t begin, u_int16_t end, 
 		u_int16_t bitvec) {
 
-	int elm[256];
+	int elm[64];
 	int cnt = end - begin;
 
 	printf("\tAckVec Built: ");

Modified: vic/branches/cc/cc/tfwc_rcvr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_rcvr.h	(original)
+++ vic/branches/cc/cc/tfwc_rcvr.h	Thu Jan 29 18:08:34 2009
@@ -67,8 +67,13 @@
 		tfwcAV = vec >> offset;
 	}
 
+	// print built AckVec
 	void print_ackvec(u_int16_t begin, u_int16_t end, 
 			u_int16_t bitvec);
+
+	/*
+	 * Variables (private)
+	 */
 	u_int32_t ts_echo_;	// for time stamp echoing
 };
 

Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Thu Jan 29 18:08:34 2009
@@ -1243,7 +1243,8 @@
 	// cwnd value
 	int magic = (int) tfwc_magic();
 	debug_msg("cwnd: %d\n", magic);
-	// last acked seqno
+
+	// just acked seqno
 	int jack = (int) tfwc_sndr_jacked();
 	debug_msg("jack: %d\n", jack);
 
@@ -1262,13 +1263,12 @@
 		// move packet pointer
 		pb = nx;
 
-		// move head pointer
-		head_ = pb;
-
-		// if pb is not 0, then parse rtp header
-		if (pb != 0)
+		// if pb is not 0, 
+		// then move head pointer and parse rtp header
+		if (pb != 0) {
+			head_ = pb;
 			rh = (rtphdr *) pb->data;
-		else 
+		} else 
 			break;
 	} // end while
 }