Changeset 4343 for pjproject/trunk

Timestamp:

Feb 7, 2013 9:35:34 AM (12 years ago)

Author:

nanang

Message:

Close #1602: configurable local port range for ICE transport.

Location:

pjproject/trunk

Files:

• pjlib/include/pj/sock.h (modified) (1 diff)
• pjlib/src/pj/sock_common.c (modified) (2 diffs)
• pjnath/include/pjnath/stun_sock.h (modified) (1 diff)
• pjnath/include/pjnath/turn_sock.h (modified) (1 diff)
• pjnath/src/pjnath/stun_sock.c (modified) (3 diffs)
• pjnath/src/pjnath/turn_sock.c (modified) (4 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/sock.h

@@ -1167 +1167 @@
                                       pj_uint16_t port);
 
+/**
+ * Bind the IP socket sockfd to the given address and a random port in the
+ * specified range.
+ *
+ * @param sockfd        The socket desriptor.
+ * @param addr          The local address and port to bind the socket to.
+ * @param port_range    The port range, relative the to start port number
+ *                      specified in port field in #addr. Note that if the
+ *                      port is zero, this param will be ignored.
+ * @param max_try       Maximum retries.
+ *
+ * @return              Zero on success.
+ */
+PJ_DECL(pj_status_t) pj_sock_bind_random( pj_sock_t sockfd,
+                                          const pj_sockaddr_t *addr,
+                                          pj_uint16_t port_range,
+                                          pj_uint16_t max_try);
+
 #if PJ_HAS_TCP
 /**

pjproject/trunk/pjlib/src/pj/sock_common.c

@@ -25 +25 @@
 #include <pj/os.h>
 #include <pj/addr_resolv.h>
+#include <pj/rand.h>
 #include <pj/string.h>
 #include <pj/compat/socket.h>
@@ -1041 +1042 @@
 
 
+/*
+ * Bind socket at random port.
+ */
+PJ_DEF(pj_status_t) pj_sock_bind_random(  pj_sock_t sockfd,
+                                          const pj_sockaddr_t *addr,
+                                          pj_uint16_t port_range,
+                                          pj_uint16_t max_try)
+{
+    pj_sockaddr bind_addr;
+    int addr_len;
+    pj_uint16_t base_port;
+    pj_status_t status = PJ_SUCCESS;
+
+    PJ_CHECK_STACK();
+
+    PJ_ASSERT_RETURN(addr, PJ_EINVAL);
+
+    pj_sockaddr_cp(&bind_addr, addr);
+    addr_len = pj_sockaddr_get_len(addr);
+    base_port = pj_sockaddr_get_port(addr);
+
+    if (base_port == 0 || port_range == 0) {
+        return pj_sock_bind(sockfd, &bind_addr, addr_len);
+    }
+
+    for (; max_try; --max_try) {
+        pj_uint16_t port;
+        port = (pj_uint16_t)(base_port + pj_rand() % (port_range + 1));
+        pj_sockaddr_set_port(&bind_addr, port);
+        status = pj_sock_bind(sockfd, &bind_addr, addr_len);
+        if (status == PJ_SUCCESS)
+            break;
+    }
+
+    return status;
+}
+
+
 /* Only need to implement these in DLL build */
 #if defined(PJ_DLL)

pjproject/trunk/pjnath/include/pjnath/stun_sock.h

@@ -239 +239 @@
      * is non-zero, socket will be bound to this address only, and the
      * transport will have only one address alias (the \a alias_cnt field
-     * in #pj_stun_sock_info structure.
+     * in #pj_stun_sock_info structure. If the port is set to zero, the
+     * socket will bind at any port (chosen by the OS).
      */
     pj_sockaddr bound_addr;
+
+    /**
+     * Specify the port range for STUN socket binding, relative to the start
+     * port number specified in \a bound_addr. Note that this setting is only
+     * applicable when the start port number is non zero.
+     *
+     * Default value is zero.
+     */
+    pj_uint16_t port_range;
 
     /**

pjproject/trunk/pjnath/include/pjnath/turn_sock.h

@@ -141 +141 @@
      */
     pj_bool_t qos_ignore_error;
+
+    /**
+     * Specify the interface where the socket should be bound to. If the
+     * address is zero, socket will be bound to INADDR_ANY. If the address
+     * is non-zero, socket will be bound to this address only. If the port is
+     * set to zero, the socket will bind at any port (chosen by the OS).
+     */
+    pj_sockaddr bound_addr;
+
+    /**
+     * Specify the port range for TURN socket binding, relative to the start
+     * port number specified in \a bound_addr. Note that this setting is only
+     * applicable when the start port number is non zero.
+     *
+     * Default value is zero.
+     */
+    pj_uint16_t port_range;
 
 } pj_turn_sock_cfg;

pjproject/trunk/pjnath/src/pjnath/stun_sock.c

@@ -33 +33 @@
 
 
+enum { MAX_BIND_RETRY = 100 };
+
 struct pj_stun_sock
 {
@@ -163 +165 @@
     pj_stun_sock *stun_sock;
     pj_stun_sock_cfg default_cfg;
+    pj_sockaddr bound_addr;
     unsigned i;
+    pj_uint16_t max_bind_retry;
     pj_status_t status;
 
@@ -212 +216 @@
 
     /* Bind socket */
-    if (pj_sockaddr_has_addr(&cfg->bound_addr)) {
-        status = pj_sock_bind(stun_sock->sock_fd, &cfg->bound_addr,
-                              pj_sockaddr_get_len(&cfg->bound_addr));
-    } else {
-        pj_sockaddr bound_addr;
-
-        pj_sockaddr_init(af, &bound_addr, NULL, 0);
-        status = pj_sock_bind(stun_sock->sock_fd, &bound_addr,
-                              pj_sockaddr_get_len(&bound_addr));
-    }
-
+    max_bind_retry = MAX_BIND_RETRY;
+    if (cfg->port_range && cfg->port_range < max_bind_retry)
+        max_bind_retry = cfg->port_range;
+    pj_sockaddr_init(af, &bound_addr, NULL, 0);
+    if (cfg->bound_addr.addr.sa_family == pj_AF_INET() || 
+        cfg->bound_addr.addr.sa_family == pj_AF_INET6())
+    {
+        pj_sockaddr_cp(&bound_addr, &cfg->bound_addr);
+    }
+    status = pj_sock_bind_random(stun_sock->sock_fd, &bound_addr,
+                                 cfg->port_range, max_bind_retry);
     if (status != PJ_SUCCESS)
         goto on_error;

pjproject/trunk/pjnath/src/pjnath/turn_sock.c

@@ -33 +33 @@
 };
 
+
+enum { MAX_BIND_RETRY = 100 };
+
+
 #define INIT    0x1FFFFFFF
 
@@ -103 +107 @@
 }
 
+
 /*
  * Create.
@@ -726 +731 @@
         pj_sock_t sock;
         pj_activesock_cb asock_cb;
+        pj_sockaddr bound_addr, *cfg_bind_addr;
+        pj_uint16_t max_bind_retry;
 
         /* Close existing connection, if any. This happens when
@@ -751 +758 @@
         }
 
-        /* Apply QoS, if specified */
+        /* Bind socket */
+        cfg_bind_addr = &turn_sock->setting.bound_addr;
+        max_bind_retry = MAX_BIND_RETRY;
+        if (turn_sock->setting.port_range &&
+            turn_sock->setting.port_range < max_bind_retry)
+        {
+            max_bind_retry = turn_sock->setting.port_range;
+        }
+        pj_sockaddr_init(turn_sock->af, &bound_addr, NULL, 0);
+        if (cfg_bind_addr->addr.sa_family == pj_AF_INET() || 
+            cfg_bind_addr->addr.sa_family == pj_AF_INET6())
+        {
+            pj_sockaddr_cp(&bound_addr, cfg_bind_addr);
+        }
+        status = pj_sock_bind_random(sock, &bound_addr,
+                                     turn_sock->setting.port_range,
+                                     max_bind_retry);
+        if (status != PJ_SUCCESS) {
+            pj_turn_sock_destroy(turn_sock);
+            return;
+        }
+
+        /* Apply QoS, if specified */
         status = pj_sock_apply_qos2(sock, turn_sock->setting.qos_type,
                                     &turn_sock->setting.qos_params, 

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -2154 +2154 @@
 
     /**
+     * Specify the port range for socket binding, relative to the start
+     * port number specified in \a port. Note that this setting is only
+     * applicable when the start port number is non zero.
+     *
+     * Default value is zero.
+     */
+    unsigned            port_range;
+
+    /**
      * Optional address to advertise as the address of this transport.
      * Application can specify any address or hostname for this field,

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -719 +719 @@
         ice_cfg.stun.max_host_cands = acc_cfg->ice_cfg.ice_max_host_cands;
 
+    /* Copy binding port setting to STUN setting */
+    pj_sockaddr_init(ice_cfg.af, &ice_cfg.stun.cfg.bound_addr,
+                     &cfg->bound_addr, cfg->port);
+    ice_cfg.stun.cfg.port_range = cfg->port_range;
+    if (cfg->port != 0 && ice_cfg.stun.cfg.port_range == 0)
+        ice_cfg.stun.cfg.port_range = pjsua_var.ua_cfg.max_calls * 10;
+
     /* Copy QoS setting to STUN setting */
     ice_cfg.stun.cfg.qos_type = cfg->qos_type;
@@ -744 +751 @@
         pj_memcpy(&ice_cfg.turn.cfg.qos_params, &cfg->qos_params,
                   sizeof(cfg->qos_params));
+
+        /* Copy binding port setting to TURN setting */
+        pj_sockaddr_init(ice_cfg.af, &ice_cfg.turn.cfg.bound_addr,
+                         &cfg->bound_addr, cfg->port);
+        ice_cfg.turn.cfg.port_range = cfg->port_range;
+        if (cfg->port != 0 && ice_cfg.turn.cfg.port_range == 0)
+            ice_cfg.turn.cfg.port_range = pjsua_var.ua_cfg.max_calls * 10;
     }