1 files changed, 0 insertions, 727 deletions
diff --git a/branches/1.0/bindings/_common/SipSession.cxx b/branches/1.0/bindings/_common/SipSession.cxx
deleted file mode 100644
index f8dbe72..0000000
--- a/branches/1.0/bindings/_common/SipSession.cxx
+++ /dev/null
@@ -1,727 +0,0 @@
-/*
-* Copyright (C) 2009-2010 Mamadou Diop.
-*
-* Contact: Mamadou Diop <diopmamadou(at)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 "SipSession.h"
-#include "SipStack.h"
-#include "MediaSessionMgr.h"
-
-#include "Msrp.h"
-
-/* ======================== AsyncAction ========================*/
-typedef struct twrap_async_action_s
-{
-	const tsip_ssession_handle_t *session;
-	const ActionConfig* config;
-}
-twrap_async_action_t;
-
-
-
-
-/* ======================== SipSession ========================*/
-SipSession::SipSession(SipStack* stack)
-{
-	this->init(stack);
-}
-
-SipSession::SipSession(SipStack* stack, tsip_ssession_handle_t* handle)
-{
-	this->init(stack, handle);
-}
-
-SipSession::~SipSession()
-{
-	tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_USERDATA(tsk_null),
-		TSIP_SSESSION_SET_NULL());
-
-	TSK_OBJECT_SAFE_FREE(this->handle);
-}
-
-void SipSession::init(SipStack* _stack, tsip_ssession_handle_t* _handle/*=tsk_null*/)
-{
-	if(_handle){
-		/* "server-side-session" */
-		if(tsip_ssession_take_ownership(_handle)){ /* should never happen */
-			TSK_DEBUG_ERROR("Failed to take ownership");
-			return;
-		}
-		this->handle = _handle;
-	}
-	else{
-		/* "client-side-session" */
-		this->handle = tsip_ssession_create(_stack->getHandle(),
-			TSIP_SSESSION_SET_USERDATA(this),
-			TSIP_SSESSION_SET_NULL());
-	}
-
-	/* set userdata (context) and ref. the stack handle */
-	tsip_ssession_set(this->handle,
-			TSIP_SSESSION_SET_USERDATA(this),
-			TSIP_SSESSION_SET_NULL());
-	this->stack = _stack;
-}
-
-bool SipSession::addHeader(const char* name, const char* value)
-{
-	return (tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_HEADER(name, value),
-		TSIP_SSESSION_SET_NULL()) == 0);
-}
-
-bool SipSession::haveOwnership()
-{
-	return (tsip_ssession_have_ownership(this->handle) == tsk_true);
-}
-
-bool SipSession::removeHeader(const char* name)
-{
-	return (tsip_ssession_set(this->handle,
-		TSIP_SSESSION_UNSET_HEADER(name),
-		TSIP_SSESSION_SET_NULL()) == 0);
-}
-
-bool SipSession::addCaps(const char* name, const char* value)
-{
-	return (tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_CAPS(name, value),
-		TSIP_SSESSION_SET_NULL()) == 0);
-}
-
-bool SipSession::addCaps(const char* name)
-{
-	return (tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_CAPS(name, tsk_null),
-		TSIP_SSESSION_SET_NULL()) == 0);
-}
-
-bool SipSession::removeCaps(const char* name)
-{
-	return (tsip_ssession_set(this->handle,
-		TSIP_SSESSION_UNSET_CAPS(name),
-		TSIP_SSESSION_SET_NULL()) == 0);
-}
-
-bool SipSession::setExpires(unsigned expires)
-{
-	return (tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_EXPIRES(expires),
-		TSIP_SSESSION_SET_NULL()) == 0);
-}
-
-bool SipSession::setFromUri(const char* fromUri)
-{
-	return (tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_FROM(fromUri),
-		TSIP_SSESSION_SET_NULL()) == 0);
-}
-
-bool SipSession::setToUri(const char* toUri)
-{
-	return (tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_TO(toUri),
-		TSIP_SSESSION_SET_NULL()) == 0);
-}
-
-bool SipSession::setSilentHangup(bool silent)
-{
-	return (tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_SILENT_HANGUP(silent ? tsk_true : tsk_false),
-		TSIP_SSESSION_SET_NULL()) == 0);
-}
-
-bool SipSession::addSigCompCompartment(const char* compId)
-{
-	return (tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_SIGCOMP_COMPARTMENT(compId),
-		TSIP_SSESSION_SET_NULL()) == 0);
-}
-
-bool SipSession::removeSigCompCompartment()
-{
-	return (tsip_ssession_set(this->handle,
-		TSIP_SSESSION_UNSET_SIGCOMP_COMPARTMENT(),
-		TSIP_SSESSION_SET_NULL()) == 0);
-}
-
-unsigned SipSession::getId()
-{
-	return (unsigned)tsip_ssession_get_id(this->handle);
-}
-
-const SipStack* SipSession::getStack()const
-{
-	return this->stack;
-}
-
-
-/* ======================== InviteSession ========================*/
-
-InviteSession::InviteSession(SipStack* Stack)
-: SipSession(Stack), mediaMgr(tsk_null)
-{
-}
-
-InviteSession::InviteSession(SipStack* Stack, tsip_ssession_handle_t* handle)
-: SipSession(Stack, handle), mediaMgr(tsk_null)
-{
-
-}
-
-InviteSession::~InviteSession()
-{
-	if(this->mediaMgr){
-		delete this->mediaMgr, this->mediaMgr = tsk_null;
-	}
-}
-
-#if ANDROID
-static void *__droid_hangup(void *param)
-{	
-	twrap_async_action_t* asyn_action = (twrap_async_action_t*)param;
-	const tsip_action_handle_t* action_cfg = asyn_action->config ? asyn_action->config->getHandle() : tsk_null;
-
-	tsip_action_BYE(asyn_action->session,
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL());
-
-	return tsk_null;
-}
-
-bool InviteSession::hangup(ActionConfig* config/*=tsk_null*/)
-{
-	void* tid[1] = {0};
-	tsip_ssession_handle_t *handle;
-	int ret;
-	twrap_async_action_t asyn_action = {0};
-	
-	handle = tsk_object_ref(this->handle);
-	asyn_action.config = config;
-	asyn_action.session = handle;
-	ret = tsk_thread_create(tid, __droid_hangup, &asyn_action);
-	tsk_thread_join(tid);
-	tsk_object_unref(handle);
-
-	return (ret == 0);
-}
-#else
-bool InviteSession::hangup(ActionConfig* config/*=tsk_null*/)
-{
-	return (tsip_action_BYE(this->handle,
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-#endif
-
-#if ANDROID
-static void *__droid_reject(void *param)
-{	
-	twrap_async_action_t* asyn_action = (twrap_async_action_t*)param;
-	const tsip_action_handle_t* action_cfg = asyn_action->config ? asyn_action->config->getHandle() : tsk_null;
-
-	tsip_action_REJECT(asyn_action->session,
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL());
-
-	return tsk_null;
-}
-
-bool InviteSession::reject(ActionConfig* config/*=tsk_null*/)
-{
-	void* tid[1] = {0};
-	tsip_ssession_handle_t *handle;
-	int ret;
-	twrap_async_action_t asyn_action = {0};
-	
-	handle = tsk_object_ref(this->handle);
-	asyn_action.config = config;
-	asyn_action.session = handle;
-	ret = tsk_thread_create(tid, __droid_reject, &asyn_action);
-	tsk_thread_join(tid);
-	tsk_object_unref(handle);
-
-	return (ret == 0);
-}
-#else
-bool InviteSession::reject(ActionConfig* config/*=tsk_null*/)
-{
-	const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null;
-
-	return (tsip_action_REJECT(this->handle,
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-#endif
-
-#if ANDROID
-static void *__droid_accept(void *param)
-{	
-	twrap_async_action_t* asyn_action = (twrap_async_action_t*)param;
-	const tsip_action_handle_t* action_cfg = asyn_action->config ? asyn_action->config->getHandle() : tsk_null;
-
-	tsip_action_ACCEPT(asyn_action->session,
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL());
-
-	return tsk_null;
-}
-
-bool InviteSession::accept(ActionConfig* config/*=tsk_null*/)
-{
-	void* tid[1] = {0};
-	tsip_ssession_handle_t *handle;
-	int ret;
-	twrap_async_action_t asyn_action = {0};
-	
-	
-	handle = tsk_object_ref(this->handle);
-	asyn_action.config = config;
-	asyn_action.session = handle;
-	ret = tsk_thread_create(tid, __droid_accept, &asyn_action);
-	tsk_thread_join(tid);
-	tsk_object_unref(handle);
-
-	return (ret == 0);
-}
-#else
-bool InviteSession::accept(ActionConfig* config/*=tsk_null*/)
-{
-	const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null;
-
-	return (tsip_action_ACCEPT(this->handle,
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-#endif
-
-const MediaSessionMgr* InviteSession::getMediaMgr()
-{
-	if(!this->mediaMgr && this->handle){
-		tmedia_session_mgr_t* mgr = tsip_session_get_mediamgr(this->handle);
-		if(mgr){
-			this->mediaMgr = new MediaSessionMgr(mgr);
-			tsk_object_unref(mgr);
-		}
-		else{
-			TSK_DEBUG_WARN("No media session associated to this session");
-		}
-	}
-	return this->mediaMgr;
-}
-
-
-/* ======================== CallSession ========================*/
-CallSession::CallSession(SipStack* Stack)
-: InviteSession(Stack)
-{
-}
-
-CallSession::CallSession(SipStack* Stack, tsip_ssession_handle_t* handle)
-: InviteSession(Stack, handle)
-{
-}
-
-CallSession::~CallSession()
-{
-}
-
-#define ANDROID32 1
-
-#if ANDROID
-typedef struct twrap_async_action_call_s
-{
-	const tsip_ssession_handle_t *session;
-	const ActionConfig* config;
-	tmedia_type_t media_type;
-}
-twrap_async_action_call_t;
-
-static void *__droid_call_thread(void *param)
-{	
-	twrap_async_action_call_t* asyn_action = (twrap_async_action_call_t*)param;
-	const tsip_action_handle_t* action_cfg = asyn_action->config ? asyn_action->config->getHandle() : tsk_null;
-
-	tsip_action_INVITE(asyn_action->session, asyn_action->media_type,
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL());
-
-	return tsk_null;
-}
-
-static bool __droid_call(tsip_ssession_handle_t * session_handle, tmedia_type_t type, ActionConfig* config/*=tsk_null*/)
-{
-	void* tid[1] = {0};
-	tsip_ssession_handle_t *handle;
-	int ret;
-	twrap_async_action_call_t asyn_action = {0};
-	
-	handle = tsk_object_ref(session_handle);
-	asyn_action.config = config;
-	asyn_action.session = handle;
-	asyn_action.media_type = type;
-
-	ret = tsk_thread_create(tid, __droid_call_thread, &asyn_action);
-	tsk_thread_join(tid);
-	tsk_object_unref(handle);
-
-	return (ret == 0);
-}
-#endif
-
-bool CallSession::callAudio(const char* remoteUri, ActionConfig* config/*=tsk_null*/)
-{
-	tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_TO(remoteUri),
-		TSIP_SSESSION_SET_NULL());
-#if ANDROID
-	__droid_call(this->handle, tmedia_audio, config);
-	return true;
-#else
-	const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null;
-	return (tsip_action_INVITE(this->handle, tmedia_audio,
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL()) == 0);
-#endif
-}
-
-bool CallSession::callAudioVideo(const char* remoteUri, ActionConfig* config/*=tsk_null*/)
-{
-	tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_TO(remoteUri),
-		TSIP_SSESSION_SET_NULL());
-#if ANDROID
-	__droid_call(this->handle, (tmedia_type_t)(tmedia_audio | tmedia_video), config);
-	return true;
-#else
-	const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null;
-	return (tsip_action_INVITE(this->handle, (tmedia_type_t)(tmedia_audio | tmedia_video),
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL()) == 0);
-#endif
-}
-
-bool CallSession::callVideo(const char* remoteUri, ActionConfig* config/*=tsk_null*/)
-{
-	tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_TO(remoteUri),
-		TSIP_SSESSION_SET_NULL());
-#if ANDROID
-	__droid_call(this->handle, tmedia_video, config);
-	return true;
-#else
-	const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null;
-	return (tsip_action_INVITE(this->handle, tmedia_video,
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL()) == 0);
-#endif
-}
-
-bool CallSession::setSessionTimer(unsigned timeout, const char* refresher)
-{
-	return (tsip_ssession_set(this->handle,
-			TSIP_SSESSION_SET_MEDIA(
-				TSIP_MSESSION_SET_TIMERS(timeout, refresher),
-				TSIP_MSESSION_SET_NULL()
-			),
-			TSIP_SSESSION_SET_NULL()) == 0);
-}
-
-bool CallSession::set100rel(bool enabled)
-{
-	if(enabled){
-		return (tsip_ssession_set(this->handle,
-			TSIP_SSESSION_SET_MEDIA(
-				TSIP_MSESSION_SET_100rel(),
-				TSIP_MSESSION_SET_NULL()
-			),
-			TSIP_SSESSION_SET_NULL()) == 0);
-	}
-	else{
-		return (tsip_ssession_set(this->handle,
-			TSIP_SSESSION_SET_MEDIA(
-				TSIP_MSESSION_UNSET_100rel(),
-				TSIP_MSESSION_SET_NULL()
-			),
-			TSIP_SSESSION_SET_NULL()) == 0);
-	}
-}
-
-bool CallSession::setQoS(tmedia_qos_stype_t type, tmedia_qos_strength_t strength)
-{
-	return (tsip_ssession_set(this->handle,
-			TSIP_SSESSION_SET_MEDIA(
-				TSIP_MSESSION_SET_QOS(type, strength),
-				TSIP_MSESSION_SET_NULL()
-			),
-			TSIP_SSESSION_SET_NULL()) == 0);
-}
-
-bool CallSession::hold(ActionConfig* config/*=tsk_null*/)
-{
-	const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null;
-
-	return (tsip_action_HOLD(this->handle, tmedia_all,
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL()) ==0 );
-}
-
-bool CallSession::resume(ActionConfig* config/*=tsk_null*/)
-{
-	const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null;
-
-	return (tsip_action_RESUME(this->handle, tmedia_all,
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-
-bool CallSession::sendDTMF(int number)
-{
-	return (tsip_action_DTMF(this->handle, number,
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-
-
-/* ======================== MsrpSession ========================*/
-
-MsrpSession::MsrpSession(SipStack* Stack, MsrpCallback* _callback)
-: InviteSession(Stack), callback(_callback)
-{
-	tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_MEDIA(
-			TSIP_MSESSION_SET_MSRP_CB(twrap_msrp_cb),
-			TSIP_MSESSION_SET_NULL()
-		),
-		TSIP_SSESSION_SET_NULL());
-}
-
-MsrpSession::MsrpSession(SipStack* Stack, tsip_ssession_handle_t* handle)
-: InviteSession(Stack, handle), callback(tsk_null)
-{
-	tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_MEDIA(
-			TSIP_MSESSION_SET_MSRP_CB(twrap_msrp_cb),
-			TSIP_MSESSION_SET_NULL()
-		),
-		TSIP_SSESSION_SET_NULL());
-}
-
-MsrpSession::~MsrpSession()
-{
-}
-
-bool MsrpSession::setCallback(MsrpCallback* _callback)
-{
-	this->callback = _callback;
-	return true;
-}
-
-bool MsrpSession::callMsrp(const char* remoteUri, ActionConfig* config/*=tsk_null*/)
-{
-	const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null;
-
-	tsip_ssession_set(this->handle,
-		TSIP_SSESSION_SET_TO(remoteUri),
-		TSIP_SSESSION_SET_NULL());
-
-	return (tsip_action_INVITE(this->handle, tmedia_msrp,
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-
-bool MsrpSession::sendMessage(const void* payload, unsigned len, ActionConfig* config/*=tsk_null*/)
-{
-	const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null;
-
-	return (tsip_action_LARGE_MESSAGE(this->handle,
-		TSIP_ACTION_SET_PAYLOAD(payload, len),
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-
-bool MsrpSession::sendFile(ActionConfig* config/*=tsk_null*/)
-{
-	return false;
-}
-
-/* ======================== MessagingSession ========================*/
-MessagingSession::MessagingSession(SipStack* Stack)
-: SipSession(Stack)
-{
-}
-
-MessagingSession::MessagingSession(SipStack* Stack, tsip_ssession_handle_t* handle)
-: SipSession(Stack, handle)
-{
-}
-
-MessagingSession::~MessagingSession()
-{
-}
-
-bool MessagingSession::send(const void* payload, unsigned len)
-{
-	TSK_DEBUG_INFO("MessagingSession::Send()");
-	int ret;
-	if(payload && len){
-		ret = tsip_action_MESSAGE(this->handle,
-			TSIP_ACTION_SET_PAYLOAD(payload, len),
-			TSIP_ACTION_SET_NULL());
-	}
-	else{
-		ret = tsip_action_PUBLISH(this->handle,
-			TSIP_ACTION_SET_NULL());
-	}
-	return (ret == 0);
-}
-
-bool MessagingSession::accept()
-{
-	return (tsip_action_ACCEPT(this->handle,
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-
-bool MessagingSession::reject()
-{
-	return (tsip_action_REJECT(this->handle,
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-
-
-/* ======================== OptionsSession ========================*/
-OptionsSession::OptionsSession(SipStack* Stack)
-: SipSession(Stack)
-{
-}
-
-OptionsSession::~OptionsSession()
-{
-}
-
-bool OptionsSession::send()
-{	
-	return (tsip_action_OPTIONS(this->handle,
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-
-
-
-
-
-/* ======================== PublicationSession ========================*/
-PublicationSession::PublicationSession(SipStack* Stack)
-: SipSession(Stack)
-{
-}
-
-PublicationSession::~PublicationSession()
-{
-}
-
-bool PublicationSession::publish(const void* payload, unsigned len)
-{
-	int ret;
-	if(payload && len){
-		ret = tsip_action_PUBLISH(this->handle,
-			TSIP_ACTION_SET_PAYLOAD(payload, len),
-			TSIP_ACTION_SET_NULL());
-	}
-	else{
-		ret = tsip_action_PUBLISH(this->handle,
-			TSIP_ACTION_SET_NULL());
-	}
-	return (ret == 0);
-}
-
-bool PublicationSession::unPublish()
-{
-	return (tsip_action_UNPUBLISH(this->handle,
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-
-
-
-/* ======================== RegistrationSession ========================*/
-RegistrationSession::RegistrationSession(SipStack* Stack)
-: SipSession(Stack)
-{
-}
-
-RegistrationSession::RegistrationSession(SipStack* Stack, tsip_ssession_handle_t* handle)
-: SipSession(Stack, handle)
-{
-
-}
-
-RegistrationSession::~RegistrationSession()
-{
-}
-
-bool RegistrationSession::register_()
-{
-	return (tsip_action_REGISTER(this->handle,
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-
-bool RegistrationSession::unRegister()
-{
-	return (tsip_action_UNREGISTER(this->handle,
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-
-bool RegistrationSession::accept(ActionConfig* config/*=tsk_null*/)
-{
-	const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null;
-
-	return (tsip_action_ACCEPT(this->handle,
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-
-bool RegistrationSession::reject(ActionConfig* config/*=tsk_null*/)
-{
-	const tsip_action_handle_t* action_cfg = config ? config->getHandle() : tsk_null;
-
-	return (tsip_action_REJECT(this->handle,
-		TSIP_ACTION_SET_CONFIG(action_cfg),
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-
-
-/* ======================== SubscriptionSession ========================*/
-SubscriptionSession::SubscriptionSession(SipStack* Stack)
-: SipSession(Stack)
-{
-}
-
-SubscriptionSession::~SubscriptionSession()
-{
-}
-
-bool SubscriptionSession::subscribe()
-{
-	return (tsip_action_SUBSCRIBE(this->handle,
-		TSIP_ACTION_SET_NULL()) == 0);
-}
-
-bool SubscriptionSession::unSubscribe()
-{
-	return (tsip_action_UNSUBSCRIBE(this->handle,
-		TSIP_ACTION_SET_NULL()) == 0);
-}