Workaround for ICE issue in Asterisk

branches/2.0/doubango/tinyNET/src/ice/tnet_ice_ctx.h

@@ -76,6 +76,7 @@ TINYNET_API int tnet_ice_ctx_start(struct tnet_ice_ctx_s* self);
 TINYNET_API int tnet_ice_ctx_rtp_callback(struct tnet_ice_ctx_s* self, tnet_ice_rtp_callback_f rtp_callback, const void* rtp_callback_data);
 TINYNET_API int tnet_ice_ctx_set_concheck_timeout(struct tnet_ice_ctx_s* self, int64_t timeout);
 TINYNET_API int tnet_ice_ctx_set_remote_candidates(struct tnet_ice_ctx_s* self, const char* candidates, const char* ufrag, const char* pwd, tsk_bool_t is_controlling, tsk_bool_t is_ice_jingle);
+TINYNET_API int tnet_ice_ctx_set_remote_candidates_2(struct tnet_ice_ctx_s* self, const char* candidates, const char* ufrag, const char* pwd, tsk_bool_t is_controlling, tsk_bool_t is_ice_jingle, tsk_bool_t use_rtcpmux);
 TINYNET_API int tnet_ice_ctx_set_rtcpmux(struct tnet_ice_ctx_s* self, tsk_bool_t use_rtcpmux);
 TINYNET_API int tnet_ice_ctx_set_ssl_certs(struct tnet_ice_ctx_s* self, const char* path_priv, const char* path_pub, const char* path_ca, tsk_bool_t verify);
 TINYNET_API tsk_size_t tnet_ice_ctx_count_local_candidates(const struct tnet_ice_ctx_s* self);

branches/2.0/doubango/tinyNET/src/ice/tnet_ice_event.c

@@ -1,85 +1,85 @@
-/*
-* Copyright (C) 2012-2014 Mamadou DIOP
-* Copyright (C) 2012-2014 Doubango Telecom <http://www.doubango.org>.
-*
-* This file is part of Open Source Doubango Framework.
-*
-* DOUBANGO is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*	
-* DOUBANGO is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*	
-* You should have received a copy of the GNU General Public License
-* along with DOUBANGO.
-*
-*/
-#include "tnet_ice_event.h"
-
-#include "tsk_string.h"
-#include "tsk_memory.h"
-#include "tsk_debug.h"
-
+/*
+ * Copyright (C) 2012-2014 Mamadou DIOP
+ * Copyright (C) 2012-2014 Doubango Telecom <http://www.doubango.org>.
+ *
+ * This file is part of Open Source Doubango Framework.
+ *
+ * DOUBANGO is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DOUBANGO is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with DOUBANGO.
+ *
+ */
+#include "tnet_ice_event.h"
+
+#include "tsk_string.h"
+#include "tsk_memory.h"
+#include "tsk_debug.h"
+
 static tsk_object_t* tnet_ice_event_ctor(tsk_object_t * self, va_list * app)
 {
-	tnet_ice_event_t *e = self;
-	if(e){
-		
-	}
-	return self;
+    tnet_ice_event_t *e = self;
+    if(e){
+        
+    }
+    return self;
 }
 static tsk_object_t* tnet_ice_event_dtor(tsk_object_t * self)
-{ 
-	tnet_ice_event_t *e = self;
-	if(e){
-		TSK_SAFE_FREE(e->phrase);
-		TSK_OBJECT_SAFE_FREE(e->action);
-		e->ctx = tsk_null; // not the owner (const)
-	}
-
-	return self;
-}
-static const tsk_object_def_t tnet_ice_event_def_s = 
 {
-	sizeof(tnet_ice_event_t),
-	tnet_ice_event_ctor, 
-	tnet_ice_event_dtor,
-	tsk_null, 
+    tnet_ice_event_t *e = self;
+    if(e){
+        TSK_SAFE_FREE(e->phrase);
+        TSK_OBJECT_SAFE_FREE(e->action);
+        e->ctx = tsk_null; // not the owner (const)
+    }
+    
+    return self;
+}
+static const tsk_object_def_t tnet_ice_event_def_s =
+{
+    sizeof(tnet_ice_event_t),
+    tnet_ice_event_ctor,
+    tnet_ice_event_dtor,
+    tsk_null,
 };
 const tsk_object_def_t *tnet_ice_event_def_t = &tnet_ice_event_def_s;
 
 
 tnet_ice_event_t* tnet_ice_event_create(const struct tnet_ice_ctx_s* ctx, tnet_ice_event_type_t type, const char* phrase, const void* userdata)
 {
-	tnet_ice_event_t* e;
-
-	if((e = tsk_object_new(tnet_ice_event_def_t))){
-		e->ctx = ctx;
-		e->type = type;
-		e->phrase = tsk_strdup(phrase);
-		e->userdata = userdata;
-	}
-	else{
-		TSK_DEBUG_ERROR("Failed to create ICE event");
-	}
-
-	return e;
+    tnet_ice_event_t* e;
+    
+    if((e = tsk_object_new(tnet_ice_event_def_t))){
+        e->ctx = ctx;
+        e->type = type;
+        e->phrase = tsk_strdup(phrase);
+        e->userdata = userdata;
+    }
+    else{
+        TSK_DEBUG_ERROR("Failed to create ICE event");
+    }
+    
+    return e;
 }
 
 int tnet_ice_event_set_action(tnet_ice_event_t* self, struct tnet_ice_action_s* action)
 {
-	if(!self){
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-	self->type = tnet_ice_event_type_action;
-	TSK_OBJECT_SAFE_FREE(self->action);
-	if(action){
-		self->action = tsk_object_ref(action);
-	}
-	return 0;
+    if(!self){
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    self->type = tnet_ice_event_type_action;
+    TSK_OBJECT_SAFE_FREE(self->action);
+    if(action){
+        self->action = tsk_object_ref(action);
+    }
+    return 0;
 }