Changeset 5636 for pjproject/trunk/pjnath/src/pjnath/nat_detect.c

Timestamp:

Aug 2, 2017 2:51:59 AM (7 years ago)

Author:

ming

Message:

Fixed #2032: NAT64 support for IPv4 interoperability

File:

• pjproject/trunk/pjnath/src/pjnath/nat_detect.c (modified) (2 diffs)

pjproject/trunk/pjnath/src/pjnath/nat_detect.c

@@ -89 +89 @@
     pj_sockaddr              server;
     pj_sockaddr             *cur_server;
+    pj_sockaddr              cur_addr;
     pj_stun_session         *stun_sess;
 
@@ -855 +856 @@
         goto on_error;
 
-    /* Configure alternate address */
-    if (alt_addr)
-        sess->cur_server = (pj_sockaddr*) alt_addr;
-    else
+    /* Configure alternate address, synthesize it if necessary */
+    if (alt_addr) {
+        status = pj_sockaddr_synthesize(sess->server.addr.sa_family,
+                                        &sess->cur_addr, alt_addr);
+        if (status != PJ_SUCCESS)
+            goto on_error;
+
+        sess->cur_server = &sess->cur_addr;
+    } else {
         sess->cur_server = &sess->server;
+    }
 
     PJ_LOG(5,(sess->pool->obj_name,