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

Timestamp:

Jun 29, 2006 2:45:17 PM (18 years ago)

Author:

bennylp

Message:

Improvements in PJMEDIA to support RFC 3605 (RTCP attribute in SDP) and other changes to improve RTCP communication behind NAT. Also fixed bug related to RTCP reporting changes in revision 565

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c (modified) (9 diffs)

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

@@ -72 +72 @@
     pj_sock_t           rtcp_sock;      /**< RTCP socket                    */
     pj_sockaddr_in      rtcp_addr_name; /**< Published RTCP address.        */
+    pj_sockaddr_in      rtcp_src_addr;  /**< Actual source RTCP address.    */
+    int                 rtcp_addr_len;  /**< Length of RTCP src address.    */
     pj_ioqueue_key_t   *rtcp_key;       /**< RTCP socket key in ioqueue     */
     pj_ioqueue_op_key_t rtcp_read_op;   /**< Pending read operation         */
@@ -90 +92 @@
                                        void *user_data,
                                        const pj_sockaddr_t *rem_addr,
+                                       const pj_sockaddr_t *rem_rtcp,
                                        unsigned addr_len,
                                        void (*rtp_cb)(void*,
@@ -276 +279 @@
     /* Kick of pending RTCP read from the ioqueue */
     size = sizeof(tp->rtcp_pkt);
-    status = pj_ioqueue_recv(tp->rtcp_key, &tp->rtcp_read_op,
-                             tp->rtcp_pkt, &size, PJ_IOQUEUE_ALWAYS_ASYNC);
+    tp->rtcp_addr_len = sizeof(tp->rtcp_src_addr);
+    status = pj_ioqueue_recvfrom( tp->rtcp_key, &tp->rtcp_read_op,
+                                  tp->rtcp_pkt, &size, PJ_IOQUEUE_ALWAYS_ASYNC,
+                                  &tp->rtcp_src_addr, &tp->rtcp_addr_len);
     if (status != PJ_EPENDING)
         goto on_error;
@@ -385 +390 @@
                 if (udp->rtp_src_cnt >= PJMEDIA_RTP_NAT_PROBATION_CNT) {
                 
-                    pj_uint16_t port;
-
                     /* Set remote RTP address to source address */
                     udp->rem_rtp_addr = udp->rtp_src_addr;
-
-                    /* Also update remote RTCP address */
-                    pj_memcpy(&udp->rem_rtcp_addr, &udp->rem_rtp_addr, 
-                              sizeof(pj_sockaddr_in));
-                    port = (pj_uint16_t)
-                           (pj_ntohs(udp->rem_rtp_addr.sin_port)+1);
-                    udp->rem_rtcp_addr.sin_port = pj_htons(port);
 
                     /* Reset counter */
@@ -404 +400 @@
                               pj_inet_ntoa(udp->rtp_src_addr.sin_addr),
                               pj_ntohs(udp->rtp_src_addr.sin_port)));
+
+                    /* Also update remote RTCP address if actual RTCP source
+                     * address is not heard yet.
+                     */
+                    if (udp->rtcp_src_addr.sin_addr.s_addr == 0) {
+                        pj_uint16_t port;
+
+                        pj_memcpy(&udp->rem_rtcp_addr, &udp->rem_rtp_addr, 
+                                  sizeof(pj_sockaddr_in));
+                        port = (pj_uint16_t)
+                               (pj_ntohs(udp->rem_rtp_addr.sin_port)+1);
+                        udp->rem_rtcp_addr.sin_port = pj_htons(port);
+
+                        pj_memcpy(&udp->rtcp_src_addr, &udp->rem_rtcp_addr, 
+                                  sizeof(pj_sockaddr_in));
+
+                        PJ_LOG(4,(udp->base.name,
+                                  "Remote RTCP address switched to %s:%d",
+                                  pj_inet_ntoa(udp->rtcp_src_addr.sin_addr),
+                                  pj_ntohs(udp->rtcp_src_addr.sin_port)));
+
+                    }
                 }
             }
@@ -441 +459 @@
             (*cb)(user_data, udp->rtcp_pkt, bytes_read);
 
+        /* Check if RTCP source address is the same as the configured
+         * remote address, and switch the address when they are
+         * different.
+         */
+        if ((udp->options & PJMEDIA_UDP_NO_SRC_ADDR_CHECKING)==0 &&
+            ((udp->rem_rtcp_addr.sin_addr.s_addr != 
+               udp->rtcp_src_addr.sin_addr.s_addr) ||
+             (udp->rem_rtcp_addr.sin_port != 
+               udp->rtcp_src_addr.sin_port)))
+        {
+            pj_memcpy(&udp->rem_rtcp_addr, &udp->rtcp_src_addr,
+                      sizeof(pj_sockaddr_in));
+            PJ_LOG(4,(udp->base.name,
+                      "Remote RTCP address switched to %s:%d",
+                      pj_inet_ntoa(udp->rtcp_src_addr.sin_addr),
+                      pj_ntohs(udp->rtcp_src_addr.sin_port)));
+        }
+
         bytes_read = sizeof(udp->rtcp_pkt);
-        status = pj_ioqueue_recv(udp->rtcp_key, &udp->rtcp_read_op,
-                                     udp->rtcp_pkt, &bytes_read, 0);
+        udp->rtcp_addr_len = sizeof(udp->rtcp_src_addr);
+        status = pj_ioqueue_recvfrom(udp->rtcp_key, &udp->rtcp_read_op,
+                                     udp->rtcp_pkt, &bytes_read, 0,
+                                     &udp->rtcp_src_addr, 
+                                     &udp->rtcp_addr_len);
 
     } while (status == PJ_SUCCESS);
@@ -453 +492 @@
                                        void *user_data,
                                        const pj_sockaddr_t *rem_addr,
+                                       const pj_sockaddr_t *rem_rtcp,
                                        unsigned addr_len,
                                        void (*rtp_cb)(void*,
@@ -462 +502 @@
 {
     struct transport_udp *udp = (struct transport_udp*) tp;
+    const pj_sockaddr_in *rtcp_addr;
 
     /* Validate arguments */
@@ -474 +515 @@
     pj_memcpy(&udp->rem_rtp_addr, rem_addr, sizeof(pj_sockaddr_in));
 
-    /* Guess RTCP address from RTP address */
-    pj_memcpy(&udp->rem_rtcp_addr, rem_addr, sizeof(pj_sockaddr_in));
-    udp->rem_rtcp_addr.sin_port = (pj_uint16_t) pj_htons((pj_uint16_t)(
-                                    pj_ntohs(udp->rem_rtp_addr.sin_port)+1));
+    /* Copy remote RTP address, if one is specified. */
+    rtcp_addr = rem_rtcp;
+    if (rtcp_addr && rtcp_addr->sin_addr.s_addr != 0) {
+        pj_memcpy(&udp->rem_rtcp_addr, rem_rtcp, sizeof(pj_sockaddr_in));
+
+    } else {
+        int rtcp_port;
+
+        /* Otherwise guess the RTCP address from the RTP address */
+        pj_memcpy(&udp->rem_rtcp_addr, rem_addr, sizeof(pj_sockaddr_in));
+        rtcp_port = pj_ntohs(udp->rem_rtp_addr.sin_port) + 1;
+        udp->rem_rtcp_addr.sin_port = pj_htons((pj_uint16_t)rtcp_port);
+    }
 
     /* Save the callbacks */