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

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

Author: soohyunc
Date: Thu Aug  7 05:03:17 2008
New Revision: 4246

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

Log:
o  TfwcSndr recv method (on-going)


Modified: vic/branches/cc/cc/tfwc_sndr.cpp
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.cpp	(original)
+++ vic/branches/cc/cc/tfwc_sndr.cpp	Thu Aug  7 05:03:17 2008
@@ -46,7 +46,10 @@
 
 TfwcSndr::TfwcSndr() :
 	seqno_(0) 
-{}
+{
+	u_int32_t marginvec_ = 0xe0000000;
+	debug_msg("XXX %d\n", marginvec_);
+}
 
 void TfwcSndr::tfwc_sndr_parse_buf(pktbuf* pb) {
 
@@ -59,6 +62,9 @@
 	debug_msg("sent seqno:		%d\n", seqno_);
 }
 
-u_int16_t TfwcSndr::get_seqno() {
-	return seqno_;
+void TfwcSndr::tfwc_sndr_recv(u_int32_t ackv)
+{
+	UNUSED(ackv);
 }
+
+

Modified: vic/branches/cc/cc/tfwc_sndr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.h	(original)
+++ vic/branches/cc/cc/tfwc_sndr.h	Thu Aug  7 05:03:17 2008
@@ -41,10 +41,13 @@
 	TfwcSndr();
 	// parse RTP data packet from Transmitter module
 	void tfwc_sndr_parse_buf(pktbuf*);
-	u_int16_t get_seqno();	// return packet sequence number
+	inline u_int16_t get_seqno() { return seqno_; }
 	u_int16_t seqno_;	// packet sequence number
 
 protected:
+	void tfwc_sndr_recv(u_int32_t ackv);
+
+	u_int32_t marginvec_;	// margin vec
 	TfwcSndr* tfwcsndr_;
 private:
 };

Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Thu Aug  7 05:03:17 2008
@@ -1077,11 +1077,13 @@
 	UNUSED(ep);
 	UNUSED(addr);
 
-	ackvec_ = r->xr_ackvec;
 	/*
 	 * if AoA is received, then first trim ackvec and send a new ackvec
 	 * if AckVec is received, then parse it to TfwcSndr
 	 */
+	ackvec_ = r->xr_ackvec;
+	ackofack_ = r->xr_begin_seq;
+	tfwc_sndr_recv(ackvec_);	// parse AckVec
 }
 
 int SessionManager::sdesbody(u_int32_t* p, u_char* ep, Source* ps,

Modified: vic/branches/cc/rtp/session.h
==============================================================================
--- vic/branches/cc/rtp/session.h	(original)
+++ vic/branches/cc/rtp/session.h	Thu Aug  7 05:03:17 2008
@@ -199,6 +199,7 @@
 	// RTP packet sequence number (for the use of AckVec)
 	u_int16_t seqno_;		// RTP packet sequence number
 	u_int16_t lastseq_;		// last packet's seqno
+	u_int16_t ackofack_;	// Ack of ack
 
 	// AckVector
 	u_int32_t ackvec_;		// this is a bit vector