Changeset 5327 for pjproject

Timestamp:

May 31, 2016 7:59:06 AM (8 years ago)

Author:

nanang

Message:

Misc (re #1917): Print warning (instead of returning error) in creating SIP UDP transport IPv6 with STUN enabled.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -2138 +2138 @@
             pj_sockaddr_set_port(p_pub_addr, (pj_uint16_t)port);
 
-    } else if (stun_srv.slen) {
+    } else if (stun_srv.slen && af == pj_AF_INET()) {
         pjstun_setting stun_opt;
 
         /*
          * STUN is specified, resolve the address with STUN.
+         * Currently, this is available for IPv4 address only.
          */
-        if (af != pj_AF_INET()) {
-            pjsua_perror(THIS_FILE, "Cannot use STUN", PJ_EAFNOTSUP);
-            pj_sock_close(sock);
-            return PJ_EAFNOTSUP;
-        }
-
         pj_bzero(&stun_opt, sizeof(stun_opt));
         stun_opt.use_stun2 = pjsua_var.ua_cfg.stun_map_use_stun2;
@@ -2164 +2159 @@
 
     } else {
+
         pj_bzero(p_pub_addr, sizeof(pj_sockaddr));
 
@@ -2179 +2175 @@
         p_pub_addr->addr.sa_family = (pj_uint16_t)af;
         pj_sockaddr_set_port(p_pub_addr, (pj_uint16_t)port);
+
+        if (stun_srv.slen && af != pj_AF_INET()) {
+            /* STUN is specified, but it is not IPv4, just print warning */
+            PJ_PERROR(2, (THIS_FILE, PJ_EAFNOTSUP,
+                          "Cannot use STUN for SIP UDP socket %s:%d",
+                          addr_string(p_pub_addr),
+                          (int)pj_sockaddr_get_port(p_pub_addr)));
+        }
+
     }