Changeset 106 for pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

Timestamp:

Dec 30, 2005 11:50:15 PM (18 years ago)

Author:

bennylp

Message:

Basic module, transport, and sending messages

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c (modified) (7 diffs)

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

@@ -22 +22 @@
 #include <pj/pool.h>
 #include <pj/sock.h>
+#include <pj/addr_resolv.h>
 #include <pj/os.h>
 #include <pj/lock.h>
@@ -268 +269 @@
     pj_status_t status;
 
+    PJ_ASSERT_RETURN(endpt && sock!=PJ_INVALID_SOCKET && a_name && async_cnt>0,
+                     PJ_EINVAL);
+
     /* Create pool. */
     pool = pjsip_endpt_create_pool(endpt, "udp%p", PJSIP_POOL_LEN_TRANSPORT, 
@@ -328 +332 @@
                               pj_inet_ntoa(((pj_sockaddr_in*)&tp->base.local_addr)->sin_addr),
                               pj_ntohs(((pj_sockaddr_in*)&tp->base.local_addr)->sin_port),
-                              tp->base.local_name.host,
+                              tp->base.local_name.host.ptr,
                               tp->base.local_name.port);
 
@@ -368 +372 @@
     /* Create rdata and put it in the array. */
     tp->rdata_cnt = 0;
+    tp->rdata = pj_pool_calloc(tp->base.pool, async_cnt, 
+                               sizeof(pjsip_rx_data*));
     for (i=0; i<async_cnt; ++i) {
         pj_pool_t *rdata_pool = pjsip_endpt_create_pool(endpt, "rtd%p", 
@@ -383 +389 @@
         tp->rdata[i]->tp_info.pool = rdata_pool;
         tp->rdata[i]->tp_info.transport = &tp->base;
+        tp->rdata[i]->tp_info.op_key.rdata = tp->rdata[i];
         pj_ioqueue_op_key_init(&tp->rdata[i]->tp_info.op_key.op_key, 
                                sizeof(pj_ioqueue_op_key_t));
@@ -437 +444 @@
     pjsip_host_port bound_name;
 
+    PJ_ASSERT_RETURN(local != NULL, PJ_EINVAL);
+
     status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, &sock);
     if (status != PJ_SUCCESS)
@@ -448 +457 @@
 
     if (a_name == NULL) {
+        /* Address name is not specified. 
+         * Build a name based on bound address.
+         */
         a_name = &bound_name;
         bound_name.host.ptr = addr_buf;
-        pj_strcpy2(&bound_name.host, pj_inet_ntoa(local->sin_addr));
         bound_name.port = pj_ntohs(local->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) {
+            pj_hostent he;
+            const pj_str_t *hostname = pj_gethostname();
+            status = pj_gethostbyname(hostname, &he);
+            if (status != PJ_SUCCESS) {
+                pj_sock_close(sock);
+                return status;
+            }
+            pj_strcpy2(&bound_name.host, 
+                       pj_inet_ntoa(*(pj_in_addr*)he.h_addr));
+        } else {
+            /* Otherwise use bound address. */
+            pj_strcpy2(&bound_name.host, pj_inet_ntoa(local->sin_addr));
+        }
+        
     }