Changeset 5105 for pjproject/trunk

Timestamp:

Jun 11, 2015 12:12:21 PM (9 years ago)

Author:

nanang

Message:

Misc (re #1843): Updated SIP transport TCP & TLS to get server local address info using getsockname() instead of using the listener address.

Location:

pjproject/trunk/pjsip/src/pjsip

Files:

• sip_transport_tcp.c (modified) (3 diffs)
• sip_transport_tls.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -1087 +1087 @@
     char addr[PJ_INET6_ADDRSTRLEN+10];
     pjsip_tp_state_callback state_cb;
-    pj_sockaddr tmp_src_addr;
+    pj_sockaddr tmp_src_addr, tmp_dst_addr;
+    int addr_len;
     pj_status_t status;
 
@@ -1124 +1125 @@
     pj_sockaddr_cp(&tmp_src_addr, src_addr);
 
+    /* Get local address */
+    addr_len = sizeof(tmp_dst_addr);
+    status = pj_sock_getsockname(sock, &tmp_dst_addr, &addr_len);
+    if (status != PJ_SUCCESS) {
+        pj_sockaddr_cp(&tmp_dst_addr, &listener->factory.local_addr);
+    }
+
     /* 
      * Incoming connection!
@@ -1129 +1137 @@
      */
     status = tcp_create( listener, NULL, sock, PJ_TRUE,
-                         &listener->factory.local_addr,
-                         &tmp_src_addr, &tcp);
+                         &tmp_dst_addr, &tmp_src_addr, &tcp);
     if (status == PJ_SUCCESS) {
         status = tcp_start_read(tcp);

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -1210 +1210 @@
      */
     status = tls_create( listener, NULL, new_ssock, PJ_TRUE,
-                         &listener->factory.local_addr,
-                         &tmp_src_addr, NULL, &tls);
+                         &ssl_info.local_addr, &tmp_src_addr, NULL, &tls);
     
     if (status != PJ_SUCCESS)