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

Timestamp:

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

Author:

nanang

Message:

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

File:

• pjproject/trunk/pjnath/src/pjnath/turn_sock.c (modified) (4 diffs)

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,