Changeset 4228

Timestamp:

07/25/08 16:24:07 (5 years ago)

Author:

soohyunc

Message:

(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

Location:

vic/branches/cc

Files:

• cc/cc.cpp (modified) (1 diff)
• cc/cc.h (modified) (1 diff)
• rtp/session.cpp (modified) (2 diffs)
• rtp/session.h (modified) (1 diff)
• rtp/transmitter.cpp (modified) (2 diffs)

vic/branches/cc/cc/cc.cpp

@@ -57 +57 @@
         // 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_;
+}

vic/branches/cc/cc/cc.h

@@ -41 +41 @@
         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
 

vic/branches/cc/rtp/session.cpp

@@ -49 +49 @@
 #include "ntp-time.h"
 #include "session.h"
+#include "cc/cc.h"
 
 /* added to support the mbus 
@@ -770 +771 @@
         //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);

vic/branches/cc/rtp/session.h

@@ -122 +122 @@
         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);

vic/branches/cc/rtp/transmitter.cpp

@@ -90 +90 @@
         loop_layer_(1000),
         loopback_(0),
-        is_cc_active_(1)
+        is_cc_active_(0)
 {
         memset((char*)&mh_, 0, sizeof(mh_));
@@ -214 +214 @@
                 cc_parse_buf(pb);
         } else {
+                cc_parse_buf(pb);
                 if (!busy_) {
                         double delay = txtime(pb);