Changeset 562

Timestamp:

Jun 28, 2006 4:23:23 PM (18 years ago)

Author:

bennylp

Message:

Enhancements and minor bug-fix in SIP UDP transport: (1) application may specify NULL address when creating the UDP transport, to allow the transport to choose arbitrary port, and (2) receive data buffers were not freed when UDP transport is closed

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_transport_udp.h (modified) (1 diff)
• src/pjsip/sip_transport_udp.c (modified) (7 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_transport_udp.h

@@ -42 +42 @@
  *
  * @param endpt         The SIP endpoint.
- * @param local         Local address to bind.
+ * @param local         Optional local address to bind. If this argument
+ *                      is NULL, the UDP transport will be bound to arbitrary
+ *                      UDP port.
  * @param a_name        Published address (only the host and port portion is 
  *                      used). If this argument is NULL, then the bound address

pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

@@ -360 +360 @@
         if (cnt == 0)
             break;
+    }
+
+    /* Destroy rdata */
+    for (i=0; i<tp->rdata_cnt; ++i) {
+        pj_pool_release(tp->rdata[i]->tp_info.pool);
     }
 
@@ -577 +582 @@
     if (p_transport)
         *p_transport = &tp->base;
+
+    PJ_LOG(4,(tp->base.obj_name, 
+              "SIP UDP transport started, published address is %.*s:%d",
+              (int)tp->base.local_name.host.slen,
+              tp->base.local_name.host.ptr,
+              tp->base.local_name.port));
+
     return PJ_SUCCESS;
 
@@ -590 +602 @@
  */
 PJ_DEF(pj_status_t) pjsip_udp_transport_start( pjsip_endpoint *endpt,
-                                               const pj_sockaddr_in *local,
+                                               const pj_sockaddr_in *local_a,
                                                const pjsip_host_port *a_name,
                                                unsigned async_cnt,
@@ -598 +610 @@
     pj_status_t status;
     char addr_buf[16];
+    pj_sockaddr_in tmp_addr;
     pjsip_host_port bound_name;
 
-    PJ_ASSERT_RETURN(local != NULL, PJ_EINVAL);
+    PJ_ASSERT_RETURN(endpt && async_cnt, PJ_EINVAL);
 
     status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, &sock);
@@ -606 +619 @@
         return status;
 
-    status = pj_sock_bind(sock, local, sizeof(*local));
+    if (local_a == NULL) {
+        pj_sockaddr_in_init(&tmp_addr, NULL, 0);
+        local_a = &tmp_addr;
+    }
+
+    status = pj_sock_bind(sock, local_a, sizeof(*local_a));
     if (status != PJ_SUCCESS) {
         pj_sock_close(sock);
@@ -616 +634 @@
          * Build a name based on bound address.
          */
+        int addr_len;
+
+        addr_len = sizeof(tmp_addr);
+        status = pj_sock_getsockname(sock, &tmp_addr, &addr_len);
+        if (status != PJ_SUCCESS) {
+            pj_sock_close(sock);
+            return status;
+        }
+
         a_name = &bound_name;
         bound_name.host.ptr = addr_buf;
-        bound_name.port = pj_ntohs(local->sin_port);
+        bound_name.port = pj_ntohs(tmp_addr.sin_port);
 
         /* If bound address specifies "0.0.0.0", get the IP address
          * of local hostname.
          */
-        if (local->sin_addr.s_addr == PJ_INADDR_ANY) {
+        if (tmp_addr.sin_addr.s_addr == PJ_INADDR_ANY) {
             pj_hostent he;
             const pj_str_t *hostname = pj_gethostname();
@@ -635 +662 @@
         } else {
             /* Otherwise use bound address. */
-            pj_strcpy2(&bound_name.host, pj_inet_ntoa(local->sin_addr));
+            pj_strcpy2(&bound_name.host, pj_inet_ntoa(tmp_addr.sin_addr));
         }