April 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12911 - freeswitch/trunk/scripts/contrib/mcollins
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: mcollins Date: Fri Apr 3 14:21:26 2009 New Revision: 12911 Log: Add html directory for output Modified: freeswitch/trunk/scripts/contrib/mcollins/create-chanvars-html-page.pl freeswitch/trunk/scripts/contrib/mcollins/extract-fs-vars-from-source-tree.sh Modified: freeswitch/trunk/scripts/contrib/mcollins/create-chanvars-html-page.pl ============================================================================== --- freeswitch/trunk/scripts/contrib/mcollins/create-chanvars-html-page.pl (original) +++ freeswitch/trunk/scripts/contrib/mcollins/create-chanvars-html-page.pl Fri Apr 3 14:21:26 2009 @@ -60,17 +60,19 @@ # Get the cmd line options my $srcdir = '/usr/src/freeswitch.trunk'; my $tmpdir = '/tmp'; +my $htmldir = '/usr/local/freeswitch/htdocs'; ## Use these as defaults unless command line args are supplied GetOptions( 'srcdir=s' => \$srcdir, 'tmpdir=s' => \$tmpdir, + 'htmldir=s' => \$htmldir, ); my $srcdirlen = length $srcdir; # calculate this once since it doesn't change my $headerfile = $tmpdir . "/header-defs.txt"; my $datafile = $tmpdir . "/get-set-vars.txt"; -my $htmlfile = $tmpdir . "/chanvars.html"; +my $htmlfile = $htmldir . "/chanvars.html"; my $site = 'http://fisheye.freeswitch.org/browse/FreeSWITCH'; Modified: freeswitch/trunk/scripts/contrib/mcollins/extract-fs-vars-from-source-tree.sh ============================================================================== --- freeswitch/trunk/scripts/contrib/mcollins/extract-fs-vars-from-source-tree.sh (original) +++ freeswitch/trunk/scripts/contrib/mcollins/extract-fs-vars-from-source-tree.sh Fri Apr 3 14:21:26 2009 @@ -11,9 +11,10 @@ # # MC 2009-04-02 -# Change these vars if your source directory is different +# Change these vars if your directories are different SRCDIR=/usr/src/freeswitch.trunk TMPDIR=/tmp +HTMLDIR=/usr/local/freeswitch/htdocs # Grep the variables, then grep the aliases in the header files echo Searching source tree for channel variable set/get... @@ -24,4 +25,4 @@ # launch perl script here echo Creating HTML file in $TMPDIR directory -./create-chanvars-html-page.pl --srcdir=$SRCDIR --tmpdir=$TMPDIR +./create-chanvars-html-page.pl --srcdir=$SRCDIR --tmpdir=$TMPDIR --htmldir=$HTMLDIR

1 0

[commit] r12910 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: mrene Date: Fri Apr 3 13:56:53 2009 New Revision: 12910 Log: tweak 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 Fri Apr 3 13:56:53 2009 @@ -2589,7 +2589,7 @@ if (end_of(command) == 's') { end_of(command) = '\0'; } - sprintf(sql, "select type, name, key from interfaces where key = '%s' order by type,name", command); + sprintf(sql, "select type, name, key from interfaces where type = '%s' order by type,name", command); } else if (!strncasecmp(command, "module", 6)) { if (argv[1]) { sprintf(sql, "select distinct type, name, key, filename from interfaces where key = '%s' order by type,name", argv[1]);

1 0

[commit] r12909 - freeswitch/trunk/scripts/contrib/mcollins
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: mcollins Date: Fri Apr 3 13:43:59 2009 New Revision: 12909 Log: Fix typos Modified: freeswitch/trunk/scripts/contrib/mcollins/create-chanvars-html-page.pl freeswitch/trunk/scripts/contrib/mcollins/extract-fs-vars-from-source-tree.sh Modified: freeswitch/trunk/scripts/contrib/mcollins/create-chanvars-html-page.pl ============================================================================== --- freeswitch/trunk/scripts/contrib/mcollins/create-chanvars-html-page.pl (original) +++ freeswitch/trunk/scripts/contrib/mcollins/create-chanvars-html-page.pl Fri Apr 3 13:43:59 2009 @@ -70,7 +70,7 @@ my $headerfile = $tmpdir . "/header-defs.txt"; my $datafile = $tmpdir . "/get-set-vars.txt"; -my $htmlfile = "/Users/michaelcollins/Downloads/chanvars.html"; +my $htmlfile = $tmpdir . "/chanvars.html"; my $site = 'http://fisheye.freeswitch.org/browse/FreeSWITCH'; Modified: freeswitch/trunk/scripts/contrib/mcollins/extract-fs-vars-from-source-tree.sh ============================================================================== --- freeswitch/trunk/scripts/contrib/mcollins/extract-fs-vars-from-source-tree.sh (original) +++ freeswitch/trunk/scripts/contrib/mcollins/extract-fs-vars-from-source-tree.sh Fri Apr 3 13:43:59 2009 @@ -12,12 +12,16 @@ # MC 2009-04-02 # Change these vars if your source directory is different -SRCDIR=/usr/usr/freeswitch.trunk +SRCDIR=/usr/src/freeswitch.trunk TMPDIR=/tmp # Grep the variables, then grep the aliases in the header files +echo Searching source tree for channel variable set/get... grep -rn "[sg]et_variable(" $SRCDIR/* | grep -v Binary | grep -v svn > $TMPDIR/get-set-vars.txt + +echo Getting header file definitions... grep -n "_VARIABLE" $SRCDIR/src/include/*h > $TMPDIR/header-defs.txt # launch perl script here -./extract-fs-chanvars.pl --srcdir=$SRCDIR --tmpdir=$TMPDIR \ No newline at end of file +echo Creating HTML file in $TMPDIR directory +./create-chanvars-html-page.pl --srcdir=$SRCDIR --tmpdir=$TMPDIR

1 0

[commit] r12908 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: mrene Date: Fri Apr 3 13:04:52 2009 New Revision: 12908 Log: fix show [interfacetype] 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 Fri Apr 3 13:04:52 2009 @@ -2589,7 +2589,7 @@ if (end_of(command) == 's') { end_of(command) = '\0'; } - sprintf(sql, "select type, name, key from interfaces where name = '%s' order by type,name", command); + sprintf(sql, "select type, name, key from interfaces where key = '%s' order by type,name", command); } else if (!strncasecmp(command, "module", 6)) { if (argv[1]) { sprintf(sql, "select distinct type, name, key, filename from interfaces where key = '%s' order by type,name", argv[1]);

1 0

[commit] r12907 - freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: dschreiber Date: Fri Apr 3 13:00:34 2009 New Revision: 12907 Log: MODAPP-229 Modified: freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/mod_nibblebill.c Modified: freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/mod_nibblebill.c ============================================================================== --- freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/mod_nibblebill.c (original) +++ freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/mod_nibblebill.c Fri Apr 3 13:00:34 2009 @@ -141,14 +141,14 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_nobal_action, globals.nobal_action); #ifdef SWITCH_HAVE_ODBC -static int nibblebill_callback(void *pArg, int argc, char **argv, char **columnNames) +/*static int nibblebill_callback(void *pArg, int argc, char **argv, char **columnNames) { nibblebill_results_t *cbt = (nibblebill_results_t *) pArg; cbt->funds = atof(argv[0]); return 0; -} +}*/ #endif static switch_status_t load_config(void) @@ -276,15 +276,16 @@ { #ifdef SWITCH_HAVE_ODBC char sql[1024] = ""; - nibblebill_results_t pdata; + SQLHSTMT stmt; - memset(&pdata, 0, sizeof(pdata)); snprintf(sql, 1024, SQL_SAVE, globals.db_table, globals.db_column_cash, globals.db_column_cash, billamount, globals.db_column_account, billaccount); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doing update query\n[%s]\n", sql); - if (!(switch_odbc_handle_callback_exec(globals.master_odbc, sql, nibblebill_callback, &pdata) == SWITCH_ODBC_SUCCESS)){ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "DB Error while updating cash!\n"); - + if (switch_odbc_handle_exec(globals.master_odbc, sql, &stmt) != SWITCH_ODBC_SUCCESS) { + char *err_str; + err_str = switch_odbc_handle_get_error(globals.master_odbc, stmt); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERR: [%s]\n[%s]\n", sql, switch_str_nil(err_str)); + switch_safe_free(err_str); } else { #endif /* TODO: Failover to a flat/text file if DB is unavailable */ @@ -292,6 +293,8 @@ return SWITCH_STATUS_SUCCESS; #ifdef SWITCH_HAVE_ODBC } + + SQLFreeHandle(SQL_HANDLE_STMT, stmt); #endif return SWITCH_STATUS_SUCCESS; } @@ -350,7 +353,7 @@ } if (profile->times->answered < 1) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Not billing %s - call is not in answered state\n", billaccount); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Not billing %s - call is not in answered state\n", billaccount); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12906 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: andrew Date: Fri Apr 3 12:52:38 2009 New Revision: 12906 Log: Whoops! Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Fri Apr 3 12:52:38 2009 @@ -1145,12 +1145,12 @@ session_element->process.type = ERLANG_PID; memcpy(&session_element->process.pid, pid, sizeof(erlang_pid)); - switch_safe_free(pid); /* malloced in handle_ref_tuple */ switch_set_flag(session_element, LFLAG_SESSION_ALIVE); switch_clear_flag(session_element, LFLAG_OUTBOUND_INIT); switch_clear_flag(session_element, LFLAG_WAITING_FOR_PID); - ei_link(listener, ei_self(listener->ec), pid); + ei_link(listener, ei_self(listener->ec), pid); + switch_safe_free(pid); /* malloced in handle_ref_tuple */ } return session_element; }

1 0

[commit] r12905 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: anthm Date: Fri Apr 3 11:43:46 2009 New Revision: 12905 Log: MODENDP-210 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Fri Apr 3 11:43:46 2009 @@ -255,15 +255,14 @@ //switch_ivr_transfer_variable(session, tech_pvt->other_session, "process_cdr"); switch_ivr_transfer_variable(session, tech_pvt->other_session, NULL); + switch_channel_set_variable(channel, "other_loopback_leg_uuid", switch_channel_get_uuid(b_channel)); + switch_channel_set_variable(b_channel, "other_loopback_leg_uuid", switch_channel_get_uuid(channel)); + if (switch_core_session_thread_launch(b_session) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); goto end; } - - switch_channel_set_variable(channel,"other_loopback_leg_uuid",switch_channel_get_uuid(b_channel)); - switch_channel_set_variable(b_channel,"other_loopback_leg_uuid",switch_channel_get_uuid(channel)); - } if (tech_pvt->other_session) {

1 0

[commit] r12904 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: anthm Date: Fri Apr 3 10:09:30 2009 New Revision: 12904 Log: add rtp-autofix-timing (defauts to true even when not present) set to false to disable it FSCORE-281 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Fri Apr 3 10:09:30 2009 @@ -191,6 +191,8 @@    +  +  <!-- clear clears them all or supply the name to add or the name prefixed with ~ to remove valid values:

1 0

[commit] r12903 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: anthm Date: Fri Apr 3 10:07:10 2009 New Revision: 12903 Log: add rtp-autofix-timing (defauts to true even when not present) set to false to disable it 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 Fri Apr 3 10:07:10 2009 @@ -716,7 +716,7 @@ return SWITCH_STATUS_GENERR; } - if (tech_pvt->check_frames++ < MAX_CODEC_CHECK_FRAMES) { + if (sofia_test_pflag(tech_pvt->profile, PFLAG_AUTOFIX_TIMING) && tech_pvt->check_frames++ < MAX_CODEC_CHECK_FRAMES) { if (!tech_pvt->read_impl.encoded_bytes_per_packet) { tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES; goto skip; 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 Fri Apr 3 10:07:10 2009 @@ -183,6 +183,7 @@ PFLAG_DISABLE_NAPTR, PFLAG_AUTOFLUSH, PFLAG_NAT_OPTIONS_PING, + PFLAG_AUTOFIX_TIMING, /* No new flags below this line */ PFLAG_MAX } PFLAGS; 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 Fri Apr 3 10:07:10 2009 @@ -1680,6 +1680,12 @@ } else { sofia_clear_pflag(profile, PFLAG_AUTOFLUSH); } + } else if (!strcasecmp(var, "rtp-autofix-timing")) { + if (switch_true(val)) { + sofia_set_pflag(profile, PFLAG_AUTOFIX_TIMING); + } else { + sofia_clear_pflag(profile, PFLAG_AUTOFIX_TIMING); + } } else if (!strcasecmp(var, "nat-options-ping")) { if (switch_true(val)) { sofia_set_pflag(profile, PFLAG_NAT_OPTIONS_PING); @@ -1947,6 +1953,7 @@ sofia_set_pflag(profile, PFLAG_STUN_ENABLED); sofia_set_pflag(profile, PFLAG_DISABLE_100REL); profile->auto_restart = 1; + sofia_set_pflag(profile, PFLAG_AUTOFIX_TIMING); for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -2218,6 +2225,12 @@ } else { sofia_clear_pflag(profile, PFLAG_AUTOFLUSH); } + } else if (!strcasecmp(var, "rtp-autofix-timing")) { + if (switch_true(val)) { + sofia_set_pflag(profile, PFLAG_AUTOFIX_TIMING); + } else { + sofia_clear_pflag(profile, PFLAG_AUTOFIX_TIMING); + } } else if (!strcasecmp(var, "nat-options-ping")) { if (switch_true(val)) { sofia_set_pflag(profile, PFLAG_NAT_OPTIONS_PING);

1 0

[commit] r12902 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: anthm Date: Fri Apr 3 09:47:52 2009 New Revision: 12902 Log: MODENDP-209 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Fri Apr 3 09:47:52 2009 @@ -539,7 +539,8 @@ break; } - if ((sofia_private && sofia_private == &mod_sofia_globals.destroy_private) || (status >= 300 && status != 401 && status != 407 && status != 603)) { + if ((sofia_private && sofia_private == &mod_sofia_globals.destroy_private) || + (!session && (status >= 300 && status != 401 && status != 407))) { nua_handle_bind(nh, NULL); nua_handle_destroy(nh); nh = NULL;

1 0