Changeset 3841 for pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c

Timestamp:

Oct 24, 2011 9:28:13 AM (13 years ago)

Author:

ming

Message:

Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk

• Backport of r3557:r3832

TODO: ticket #1268 (Option for automatic/manual sending of RTCP SDES/BYE for the stream) for video stream.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/transport_udp.c (modified) (8 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c

@@ -84 +84 @@
     pj_sockaddr         rtcp_addr_name; /**< Published RTCP address.        */
     pj_sockaddr         rtcp_src_addr;  /**< Actual source RTCP address.    */
+    unsigned            rtcp_src_cnt;   /**< How many pkt from this addr.   */
     int                 rtcp_addr_len;  /**< Length of RTCP src address.    */
     pj_ioqueue_key_t   *rtcp_key;       /**< RTCP socket key in ioqueue     */
@@ -453 +454 @@
         void (*cb)(void*,void*,pj_ssize_t);
         void *user_data;
+        pj_bool_t discard = PJ_FALSE;
 
         cb = udp->rtp_cb;
@@ -463 +465 @@
                           "RX RTP packet dropped because of pkt lost "
                           "simulation"));
-                goto read_next_packet;
+                discard = PJ_TRUE;
             }
         }
-
-
-        if (udp->attached && cb)
-            (*cb)(user_data, udp->rtp_pkt, bytes_read);
 
         /* See if source address of RTP packet is different than the 
@@ -479 +477 @@
             (udp->options & PJMEDIA_UDP_NO_SRC_ADDR_CHECKING)==0) 
         {
-            if (pj_sockaddr_cmp(&udp->rem_rtp_addr, &udp->rtp_src_addr) != 0) {
-
+            if (pj_sockaddr_cmp(&udp->rem_rtp_addr, &udp->rtp_src_addr) == 0) {
+                /* We're still receiving from rem_rtp_addr. Don't switch. */
+                udp->rtp_src_cnt = 0;
+            } else {
                 udp->rtp_src_cnt++;
 
-                if (udp->rtp_src_cnt >= PJMEDIA_RTP_NAT_PROBATION_CNT) {
+                if (udp->rtp_src_cnt < PJMEDIA_RTP_NAT_PROBATION_CNT) {
+                    discard = PJ_TRUE;
+                } else {
                 
                     char addr_text[80];
@@ -517 +519 @@
 
                         PJ_LOG(4,(udp->base.name,
-                                  "Remote RTCP address switched to %s",
+                                  "Remote RTCP address switched to predicted"
+                                  " address %s",
                                   pj_sockaddr_print(&udp->rtcp_src_addr, 
                                                     addr_text,
@@ -527 +530 @@
         }
 
-read_next_packet:
+        if (!discard && udp->attached && cb)
+            (*cb)(user_data, udp->rtp_pkt, bytes_read);
+
         bytes_read = sizeof(udp->rtp_pkt);
         udp->rtp_addrlen = sizeof(udp->rtp_src_addr);
@@ -569 +574 @@
          */
         if (bytes_read>0 &&
-            (udp->options & PJMEDIA_UDP_NO_SRC_ADDR_CHECKING)==0 &&
-            pj_sockaddr_cmp(&udp->rem_rtcp_addr, &udp->rtcp_src_addr) != 0)
+            (udp->options & PJMEDIA_UDP_NO_SRC_ADDR_CHECKING)==0)
         {
-            char addr_text[80];
-
-            pj_memcpy(&udp->rem_rtcp_addr, &udp->rtcp_src_addr,
-                      sizeof(pj_sockaddr));
-
-            PJ_LOG(4,(udp->base.name,
-                      "Remote RTCP address switched to %s",
-                      pj_sockaddr_print(&udp->rtcp_src_addr, addr_text,
-                                        sizeof(addr_text), 3)));
+            if (pj_sockaddr_cmp(&udp->rem_rtcp_addr, &udp->rtcp_src_addr) == 0) {
+                /* Still receiving from rem_rtcp_addr, don't switch */
+                udp->rtcp_src_cnt = 0;
+            } else {
+                ++udp->rtcp_src_cnt;
+
+                if (udp->rtcp_src_cnt >= PJMEDIA_RTCP_NAT_PROBATION_CNT ) {
+                    char addr_text[80];
+
+                    udp->rtcp_src_cnt = 0;
+                    pj_memcpy(&udp->rem_rtcp_addr, &udp->rtcp_src_addr,
+                              sizeof(pj_sockaddr));
+
+                    PJ_LOG(4,(udp->base.name,
+                              "Remote RTCP address switched to %s",
+                              pj_sockaddr_print(&udp->rtcp_src_addr, addr_text,
+                                                sizeof(addr_text), 3)));
+                }
+            }
         }
 
@@ -678 +692 @@
     pj_bzero(&udp->rtcp_src_addr, sizeof(udp->rtcp_src_addr));
     udp->rtp_src_cnt = 0;
+    udp->rtcp_src_cnt = 0;
 
     /* Unlock keys */