- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9677 - freeswitch/trunk/src
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: brian Date: Sat Sep 27 04:52:13 2008 New Revision: 9677 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: round one from FSCORE-193, we need to revisit this for improvement Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Sat Sep 27 04:52:13 2008 @@ -340,6 +340,13 @@ switch_status_t status; time_t to = 0; displace_helper_t *dh; + + status = switch_channel_pre_answer(channel); + + if (!switch_channel_media_ready(channel) || !switch_core_session_get_read_codec(session)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not displace session. Media not enabled on channel\n"); + return status; + } if ((bug = switch_channel_get_private(channel, file))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Only 1 of the same file per channel please!\n"); @@ -803,7 +810,16 @@ switch_status_t status; time_t to = 0; switch_media_bug_flag_t flags = SMBF_READ_STREAM | SMBF_WRITE_STREAM; - uint8_t channels = read_codec->implementation->number_of_channels; + uint8_t channels; + + status = switch_channel_pre_answer(channel); + + if (!switch_channel_media_ready(channel) || !switch_core_session_get_read_codec(session)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not record session. Media not enabled on channel\n"); + return status; + } + + channels = read_codec->implementation->number_of_channels; if ((bug = switch_channel_get_private(channel, file))) { return switch_ivr_stop_record_session(session, file); @@ -838,8 +854,6 @@ return SWITCH_STATUS_GENERR; } - switch_channel_pre_answer(channel); - if ((p = switch_channel_get_variable(channel, "RECORD_TITLE"))) { vval = (const char *) switch_core_session_strdup(session, p); switch_core_file_set_string(fh, SWITCH_AUDIO_COL_STR_TITLE, vval);

1 0

[commit] r9676 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: brian Date: Fri Sep 26 19:37:27 2008 New Revision: 9676 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Log: revert this change for now Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri Sep 26 19:37:27 2008 @@ -1 +1 @@ -Fri Sep 26 15:32:07 EDT 2008 +Fri Sep 26 18:37:04 CDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Fri Sep 26 19:37:27 2008 @@ -1019,10 +1019,8 @@ home->suh_blocks = NULL; - if (home->suh_lock) { + if (home->suh_lock) _su_home_destroy_mutexes(home->suh_lock); - UNLOCK(home); - } } home->suh_lock = NULL;

1 0

[commit] r9675 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: anthm Date: Fri Sep 26 19:14:19 2008 New Revision: 9675 Removed: freeswitch/trunk/src/mod/formats/mod_shout/common.c freeswitch/trunk/src/mod/formats/mod_shout/dct64_i386.c freeswitch/trunk/src/mod/formats/mod_shout/decode_i386.c freeswitch/trunk/src/mod/formats/mod_shout/decode_ntom.c freeswitch/trunk/src/mod/formats/mod_shout/huffman.h freeswitch/trunk/src/mod/formats/mod_shout/interface.c freeswitch/trunk/src/mod/formats/mod_shout/layer3.c freeswitch/trunk/src/mod/formats/mod_shout/mpg123.h freeswitch/trunk/src/mod/formats/mod_shout/mpglib.h freeswitch/trunk/src/mod/formats/mod_shout/tabinit.c Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: break mod_shout Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile Fri Sep 26 19:14:19 2008 @@ -1,21 +1,22 @@ LAME=lame-3.97 SHOUT=libshout-2.2.2 +MPG123=mpg123 switch_srcdir=../../../.. WANT_CURL=yes LAME_DIR=$(switch_srcdir)/libs/$(LAME) SHOUT_DIR=$(switch_srcdir)/libs/$(SHOUT) +MPG123_DIR=$(switch_srcdir)/libs/$(MPG123) LAMELA=$(LAME_DIR)/libmp3lame/libmp3lame.la SHOUTLA=$(SHOUT_DIR)/src/libshout.la +MPG123LA=$(MPG123_DIR)/src/libmpg123/.libs/libmpg123.la -LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) +LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -I$(MPG123_DIR)/src +LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) $(MPG123LA) -LOCAL_LDFLAGS=`cat ../../../../libs/libshout-2.2.2/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'` -MP3SOURCES=common.c dct64_i386.c decode_ntom.c layer3.c tabinit.c interface.c -MP3OBJS=common.o dct64_i386.o decode_ntom.o layer3.o tabinit.o interface.o +LOCAL_LDFLAGS=`cat ../../../../libs/libshout-2.2.2/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'` LOCAL_OBJS=$(MP3OBJS) LOCAL_SOURCES=$(MP3SOURCES) @@ -25,6 +26,17 @@ $(LOCAL_OBJS): $(LOCAL_SOURCES) +$(MPG123_DIR): + $(GETLIB) $(MPG123).tar.gz + +$(MPG123_DIR)/Makefile: $(MPG123_DIR) + cd $(MPG123_DIR) && ./configure $(DEFAULT_ARGS) --disable-shared + $(TOUCH_TARGET) + +$(MPG123LA): $(MPG123_DIR)/Makefile + cd $(MPG123_DIR) && $(MAKE) + $(TOUCH_TARGET) + $(LAME_DIR): $(GETLIB) $(LAME).tar.gz @@ -40,7 +52,7 @@ $(GETLIB) $(SHOUT).tar.gz $(SHOUT_DIR)/Makefile: $(SHOUT_DIR) - cd $(SHOUT_DIR) && ./configure $(DEFAULT_ARGS) --with-speex=no --without-vorbis + cd $(SHOUT_DIR) && ./configure $(DEFAULT_ARGS) --without-speex --without-vorbis --without-ogg $(TOUCH_TARGET) $(SHOUTLA): $(SHOUT_DIR)/Makefile Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Fri Sep 26 19:14:19 2008 @@ -30,8 +30,7 @@ * example filename: shout://user:pass@host.com/mount.mp3 * */ -#include "mpg123.h" -#include "mpglib.h" +#include "libmpg123/mpg123.h" #include <switch.h> #include <shout/shout.h> #include <lame.h> @@ -40,6 +39,7 @@ #define OUTSCALE 8192 * 2 #define MP3_SCACHE 16384 * 2 #define MP3_DCACHE 8192 *2 +#define MP3_TOOSMALL -1234 SWITCH_MODULE_LOAD_FUNCTION(mod_shout_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_shout_shutdown); @@ -54,8 +54,10 @@ switch_mutex_t *audio_mutex; switch_buffer_t *audio_buffer; switch_memory_pool_t *memory_pool; - char decode_buf[MP3_DCACHE]; - struct mpstr mp; + unsigned char decode_buf[MP3_DCACHE]; + //struct mpstr mp; + switch_file_handle_t *handle; + mpg123_handle *mh; int err; int mp3err; int dlen; @@ -141,7 +143,12 @@ } } - ExitMP3(&context->mp); + + } + + if (context->mh) { + mpg123_close(context->mh); + mpg123_delete(context->mh); } } } @@ -227,24 +234,24 @@ static size_t decode_fd(shout_context_t *context, void *data, size_t bytes) { int decode_status = 0; - int dlen = 0; + size_t dlen = 0; int x = 0; - char *in; + unsigned char *in; int inlen = 0; - char *out; + unsigned char *out; int outlen; int usedlen; - char inbuf[MP3_SCACHE]; + unsigned char inbuf[MP3_SCACHE]; int done = 0; size_t used; size_t lp; size_t rb = 0; - while (!context->eof && switch_buffer_inuse(context->audio_buffer) < bytes) { + while (context->eof < 2 && switch_buffer_inuse(context->audio_buffer) < bytes) { lp = sizeof(inbuf); - if ((switch_file_read(context->fd, inbuf, &lp) != SWITCH_STATUS_SUCCESS) || lp == 0) { + if (!context->eof && ((switch_file_read(context->fd, inbuf, &lp) != SWITCH_STATUS_SUCCESS) || lp == 0)) { context->eof++; - goto end; + //goto end; } inlen = (int) lp; @@ -260,8 +267,13 @@ } do { - decode_status = decodeMP3(&context->mp, in, inlen, out, outlen, &dlen); - + if (context->eof) { + decode_status = mpg123_read(context->mh, out, outlen, &dlen); + } else { + decode_status = mpg123_decode(context->mh, in, inlen, out, outlen, &dlen); + } + + if (context->err) { goto error; } @@ -272,7 +284,11 @@ x++; } - if (decode_status == MP3_TOOSMALL) { + if (decode_status == MPG123_NEW_FORMAT) { + continue; + } else if (decode_status == MPG123_OK) { + usedlen = dlen; + break; if (context->audio_buffer) { switch_buffer_write(context->audio_buffer, context->decode_buf, usedlen); } else { @@ -285,7 +301,10 @@ continue; - } else if (decode_status == MP3_ERR) { + } else if (decode_status == MPG123_DONE) { + context->eof++; + goto end; + } else if (decode_status == MPG123_ERR || decode_status > 0) { if (++context->mp3err >= 5) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Decoder Error!\n"); context->eof++; @@ -302,7 +321,7 @@ dlen = 0; - } while (decode_status != MP3_NEED_MORE); + } while (decode_status != MPG123_NEED_MORE); if (context->audio_buffer) { switch_buffer_write(context->audio_buffer, context->decode_buf, usedlen); @@ -318,7 +337,7 @@ end: used = switch_buffer_inuse(context->audio_buffer); - + if (context->eof || done || used >= bytes) { if (!(rb = switch_buffer_read(context->audio_buffer, data, bytes))) { goto error; @@ -342,15 +361,15 @@ register unsigned int realsize = (unsigned int) (size * nmemb); shout_context_t *context = data; int decode_status = 0; - int dlen = 0; + size_t dlen = 0; int x = 0; - char *in; + unsigned char *in; int inlen; - char *out; + unsigned char *out; int outlen; int usedlen; uint32_t used, buf_size = 1024 * 64; - + in = ptr; inlen = realsize; out = context->decode_buf; @@ -387,7 +406,7 @@ error_check(); do { - decode_status = decodeMP3(&context->mp, in, inlen, out, outlen, &dlen); + decode_status = mpg123_decode(context->mh, in, inlen, out, outlen, &dlen); error_check(); @@ -409,16 +428,19 @@ usedlen = 0; switch_mutex_unlock(context->audio_mutex); - } else if (decode_status == MP3_ERR) { + } else if (decode_status == MPG123_ERR) { if (++context->mp3err >= 20) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Decoder Error!\n"); goto error; } - ExitMP3(&context->mp); - InitMP3(&context->mp, OUTSCALE, context->samplerate); - + mpg123_close(context->mh); + //InitMP3(context->mh, OUTSCALE, context->samplerate); + context->mh = mpg123_new(NULL, NULL); + mpg123_open_feed(context->mh); + mpg123_format(context->mh, context->samplerate, MPG123_MONO, 0); + return realsize; } @@ -427,7 +449,7 @@ out += dlen; outlen -= dlen; dlen = 0; - } while (decode_status != MP3_NEED_MORE); + } while (decode_status != MPG123_NEED_MORE); switch_mutex_lock(context->audio_mutex); @@ -598,6 +620,7 @@ context->memory_pool = handle->memory_pool; context->samplerate = handle->samplerate; + context->handle = handle; if (switch_test_flag(handle, SWITCH_FILE_FLAG_READ)) { if (switch_buffer_create_dynamic(&context->audio_buffer, TC_BUFFER_SIZE, TC_BUFFER_SIZE * 2, 0) != SWITCH_STATUS_SUCCESS) { @@ -606,17 +629,23 @@ } switch_mutex_init(&context->audio_mutex, SWITCH_MUTEX_NESTED, context->memory_pool); - InitMP3(&context->mp, OUTSCALE, context->samplerate); + //InitMP3(context->mh, OUTSCALE, context->samplerate); + context->mh = mpg123_new(NULL, NULL); + mpg123_open_feed(context->mh); + mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); + + if (handle->handler) { context->stream_url = switch_core_sprintf(context->memory_pool, "http://%s", path); context->prebuf = handle->prebuf; launch_read_stream_thread(context); } else { - if (switch_file_open(&context->fd, path, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, handle->memory_pool) != + if (switch_file_open(&context->fd, path, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, handle->memory_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", path); goto error; } + } } else if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) { if (!(context->gfp = lame_init())) { @@ -794,8 +823,11 @@ *cur_sample = fseek(context->fp, *cur_sample, whence); } - ExitMP3(&context->mp); - InitMP3(&context->mp, OUTSCALE, context->samplerate); + mpg123_close(context->mh); + //InitMP3(context->mh, OUTSCALE, context->samplerate); + context->mh = mpg123_new(NULL, NULL); + mpg123_open_feed(context->mh); + mpg123_format(context->mh, context->samplerate, MPG123_MONO, 0); switch_buffer_zero(context->audio_buffer); } else { @@ -1385,7 +1417,8 @@ //*module_interface = &shout_module_interface; shout_init(); - InitMP3Constants(); + //InitMP3Constants(); + mpg123_init(); SWITCH_ADD_API(shout_api_interface, "telecast", "telecast", telecast_api_function, TELECAST_SYNTAX);

1 0

[commit] r9674 - freeswitch/trunk/docs/phrase
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: brian Date: Fri Sep 26 16:53:33 2008 New Revision: 9674 Modified: freeswitch/trunk/docs/phrase/phrase_en.xml Log: add sound Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Fri Sep 26 16:53:33 2008 @@ -281,6 +281,7 @@ <prompt phrase="Please enter extension you want to transfer to" filename="transfer1.wav"/> <prompt phrase="Transfer" filename="transfer2.wav"/> <prompt phrase="We are trying to reach" filename="we_are_trying_to_reach.wav"/> + <prompt phrase="An error has occurred please contact the administrator" filename="error.wav"/> </misc> </en> </language>

1 0

[commit] r9671 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: mikej Date: Fri Sep 26 15:48:55 2008 New Revision: 9671 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: (MODAPP-139) localize voice-mail notification emails Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Sep 26 15:48:55 2008 @@ -26,6 +26,7 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * Bret McDanel <trixter AT 0xdecafbad.com> * John Wehle (john(a)feith.com) + * Raymond Chandler <intralanman(a)gmail.com> * * mod_voicemail.c -- Voicemail Module * @@ -2052,6 +2053,7 @@ char *vm_email = NULL; char *vm_notify_email = NULL; char *email_addr = NULL; + char *vm_timezone = NULL; int send_mail = 0; int send_main = 0; int send_notify = 0; @@ -2112,9 +2114,12 @@ insert_db = switch_true(val); } else if (!strcasecmp(var, "vm-attach-file")) { email_attach = switch_true(val); + } else if (!strcasecmp(var, "timezone")) { + vm_timezone = switch_core_strdup(pool, val); } + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "send mail is %d, var is %s\n", send_mail, var);*/ } - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "send mail is %d and that's my final answer\n", send_mail); if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_mprintf("%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid); } else if (!switch_strlen_zero(profile->storage_dir)) { @@ -2199,7 +2204,38 @@ switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_caller_id_name", caller_id_name); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_file_path", file_path); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_read_flags", read_flags); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date); + + if(switch_loadable_module_exists("mod_timezone") == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mod_timezone is loaded... let's try to convert\n"); + if(!switch_strlen_zero(vm_timezone)) { + switch_status_t status; + switch_stream_handle_t time_stream = { 0 }; + char *reply; + char *args = switch_mprintf("%s %s", vm_timezone, profile->date_fmt); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "User's timezone is %s\n", vm_timezone); + SWITCH_STANDARD_STREAM(time_stream); + if ((status = switch_api_execute("strftime_tz", args, NULL, &time_stream)) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Successfully Converted Timezone\n"); + reply = time_stream.data; + if(strncasecmp(reply, "-ERR", 4)) { + if(strlen(reply)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "old time was: %s, new time is: %s\n", date, reply); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", reply); + } else { + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date); + } + switch_safe_free(reply); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed To Successfully Convert Timezone\n"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date); + } + switch_safe_free(args); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mod_timezone isn't loaded... we'll only be using system time\n"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date); + } switch_snprintf(tmpvar, sizeof(tmpvar), "%d", priority); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_priority", tmpvar); if (vm_email) {

1 0

[commit] r9670 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: mikej Date: Fri Sep 26 15:33:17 2008 New Revision: 9670 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Log: unlock before destroy (handle leak from SFSIP-88) Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri Sep 26 15:33:17 2008 @@ -1 +1 @@ -Fri Sep 12 12:28:02 EDT 2008 +Fri Sep 26 15:32:07 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Fri Sep 26 15:33:17 2008 @@ -1022,6 +1022,7 @@ if (home->suh_lock) { _su_home_destroy_mutexes(home->suh_lock); UNLOCK(home); + } } home->suh_lock = NULL;

1 0

[commit] r9669 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: mikej Date: Fri Sep 26 15:30:52 2008 New Revision: 9669 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Log: unlock before destroy (handle leak from SFSIP-88) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Fri Sep 26 15:30:52 2008 @@ -1019,8 +1019,9 @@ home->suh_blocks = NULL; - if (home->suh_lock) + if (home->suh_lock) { _su_home_destroy_mutexes(home->suh_lock); + UNLOCK(home); } home->suh_lock = NULL;

1 0

[commit] r9668 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: anthm Date: Fri Sep 26 15:19:55 2008 New Revision: 9668 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: deal with MODENDP-138 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Sep 26 15:19:55 2008 @@ -1780,7 +1780,8 @@ "--------------------------------------------------------------------------------\n" "sofia help\n" "sofia profile <profile_name> [[start|stop|restart|rescan] [reloadxml]|flush_inbound_reg [<call_id>] [reboot]|[register|unregister] [<gateway name>|all]|killgw <gateway name>|[stun-auto-disable|stun-enabled] [true|false]]\n" - "sofia status [[profile | gateway] <name>]\n" + "sofia status profile <name> [ reg <contact str> ] | [ pres <pres str> ]\n" + "sofia status gateway <name>\n" "sofia loglevel [0-9]\n" "--------------------------------------------------------------------------------\n"; if (session) {

1 0

[commit] r9667 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: anthm Date: Fri Sep 26 15:17:03 2008 New Revision: 9667 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: deal with MODENDP-138 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Sep 26 15:17:03 2008 @@ -1279,63 +1279,87 @@ } } else if (!strcasecmp(argv[0], "profile")) { struct cb_helper cb; + char *sql = NULL; if ((argv[1]) && (profile = sofia_glue_find_profile(argv[1]))) { - stream->write_function(stream, "%s\n", line); - stream->write_function(stream, "Name \t\t%s\n", switch_str_nil(argv[1])); - stream->write_function(stream, "Domain Name \t\t%s\n", profile->domain_name ? profile->domain_name : "N/A"); - if (strcasecmp(argv[1], profile->name)) { - stream->write_function(stream, "Alias Of \t\t%s\n", switch_str_nil(profile->name)); - } - stream->write_function(stream, "DBName \t\t%s\n", switch_str_nil(profile->dbname)); - stream->write_function(stream, "Pres Hosts \t\t%s\n", switch_str_nil(profile->presence_hosts)); - stream->write_function(stream, "Dialplan \t\t%s\n", switch_str_nil(profile->dialplan)); - stream->write_function(stream, "Context \t\t%s\n", switch_str_nil(profile->context)); - stream->write_function(stream, "Challenge Realm\t\t%s\n", - switch_strlen_zero(profile->challenge_realm) ? "auto_to" : profile->challenge_realm); - stream->write_function(stream, "RTP-IP \t\t%s\n", switch_str_nil(profile->rtpip)); - if (profile->extrtpip) { - stream->write_function(stream, "Ext-RTP-IP \t\t%s\n", profile->extrtpip); - } + if (!argv[2] || strcasecmp(argv[2], "reg")) { + stream->write_function(stream, "%s\n", line); + stream->write_function(stream, "Name \t\t%s\n", switch_str_nil(argv[1])); + stream->write_function(stream, "Domain Name \t\t%s\n", profile->domain_name ? profile->domain_name : "N/A"); + if (strcasecmp(argv[1], profile->name)) { + stream->write_function(stream, "Alias Of \t\t%s\n", switch_str_nil(profile->name)); + } + stream->write_function(stream, "DBName \t\t%s\n", switch_str_nil(profile->dbname)); + stream->write_function(stream, "Pres Hosts \t\t%s\n", switch_str_nil(profile->presence_hosts)); + stream->write_function(stream, "Dialplan \t\t%s\n", switch_str_nil(profile->dialplan)); + stream->write_function(stream, "Context \t\t%s\n", switch_str_nil(profile->context)); + stream->write_function(stream, "Challenge Realm\t\t%s\n", + switch_strlen_zero(profile->challenge_realm) ? "auto_to" : profile->challenge_realm); + stream->write_function(stream, "RTP-IP \t\t%s\n", switch_str_nil(profile->rtpip)); + if (profile->extrtpip) { + stream->write_function(stream, "Ext-RTP-IP \t\t%s\n", profile->extrtpip); + } - stream->write_function(stream, "SIP-IP \t\t%s\n", switch_str_nil(profile->sipip)); - if (profile->extsipip) { - stream->write_function(stream, "Ext-SIP-IP \t\t%s\n", profile->extsipip); - } - stream->write_function(stream, "URL \t\t%s\n", switch_str_nil(profile->url)); - stream->write_function(stream, "BIND-URL \t\t%s\n", switch_str_nil(profile->bindurl)); - if (sofia_test_pflag(profile, PFLAG_TLS)) { - stream->write_function(stream, "TLS-URL \t\t%s\n", switch_str_nil(profile->tls_url)); - stream->write_function(stream, "TLS-BIND-URL \t%s\n", switch_str_nil(profile->tls_bindurl)); - } - stream->write_function(stream, "HOLD-MUSIC \t\t%s\n", switch_strlen_zero(profile->hold_music) ? "N/A" : profile->hold_music); - stream->write_function(stream, "CODECS \t\t%s\n", switch_str_nil(profile->codec_string)); - stream->write_function(stream, "TEL-EVENT \t\t%d\n", profile->te); - if (profile->dtmf_type == DTMF_2833) { - stream->write_function(stream, "DTMF-MODE \t\trfc2833\n"); - } else if (profile->dtmf_type == DTMF_INFO) { - stream->write_function(stream, "DTMF-MODE \t\tinfo\n"); - } else { - stream->write_function(stream, "DTMF-MODE \t\tnone\n"); + stream->write_function(stream, "SIP-IP \t\t%s\n", switch_str_nil(profile->sipip)); + if (profile->extsipip) { + stream->write_function(stream, "Ext-SIP-IP \t\t%s\n", profile->extsipip); + } + stream->write_function(stream, "URL \t\t%s\n", switch_str_nil(profile->url)); + stream->write_function(stream, "BIND-URL \t\t%s\n", switch_str_nil(profile->bindurl)); + if (sofia_test_pflag(profile, PFLAG_TLS)) { + stream->write_function(stream, "TLS-URL \t\t%s\n", switch_str_nil(profile->tls_url)); + stream->write_function(stream, "TLS-BIND-URL \t%s\n", switch_str_nil(profile->tls_bindurl)); + } + stream->write_function(stream, "HOLD-MUSIC \t\t%s\n", switch_strlen_zero(profile->hold_music) ? "N/A" : profile->hold_music); + stream->write_function(stream, "CODECS \t\t%s\n", switch_str_nil(profile->codec_string)); + stream->write_function(stream, "TEL-EVENT \t\t%d\n", profile->te); + if (profile->dtmf_type == DTMF_2833) { + stream->write_function(stream, "DTMF-MODE \t\trfc2833\n"); + } else if (profile->dtmf_type == DTMF_INFO) { + stream->write_function(stream, "DTMF-MODE \t\tinfo\n"); + } else { + stream->write_function(stream, "DTMF-MODE \t\tnone\n"); + } + stream->write_function(stream, "CNG \t\t%d\n", profile->cng_pt); + stream->write_function(stream, "SESSION-TO \t\t%d\n", profile->session_timeout); + stream->write_function(stream, "MAX-DIALOG \t\t%d\n", profile->max_proceeding); + stream->write_function(stream, "NOMEDIA \t\t%s\n", switch_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); + stream->write_function(stream, "LATE-NEG \t\t%s\n", switch_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); + stream->write_function(stream, "PROXY-MEDIA \t\t%s\n", switch_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); + stream->write_function(stream, "AGGRESSIVENAT \t\t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); + stream->write_function(stream, "STUN_ENABLED \t\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); + stream->write_function(stream, "STUN_AUTO_DISABLE \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); } - stream->write_function(stream, "CNG \t\t%d\n", profile->cng_pt); - stream->write_function(stream, "SESSION-TO \t\t%d\n", profile->session_timeout); - stream->write_function(stream, "MAX-DIALOG \t\t%d\n", profile->max_proceeding); - stream->write_function(stream, "NOMEDIA \t\t%s\n", switch_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); - stream->write_function(stream, "LATE-NEG \t\t%s\n", switch_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); - stream->write_function(stream, "PROXY-MEDIA \t\t%s\n", switch_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); - stream->write_function(stream, "AGGRESSIVENAT \t\t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); - stream->write_function(stream, "STUN_ENABLED \t\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); - stream->write_function(stream, "STUN_AUTO_DISABLE \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); stream->write_function(stream, "\nRegistrations:\n%s\n", line); cb.profile = profile; cb.stream = stream; + + if (argv[3]) { + if (argv[4]) { + if (!strcasecmp(argv[3], "pres")) { + sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status," + "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" + " from sip_registrations where profile_name='%q' and presence_hosts like '%%%q%%'", + profile->name, argv[4]); + } + } else { + sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status," + "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" + " from sip_registrations where profile_name='%q' and contact like '%%%q%%'", + profile->name, argv[3]); + } + } + + if (!sql) { + sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status," + "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" + " from sip_registrations where profile_name='%q'", + profile->name); + } - sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, - "select call_id,sip_user,sip_host,contact,status," - "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" - " from sip_registrations", show_reg_callback, &cb); + sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, show_reg_callback, &cb); + free(sql); stream->write_function(stream, "%s\n", line);

1 0

[commit] r9666 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: brian Date: Fri Sep 26 14:26:00 2008 New Revision: 9666 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: Document chances from MODENDP-131 for min se Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Fri Sep 26 14:26:00 2008 @@ -47,6 +47,7 @@    +  <param name="apply-inbound-acl" value="domains"/>

1 0