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

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

Author: soohyunc
Date: Thu Aug  7 23:42:11 2008
New Revision: 4251

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

Log:
XR block contents changed because we need two different types of XR format 
  (1) ackvec and AoA transmission (RFC 3611 Section 4.1), BT=1
  (2) time stamp transmission (RFC 3611 Section 4.4), BT=4 LEN=2


Modified: vic/branches/cc/rtp/rtp.h
==============================================================================
--- vic/branches/cc/rtp/rtp.h	(original)
+++ vic/branches/cc/rtp/rtp.h	Thu Aug  7 23:42:11 2008
@@ -140,7 +140,7 @@
 	u_int32_t ssrc;	/* ssrc of the RTP data pkt being reported upon by this */
 	u_int16_t begin_seq; /* first seqno that this block report */
 	u_int16_t end_seq;	/* last seqno that this block report plus 1 */
-	u_int32_t chunk;	/* extended report chunks */
+	u_int32_t *chunk;	/* extended report chunks */
 };
 
 #define RTCP_PT_SR	200	/* sender report */

Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Thu Aug  7 23:42:11 2008
@@ -647,9 +647,10 @@
 		xrh = (rtcp_xr_hdr*)(rh + 1);	// XR header
 		int xrlen = (xrh->xr_flags << 16) >> 16; // XR length
 		xrb = (rtcp_xr_blk*)(xrh + xrlen + 1);	// XR block
-		xrb->begin_seq = lastseq_;// this will be used for ackofack
-		xrb->end_seq = seqno_ + 1;// as defined in RFC3611 section 4.1
-		xrb->chunk = get_ackvec();	// ackvec
+		xrb->begin_seq = htonl(lastseq_);// this will be used for ackofack
+		xrb->end_seq = htonl(seqno_ + 1);// as defined in RFC3611 section 4.1
+		xrb->chunk = (u_int32_t *) htonl(get_ackvec());
+		//xrb->chunk = htonl(mt->ref_ts());
 	}
 
 	int nrr = 0;
@@ -1087,12 +1088,12 @@
 	 * if AckVec is received, then parse it to TfwcSndr
 	 */
 	if (xrb->begin_seq == xrb->end_seq) {
-		// we just received ackofack, so do receiver stuffs here
-		
+		// we received ackofack, so do receiver stuffs here
 		//trim_vec(xrb->chunk);	// chunk in xrb is ackvec
 		ch_[0].send(build_ackvpkt(xrh), xrlen);
 	} else {
-		ackvec_ = xrb->chunk;
+		// we received ackvec, so do sender stuffs here
+		ackvec_ = (u_int32_t) &xrb->chunk;
 		ackofack_ = xrb->begin_seq;
 		// time stamp update comes to here
 		tfwc_sndr_recv(ackvec_);	// parse AckVec