Changeset 4262 for pjproject/trunk/pjsip/src/pjsip/sip_transport.c

Timestamp:

Sep 20, 2012 6:00:23 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1585: IPv6 support for SIP TCP and TLS transports and PJSUA-LIB v2

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -199 +199 @@
         PJSIP_TRANSPORT_RELIABLE
     },
+    {
+        PJSIP_TRANSPORT_TLS6,
+        5061,
+        {"TLS", 3},
+        "TLS IPv6 transport",
+        PJSIP_TRANSPORT_RELIABLE | PJSIP_TRANSPORT_SECURE
+    },
 };
 
@@ -1280 +1287 @@
                 status = get_net_interface(f->type, &prm->dst_host,
                                            &tmp_str);
-                if (status != PJ_SUCCESS)
-                    goto on_return;
-                pj_strdup(pool, &prm->ret_addr, &tmp_str);
+                if (status == PJ_SUCCESS) {
+                    pj_strdup(pool, &prm->ret_addr, &tmp_str);
+                } else {
+                    /* It could fail "normally" on certain cases, e.g.
+                     * when connecting to IPv6 link local address, it
+                     * will wail with EINVAL.
+                     * In this case, fallback to use the default interface
+                     * rather than failing the call.
+                     */
+                    PJ_PERROR(5,(THIS_FILE, status, "Warning: unable to "
+                                 "determine local interface"));
+                    pj_strdup(pool, &prm->ret_addr, &f->addr_name.host);
+                    status = PJ_SUCCESS;
+                }
             } else {
                 pj_strdup(pool, &prm->ret_addr, &f->addr_name.host);