Changeset 5383

Timestamp:

Jul 14, 2016 5:15:16 AM (8 years ago)

Author:

nanang

Message:

Misc (re #1928): Print explicit log message about PJSUA ignoring IPv6 STUN server.

File:

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

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

@@ -1332 +1332 @@
     /* Loop while we have entry to try */
     for (; sess->idx < sess->count; ++sess->idx) {
-        const int af = pj_AF_INET();
+        int af;
         char target[64];
         pj_str_t hostpart;
@@ -1345 +1345 @@
 
         /* Parse the server entry into host:port */
-        status = pj_sockaddr_parse2(af, 0, &sess->srv[sess->idx],
-                                          &hostpart, &port, NULL);
+        status = pj_sockaddr_parse2(pj_AF_UNSPEC(), 0, &sess->srv[sess->idx],
+                                    &hostpart, &port, &af);
         if (status != PJ_SUCCESS) {
             PJ_LOG(2,(THIS_FILE, "Invalid STUN server entry %s", target));
+            continue;
+        } else if (af != pj_AF_INET()) {
+            /* Ignore IPv6 STUN server for now */
+            status = PJ_EAFNOTSUP;
+            PJ_LOG(3,(THIS_FILE, "Ignored STUN server entry %s, currently "
+                                 "only IPv4 STUN server is supported (does "
+                                 "IPv6 still need a mapped address?)",
+                      target));
             continue;
         }
@@ -1365 +1373 @@
         stun_sock_cb.on_status = &test_stun_on_status;
         status = pj_stun_sock_create(&pjsua_var.stun_cfg, "stunresolve",
-                                           pj_AF_INET(), &stun_sock_cb,
-                                           NULL, sess, &sess->stun_sock);
+                                     pj_AF_INET(), &stun_sock_cb,
+                                     NULL, sess, &sess->stun_sock);
         if (status != PJ_SUCCESS) {
             char errmsg[PJ_ERR_MSG_SIZE];
@@ -1377 +1385 @@
         }
 
-        status = pj_stun_sock_start(sess->stun_sock, &hostpart,
-                                          port, pjsua_var.resolver);
+        status = pj_stun_sock_start(sess->stun_sock, &hostpart, port,
+                                    pjsua_var.resolver);
         if (status != PJ_SUCCESS) {
             char errmsg[PJ_ERR_MSG_SIZE];