May 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5146 - freeswitch/trunk/libs/iax/src
by Freeswitch SVN 11 May '07

11 May '07

Author: anthm Date: Fri May 11 00:09:47 2007 New Revision: 5146 Modified: freeswitch/trunk/libs/iax/src/iax-mutex.c Log: fix build of iax-mutex.c Modified: freeswitch/trunk/libs/iax/src/iax-mutex.c ============================================================================== --- freeswitch/trunk/libs/iax/src/iax-mutex.c (original) +++ freeswitch/trunk/libs/iax/src/iax-mutex.c Fri May 11 00:09:47 2007 @@ -17,7 +17,8 @@ * */ - +#define _XOPEN_SOURCE 600 +#include <stdlib.h> #include "iax-mutex.h" @@ -29,7 +30,7 @@ }; #else -#define _XOPEN_SOURCE 600 + #include <pthread.h> struct mutex { pthread_mutex_t mutex;

1 0

[commit] r5145 - freeswitch/trunk/libs/iax/src
by Freeswitch SVN 11 May '07

11 May '07

Author: anthm Date: Thu May 10 23:46:24 2007 New Revision: 5145 Modified: freeswitch/trunk/libs/iax/src/iax-mutex.c Log: fix compile Modified: freeswitch/trunk/libs/iax/src/iax-mutex.c ============================================================================== --- freeswitch/trunk/libs/iax/src/iax-mutex.c (original) +++ freeswitch/trunk/libs/iax/src/iax-mutex.c Thu May 10 23:46:24 2007 @@ -29,7 +29,7 @@ }; #else - +#define _XOPEN_SOURCE 600 #include <pthread.h> struct mutex { pthread_mutex_t mutex; @@ -64,7 +64,7 @@ goto success; fail: - pthread_mutexattr_destroy(&mattr); + pthread_mutexattr_destroy(&attr); goto done; success:

1 0

[commit] r5144 - freeswitch/trunk/libs/iax/src
by Freeswitch SVN 11 May '07

11 May '07

Author: mikej Date: Thu May 10 23:41:06 2007 New Revision: 5144 Modified: freeswitch/trunk/libs/iax/src/iax-mutex.c Log: make pthread mutexes nested. Modified: freeswitch/trunk/libs/iax/src/iax-mutex.c ============================================================================== --- freeswitch/trunk/libs/iax/src/iax-mutex.c (original) +++ freeswitch/trunk/libs/iax/src/iax-mutex.c Thu May 10 23:41:06 2007 @@ -40,22 +40,40 @@ mutex_status_t iax_mutex_create(mutex_t **mutex) { + mutex_status_t status = MUTEX_FAILURE; +#ifndef WIN32 + pthread_mutexattr_t attr; +#endif mutex_t *check = NULL; check = (mutex_t *)malloc(sizeof(**mutex)); if (!check) - return MUTEX_FAILURE; + goto done; #ifdef WIN32 InitializeCriticalSection(&check->mutex); #else - if (pthread_mutex_init(&check->mutex, NULL)) - return MUTEX_FAILURE; + if (pthread_mutexattr_init(&attr)) + goto done; -#endif + if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE)) + goto fail; + + if (pthread_mutex_init(&check->mutex, &attr)) + goto fail; + goto success; + +fail: + pthread_mutexattr_destroy(&mattr); + goto done; + +success: +#endif *mutex = check; + status = MUTEX_SUCCESS; - return MUTEX_SUCCESS; +done: + return status; } mutex_status_t iax_mutex_destroy(mutex_t *mutex)

1 0

[commit] r5143 - freeswitch/trunk/src
by Freeswitch SVN 11 May '07

11 May '07

Author: anthm Date: Thu May 10 21:47:13 2007 New Revision: 5143 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: update Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Thu May 10 21:47:13 2007 @@ -917,8 +917,7 @@ //Make sure we made it out alive if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - break; + goto done; } //we only get one digit out of playback, see if thats all we needed and what we got if (max_digits == 1 && status == SWITCH_STATUS_BREAK) { @@ -938,8 +937,7 @@ //Make sure we made it out alive if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - break; + goto done; } } } @@ -957,8 +955,7 @@ //Make sure we made it out alive if (status != SWITCH_STATUS_SUCCESS) { //Bail - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - break; + goto done; } //see if we got enough if (min_digits <= strlen(digit_buffer)) { @@ -977,8 +974,7 @@ //Make sure we made it out alive if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - break; + goto done; } } } @@ -989,6 +985,7 @@ } } + done: //if we got here, we got no digits or lost the channel digit_buffer = "\0"; return SWITCH_STATUS_FALSE;

1 0

[commit] r5142 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 May '07

11 May '07

Author: anthm Date: Thu May 10 20:41:40 2007 New Revision: 5142 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu May 10 20:41:40 2007 @@ -281,7 +281,7 @@ if (!from_user || !from_host) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not do authorization without a complete from header\n"); - nua_respond(nh, SIP_500_INTERNAL_SERVER_ERROR, TAG_END()); + nua_respond(nh, SIP_401_UNAUTHORIZED, NUTAG_WITH_THIS(nua), TAG_END()); return 1; }

1 0

[commit] r5141 - freeswitch/trunk/src
by Freeswitch SVN 11 May '07

11 May '07

Author: anthm Date: Thu May 10 20:30:23 2007 New Revision: 5141 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_scheduler.c Log: update Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu May 10 20:30:23 2007 @@ -76,7 +76,7 @@ send_heartbeat(); /* reschedule this task */ - task->runtime += 20; + task->runtime = time(NULL) + 20; } Modified: freeswitch/trunk/src/switch_scheduler.c ============================================================================== --- freeswitch/trunk/src/switch_scheduler.c (original) +++ freeswitch/trunk/src/switch_scheduler.c Thu May 10 20:30:23 2007 @@ -77,6 +77,11 @@ } else { int64_t now = time(NULL); if (now >= tp->task.runtime && !tp->in_thread) { + int32_t diff = now - tp->task.runtime; + if (diff > 1) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Task was executed late by %d seconds %u %s (%s)\n", + diff, tp->task.task_id, tp->desc, switch_str_nil(tp->task.group)); + } tp->executed = now; if (switch_test_flag(tp, SSHF_OWN_THREAD)) { switch_thread_t *thread;

1 0

[commit] r5140 - in freeswitch/trunk/src: . include mod/endpoints/mod_alsa mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_portaudio mod/endpoints/mod_sofia mod/endpoints/mod_wanpipe mod/endpoints/mod_woomera
by Freeswitch SVN 11 May '07

11 May '07

Author: anthm Date: Thu May 10 20:27:55 2007 New Revision: 5140 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/trunk/src/switch_core_session.c Log: add some robustness to deal with runaway threads Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu May 10 20:27:55 2007 @@ -428,12 +428,15 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch_endpoint_interface_t *endpoint_interface, switch_memory_pool_t **pool); + +SWITCH_DECLARE(void) switch_core_session_perform_destroy(switch_core_session_t **session, const char *file, const char *func, int line); + /*! \brief Destroy a session and return the memory pool to the core \param session pointer to a pointer of the session to destroy \return */ -SWITCH_DECLARE(void) switch_core_session_destroy(switch_core_session_t **session); +#define switch_core_session_destroy(session) switch_core_session_perform_destroy(session, __FILE__, __SWITCH_FUNC__, __LINE__) /*! \brief Provide the total number of sessions @@ -458,8 +461,9 @@ /*! \brief Launch the session thread (state machine) on a given session \param session the session to activate the state machine on + \return SWITCH_STATUS_SUCCESS if the thread was launched */ -SWITCH_DECLARE(void) switch_core_session_thread_launch(switch_core_session_t *session); +SWITCH_DECLARE(switch_status_t) switch_core_session_thread_launch(switch_core_session_t *session); /*! \brief Retrieve a pointer to the channel object associated with a given session Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Thu May 10 20:27:55 2007 @@ -1504,9 +1504,15 @@ switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); switch_channel_mark_answered(channel); switch_channel_set_state(channel, CS_INIT); - switch_core_session_thread_launch(tech_pvt->session); - add_pvt(tech_pvt, PA_MASTER); - stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session)); + + if (switch_core_session_thread_launch(tech_pvt->session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + switch_core_session_destroy(&session); + stream->write_function(stream, "FAIL:Thread Error!\n"); + } else { + add_pvt(tech_pvt, PA_MASTER); + stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session)); + } } else { switch_core_session_destroy(&session); stream->write_function(stream, "FAIL:Device Error!\n"); Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu May 10 20:27:55 2007 @@ -2720,7 +2720,12 @@ tech_pvt->dlsession = dlsession; switch_channel_set_name(channel, "DingaLing/new"); switch_channel_set_state(channel, CS_INIT); - switch_core_session_thread_launch(session); + if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + terminate_session(&session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + status = LDL_STATUS_FALSE; + goto done; + } } else { status = LDL_STATUS_FALSE; goto done; Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Thu May 10 20:27:55 2007 @@ -1128,7 +1128,10 @@ iax_accept(tech_pvt->iax_session, tech_pvt->codec); iax_ring_announce(tech_pvt->iax_session); switch_channel_set_state(channel, CS_INIT); - switch_core_session_thread_launch(session); + if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + switch_core_session_destroy(&session); + } } } } Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu May 10 20:27:55 2007 @@ -1694,9 +1694,14 @@ switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); switch_channel_mark_answered(channel); switch_channel_set_state(channel, CS_INIT); - switch_core_session_thread_launch(tech_pvt->session); - add_pvt(tech_pvt, PA_MASTER); - stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session)); + if (switch_core_session_thread_launch(tech_pvt->session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + switch_core_session_destroy(&session); + stream->write_function(stream, "FAIL:Thread Error!\n"); + } else { + add_pvt(tech_pvt, PA_MASTER); + stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session)); + } } else { switch_core_session_destroy(&session); stream->write_function(stream, "FAIL:Device Error!\n"); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Thu May 10 20:27:55 2007 @@ -242,6 +242,7 @@ switch_thread_rwlock_t *rwlock; switch_mutex_t *flag_mutex; uint32_t inuse; + uint32_t soft_max; time_t started; #ifdef SWITCH_HAVE_ODBC char *odbc_dsn; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu May 10 20:27:55 2007 @@ -1703,10 +1703,17 @@ const char *context = NULL; char network_ip[80]; switch_event_t *v_event = NULL; + uint32_t sess_count = switch_core_session_count(); + uint32_t sess_max = switch_core_session_limit(0); + + if ((profile->soft_max && sess_count >= profile->soft_max) || sess_count >= sess_max) { + nua_respond(nh, 480, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); + return; + } if (!sip || !sip->sip_request || !sip->sip_request->rq_method_name) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received an invalid packet!\n"); - nua_respond(nh, SIP_500_INTERNAL_SERVER_ERROR, TAG_END()); + nua_respond(nh, SIP_503_SERVICE_UNAVAILABLE, TAG_END()); return; } @@ -1906,7 +1913,33 @@ switch_copy_string(tech_pvt->sofia_private->uuid, switch_core_session_get_uuid(session), sizeof(tech_pvt->sofia_private->uuid)); nua_handle_bind(nh, tech_pvt->sofia_private); tech_pvt->nh = nh; - switch_core_session_thread_launch(session); + + if (switch_core_session_thread_launch(session) == SWITCH_STATUS_SUCCESS) { + return; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "LUKE: I'm hit, but not bad.\n"); + + switch_mutex_lock(profile->flag_mutex); + + profile->soft_max = sess_count - 10; + switch_core_session_limit(profile->soft_max); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "LUKE'S VOICE: Artoo, see what you can do with it. Hang on back there....\n" + "Green laserfire moves past the beeping little robot as his head turns. " + "After a few beeps and a twist of his mechanical arm,\n" + "Artoo reduces the max sessions to %d thus, saving the switch from certian doom.\n", + profile->soft_max); + + switch_mutex_unlock(profile->flag_mutex); + + if (tech_pvt->hash_key) { + switch_core_hash_delete(tech_pvt->profile->chat_hash, tech_pvt->hash_key); + } + + nua_handle_bind(nh, NULL); + free(tech_pvt->sofia_private); + switch_core_session_destroy(&session); + nua_respond(nh, 480, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); } void sofia_handle_sip_i_options(int status, Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Thu May 10 20:27:55 2007 @@ -1562,6 +1562,12 @@ switch_copy_string(chanmap->map[pevent->ring.channel], switch_core_session_get_uuid(session), sizeof(chanmap->map[pevent->ring.channel])); switch_channel_set_state(channel, CS_INIT); + if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + switch_core_session_destroy(&session); + ret = 0; + goto done; + } switch_core_session_thread_launch(session); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create new Inbound Channel!\n"); Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Thu May 10 20:27:55 2007 @@ -1240,7 +1240,11 @@ break; } switch_channel_set_state(channel, CS_INIT); - switch_core_session_thread_launch(session); + if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + switch_core_session_destroy(&session); + break; + } } } } Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu May 10 20:27:55 2007 @@ -651,13 +651,15 @@ } -SWITCH_DECLARE(void) switch_core_session_destroy(switch_core_session_t **session) +SWITCH_DECLARE(void) switch_core_session_perform_destroy(switch_core_session_t **session, const char *file, const char *func, int line) { switch_memory_pool_t *pool; switch_event_t *event; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Close Channel %s\n", switch_channel_get_name((*session)->channel)); - + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_NOTICE, "Close Channel %s [%s]\n", + switch_channel_get_name((*session)->channel), + switch_channel_state_name(switch_channel_get_state((*session)->channel))); + switch_ivr_deactivate_unicast(*session); switch_scheduler_del_task_group((*session)->uuid_str); @@ -711,7 +713,7 @@ } -SWITCH_DECLARE(void) switch_core_session_thread_launch(switch_core_session_t *session) +SWITCH_DECLARE(switch_status_t) switch_core_session_thread_launch(switch_core_session_t *session) { switch_thread_t *thread; switch_threadattr_t *thd_attr;; @@ -720,10 +722,16 @@ if (!session->thread_running) { switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - if (switch_thread_create(&thread, thd_attr, switch_core_session_thread, session, session->pool) != SWITCH_STATUS_SUCCESS) { - switch_core_session_destroy(&session); + if (switch_thread_create(&thread, thd_attr, switch_core_session_thread, session, session->pool) == SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_SUCCESS; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot create thread!\n"); } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot double-launch thread!\n"); } + + return SWITCH_STATUS_FALSE; }

1 0

[commit] r5139 - in freeswitch/trunk: libs/sofia-sip/libsofia-sip-ua src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 May '07

10 May '07

Author: anthm Date: Thu May 10 17:42:16 2007 New Revision: 5139 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am Log: make sofia-sip a conv. lib so we get their libs when we link Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am Thu May 10 17:42:16 2007 @@ -30,7 +30,7 @@ DOXYGEN = doxygen -lib_LTLIBRARIES = libsofia-sip-ua.la +noinst_LTLIBRARIES = libsofia-sip-ua.la libsofia_sip_ua_la_SOURCES = libsofia_sip_ua_la_LIBADD = bnf/libbnf.la \ Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am Thu May 10 17:42:16 2007 @@ -12,9 +12,7 @@ MODNAME=mod_sofia -BASE=../../../.. - -SOFIA_DIR=$(BASE)/libs/sofia-sip +SOFIA_DIR=$(switch_builddir)/libs/sofia-sip SOFIAUA_DIR=$(SOFIA_DIR)/libsofia-sip-ua SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la @@ -31,7 +29,7 @@ mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/stun -I$(SOFIAUA_DIR)/su mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/tport -I$(SOFIAUA_DIR)/url mod_sofia_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SOFIALA) -mod_sofia_la_LDFLAGS = -avoid-version -module -no-undefined -lssl -lcrypto -ldl -lz -lrt -lpthread +mod_sofia_la_LDFLAGS = -avoid-version -module -no-undefined if ADD_ODBC mod_sofia_la_CFLAGS += -DSWITCH_HAVE_ODBC

1 0

[commit] r5138 - freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 10 May '07

10 May '07

Author: cparker Date: Thu May 10 17:20:54 2007 New Revision: 5138 Modified: freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: more making it work, and getting some real channel information passed Modified: freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Thu May 10 17:20:54 2007 @@ -48,13 +48,13 @@ static switch_status_t my_on_hangup(switch_core_session_t *session) { switch_xml_t cdr; + switch_channel_t *channel = switch_core_session_get_channel(session); rc_handle *rad_config; int retval = 0; VALUE_PAIR *send = NULL; UINT4 client_port = 0; UINT4 status_type = PW_STATUS_STOP; - char src[] = "8475551212"; char *uuid_str; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Entering my_on_hangup\n"); @@ -75,7 +75,6 @@ } if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { - /*switch_channel_t *channel = switch_core_session_get_channel(session);*/ uuid_str = switch_core_session_get_uuid(session); /* Some hardcoded ( for now ) defaults needed to initialize radius */ @@ -153,12 +152,66 @@ return SWITCH_STATUS_TERM; } - /* Add VSA */ - if (rc_avpair_add(rad_config, &send, PW_FS_SRC, src, -1, PW_FS_PEC) == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Src: %s\n", src); - rc_destroy(rad_config); - return SWITCH_STATUS_TERM; - } + /* Add VSAs */ + + if(channel) { + switch_call_cause_t cause; + switch_caller_profile_t *profile; + + cause = switch_channel_get_cause(channel); + if (rc_avpair_add(rad_config, &send, PW_FS_HANGUPCAUSE, &cause, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Hangupcause: %d\n", cause); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + + profile = switch_channel_get_caller_profile(channel); + + if(profile) { + if(profile->caller_id_number) { + if (rc_avpair_add(rad_config, &send, PW_FS_SRC, profile->caller_id_number, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Src: %s\n", profile->caller_id_number); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->caller_id_name) { + if (rc_avpair_add(rad_config, &send, PW_FS_CLID, profile->caller_id_name, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-CLID: %s\n", profile->caller_id_name); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->destination_number) { + if (rc_avpair_add(rad_config, &send, PW_FS_DST, profile->destination_number, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Dst: %s\n", profile->destination_number); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->dialplan) { + if (rc_avpair_add(rad_config, &send, PW_FS_DIALPLAN, profile->dialplan, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Dialplan: %s\n", profile->dialplan); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->source) { + if (rc_avpair_add(rad_config, &send, PW_FS_LASTAPP, profile->source, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Lastapp: %s\n", profile->source); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "profile == NULL\n"); + } + } if(rc_acct(rad_config, client_port, send) == OK_RC) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RADIUS Accounting OK\n");

1 0

[commit] r5137 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 May '07

10 May '07

Author: anthm Date: Thu May 10 17:05:58 2007 New Revision: 5137 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am Log: build band-aid Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am Thu May 10 17:05:58 2007 @@ -1,6 +1,6 @@ AM_CFLAGS = $(SWITCH_AM_CFLAGS) AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS) -AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) +#AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) #we should set all these vars from configure, no reason to have these in each Makefile.am LIBTOOL = echo "`link=\`echo $@|grep .la;echo $@|grep .so;echo $@|grep .dll\`;if test -n "$$link"; then echo Creating $@;fi`";`if test -z "$(VERBOSE)" ; \ then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(SHELL) $(switch_builddir)/libtool; fi` @@ -30,8 +30,8 @@ mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/soa -I$(SOFIAUA_DIR)/sresolv mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/stun -I$(SOFIAUA_DIR)/su mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/tport -I$(SOFIAUA_DIR)/url -mod_sofia_la_LIBADD = $(SOFIALA) $(switch_builddir)/libfreeswitch.la -mod_sofia_la_LDFLAGS = -module -avoid-version -no-undefined +mod_sofia_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SOFIALA) +mod_sofia_la_LDFLAGS = -avoid-version -module -no-undefined -lssl -lcrypto -ldl -lz -lrt -lpthread if ADD_ODBC mod_sofia_la_CFLAGS += -DSWITCH_HAVE_ODBC @@ -51,12 +51,12 @@ ../../../../libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua_tag.h: $(SOFIALA) -install-data-am: $(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN) +#install-data-am: $(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN) -$(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).la - @echo installing $(MODNAME).$(DYNAMIC_LIB_EXTEN) - @if [ -f .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) ] ; then \ - $(LIBTOOL) --mode=install $(INSTALL) .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ - else \ - $(LIBTOOL) --mode=install $(INSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ - fi +#$(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).la +# @echo installing $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# @if [ -f .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) ] ; then \ +# $(LIBTOOL) --mode=install $(INSTALL) .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ +# else \ +# $(LIBTOOL) --mode=install $(INSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ +# fi

1 0