February 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11706 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 09 Feb '09

09 Feb '09

Author: brian Date: Mon Feb 9 10:40:37 2009 New Revision: 11706 Log: tweak time_Test to not take insane values Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Feb 9 10:40:37 2009 @@ -55,12 +55,19 @@ stream->write_function(stream, "parameter missing\n"); return SWITCH_STATUS_SUCCESS; } + mss = atol(cmd); + if (mss > 10000) { + mss = 10000; + } + if ((p = strchr(cmd, ' '))) { max = atoi(p+1); if (max < 0) { - max = 10; + max = 1; + } else if (max > 100) { + max = 100; } }

1 0

[commit] r11704 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 09 Feb '09

09 Feb '09

Author: brian Date: Mon Feb 9 10:18:21 2009 New Revision: 11704 Log: xml_free in the proper location if invalid data is given to group_call Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Feb 9 10:18:21 2009 @@ -248,8 +248,8 @@ } } - switch_xml_free(xml); } + switch_xml_free(xml); switch_event_destroy(&params); }

1 0

[commit] r11702 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 09 Feb '09

09 Feb '09

Author: brian Date: Mon Feb 9 10:02:50 2009 New Revision: 11702 Log: never hurts to be extra careful Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Mon Feb 9 10:02:50 2009 @@ -1929,6 +1929,10 @@ int argc; time_t expires = 0; + if (!globals.running) { + return SWITCH_STATUS_FALSE; + } + if (switch_strlen_zero(cmd)){ stream->write_function(stream, "-USAGE: %s\n", FIFO_MEMBER_API_SYNTAX); return SWITCH_STATUS_SUCCESS;

1 0

[commit] r11699 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 09 Feb '09

09 Feb '09

Author: brian Date: Mon Feb 9 03:03:32 2009 New Revision: 11699 Log: MODAPP-210 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Mon Feb 9 03:03:32 2009 @@ -1929,6 +1929,11 @@ int argc; time_t expires = 0; + if (switch_strlen_zero(cmd)){ + stream->write_function(stream, "-USAGE: %s\n", FIFO_MEMBER_API_SYNTAX); + return SWITCH_STATUS_SUCCESS; + } + mydata = strdup(cmd); switch_assert(mydata);

1 0

[commit] r11698 - freeswitch/trunk/src/mod/formats/mod_sndfile
by FreeSWITCH SVN 09 Feb '09

09 Feb '09

Author: anthm Date: Sun Feb 8 18:51:42 2009 New Revision: 11698 Log: MODFORM-23 Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Sun Feb 8 18:51:42 2009 @@ -66,7 +66,11 @@ size_t alt_len = 0; int rates[4] = {8000, 16000, 32000, 48000}; int i; +#ifdef WIN32 + char ps[2] = {'\\', '/'}; +#else char ps[2] = {'/', '\\'}; +#endif int x; if ((ext = strrchr(path, '.')) == 0) { @@ -175,9 +179,6 @@ } } } -#ifndef WIN32 - break; -#endif } if (!context->handle) {

1 0

[commit] r11697 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 09 Feb '09

09 Feb '09

Author: anthm Date: Sun Feb 8 18:30:32 2009 New Revision: 11697 Log: MODENDP-184 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Sun Feb 8 18:30:32 2009 @@ -1561,6 +1561,7 @@ stream->write_function(stream, "TLS-BIND-URL \t%s\n", switch_str_nil(profile->tls_bindurl)); } stream->write_function(stream, "HOLD-MUSIC \t%s\n", switch_strlen_zero(profile->hold_music) ? "N/A" : profile->hold_music); + stream->write_function(stream, "OUTBOUND-PROXY \t%s\n", switch_strlen_zero(profile->outbound_proxy) ? "N/A" : profile->outbound_proxy); stream->write_function(stream, "CODECS \t%s\n", switch_str_nil(profile->codec_string)); stream->write_function(stream, "TEL-EVENT \t%d\n", profile->te); if (profile->dtmf_type == DTMF_2833) { @@ -1751,6 +1752,7 @@ stream->write_function(stream, "<TLS-BIND-URL>%s</TLS-BIND-URL>\n", switch_str_nil(profile->tls_bindurl)); } stream->write_function(stream, "<HOLD-MUSIC>%s</HOLD-MUSIC>\n", switch_strlen_zero(profile->hold_music) ? "N/A" : profile->hold_music); + stream->write_function(stream, "<OUTBOUND-PROXY>%s</OUTBOUND-PROXY>\n", switch_strlen_zero(profile->outbound_proxy) ? "N/A" : profile->outbound_proxy); stream->write_function(stream, "<CODECS>%s</CODECS>\n", switch_str_nil(profile->codec_string)); stream->write_function(stream, "<TEL-EVENT>%d</TEL-EVENT>\n", profile->te); if (profile->dtmf_type == DTMF_2833) { 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 Sun Feb 8 18:30:32 2009 @@ -379,6 +379,7 @@ char *sipdomain; char *timer_name; char *hold_music; + char *outbound_proxy; char *bind_params; char *tls_bind_params; char *tls_cert_dir; 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 Sun Feb 8 18:30:32 2009 @@ -730,6 +730,7 @@ TAG_IF(!strchr(profile->sipip, ':'), NTATAG_UDP_MTU(65535)), TAG_IF(profile->disable_srv, NTATAG_USE_SRV(0)), TAG_IF(profile->disable_naptr, NTATAG_USE_NAPTR(0)), + NTATAG_DEFAULT_PROXY(profile->outbound_proxy), NTATAG_SERVER_RPORT(profile->rport_level), TAG_IF(tportlog, TPTAG_LOG(1)), TAG_END()); /* Last tag should always finish the sequence */ @@ -1587,6 +1588,8 @@ profile->reg_db_domain = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "hold-music")) { profile->hold_music = switch_core_strdup(profile->pool, val); + } else if (!strcasecmp(var, "outbound-proxy")) { + profile->outbound_proxy = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "session-timeout")) { int v_session_timeout = atoi(val); if (v_session_timeout >= 0) { @@ -1979,6 +1982,8 @@ profile->timer_name = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "hold-music")) { profile->hold_music = switch_core_strdup(profile->pool, val); + } else if (!strcasecmp(var, "outbound-proxy")) { + profile->outbound_proxy = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "session-timeout")) { int v_session_timeout = atoi(val); if (v_session_timeout >= 0) {

1 0

[commit] r11684 - freeswitch/trunk/src/mod/codecs/mod_dahdi_codec
by FreeSWITCH SVN 08 Feb '09

08 Feb '09

Author: moy Date: Sun Feb 8 00:33:22 2009 New Revision: 11684 Log: fixed calculation of numchannels for decoders and transcoders for mod_dahdi_codec Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Sun Feb 8 00:33:22 2009 @@ -364,11 +364,11 @@ for (info.tcnum = 0; !(res = ioctl(fd, DAHDI_TC_GETINFO, &info)); info.tcnum++) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found dahdi transcoder name: %s\n", info.name); if ((info.srcfmts & DAHDI_FORMAT_ULAW) && (info.dstfmts & (DAHDI_FORMAT_G729A | DAHDI_FORMAT_G723_1))) { - total_encoders += info.numchannels/2; + total_encoders += info.numchannels; continue; } if ((info.dstfmts & DAHDI_FORMAT_ULAW) && (info.srcfmts & (DAHDI_FORMAT_G729A | DAHDI_FORMAT_G723_1))) { - total_decoders += info.numchannels/2; + total_decoders += info.numchannels; continue; } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,

1 0

[commit] r11683 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 08 Feb '09

08 Feb '09

Author: mrene Date: Sat Feb 7 18:38:48 2009 New Revision: 11683 Log: MODENDP-183 Add disable-srv and disable-naptr params to sip profiles (default false) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Sat Feb 7 18:38:48 2009 @@ -441,6 +441,8 @@ uint32_t force_subscription_expires; switch_rtp_bug_flag_t auto_rtp_bugs; char manage_shared_appearance; /* pflags was all full up - MTK */ + char disable_srv; + char disable_naptr; }; struct private_object { 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 Sat Feb 7 18:38:48 2009 @@ -728,6 +728,8 @@ TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERSION(profile->tls_version)), TAG_IF(!strchr(profile->sipip, ':'), NTATAG_UDP_MTU(65535)), + TAG_IF(profile->disable_srv, NTATAG_USE_SRV(0)), + TAG_IF(profile->disable_naptr, NTATAG_USE_NAPTR(0)), NTATAG_SERVER_RPORT(profile->rport_level), TAG_IF(tportlog, TPTAG_LOG(1)), TAG_END()); /* Last tag should always finish the sequence */ @@ -1798,6 +1800,9 @@ profile->pflags |= PFLAG_STUN_ENABLED; profile->pflags |= PFLAG_DISABLE_100REL; profile->auto_restart = 1; + profile->manage_shared_appearance = 0; /* Initialize default */ + profile->disable_srv = 0; + profile->disable_naptr = 0; for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -2016,6 +2021,14 @@ profile->manage_shared_appearance = 1; profile->sla_contact = switch_core_sprintf(profile->pool, "sip:sla-agent@%s", profile->sipip); } + } else if (!strcasecmp(var, "disable-srv")) { + if (switch_true(val)) { + profile->disable_srv = 1; + } + } else if (!strcasecmp(var, "disable-naptr")) { + if (switch_true(val)) { + profile->disable_naptr = 1; + } } else if (!strcasecmp(var, "unregister-on-options-fail")) { if (switch_true(val)) { profile->pflags |= PFLAG_UNREG_OPTIONS_FAIL;

1 0

[commit] r11682 - freeswitch/trunk/src
by FreeSWITCH SVN 07 Feb '09

07 Feb '09

Author: anthm Date: Sat Feb 7 15:22:12 2009 New Revision: 11682 Log: lisdexic Modified: freeswitch/trunk/src/switch_ivr_play_say.c 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 Sat Feb 7 15:22:12 2009 @@ -421,7 +421,7 @@ } vval = switch_channel_get_variable(channel, "enable_file_write_buffering"); - if (!vval || !switch_true(vval)) { + if (!vval || switch_true(vval)) { fh->pre_buffer_datalen = SWITCH_DEFAULT_FILE_BUFFER_LEN; }

1 0

[commit] r11681 - freeswitch/trunk/src/mod/codecs/mod_dahdi_codec
by FreeSWITCH SVN 07 Feb '09

07 Feb '09

Author: moy Date: Sat Feb 7 13:14:03 2009 New Revision: 11681 Log: mod_dahdi_codec now works with Zaptel too, no need for DAHDI or Zaptel headers. Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Sat Feb 7 13:14:03 2009 @@ -32,16 +32,11 @@ #include <switch.h> #include <g711.h> -#include <dahdi/user.h> +#include <linux/types.h> /* __u32 */ #include <sys/ioctl.h> /*#define DEBUG_DAHDI_CODEC 1*/ -#define DAHDI_FORMAT_G723_1 (1 << 0) -#define DAHDI_FORMAT_ULAW (1 << 2) -#define DAHDI_FORMAT_SLINEAR (1 << 6) -#define DAHDI_FORMAT_G729A (1 << 8) - #define CODEC_G729_IANA_CODE 18 #define CODEC_G723_IANA_CODE 4 @@ -50,8 +45,40 @@ static uint32_t total_encoders_usage = 0; static uint32_t total_decoders = 0; static uint32_t total_decoders_usage = 0; -static const char transcoding_device[] = "/dev/dahdi/transcode"; -static const char transcoder_name[] = "DAHDI"; + +/* + Zaptel/DAHDI definitions to not require the headers installed + Zaptel and DAHDI are binary compatible (at least in the transcoder interface) + */ + +#define DAHDI_TC_CODE 'T' +#define DAHDI_TC_ALLOCATE _IOW(DAHDI_TC_CODE, 1, struct dahdi_transcoder_formats) +#define DAHDI_TC_GETINFO _IOWR(DAHDI_TC_CODE, 2, struct dahdi_transcoder_info) + +#define DAHDI_FORMAT_G723_1 (1 << 0) +#define DAHDI_FORMAT_ULAW (1 << 2) +#define DAHDI_FORMAT_SLINEAR (1 << 6) +#define DAHDI_FORMAT_G729A (1 << 8) + +struct dahdi_transcoder_formats { + __u32 srcfmt; + __u32 dstfmt; +}; + +struct dahdi_transcoder_info { + __u32 tcnum; + char name[80]; + __u32 numchannels; + __u32 dstfmts; + __u32 srcfmts; +}; + +static const char transcoding_device_dahdi[] = "/dev/dahdi/transcode"; +static const char transcoder_name_dahdi[] = "DAHDI"; +static const char transcoding_device_zap[] = "/dev/zap/transcode"; +static const char transcoder_name_zap[] = "Zap"; +static const char *transcoding_device = NULL; +static const char *transcoder_name = NULL; SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_codec_load); SWITCH_MODULE_DEFINITION(mod_dahdi_codec, mod_dahdi_codec_load, NULL, NULL); @@ -305,6 +332,7 @@ { switch_api_interface_t *api_interface; switch_codec_interface_t *codec_interface; + struct stat statbuf; struct dahdi_transcoder_info info = { 0 }; int32_t fd, res; @@ -313,6 +341,20 @@ total_decoders = 0; total_decoders_usage = 0; + /* Let's check if DAHDI or Zaptel device should be used */ + if (!stat(transcoding_device_dahdi, &statbuf)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DAHDI transcoding device found.\n"); + transcoding_device = transcoding_device_dahdi; + transcoder_name = transcoder_name_zap; + } else if (!stat(transcoding_device_zap, &statbuf)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Zap transcoding device found.\n"); + transcoding_device = transcoding_device_zap; + transcoder_name = transcoder_name_zap; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No DAHDI or Zap transcoder device was found in /dev/.\n"); + return SWITCH_STATUS_FALSE; + } + fd = open(transcoding_device, O_RDWR); if (fd < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open %s transcoder device.\n", transcoder_name);

1 0