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

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

Author: soohyunc
Date: Fri Aug  8 10:53:40 2008
New Revision: 4253

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/transmitter.cpp

Log:
(on-going) TfwcSndr


Modified: vic/branches/cc/cc/tfwc_sndr.cpp
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.cpp	(original)
+++ vic/branches/cc/cc/tfwc_sndr.cpp	Fri Aug  8 10:53:40 2008
@@ -52,7 +52,7 @@
 	u_int32_t marginvec_ = 0xe0000000;
 }
 
-void TfwcSndr::tfwc_sndr_parse_buf(pktbuf* pb) {
+void TfwcSndr::tfwc_sndr_send(pktbuf* pb) {
 
 	// get RTP hearder information
 	rtphdr* rh =(rtphdr*) pb->data;
@@ -69,4 +69,6 @@
 	ackv_ = ackv | marginvec_;
 }
 
-
+void TfwcSndr::ackofack() {
+	aoa_ = marginvec_ | 0x01000000;
+}

Modified: vic/branches/cc/cc/tfwc_sndr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.h	(original)
+++ vic/branches/cc/cc/tfwc_sndr.h	Fri Aug  8 10:53:40 2008
@@ -40,15 +40,19 @@
 public:
 	TfwcSndr();
 	// parse RTP data packet from Transmitter module
-	void tfwc_sndr_parse_buf(pktbuf*);
+	void tfwc_sndr_send(pktbuf*);
+	void tfwc_sndr_recv(u_int32_t ackv);
 	inline u_int16_t get_seqno() { return seqno_; }
+	inline u_int32_t get_aoa() { return aoa_; }
+	void ackofack();	// set ack of ack
 	u_int16_t seqno_;	// packet sequence number
 
 protected:
-	void tfwc_sndr_recv(u_int32_t ackv);
 
 	u_int32_t marginvec_;	// margin vec
 	u_int32_t ackv_;	// AckVec (in TfwcSndr)
+	u_int32_t aoa_;		// ack of ack
+	u_int32_t ts_;		// time stamp 
 	TfwcSndr* tfwcsndr_;
 private:
 };

Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Fri Aug  8 10:53:40 2008
@@ -459,8 +459,12 @@
 	if (pb->layer < loop_layer_) {
 	//	if ( pb->layer <0 ) exit(1);
 		Network* n = dh_[pb->layer].net();
-		if (n != 0)
+		if (n != 0) {
 			n->send(pb);
+			if(is_cc_on()) {
+				//ch_[0].send(build_aoapkt());
+			}
+		}
 	}
 }
 

Modified: vic/branches/cc/rtp/transmitter.cpp
==============================================================================
--- vic/branches/cc/rtp/transmitter.cpp	(original)
+++ vic/branches/cc/rtp/transmitter.cpp	Fri Aug  8 10:53:40 2008
@@ -213,7 +213,7 @@
 void Transmitter::send(pktbuf* pb)
 {
 	if (is_cc_active_) {
-		tfwc_sndr_parse_buf(pb);
+		tfwc_sndr_send(pb);
 		if (!busy_) {
 			double delay = txtime(pb);
 			nextpkttime_ = gettimeofday_secs() + delay;