Changeset 791 for pjproject/branches/symbian/pjsip/src/pjsip/sip_transport_udp.c

Timestamp:

Nov 1, 2006 1:57:01 PM (17 years ago)

Author:

bennylp

Message:

Ported all projects (except pjmedia-codec) on Symbian. PJMEDIA's sound device is still in progress

File:

• pjproject/branches/symbian/pjsip/src/pjsip/sip_transport_udp.c (modified) (4 diffs)

pjproject/branches/symbian/pjsip/src/pjsip/sip_transport_udp.c

@@ -579 +579 @@
  */
 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,
@@ -587 +587 @@
     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);
@@ -595 +596 @@
         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);
@@ -605 +611 @@
          * 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) {
-            pj_hostent he;
-            const pj_str_t *hostname = pj_gethostname();
-            status = pj_gethostbyname(hostname, &he);
-            if (status != PJ_SUCCESS) {
-                pj_sock_close(sock);
+        if (tmp_addr.sin_addr.s_addr == PJ_INADDR_ANY) {
+            pj_in_addr hostip;
+
+            status = pj_gethostip(&hostip);
+            if (status != PJ_SUCCESS)
                 return status;
-            }
-            pj_strcpy2(&bound_name.host, 
-                       pj_inet_ntoa(*(pj_in_addr*)he.h_addr));
+
+            pj_strcpy2(&bound_name.host, pj_inet_ntoa(hostip));
         } 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));
         }