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

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

Author: soohyunc
Date: Tue Jan 27 12:28:12 2009
New Revision: 4369

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

Log:
o  AckVec construction mechanism changed that can be relevant to Revision 4353
   to 4357.
o  send_xreport() on the data receiver is changed accordingly.


Modified: vic/branches/cc/cc/tfwc_rcvr.cpp
==============================================================================
--- vic/branches/cc/cc/tfwc_rcvr.cpp	(original)
+++ vic/branches/cc/cc/tfwc_rcvr.cpp	Tue Jan 27 12:28:12 2009
@@ -57,7 +57,6 @@
 {
 	// variables
 	int cnt		= 0;
-	int offset	= 0;
 	int num		= 0;
 
 	// parse the received seqno and ackofack
@@ -84,22 +83,24 @@
 			// then, set this packet as received (this is important)
 			SET_BIT_VEC(tfwcAV, 1);
 		}
+
+		// start seqno that this AckVec is reporting
+		if (ackofack_ != 0)
+			begins_ = ackofack_ + 1;
+		else
+			begins_ = 1;
+
+		// end seqno is current seqno plus one (according to RFC 3611)
+		ends_ = currseq_ + 1;
 		
 		// number of elements in tfwcAV
-		num = currseq_ - ackofack_ - cnt;
+		num = ends_ - begins_;
 
-		// trim ackvec
-		offset = ((num - DUPACKS) < 0) ? 0 : (num - DUPACKS);
-
-		if (ackofack_)
-			trimvec(tfwcAV, offset);
+		//if (ackofack_)
+		//	trimvec(tfwcAV, offset);
 
 		// set this seqno to the prevseq before exit
 		prevseq_ = currseq_;
-
-		// set XR parameters
-		begins_ = ackofack_;
-		ends_ = currseq_ + 1;
 	}
 	// parse timestamp
 	else if (type == XR_BT_3) {

Modified: vic/branches/cc/cc/tfwc_rcvr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_rcvr.h	(original)
+++ vic/branches/cc/cc/tfwc_rcvr.h	Tue Jan 27 12:28:12 2009
@@ -59,7 +59,7 @@
 	u_int16_t prevseq_;		// previous sequence number
 	u_int16_t ackofack_;	// ackofack
 	u_int16_t begins_;		// begin seqno that XR chunk is reporting
-	u_int16_t ends_;		// end seqno that XR chunk is reporting
+	u_int16_t ends_;		// end seqno + 1 that XR chunk is reporting
 
 private:
 	// trim ackvec

Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Tue Jan 27 12:28:12 2009
@@ -691,8 +691,8 @@
 			xr->xr_flags = htons(XR_BT_1 << 8);
 
 			// make 'begin_seq' equal to 'end_seq'
-			xr->begin_seq = htons(seqno_);
-			xr->end_seq = htons(seqno_);
+			xr->begin_seq = htons(tfwc_rcvr_begins());
+			xr->end_seq = htons(tfwc_rcvr_ends());
 
 			// get ackvec from TfwcRcvr
 			xr->chunk = htons(tfwc_rcvr_getvec());