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

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

Author: soohyunc
Date: Fri Jul 25 18:23:39 2008
New Revision: 4229

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

Log:
o  deleted duplicated member variable declaration (seqno_ is already defined in
    Transmitter class, and SessionManager is a subclass of it.)
o  moved priting seqno part to the right location


Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Fri Jul 25 18:23:39 2008
@@ -770,10 +770,6 @@
 	//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) {
@@ -781,6 +777,10 @@
 		return;
 	}
 
+	rtphdr* rh = (rtphdr*) pb->data;
+	u_int16_t seqno = ntohs(rh->rh_seqno);	// received packet seqno
+	debug_msg("received seqno:	%d\n", seqno);
+
     // Ignore loopback packets
 	if (!loopback_) {
 		rtphdr* rh = (rtphdr*)pb->data;

Modified: vic/branches/cc/rtp/session.h
==============================================================================
--- vic/branches/cc/rtp/session.h	(original)
+++ vic/branches/cc/rtp/session.h	Fri Jul 25 18:23:39 2008
@@ -121,8 +121,6 @@
 //	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);