Changeset 5636 for pjproject/trunk/pjlib-util/src/pjlib-util/stun_simple_client.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/pjlib-util/src/pjlib-util/stun_simple_client.c (modified) (5 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/stun_simple_client.c

@@ -64 +64 @@
     const pj_str_t *srv1, *srv2;
     int port1, port2;
-    pj_sockaddr_in srv_addr[2];
+    pj_sockaddr srv_addr[2];
     int i, send_cnt = 0, nfds;
     pj_pool_t *pool;
@@ -117 +117 @@
 
     /* Resolve servers. */
-    status = pj_sockaddr_in_init(&srv_addr[0], srv1, (pj_uint16_t)port1);
+    status = pj_sockaddr_init(opt->af, &srv_addr[0], srv1, (pj_uint16_t)port1);
     if (status != PJ_SUCCESS)
         goto on_error;
@@ -124 +124 @@
 
     if (srv2 && port2) {
-        status = pj_sockaddr_in_init(&srv_addr[1], srv2, (pj_uint16_t)port2);
+        status = pj_sockaddr_init(opt->af, &srv_addr[1], srv2,
+                                  (pj_uint16_t)port2);
         if (status != PJ_SUCCESS)
             goto on_error;
 
-        if (srv_addr[1].sin_addr.s_addr != srv_addr[0].sin_addr.s_addr &&
-            srv_addr[1].sin_port != srv_addr[0].sin_port)
-        {
+        if (pj_sockaddr_cmp(&srv_addr[1], &srv_addr[0]) != 0) {
             srv_cnt++;
         }
@@ -182 +181 @@
                 status = pj_sock_sendto(sock[i], out_msg, &sent_len, 0,
                                         (pj_sockaddr_t*)&srv_addr[j],
-                                        sizeof(pj_sockaddr_in));
+                                        pj_sockaddr_get_len(&srv_addr[j]));
             }
         }
@@ -222 +221 @@
                 pj_ssize_t len;
                 pjstun_msg msg;
-                pj_sockaddr_in addr;
+                pj_sockaddr addr;
                 int addrlen = sizeof(addr);
                 pjstun_mapped_addr_attr *attr;