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

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

Author: soohyunc
Date: Wed Aug  6 15:43:15 2008
New Revision: 4243

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

Log:
o  now, the received packet seqno is just tossed to TfwcRcvr
o  this is to build AckVec at TfwcRcvr module rather than dealing directly in
   rtp/session.cpp


Modified: vic/branches/cc/cc/tfwc_rcvr.cpp
==============================================================================
--- vic/branches/cc/cc/tfwc_rcvr.cpp	(original)
+++ vic/branches/cc/cc/tfwc_rcvr.cpp	Wed Aug  6 15:43:15 2008
@@ -48,3 +48,9 @@
 	seqno_(0) 
 {}
 
+void TfwcRcvr::set_received_seqno(u_int16_t seqno) 
+{
+	seqno_ = seqno;
+    debug_msg("received seqno:  %d\n", seqno_);
+}
+

Modified: vic/branches/cc/cc/tfwc_rcvr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_rcvr.h	(original)
+++ vic/branches/cc/cc/tfwc_rcvr.h	Wed Aug  6 15:43:15 2008
@@ -47,6 +47,7 @@
 class TfwcRcvr {
 public:
 	TfwcRcvr();
+	void set_received_seqno(u_int16_t seqno);
 
 protected:
 	u_int16_t seqno_;

Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Wed Aug  6 15:43:15 2008
@@ -51,6 +51,7 @@
 #include "ntp-time.h"
 #include "session.h"
 #include "cc/tfwc_sndr.h"
+#include "cc/tfwc_rcvr.h"
 
 /* added to support the mbus 
 #include "mbus_handler.h"*/
@@ -795,8 +796,8 @@
 	}
 
 	rtphdr* rh = (rtphdr*)pb->data;
-	seqno_ = ntohs(rh->rh_seqno);	// received packet seqno
-	debug_msg("received seqno:	%d\n", seqno_);
+	seqno_ = ntohs(rh->rh_seqno);	// get received packet seqno
+	tfwc_rcvr_->set_received_seqno(seqno_);	// set received seqno in TfwcRcvr
 
     // Ignore loopback packets
 	if (!loopback_) {
@@ -807,7 +808,8 @@
 			pb->release();	// releasing loopback packet
 			return;
 		}
-	} // now, loopback packets ignored (if disabled) 
+	} // now, loopback packets ignored (if disabled)
+
 /*
 	// set bit vector
 	for (int i = lastseq_+1; i <= seqno_; i++) {

Modified: vic/branches/cc/rtp/session.h
==============================================================================
--- vic/branches/cc/rtp/session.h	(original)
+++ vic/branches/cc/rtp/session.h	Wed Aug  6 15:43:15 2008
@@ -46,6 +46,7 @@
 
 class Source;
 class SessionManager;
+class TfwcRcvr;
 
 class DataHandler : public IOHandler {
     public:
@@ -194,6 +195,7 @@
 	u_char* pktbuf_;
 
 	SourceManager *sm_;
+	TfwcRcvr *tfwc_rcvr_;
 
 	// RTP packet sequence number (for the use of AckVec)
 	u_int16_t seqno_;		// RTP packet sequence number