[Sumover-dev] [svn commit] r4815 - vic/branches/cc/rtp

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

Author: soohyunc
Date: Mon May 10 19:25:07 2010
New Revision: 4815

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

Log:
corrected a wrong comment and added (re)set_new_ack() methods.



Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Mon May 10 19:25:07 2010
@@ -1377,7 +1377,7 @@
 		u_int16_t *chunk = (u_int16_t *) ++xr1;
 
 		// -----------------------------------------------------------------*
-		// i am an RTP data sender (AoA)                                    *
+		// i am an RTP data sender (receive ackvec)                         *
 		// -----------------------------------------------------------------*
 		if (am_i_sender()) {
   		  fprintf(stderr, ">>> parse_xr - i_am_sender\n");
@@ -1387,6 +1387,7 @@
 		  // SO_TIMESTAMP
 		  //so_rtime = ch_[0].net()->recv_so_time();
 		  //sender_xr_ts_info(so_rtime);
+		  set_new_ack();
 		  switch (cc_type_) {
 			case WBCC:
 			// TFWC sender (getting AckVec)

Modified: vic/branches/cc/rtp/session.h
==============================================================================
--- vic/branches/cc/rtp/session.h	(original)
+++ vic/branches/cc/rtp/session.h	Mon May 10 19:25:07 2010
@@ -159,7 +159,8 @@
 	inline bool am_i_sender() { return is_sender_; }
 	// was there a new ack?
 	inline virtual bool new_ack() { return new_ack_; }
-	inline virtual void set_new_ack() { new_ack_ = false; }
+	inline virtual void set_new_ack() { new_ack_ = true; }
+	inline virtual void reset_new_ack() { new_ack_ = false; }
 
 protected:
 //	void demux(rtphdr* rh, u_char* bp, int cc, Address & addr, int layer);

Modified: vic/branches/cc/rtp/transmitter.cpp
==============================================================================
--- vic/branches/cc/rtp/transmitter.cpp	(original)
+++ vic/branches/cc/rtp/transmitter.cpp	Mon May 10 19:25:07 2010
@@ -330,7 +330,9 @@
 	{
 	  int len = 0;
 	  int num_acked = 0;
-	  set_new_ack();
+	  // number of acked bytes
+ 	  if (new_ack())
+	  num_acked += tfwc_sndr_.b_jacked();
 
 	  if(pb->len < tfwc_sndr_.b_magic() + num_acked - len) {
 		len += pb->len;
@@ -339,11 +341,8 @@
 		// call Transmitter::output_data_only w/ XR reception
 		output_data_only(pb, XR_RECV);
 
-		// number of acked bytes
-		if (new_ack())
-		num_acked += tfwc_sndr_.b_jacked();
 		// and, reset status
-		set_new_ack();
+		reset_new_ack();
 	  }
 	}
 	break;
@@ -403,7 +402,7 @@
 		if (new_ack())
 		num_acked += tfwc_sndr_.b_jacked();
 		// and, reset status
-		set_new_ack();
+		reset_new_ack();
 
 		if (head_ != 0)
 			pb = head_;

Modified: vic/branches/cc/rtp/transmitter.h
==============================================================================
--- vic/branches/cc/rtp/transmitter.h	(original)
+++ vic/branches/cc/rtp/transmitter.h	Mon May 10 19:25:07 2010
@@ -146,6 +146,7 @@
 	// new ack arrived?
 	virtual bool new_ack() = 0;
 	virtual void set_new_ack() = 0;
+	virtual void reset_new_ack() = 0;
 
 	int mtu_;		/* mtu of wire (as seen by application) */
 	msghdr mh_;