Changeset 4224 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Aug 9, 2012 5:21:25 AM (12 years ago)

Author:

nanang

Message:

Close #1567: Added option to use STUN2 format for resolving mapped address in pjsua_config.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

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

@@ -329 +329 @@
             char ip_addr[32];
             pj_str_t stun_srv;
+            pjstun_setting stun_opt;
 
             pj_ansi_strcpy(ip_addr,
@@ -334 +335 @@
             stun_srv = pj_str(ip_addr);
 
-            status=pjstun_get_mapped_addr(&pjsua_var.cp.factory, 2, sock,
-                                           &stun_srv, pj_ntohs(pjsua_var.stun_srv.ipv4.sin_port),
-                                           &stun_srv, pj_ntohs(pjsua_var.stun_srv.ipv4.sin_port),
-                                           mapped_addr);
+            pj_bzero(&stun_opt, sizeof(stun_opt));
+            stun_opt.use_stun2 = pjsua_var.ua_cfg.stun_map_use_stun2;
+            stun_opt.srv1  = stun_opt.srv2  = stun_srv;
+            stun_opt.port1 = stun_opt.port2 = 
+                             pj_ntohs(pjsua_var.stun_srv.ipv4.sin_port);
+            status=pjstun_get_mapped_addr2(&pjsua_var.cp.factory, &stun_opt,
+                                           2, sock, mapped_addr);
             if (status != PJ_SUCCESS) {
                 pjsua_perror(THIS_FILE, "STUN resolve error", status);