From 3383de3026cd0afb06747069c05a600fd07ec02e Mon Sep 17 00:00:00 2001
From: Mamadou DIOP <bossiel@yahoo.fr>
Date: Tue, 24 May 2016 00:11:39 +0200
Subject: Make ICE dual-satck (IPv46) more versatile

---
 tinyDAV/src/bfcp/tdav_session_bfcp.c |  2 +-
 tinyDAV/src/msrp/tdav_session_msrp.c |  2 +-
 tinyDAV/src/tdav_session_av.c        | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'tinyDAV')

diff --git a/tinyDAV/src/bfcp/tdav_session_bfcp.c b/tinyDAV/src/bfcp/tdav_session_bfcp.c
index c69babc..021ca63 100755
--- a/tinyDAV/src/bfcp/tdav_session_bfcp.c
+++ b/tinyDAV/src/bfcp/tdav_session_bfcp.c
@@ -102,7 +102,7 @@ static int _tdav_session_bfcp_set(tmedia_session_t* p_self, const tmedia_param_t
         else if (tsk_striequals(param->key, "local-ip")) {
             tsk_strupdate(&p_bfcp->p_local_ip, param->value);
         }
-        else if (tsk_striequals(param->key, "local-ipver")) {
+        else if (tsk_striequals(param->key, "use-ipv6")) {
             p_bfcp->b_use_ipv6 = tsk_striequals(param->value, "ipv6");
         }
     }
diff --git a/tinyDAV/src/msrp/tdav_session_msrp.c b/tinyDAV/src/msrp/tdav_session_msrp.c
index 950fa25..a29c7c7 100755
--- a/tinyDAV/src/msrp/tdav_session_msrp.c
+++ b/tinyDAV/src/msrp/tdav_session_msrp.c
@@ -370,7 +370,7 @@ int tdav_session_msrp_set(tmedia_session_t* self, const tmedia_param_t* param)
         else if(tsk_striequals(param->key, "local-ip")) {
             tsk_strupdate(&msrp->local_ip, param->value);
         }
-        else if(tsk_striequals(param->key, "local-ipver")) {
+        else if(tsk_striequals(param->key, "use-ipv6")) {
             msrp->useIPv6 = tsk_striequals(param->value, "ipv6");
         }
         else if(tsk_striequals(param->key, "accept-types")) {
diff --git a/tinyDAV/src/tdav_session_av.c b/tinyDAV/src/tdav_session_av.c
index 3140100..3a0ea41 100755
--- a/tinyDAV/src/tdav_session_av.c
+++ b/tinyDAV/src/tdav_session_av.c
@@ -305,7 +305,7 @@ tsk_bool_t tdav_session_av_set(tdav_session_av_t* self, const tmedia_param_t* pa
                 tsk_strupdate(&self->local_ip, (const char*)param->value);
                 return tsk_true;
             }
-            else if(tsk_striequals(param->key, "local-ipver")) {
+            else if(tsk_striequals(param->key, "use-ipv6")) {
                 self->use_ipv6 = tsk_striequals(param->value, "ipv6");
                 return tsk_true;
             }
@@ -876,11 +876,11 @@ const tsdp_header_M_t* tdav_session_av_get_lo(tdav_session_av_t* self, tsk_bool_
     *updated = (base->ro_changed || !base->M.lo);
 
     if(!base->M.lo) {
-        if((base->M.lo = tsdp_header_M_create(base->plugin->media, self->rtp_manager->rtp.public_port, "RTP/AVP"))) {
+        if((base->M.lo = tsdp_header_M_create(base->plugin->media, self->rtp_manager->rtp.public_addr.port, "RTP/AVP"))) {
             /* If NATT is active, do not rely on the global IP address Connection line */
             if(self->natt_ctx) {
                 tsdp_header_M_add_headers(base->M.lo,
-                                          TSDP_HEADER_C_VA_ARGS("IN", self->use_ipv6 ? "IP6" : "IP4", self->rtp_manager->rtp.public_ip),
+					TSDP_HEADER_C_VA_ARGS("IN", TNET_SOCKET_TYPE_IS_IPV6(self->rtp_manager->rtp.public_addr.type) ? "IP6" : "IP4", self->rtp_manager->rtp.public_addr.ip),
                                           tsk_null);
             }
             /* 3GPP TS 24.229 - 6.1.1 General
@@ -1337,10 +1337,10 @@ const tsdp_header_M_t* tdav_session_av_get_lo(tdav_session_av_t* self, tsk_bool_
         }
         else {
             if(base->M.lo->C) {
-                tsk_strupdate(&base->M.lo->C->addr, self->rtp_manager->rtp.public_ip);
-                tsk_strupdate(&base->M.lo->C->addrtype, (self->use_ipv6 ? "IP6" : "IP4"));
+                tsk_strupdate(&base->M.lo->C->addr, self->rtp_manager->rtp.public_addr.ip);
+                tsk_strupdate(&base->M.lo->C->addrtype, (TNET_SOCKET_TYPE_IS_IPV6(self->rtp_manager->rtp.public_addr.type) ? "IP6" : "IP4"));
             }
-            base->M.lo->port = self->rtp_manager->rtp.public_port;
+            base->M.lo->port = self->rtp_manager->rtp.public_addr.port;
         }
 
         if(self->media_type & tmedia_audio) {
-- 
cgit v1.1