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

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

Author: soohyunc
Date: Wed Aug  6 16:12:10 2008
New Revision: 4244

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

Log:
o  bug fixed
   (the previous commit made seg faults)


Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Wed Aug  6 16:12:10 2008
@@ -797,7 +797,7 @@
 
 	rtphdr* rh = (rtphdr*)pb->data;
 	seqno_ = ntohs(rh->rh_seqno);	// get received packet seqno
-	tfwc_rcvr_->set_received_seqno(seqno_);	// set received seqno in TfwcRcvr
+	set_received_seqno(seqno_);	// set received seqno in TfwcRcvr
 
     // Ignore loopback packets
 	if (!loopback_) {

Modified: vic/branches/cc/rtp/session.h
==============================================================================
--- vic/branches/cc/rtp/session.h	(original)
+++ vic/branches/cc/rtp/session.h	Wed Aug  6 16:12:10 2008
@@ -46,7 +46,6 @@
 
 class Source;
 class SessionManager;
-class TfwcRcvr;
 
 class DataHandler : public IOHandler {
     public:
@@ -195,7 +194,6 @@
 	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

Modified: vic/branches/cc/rtp/transmitter.h
==============================================================================
--- vic/branches/cc/rtp/transmitter.h	(original)
+++ vic/branches/cc/rtp/transmitter.h	Wed Aug  6 16:12:10 2008
@@ -50,12 +50,14 @@
 #include "inet.h"
 #include "pktbuf-rtp.h"
 #include "cc/tfwc_sndr.h"
+#include "cc/tfwc_rcvr.h"
 
 /*
  * The base object for performing the outbound path of
  * the application level protocol.
  */
-class Transmitter : public TclObject, public Timer, public TfwcSndr {
+class Transmitter : public TclObject, public Timer, 
+	public TfwcSndr, public TfwcRcvr {
     public:
 	Transmitter();
 	virtual void timeout();