Changeset 382

Timestamp:

Apr 4, 2006 9:39:10 PM (18 years ago)

Author:

bennylp

Message:

Fixed bug in RTCP: packing error causing size mismatch when compiled with MSVC

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/rtcp.h (modified) (3 diffs)
• pjsip-apps/src/samples/siprtp.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/rtcp.h

@@ -37 +37 @@
  * @{
  */
+
+#pragma pack(1)
 
 /**
@@ -101 +103 @@
     unsigned        pt:8;       /**< payload type           */
 #endif
-    pj_uint16_t     length;     /**< packet length          */
+    unsigned        length:16;  /**< packet length          */
 };
 
@@ -123 +125 @@
  */
 typedef struct pjmedia_rtcp_pkt pjmedia_rtcp_pkt;
+
+
+#pragma pack()
 
 

pjproject/trunk/pjsip-apps/src/samples/siprtp.c

@@ -1106 +1106 @@
                 app_perror(THIS_FILE, "Error receiving RTCP packet", status);
             else {
-                if (size > sizeof(strm->rem_rtcp)) {
-                    PJ_LOG(3,(THIS_FILE, "Error: RTCP packet too large"));
+                if (size != sizeof(strm->rem_rtcp)) {
+                    PJ_LOG(3,(THIS_FILE, "Error: RTCP packet size mismatch "
+                                         "(recv %d bytes, expecting %d)",
+                                         size, sizeof(strm->rem_rtcp)));
                     status = -1;
                 } else {