Changeset 4234

Timestamp:

08/05/08 14:29:31 (5 years ago)

Author:

soohyunc

Message:

o on-going ackvec implementation

Location:

vic/branches/cc

Files:

• Makefile.in (modified) (1 diff)
• cc/tfwc_sndr.cpp (moved) (moved from vic/branches/cc/cc/cc.cpp) (2 diffs)
• cc/tfwc_sndr.h (moved) (moved from vic/branches/cc/cc/cc.h) (2 diffs)
• rtp/rtp.h (modified) (2 diffs)
• rtp/session.cpp (modified) (11 diffs)
• rtp/session.h (modified) (1 diff)
• rtp/transmitter.h (modified) (2 diffs)

vic/branches/cc/Makefile.in

@@ -153 +153 @@
         render/rgb-converter.o render/vw.o render/ppm.o \
         @V_OBJ@ \
-        cc/cc.o
+        cc/tfwc_sndr.o
 
 

vic/branches/cc/cc/tfwc_sndr.cpp

@@ -43 +43 @@
 #include "module.h"
 #include "transmitter.h"
-#include "cc.h"
+#include "tfwc_sndr.h"
 
-CcManager::CcManager() :
+TfwcSndr::TfwcSndr() :
         seqno_(-1) 
 {}
 
-void CcManager::cc_parse_buf(pktbuf* pb) {
+void TfwcSndr::cc_parse_buf(pktbuf* pb) {
 
         // get RTP hearder information
@@ -60 +60 @@
 }
 
-u_int16_t CcManager::cc_get_seqno() {
+u_int16_t TfwcSndr::cc_get_seqno() {
         return seqno_;
 }

vic/branches/cc/cc/tfwc_sndr.h

@@ -34 +34 @@
  */
 
-#ifndef vic_cc_h
-#define vic_cc_h
+#ifndef vic_tfwc_sndr_h
+#define vic_tfwc_sndr_h
 
-class CcManager {
+class TfwcSndr {
 public:
-        CcManager();
+        TfwcSndr();
         void cc_parse_buf(pktbuf*);     // get pktbuf from transmitter module
         u_int16_t cc_get_seqno();               // return packet sequence number
@@ -45 +45 @@
 
 protected:
-        CcManager* ccman_;
+        TfwcSndr* tfwcsndr_;
 private:
 };

vic/branches/cc/rtp/rtp.h

@@ -129 +129 @@
 };
 
+/*
+ * RTCP Extended Report
+ * (RFC 3611)
+ */
+struct rtcp_xr {
+        u_int32_t xr_flags;             /*BT:8 TS:8 LEN:16*/
+        u_int32_t xr_ackvec;    /* Ack vector bit chunk */
+};
+
 #define RTCP_PT_SR      200     /* sender report */
 #define RTCP_PT_RR      201     /* receiver report */
@@ -142 +151 @@
 #define RTCP_PT_BYE     203     /* end of participation */
 #define RTCP_PT_APP     204     /* application specific functions */
+#define RTCP_PT_XR      207 /* extended report */
 
 #define         RTCP_SDES_MIN   1

vic/branches/cc/rtp/session.cpp

@@ -51 +51 @@
 #include "ntp-time.h"
 #include "session.h"
-#include "cc/cc.h"
+#include "cc/tfwc_sndr.h"
 
 /* added to support the mbus 
@@ -615 +615 @@
         int we_sent = 0;
         rtcp_rr* rr;
+        rtcp_xr* xr;    // extended report
         Tcl& tcl = Tcl::instance();
 
@@ -636 +637 @@
                 sr->sr_nb = htonl(sl.nb());
                 rr = (rtcp_rr*)(sr + 1);
+                xr = (rtcp_xr*)(rr + 1);
         } else {
                 flags |= RTCP_PT_RR;
                 rr = (rtcp_rr*)(rh + 1);
+                xr = (rtcp_xr*)(rr + 1);        // extended report
         }
         int nrr = 0;
@@ -658 +661 @@
                 int received = sl.np() - sl.snp();
                 if (received == 0) {
-                        //                      if (u_int(now.tv_sec - sp->lts_ctrl().tv_sec) > inactive)
+                        //              if (u_int(now.tv_sec - sp->lts_ctrl().tv_sec) > inactive)
                         if (u_int(now.tv_sec - sl.lts_ctrl().tv_sec) > inactive)
                                 --nsrc;
@@ -766 +769 @@
 }
 
+/*
+ * receive an RTP packet
+ */
 void SessionManager::recv(DataHandler* dh)
 {
@@ -799 +805 @@
 
         // set bit vector
-        for (int i = lastseq_; i <= seqno_; i++) {
+        for (int i = lastseq_+1; i <= seqno_; i++) {
                         SET_BIT_VEC (ackvec_, 1);
         }
@@ -805 +811 @@
         // printing bit vector
         bool isThere;
-        printf("XXX received packet number: ");
-        for (int i = lastseq_; i <= seqno_; i++) {
+        debug_msg("XXX received ackvec:");
+        for (int i = lastseq_+1; i <= seqno_; i++) {
                 isThere = SEE_BIT_VEC (ackvec_, i, seqno_);
-                printf(" %d: %s ", i, isThere ? "OK" : "NOK");
+                printf(" %d... %s ", seqno_, isThere ? "Ok" : "NOk");
         }
         printf("\n");
@@ -1053 +1059 @@
 }
 
+void SessionManager::parse_xr(rtcphdr* rh, int flags, u_char* ep,
+                                                          Source* ps, Address & addr, int layer)
+{
+        UNUSED(flags);
+        UNUSED(ep);
+        UNUSED(ps);
+        UNUSED(addr);
+        UNUSED(layer);
+
+        Source* s;
+        u_int32_t ssrc = rh->rh_ssrc;
+        if (ps->srcid() != ssrc)
+                s = SourceManager::instance().lookup(ssrc, ssrc, addr);
+        else
+                s = ps;
+
+        s->layer(layer).lts_ctrl(unixtime());
+        int cnt = flags >> 8 & 0x1f;
+        parse_xr_records(ssrc, (rtcp_xr*)(rh + 1), cnt, ep, addr);
+}
+
+void SessionManager::parse_xr_records(u_int32_t ssrc, rtcp_xr* r, int cnt,
+                                      const u_char* ep, Address & addr)
+{
+        
+}
+
 int SessionManager::sdesbody(u_int32_t* p, u_char* ep, Source* ps,
                                                 Address & addr, u_int32_t ssrc, int layer)
@@ -1163 +1196 @@
         case RTP_VERSION << 14 | RTCP_PT_SR:
         case RTP_VERSION << 14 | RTCP_PT_RR:
+        case RTP_VERSION << 14 | RTCP_PT_XR:
         case RTP_VERSION << 14 | RTCP_PT_BYE:
                 break;
@@ -1221 +1255 @@
                         break;
 
+                case RTCP_PT_XR:
+                        parse_xr(rh, flags, ep, ps, addr, layer);
+                        break;
+
                 case RTCP_PT_SDES:
                         parse_sdes(rh, flags, ep, ps, addr, ssrc, layer);
@@ -1235 +1273 @@
                 rh = (rtcphdr*)ep;
         }
-}
-
+        return;
+}
+

vic/branches/cc/rtp/session.h

@@ -145 +145 @@
         void parse_rr(rtcphdr* rh, int flags, u_char* ep,
                       Source* ps, Address & addr, int layer);
+        void parse_xr(rtcphdr* rh, int flags, u_char* ep,
+                      Source* ps, Address & addr, int layer);
         void parse_rr_records(u_int32_t ssrc, rtcp_rr* r, int cnt,
+                              const u_char* ep, Address & addr);
+        void parse_xr_records(u_int32_t ssrc, rtcp_xr* r, int cnt,
                               const u_char* ep, Address & addr);
         int sdesbody(u_int32_t* p, u_char* ep, Source* ps,

vic/branches/cc/rtp/transmitter.h

@@ -50 +50 @@
 #include "inet.h"
 #include "pktbuf-rtp.h"
-#include "cc/cc.h"
+#include "cc/tfwc_sndr.h"
 
 /*
@@ -56 +56 @@
  * the application level protocol.
  */
-class Transmitter : public TclObject, public Timer, public CcManager {
+class Transmitter : public TclObject, public Timer, public TfwcSndr {
     public:
         Transmitter();