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

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

Author: soohyunc
Date: Fri Jul 25 16:24:07 2008
New Revision: 4228

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

Log:
(temporary commit)
o  now, we can give a packet sequence number and print on console
o  and, the receiver print the received packet's seqno on console
o  note: this is an experimental commit


Modified: vic/branches/cc/cc/cc.cpp
==============================================================================
--- vic/branches/cc/cc/cc.cpp	(original)
+++ vic/branches/cc/cc/cc.cpp	Fri Jul 25 16:24:07 2008
@@ -56,5 +56,9 @@
 
 	// sequence number must be greater than zero
 	assert (seqno_ > 0);
-	debug_msg("seqno:	%d\n", seqno_);
+	debug_msg("sent seqno:	%d\n", seqno_);
+}
+
+u_int16_t CcManager::cc_get_seqno() {
+	return seqno_;
 }

Modified: vic/branches/cc/cc/cc.h
==============================================================================
--- vic/branches/cc/cc/cc.h	(original)
+++ vic/branches/cc/cc/cc.h	Fri Jul 25 16:24:07 2008
@@ -40,6 +40,7 @@
 public:
 	CcManager();
 	void cc_parse_buf(pktbuf*);	// get pktbuf from transmitter module
+	u_int16_t cc_get_seqno();		// return packet sequence number
 	u_int16_t seqno_;			// packet sequence number
 
 protected:

Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Fri Jul 25 16:24:07 2008
@@ -48,6 +48,7 @@
 #include "timer.h"
 #include "ntp-time.h"
 #include "session.h"
+#include "cc/cc.h"
 
 /* added to support the mbus 
 #include "mbus_handler.h"*/
@@ -769,6 +770,10 @@
 	//u_char* bp = &pktbuf_[4];
 	//u_char* bp = pktbuf_;
 	
+	rtphdr* rh = (rtphdr*) pb->data;
+	seqno_ = ntohs(rh->rh_seqno);	// received packet seqno
+	debug_msg("received seqno:	%d\n", seqno_);
+	
 	int cc = dh->recv(pb->data, sizeof(pb->data), addrp);
 	//int cc = dh->recv(bp, 2 * RTP_MTU - 4, addrp);
 	if (cc <= 0) {

Modified: vic/branches/cc/rtp/session.h
==============================================================================
--- vic/branches/cc/rtp/session.h	(original)
+++ vic/branches/cc/rtp/session.h	Fri Jul 25 16:24:07 2008
@@ -121,6 +121,8 @@
 //	virtual void send_report();
 	virtual void send_report(CtrlHandler*, int bye, int app = 0);
 
+	u_int16_t seqno_;	// received packet sequence number
+
 protected:
 //	void demux(rtphdr* rh, u_char* bp, int cc, Address & addr, int layer);
 	void demux(pktbuf* pb, Address & addr);

Modified: vic/branches/cc/rtp/transmitter.cpp
==============================================================================
--- vic/branches/cc/rtp/transmitter.cpp	(original)
+++ vic/branches/cc/rtp/transmitter.cpp	Fri Jul 25 16:24:07 2008
@@ -89,7 +89,7 @@
 	tail_(0),
 	loop_layer_(1000),
 	loopback_(0),
-	is_cc_active_(1)
+	is_cc_active_(0)
 {
 	memset((char*)&mh_, 0, sizeof(mh_));
 	mh_.msg_iovlen = 2;
@@ -213,6 +213,7 @@
 	if (is_cc_active_) {
 		cc_parse_buf(pb);
 	} else {
+		cc_parse_buf(pb);
 		if (!busy_) {
 			double delay = txtime(pb);
 			nextpkttime_ = gettimeofday_secs() + delay;