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

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

Author: soohyunc
Date: Thu Jan 22 16:29:16 2009
New Revision: 4356

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

Log:
o  this commit is follow-up work for Revision 4347 and 4348
o  issues in Revision 4347 is now resolved (by Revision 4355)
o  issues in Revision 4348 is now resolved by this commit


Modified: vic/branches/cc/cc/tfwc_sndr.cpp
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.cpp	(original)
+++ vic/branches/cc/cc/tfwc_sndr.cpp	Thu Jan 22 16:29:16 2009
@@ -116,7 +116,8 @@
 /*
  * main TFWC reception path
  */
-void TfwcSndr::tfwc_sndr_recv(u_int16_t type, u_int16_t ackv, u_int32_t ts_echo)
+void TfwcSndr::tfwc_sndr_recv(u_int16_t type, u_int16_t begin, u_int16_t end,
+		u_int16_t ackv, u_int32_t ts_echo)
 {
 	// retrieve ackvec
 	if (type == XR_BT_1) {

Modified: vic/branches/cc/cc/tfwc_sndr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.h	(original)
+++ vic/branches/cc/cc/tfwc_sndr.h	Thu Jan 22 16:29:16 2009
@@ -61,7 +61,8 @@
 	void tfwc_sndr_send(pktbuf*);
 
 	// main reception path (XR packet)
-	void tfwc_sndr_recv(u_int16_t type, u_int16_t ackv, u_int32_t ts_echo);
+	void tfwc_sndr_recv(u_int16_t type, u_int16_t begin, u_int16_t end,
+			u_int16_t ackv, u_int32_t ts_echo);
 
 	// return current data packet's seqno
 	inline u_int16_t tfwc_sndr_get_seqno() { return seqno_; }

Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Thu Jan 22 16:29:16 2009
@@ -1177,16 +1177,12 @@
 	if (am_i_sender()) {
 		// parse AckVec and ts echo from XR report block
 		if (flags == XR_BT_1) {
-			ackvec_ = ntohl(xr->chunk);
-
 			// this XR conveys AckVec from data receiver
-			tfwc_sndr_recv(flags, ackvec_, 0);
+			tfwc_sndr_recv(flags, begin, end, chunk, 0);
 		} 
 		else if (flags == XR_BT_3) {
-			ts_echo_ = ntohl(xr->chunk);
-
 			// this XR conveys ts echo
-			tfwc_sndr_recv(flags, 0, ts_echo_);
+			tfwc_sndr_recv(flags, begin, end, 0, chunk);
 		}
 
 		// we need to call Transmitter::output(pb) to make Ack driven
@@ -1200,10 +1196,8 @@
 			tfwc_rcvr_recv(flags, begin, chunk, 0);
 		}
 		else if(flags == XR_BT_3) {
-			ts_ = ntohl(xr->chunk);
-
 			// this is XR conveys timestamp
-			tfwc_rcvr_recv(flags, 0, 0, ts_);
+			tfwc_rcvr_recv(flags, 0, 0, chunk);
 		}
 
 		// send receiver side XR report