Changeset 4343 for pjproject/trunk/pjnath/src/pjnath/stun_sock.c

Timestamp:

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

Author:

nanang

Message:

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

File:

• pjproject/trunk/pjnath/src/pjnath/stun_sock.c (modified) (3 diffs)

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;