Changeset 483

Timestamp:

Jun 1, 2006 11:37:30 AM (17 years ago)

Author:

bennylp

Message:

Added options in pjmedia UDP transport to disable source address checking

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/transport_udp.h (modified) (1 diff)
• pjmedia/src/pjmedia/transport_udp.c (modified) (6 diffs)
• pjsip-apps/src/samples/simpleua.c (modified) (1 diff)
• pjsip-apps/src/samples/streamutil.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/transport_udp.h

@@ -30 +30 @@
 
 /**
- * Create UDP stream transport.
+ * Options that can be specified when creating UDP transport.
+ */
+enum pjmedia_transport_udp_options
+{
+    /**
+     * Normally the UDP transport will continuously check the source address
+     * of incoming packets to see if it is different than the configured
+     * remote address, and switch the remote address to the source address
+     * of the packet if they are different after several packets are
+     * received.
+     * Specifying this option will disable this feature.
+     */
+    PJMEDIA_UDP_NO_SRC_ADDR_CHECKING = 1,
+};
+
+
+/**
+ * Create an RTP and RTCP sockets and bind RTP the socket to the specified
+ * port to create media transport.
+ *
+ * @param endpt     The media endpoint instance.
+ * @param name      Optional name to be assigned to the transport.
+ * @param port      UDP port number for the RTP socket. The RTCP port number
+ *                  will be set to one above RTP port.
+ * @param options   Options, bitmask of #pjmedia_transport_udp_options.
+ * @param p_tp      Pointer to receive the transport instance.
+ *
+ * @return          PJ_SUCCESS on success.
  */
 PJ_DECL(pj_status_t) pjmedia_transport_udp_create(pjmedia_endpt *endpt,
                                                   const char *name,
                                                   int port,
+                                                  unsigned options,
                                                   pjmedia_transport **p_tp);
 
 
 /**
- * Create UDP stream transport from existing socket info.
+ * Create UDP stream transport from existing sockets. Use this function when
+ * the sockets have previously been created.
+ *
+ * @param endpt     The media endpoint instance.
+ * @param name      Optional name to be assigned to the transport.
+ * @param si        Media socket info containing the RTP and RTCP sockets.
+ * @param options   Options, bitmask of #pjmedia_transport_udp_options.
+ * @param p_tp      Pointer to receive the transport instance.
+ *
+ * @return          PJ_SUCCESS on success.
  */
 PJ_DECL(pj_status_t) pjmedia_transport_udp_attach(pjmedia_endpt *endpt,
                                                   const char *name,
                                                   const pjmedia_sock_info *si,
+                                                  unsigned options,
                                                   pjmedia_transport **p_tp);
 
 
 /**
- * Close UDP transport.
+ * Close UDP transport. Application can also use the "destroy" member of
+ * media transport interface to close the UDP transport.
  */
 PJ_DECL(pj_status_t) pjmedia_transport_udp_close(pjmedia_transport *tp);

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

@@ -37 +37 @@
 
     pj_pool_t          *pool;           /**< Memory pool                    */
-
+    unsigned            options;        /**< Transport options.             */
     pjmedia_stream     *stream;         /**< Stream user (may be NULL)      */
     pj_sockaddr_in      rem_rtp_addr;   /**< Remote RTP address             */
@@ -109 +109 @@
                                                   const char *name,
                                                   int port,
+                                                  unsigned options,
                                                   pjmedia_transport **p_tp)
 {
@@ -153 +154 @@
     
     /* Create UDP transport by attaching socket info */
-    return pjmedia_transport_udp_attach( endpt, name, &si, p_tp);
+    return pjmedia_transport_udp_attach( endpt, name, &si, options, p_tp);
 
 
@@ -171 +172 @@
                                                   const char *name,
                                                   const pjmedia_sock_info *si,
+                                                  unsigned options,
                                                   pjmedia_transport **p_tp)
 {
@@ -199 +201 @@
     tp = pj_pool_zalloc(pool, sizeof(struct transport_udp));
     tp->pool = pool;
+    tp->options = options;
     pj_ansi_strcpy(tp->base.name, name);
     tp->base.op = &transport_udp_op;
@@ -320 +323 @@
 
         /* See if source address of RTP packet is different than the 
-         * configured address.
+         * configured address, and switch RTP remote address to 
+         * source packet address after several consecutive packets
+         * have been received.
          */
-        if ((udp->rem_rtp_addr.sin_addr.s_addr != 
-             udp->rtp_src_addr.sin_addr.s_addr) ||
-            (udp->rem_rtp_addr.sin_port != 
-             udp->rtp_src_addr.sin_port))
-        {
-            udp->rtp_src_cnt++;
-
-            if (udp->rtp_src_cnt >= PJMEDIA_RTP_NAT_PROBATION_CNT) {
-            
-                udp->rem_rtp_addr = udp->rtp_src_addr;
-                udp->rtp_src_cnt = 0;
-
-                PJ_LOG(4,(udp->base.name,
-                          "Remote RTP address switched to %s:%d",
-                          pj_inet_ntoa(udp->rtp_src_addr.sin_addr),
-                          pj_ntohs(udp->rtp_src_addr.sin_port)));
+        if ((udp->options & PJMEDIA_UDP_NO_SRC_ADDR_CHECKING)==0) {
+            if ((udp->rem_rtp_addr.sin_addr.s_addr != 
+                 udp->rtp_src_addr.sin_addr.s_addr) ||
+                (udp->rem_rtp_addr.sin_port != 
+                 udp->rtp_src_addr.sin_port))
+            {
+                udp->rtp_src_cnt++;
+
+                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 */
+                    udp->rtp_src_cnt = 0;
+
+                    PJ_LOG(4,(udp->base.name,
+                              "Remote RTP address switched to %s:%d",
+                              pj_inet_ntoa(udp->rtp_src_addr.sin_addr),
+                              pj_ntohs(udp->rtp_src_addr.sin_port)));
+                }
             }
         }

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

@@ -284 +284 @@
     /* Create media transport */
     status = pjmedia_transport_udp_attach(g_med_endpt, NULL, &g_med_skinfo,
-                                          &g_med_transport);
+                                          0, &g_med_transport);
     if (status != PJ_SUCCESS) {
         app_perror(THIS_FILE, "Unable to create media transport", status);

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

@@ -133 +133 @@
     /* Create media transport */
     status = pjmedia_transport_udp_create(med_endpt, NULL, local_port,
-                                          &transport);
+                                          0, &transport);
     if (status != PJ_SUCCESS)
         return status;