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

Timestamp:

Jun 24, 2013 9:53:16 AM (11 years ago)

Author:

bennylp

Message:

Closed #1668: Option to use the IP address found in REGISTER response in the SDP

File:

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

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

@@ -240 +240 @@
     pj_status_t status = PJ_SUCCESS;
     char addr_buf[PJ_INET6_ADDRSTRLEN+10];
+    pjsua_acc *acc;
     pj_sock_t sock[2];
-    pjsua_acc *acc = &pjsua_var.acc[call_med->call->acc_id];
 
     use_ipv6 = (acc->cfg.ipv6_media_use != PJSUA_IPV6_DISABLED);
     af = use_ipv6 ? pj_AF_INET6() : pj_AF_INET();
+
+    acc = &pjsua_var.acc[call_med->call->acc_id];
 
     /* Make sure STUN server resolution has completed */
@@ -424 +426 @@
 
         } else {
+            if (acc->cfg.allow_sdp_nat_rewrite && acc->reg_mapped_addr.slen) {
+                pj_status_t status;
+
+                /* Take the address from mapped addr as seen by registrar */
+                status = pj_sockaddr_set_str_addr(af, &bound_addr,
+                                                  &acc->reg_mapped_addr);
+                if (status != PJ_SUCCESS) {
+                    /* just leave bound_addr with whatever it was
+                    pj_bzero(pj_sockaddr_get_addr(&bound_addr),
+                             pj_sockaddr_get_addr_len(&bound_addr));
+                     */
+                }
+            }
 
             if (!pj_sockaddr_has_addr(&bound_addr)) {