1 files changed, 244 insertions, 245 deletions

diff --git a/tinySIP/src/api/tsip_api_invite.c b/tinySIP/src/api/tsip_api_invite.c
index 530eb67..9cdaa9f 100755
--- a/tinySIP/src/api/tsip_api_invite.c
+++ b/tinySIP/src/api/tsip_api_invite.c
@@ -2,19 +2,19 @@
 * Copyright (C) 2010-2011 Mamadou Diop.
 *
 * Contact: Mamadou Diop <diopmamadou(at)doubango[dot]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.
 *
@@ -45,274 +45,274 @@ extern int _tsip_api_common_any(const tsip_ssession_handle_t *ss, tsip_action_ty
 
 int tsip_invite_event_signal(tsip_invite_event_type_t type, tsip_ssession_handle_t* ss, short status_code, const char *phrase, const tsip_message_t* sipmessage)
 {
-	tsip_invite_event_t* sipevent = TSIP_INVITE_EVENT_CREATE(type);
-	tsip_event_init(TSIP_EVENT(sipevent), ss, status_code, phrase, sipmessage, tsip_event_invite);
+    tsip_invite_event_t* sipevent = TSIP_INVITE_EVENT_CREATE(type);
+    tsip_event_init(TSIP_EVENT(sipevent), ss, status_code, phrase, sipmessage, tsip_event_invite);
 
-	TSK_RUNNABLE_ENQUEUE_OBJECT(TSK_RUNNABLE(TSIP_SSESSION(ss)->stack), sipevent);
+    TSK_RUNNABLE_ENQUEUE_OBJECT(TSK_RUNNABLE(TSIP_SSESSION(ss)->stack), sipevent);
 
-	return 0;
+    return 0;
 }
 
 int tsip_api_invite_send_invite(const tsip_ssession_handle_t *ss, tmedia_type_t type, ...)
 {
-	const tsip_ssession_t* _ss;
-	va_list ap;
-	tsip_action_t* action;
-	tsip_dialog_t* dialog;
-	int ret = -1;
-
-	if(!(_ss = ss) || !_ss->stack){
-		TSK_DEBUG_ERROR("Invalid parameter.");
-		return ret;
-	}
-
-	/* Checks if the stack has been started */
-	if(!TSK_RUNNABLE(_ss->stack)->started){
-		TSK_DEBUG_ERROR("Stack not started.");
-		return -2;
-	}
-	
-	va_start(ap, type);
-	if((action = _tsip_action_create(tsip_atype_invite, &ap))){
-		tsk_bool_t new_dialog = tsk_false;
-		/* Media type */
-		action->media.type = type;
-
-		if(!(dialog = tsip_dialog_layer_find_by_ss(_ss->stack->layer_dialog, ss))){
-			dialog = tsip_dialog_layer_new(_ss->stack->layer_dialog, tsip_dialog_INVITE, ss);
-			new_dialog = tsk_true;
-		}
-		if(!(ret = tsip_dialog_fsm_act(dialog, action->type, tsk_null, action))){
-			if(new_dialog){ // otherwise we are trying to refresh the media type and the type will be updated if 200 OK
-				TSIP_SSESSION(_ss)->media.type = type; // Update Session Media Type
-			}
-		}
-		
-		tsk_object_unref(dialog);
-		TSK_OBJECT_SAFE_FREE(action);
-	}
-	va_end(ap);
-
-	return ret;
+    const tsip_ssession_t* _ss;
+    va_list ap;
+    tsip_action_t* action;
+    tsip_dialog_t* dialog;
+    int ret = -1;
+
+    if(!(_ss = ss) || !_ss->stack) {
+        TSK_DEBUG_ERROR("Invalid parameter.");
+        return ret;
+    }
+
+    /* Checks if the stack has been started */
+    if(!TSK_RUNNABLE(_ss->stack)->started) {
+        TSK_DEBUG_ERROR("Stack not started.");
+        return -2;
+    }
+
+    va_start(ap, type);
+    if((action = _tsip_action_create(tsip_atype_invite, &ap))) {
+        tsk_bool_t new_dialog = tsk_false;
+        /* Media type */
+        action->media.type = type;
+
+        if(!(dialog = tsip_dialog_layer_find_by_ss(_ss->stack->layer_dialog, ss))) {
+            dialog = tsip_dialog_layer_new(_ss->stack->layer_dialog, tsip_dialog_INVITE, ss);
+            new_dialog = tsk_true;
+        }
+        if(!(ret = tsip_dialog_fsm_act(dialog, action->type, tsk_null, action))) {
+            if(new_dialog) { // otherwise we are trying to refresh the media type and the type will be updated if 200 OK
+                TSIP_SSESSION(_ss)->media.type = type; // Update Session Media Type
+            }
+        }
+
+        tsk_object_unref(dialog);
+        TSK_OBJECT_SAFE_FREE(action);
+    }
+    va_end(ap);
+
+    return ret;
 }
 
 int tsip_api_invite_send_info(const tsip_ssession_handle_t *ss, ...)
 {
-	int ret = -1;
-	tsip_action_t* action;
-	const tsip_ssession_t* _ss;
-	va_list ap;
-
-	/* Checks for validity */
-	if(!(_ss = ss) || !_ss->stack){
-		TSK_DEBUG_ERROR("Invalid parameter.");
-		return ret;
-	}
-	
-	/* Checks if the stack has been started */
-	if(!TSK_RUNNABLE(_ss->stack)->started){
-		TSK_DEBUG_ERROR("Stack not started.");
-		return -2;
-	}
-
-	va_start(ap, ss);
-	/* execute action */
-	if((action = _tsip_action_create(tsip_atype_info_send, &ap))){
-		/* Perform action */
-		ret = tsip_ssession_handle(_ss, action);
-		TSK_OBJECT_SAFE_FREE(action);
-	}
-	va_end(ap);
-
-	return ret;
+    int ret = -1;
+    tsip_action_t* action;
+    const tsip_ssession_t* _ss;
+    va_list ap;
+
+    /* Checks for validity */
+    if(!(_ss = ss) || !_ss->stack) {
+        TSK_DEBUG_ERROR("Invalid parameter.");
+        return ret;
+    }
+
+    /* Checks if the stack has been started */
+    if(!TSK_RUNNABLE(_ss->stack)->started) {
+        TSK_DEBUG_ERROR("Stack not started.");
+        return -2;
+    }
+
+    va_start(ap, ss);
+    /* execute action */
+    if((action = _tsip_action_create(tsip_atype_info_send, &ap))) {
+        /* Perform action */
+        ret = tsip_ssession_handle(_ss, action);
+        TSK_OBJECT_SAFE_FREE(action);
+    }
+    va_end(ap);
+
+    return ret;
 }
 
 int tsip_api_invite_send_hold(const tsip_ssession_handle_t *ss, tmedia_type_t type, ...)
 {
-	int ret = -1;
-	tsip_action_t* action;
-	const tsip_ssession_t* _ss;
-	va_list ap;
-
-	/* Checks for validity */
-	if(!(_ss = ss) || !_ss->stack){
-		TSK_DEBUG_ERROR("Invalid parameter.");
-		return ret;
-	}
-	
-	/* Checks if the stack has been started */
-	if(!TSK_RUNNABLE(_ss->stack)->started){
-		TSK_DEBUG_ERROR("Stack not started.");
-		return -2;
-	}
-
-	va_start(ap, type);
-	/* execute action */
-	if((action = _tsip_action_create(tsip_atype_hold, &ap))){
-		/* Media type */
-		action->media.type = type;
-		/* Perform action */
-		ret = tsip_ssession_handle(_ss, action);
-		TSK_OBJECT_SAFE_FREE(action);
-	}
-	va_end(ap);
-
-	return ret;
+    int ret = -1;
+    tsip_action_t* action;
+    const tsip_ssession_t* _ss;
+    va_list ap;
+
+    /* Checks for validity */
+    if(!(_ss = ss) || !_ss->stack) {
+        TSK_DEBUG_ERROR("Invalid parameter.");
+        return ret;
+    }
+
+    /* Checks if the stack has been started */
+    if(!TSK_RUNNABLE(_ss->stack)->started) {
+        TSK_DEBUG_ERROR("Stack not started.");
+        return -2;
+    }
+
+    va_start(ap, type);
+    /* execute action */
+    if((action = _tsip_action_create(tsip_atype_hold, &ap))) {
+        /* Media type */
+        action->media.type = type;
+        /* Perform action */
+        ret = tsip_ssession_handle(_ss, action);
+        TSK_OBJECT_SAFE_FREE(action);
+    }
+    va_end(ap);
+
+    return ret;
 }
 
 int tsip_api_invite_send_resume(const tsip_ssession_handle_t *ss, tmedia_type_t type, ...)
 {
-	int ret = -1;
-	tsip_action_t* action;
-	const tsip_ssession_t* _ss;
-	va_list ap;
-
-	/* Checks for validity */
-	if(!(_ss = ss) || !_ss->stack){
-		TSK_DEBUG_ERROR("Invalid parameter.");
-		return ret;
-	}
-	
-	/* Checks if the stack has been started */
-	if(!TSK_RUNNABLE(_ss->stack)->started){
-		TSK_DEBUG_ERROR("Stack not started.");
-		return -2;
-	}
-
-	va_start(ap, type);
-	/* execute action */
-	if((action = _tsip_action_create(tsip_atype_resume, &ap))){
-		/* Media type */
-		action->media.type = type;
-		/* Perform action */
-		ret = tsip_ssession_handle(_ss, action);
-		TSK_OBJECT_SAFE_FREE(action);
-	}
-	va_end(ap);
-
-	return ret;
+    int ret = -1;
+    tsip_action_t* action;
+    const tsip_ssession_t* _ss;
+    va_list ap;
+
+    /* Checks for validity */
+    if(!(_ss = ss) || !_ss->stack) {
+        TSK_DEBUG_ERROR("Invalid parameter.");
+        return ret;
+    }
+
+    /* Checks if the stack has been started */
+    if(!TSK_RUNNABLE(_ss->stack)->started) {
+        TSK_DEBUG_ERROR("Stack not started.");
+        return -2;
+    }
+
+    va_start(ap, type);
+    /* execute action */
+    if((action = _tsip_action_create(tsip_atype_resume, &ap))) {
+        /* Media type */
+        action->media.type = type;
+        /* Perform action */
+        ret = tsip_ssession_handle(_ss, action);
+        TSK_OBJECT_SAFE_FREE(action);
+    }
+    va_end(ap);
+
+    return ret;
 }
 
 int tsip_api_invite_send_large_message(const tsip_ssession_handle_t *ss, ...)
 {
-	int ret = -1;
-	va_list ap;
-	
-	va_start(ap, ss);
-	if((ret = _tsip_api_common_any(ss, tsip_atype_lmessage, &ap))){
-		TSK_DEBUG_ERROR("Failed to send MSRP message");
-	}
-	va_end(ap);
-	
-	return ret;
+    int ret = -1;
+    va_list ap;
+
+    va_start(ap, ss);
+    if((ret = _tsip_api_common_any(ss, tsip_atype_lmessage, &ap))) {
+        TSK_DEBUG_ERROR("Failed to send MSRP message");
+    }
+    va_end(ap);
+
+    return ret;
 }
 
 int tsip_api_invite_send_ect(const tsip_ssession_handle_t *ss, const char* toUri, ...)
 {
-	int ret = -1;
-	tsip_action_t* action;
-	const tsip_ssession_t* _ss;
-	va_list ap;
-
-	/* Checks for validity */
-	if(!(_ss = ss) || !_ss->stack || !toUri){
-		TSK_DEBUG_ERROR("Invalid parameter.");
-		return ret;
-	}
-	
-	/* Checks if the stack has been started */
-	if(!TSK_RUNNABLE(_ss->stack)->started){
-		TSK_DEBUG_ERROR("Stack not started.");
-		return -2;
-	}
-
-	va_start(ap, toUri);
-	/* execute action */
-	if((action = _tsip_action_create(tsip_atype_ect, &ap))){
-		/* Refer-To */
-		action->ect.to = tsk_strdup(toUri);
-		/* Perform action */
-		ret = tsip_ssession_handle(_ss, action);
-		TSK_OBJECT_SAFE_FREE(action);
-	}
-	va_end(ap);
-
-	return ret;
+    int ret = -1;
+    tsip_action_t* action;
+    const tsip_ssession_t* _ss;
+    va_list ap;
+
+    /* Checks for validity */
+    if(!(_ss = ss) || !_ss->stack || !toUri) {
+        TSK_DEBUG_ERROR("Invalid parameter.");
+        return ret;
+    }
+
+    /* Checks if the stack has been started */
+    if(!TSK_RUNNABLE(_ss->stack)->started) {
+        TSK_DEBUG_ERROR("Stack not started.");
+        return -2;
+    }
+
+    va_start(ap, toUri);
+    /* execute action */
+    if((action = _tsip_action_create(tsip_atype_ect, &ap))) {
+        /* Refer-To */
+        action->ect.to = tsk_strdup(toUri);
+        /* Perform action */
+        ret = tsip_ssession_handle(_ss, action);
+        TSK_OBJECT_SAFE_FREE(action);
+    }
+    va_end(ap);
+
+    return ret;
 }
 
 int tsip_api_invite_send_ect_accept(const tsip_ssession_handle_t *ss, ...)
 {
-	int ret = -1;
-	va_list ap;
-	
-	va_start(ap, ss);
-	if((ret = _tsip_api_common_any(ss, tsip_atype_ect_accept, &ap))){
-		TSK_DEBUG_ERROR("Failed to accept incoming ECT");
-	}
-	va_end(ap);
-	
-	return ret;
+    int ret = -1;
+    va_list ap;
+
+    va_start(ap, ss);
+    if((ret = _tsip_api_common_any(ss, tsip_atype_ect_accept, &ap))) {
+        TSK_DEBUG_ERROR("Failed to accept incoming ECT");
+    }
+    va_end(ap);
+
+    return ret;
 }
 
 int tsip_api_invite_send_ect_reject(const tsip_ssession_handle_t *ss, ...)
 {
-	int ret = -1;
-	va_list ap;
-	
-	va_start(ap, ss);
-	if((ret = _tsip_api_common_any(ss, tsip_atype_ect_reject, &ap))){
-		TSK_DEBUG_ERROR("Failed to reject incoming ECT");
-	}
-	va_end(ap);
-	
-	return ret;
+    int ret = -1;
+    va_list ap;
+
+    va_start(ap, ss);
+    if((ret = _tsip_api_common_any(ss, tsip_atype_ect_reject, &ap))) {
+        TSK_DEBUG_ERROR("Failed to reject incoming ECT");
+    }
+    va_end(ap);
+
+    return ret;
 }
 
 int tsip_api_invite_send_dtmf(const tsip_ssession_handle_t *ss, int event, ...)
 {
-	int ret = -1;
-	tsip_action_t* action;
-	const tsip_ssession_t* _ss;
-	va_list ap;
-
-	/* Checks for validity */
-	if(!(_ss = ss) || !_ss->stack || (event <0 || event>15)){
-		TSK_DEBUG_ERROR("Invalid parameter.");
-		return ret;
-	}
-	
-	/* Checks if the stack has been started */
-	if(!TSK_RUNNABLE(_ss->stack)->started){
-		TSK_DEBUG_ERROR("Stack not started.");
-		return -2;
-	}
-
-	va_start(ap, event);
-	/* execute action */
-	if((action = _tsip_action_create(tsip_atype_dtmf_send, &ap))){
-		/* Event */
-		action->dtmf.event = event;
-		/* Perform action */
-		ret = tsip_ssession_handle(_ss, action);
-		TSK_OBJECT_SAFE_FREE(action);
-	}
-	va_end(ap);
-
-	return ret;
+    int ret = -1;
+    tsip_action_t* action;
+    const tsip_ssession_t* _ss;
+    va_list ap;
+
+    /* Checks for validity */
+    if(!(_ss = ss) || !_ss->stack || (event <0 || event>15)) {
+        TSK_DEBUG_ERROR("Invalid parameter.");
+        return ret;
+    }
+
+    /* Checks if the stack has been started */
+    if(!TSK_RUNNABLE(_ss->stack)->started) {
+        TSK_DEBUG_ERROR("Stack not started.");
+        return -2;
+    }
+
+    va_start(ap, event);
+    /* execute action */
+    if((action = _tsip_action_create(tsip_atype_dtmf_send, &ap))) {
+        /* Event */
+        action->dtmf.event = event;
+        /* Perform action */
+        ret = tsip_ssession_handle(_ss, action);
+        TSK_OBJECT_SAFE_FREE(action);
+    }
+    va_end(ap);
+
+    return ret;
 }
 
 int tsip_api_invite_send_bye(const tsip_ssession_handle_t *ss, ...)
 {
-	int ret = -1;
-	va_list ap;
+    int ret = -1;
+    va_list ap;
 
-	va_start(ap, ss);
-	if((ret = _tsip_api_common_any(ss, tsip_atype_bye, &ap))){
-		TSK_DEBUG_ERROR("Bye() failed.");
-	}
-	va_end(ap);
+    va_start(ap, ss);
+    if((ret = _tsip_api_common_any(ss, tsip_atype_bye, &ap))) {
+        TSK_DEBUG_ERROR("Bye() failed.");
+    }
+    va_end(ap);
 
-	return ret;
+    return ret;
 }
 
 
@@ -332,32 +332,31 @@ int tsip_api_invite_send_bye(const tsip_ssession_handle_t *ss, ...)
 //
 static tsk_object_t* tsip_invite_event_ctor(tsk_object_t * self, va_list * app)
 {
-	tsip_invite_event_t *sipevent = self;
-	if(sipevent){
-		sipevent->type = va_arg(*app, tsip_invite_event_type_t);
-	}
-	return self;
+    tsip_invite_event_t *sipevent = self;
+    if(sipevent) {
+        sipevent->type = va_arg(*app, tsip_invite_event_type_t);
+    }
+    return self;
 }
 
 static tsk_object_t* tsip_invite_event_dtor(tsk_object_t * self)
-{ 
-	tsip_invite_event_t *sipevent = self;
-	if(sipevent){
-		tsip_event_deinit(TSIP_EVENT(sipevent));
-	}
-	return self;
+{
+    tsip_invite_event_t *sipevent = self;
+    if(sipevent) {
+        tsip_event_deinit(TSIP_EVENT(sipevent));
+    }
+    return self;
 }
 
 static int tsip_invite_event_cmp(const tsk_object_t *obj1, const tsk_object_t *obj2)
 {
-	return -1;
+    return -1;
 }
 
-static const tsk_object_def_t tsip_invite_event_def_s = 
-{
-	sizeof(tsip_invite_event_t),
-	tsip_invite_event_ctor, 
-	tsip_invite_event_dtor,
-	tsip_invite_event_cmp, 
+static const tsk_object_def_t tsip_invite_event_def_s = {
+    sizeof(tsip_invite_event_t),
+    tsip_invite_event_ctor,
+    tsip_invite_event_dtor,
+    tsip_invite_event_cmp,
 };
 const tsk_object_def_t *tsip_invite_event_def_t = &tsip_invite_event_def_s;