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

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

Author: soohyunc
Date: Tue Mar  2 19:36:03 2010
New Revision: 4663

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

Log:
-- converted cc_tfwc_output() to virtual method
   we wanted to call cc_tfwc_output() in TfwcSndr (parent class)
   which is fully defined in Transmitter (derived class)

the purpose is to make TFWC can clock packets out when timeout occurs.



Modified: vic/branches/cc/cc/tfwc_sndr.cpp
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.cpp	(original)
+++ vic/branches/cc/cc/tfwc_sndr.cpp	Tue Mar  2 19:36:03 2010
@@ -642,7 +642,7 @@
 			jacked_++;
 
 		// trigger packet sending
-		tx_->cc_tfwc_output();
+		cc_tfwc_output();
 	}
 }
 

Modified: vic/branches/cc/cc/tfwc_sndr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.h	(original)
+++ vic/branches/cc/cc/tfwc_sndr.h	Tue Mar  2 19:36:03 2010
@@ -74,7 +74,11 @@
 // TFWC sender class
 class TfwcSndr {
 public:
+	// constructor
 	TfwcSndr();
+
+	virtual void cc_tfwc_output() = 0;
+
 	// parse seqno and timestamp
 	void tfwc_sndr_send(int, double, double);
 

Modified: vic/branches/cc/rtp/transmitter.h
==============================================================================
--- vic/branches/cc/rtp/transmitter.h	(original)
+++ vic/branches/cc/rtp/transmitter.h	Tue Mar  2 19:36:03 2010
@@ -90,7 +90,7 @@
 	void flush();
 	void send(pktbuf*);
 	inline bool is_cc_on() { return is_cc_active_; }
-	void cc_tfwc_output();
+	virtual void cc_tfwc_output();
 	void cc_tfwc_output(pktbuf*);
 	void cc_tfrc_output();