January 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7211 - in freeswitch/trunk/src: . include
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: anthm Date: Mon Jan 14 10:26:46 2008 New Revision: 7211 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core_state_machine.c Log: add process_cdr variable Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Jan 14 10:26:46 2008 @@ -101,6 +101,7 @@ #define SWITCH_PATH_SEPARATOR "/" #endif #define SWITCH_URL_SEPARATOR "://" +#define SWITCH_PROCESS_CDR_VARIABLE "process_cdr" #define SWITCH_BRIDGE_CHANNEL_VARIABLE "bridge_channel" #define SWITCH_CHANNEL_NAME_VARIABLE "channel_name" #define SWITCH_BRIDGE_UUID_VARIABLE "bridge_uuid" Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Mon Jan 14 10:26:46 2008 @@ -307,7 +307,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State %s\n", switch_channel_get_name(session->channel), __STATE_STR); \ if (!driver_state_handler->on_##__STATE || (driver_state_handler->on_##__STATE(session) == SWITCH_STATUS_SUCCESS \ && midstate == switch_channel_get_state(session->channel))) { \ - while ((application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) { \ + while (do_extra_handlers && (application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) { \ if (!application_state_handler || !application_state_handler->on_##__STATE \ || (application_state_handler->on_##__STATE \ && application_state_handler->on_##__STATE(session) == SWITCH_STATUS_SUCCESS \ @@ -320,7 +320,7 @@ } \ } \ index = 0; \ - while (proceed && (application_state_handler = switch_core_get_state_handler(index++)) != 0) { \ + while (do_extra_handlers && proceed && (application_state_handler = switch_core_get_state_handler(index++)) != 0) { \ if (!application_state_handler || !application_state_handler->on_##__STATE || \ (application_state_handler->on_##__STATE && \ application_state_handler->on_##__STATE(session) == SWITCH_STATUS_SUCCESS \ @@ -408,7 +408,8 @@ if (state != switch_channel_get_running_state(session->channel) || state == CS_HANGUP || exception) { int index = 0; int proceed = 1; - + int do_extra_handlers = 1; + switch_channel_set_running_state(session->channel); switch (state) { @@ -418,7 +419,15 @@ case CS_DONE: goto done; case CS_HANGUP: /* Deactivate and end the thread */ - STATE_MACRO(hangup, "HANGUP"); + { + const char *var = NULL; + + if (!(var = switch_channel_get_variable(session->channel, SWITCH_PROCESS_CDR_VARIABLE)) || !switch_true(var)) { + do_extra_handlers = 0; + } + + STATE_MACRO(hangup, "HANGUP"); + } goto done; case CS_INIT: /* Basic setup tasks */ STATE_MACRO(init, "INIT");

1 0

[commit] r7210 - freeswitch/trunk
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: brian Date: Mon Jan 14 10:24:14 2008 New Revision: 7210 Modified: freeswitch/trunk/Makefile.am Log: adding ttml Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Jan 14 10:24:14 2008 @@ -168,7 +168,7 @@ samples-conf: test -d $(DESTDIR)$(prefix)/conf || $(mkinstalldirs) $(DESTDIR)$(prefix)/conf - for conffile in `find conf -name \*.xml && find conf -name \*.conf && find conf -name \*.tpl && find conf -name mime.types` ; do \ + for conffile in `find conf -name \*.xml && find conf -name \*.conf && find conf -name \*.tpl && find conf -name \*.ttml && find conf -name mime.types` ; do \ dir=`echo $$conffile | sed -e 's|/[^/]*$$||'`; \ filename=`echo $$conffile | sed -e 's|^.*/||'`; \ test -d $(DESTDIR)$(PREFIX)/$$dir || $(mkinstalldirs) $(DESTDIR)$(prefix)/$$dir ; \

1 0

[commit] r7209 - freeswitch/trunk/libs/xmlrpc-c
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: mikej Date: Mon Jan 14 10:16:09 2008 New Revision: 7209 Modified: freeswitch/trunk/libs/xmlrpc-c/configure.in Log: cleaner build fixes Modified: freeswitch/trunk/libs/xmlrpc-c/configure.in ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/configure.in (original) +++ freeswitch/trunk/libs/xmlrpc-c/configure.in Mon Jan 14 10:16:09 2008 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(include/xmlrpc-c/base.h) -AM_CONFIG_HEADER(xmlrpc_amconfig.h) +AC_CONFIG_HEADERS(xmlrpc_amconfig.h) dnl ======================================================================= dnl Define PACKAGE, VERSION, @PACKAGE@, @VERSION@

1 0

[commit] r7208 - freeswitch/trunk
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: mikej Date: Mon Jan 14 01:14:04 2008 New Revision: 7208 Modified: freeswitch/trunk/Makefile.am Log: permissions on conf files to 644 (FSBUILD-32) Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Jan 14 01:14:04 2008 @@ -174,7 +174,7 @@ test -d $(DESTDIR)$(PREFIX)/$$dir || $(mkinstalldirs) $(DESTDIR)$(prefix)/$$dir ; \ test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename || \ test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename.noload || \ - $(INSTALL) $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \ + $(INSTALL) -m 644 $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \ done samples-htdocs: @@ -183,7 +183,7 @@ dir=`echo $$htdocsfile | sed -e 's|/[^/]*$$||'`; \ filename=`echo $$htdocsfile | sed -e 's|^.*/||'`; \ test -d $(DESTDIR)$(PREFIX)/$$dir || $(mkinstalldirs) $(DESTDIR)$(prefix)/$$dir ; \ - test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename || $(INSTALL) $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \ + test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename || $(INSTALL) -m 644 $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \ done samples: samples-conf samples-htdocs

1 0

[commit] r7207 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: brian Date: Mon Jan 14 00:29:33 2008 New Revision: 7207 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: clean this code up a tiny bit. Doesn't add anything 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 Mon Jan 14 00:29:33 2008 @@ -120,18 +120,19 @@ tagi_t tags[]) { switch_channel_t *channel = NULL; - const char *rtp_txstat_header; - const char *rtp_rxstat_header; + if (session) { + const char *tmp; + channel = switch_core_session_get_channel(session); if (sip->sip_user_agent && !switch_strlen_zero(sip->sip_user_agent->g_string)){ switch_channel_set_variable(channel, "sip_user_agent", sip->sip_user_agent->g_string); } - if ((rtp_txstat_header = sofia_glue_get_unknown_header(sip, "rtp-txstat"))) { - switch_channel_set_variable(channel, "sip_rtp_txstat", rtp_txstat_header); + if ((tmp = sofia_glue_get_unknown_header(sip, "rtp-txstat"))) { + switch_channel_set_variable(channel, "sip_rtp_txstat", tmp); } - if ((rtp_rxstat_header = sofia_glue_get_unknown_header(sip, "rtp-rxstat"))) { - switch_channel_set_variable(channel, "sip_rtp_rxstat", rtp_rxstat_header); + if ((tmp = sofia_glue_get_unknown_header(sip, "rtp-rxstat"))) { + switch_channel_set_variable(channel, "sip_rtp_rxstat", tmp); } }

1 0

[commit] r7206 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 13 Jan '08

13 Jan '08

Author: brian Date: Sun Jan 13 18:15:25 2008 New Revision: 7206 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: update Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sun Jan 13 18:15:25 2008 @@ -9,7 +9,7 @@ <action application="deflect" data="${destination_number}"/> </condition> </extension> - +  <extension name="tod_example" continue="true"> <condition field="${strftime(%H%M)}" expression="^((09|1[0-7])[0-5][0-9]|1800)$"> <action application="set" data="open=true"/> @@ -254,7 +254,6 @@ </condition> </extension> - <X-PRE-PROCESS cmd="include" data="extensions/*.xml"/> <extension name="enum"> @@ -263,6 +262,5 @@ <action application="transfer" data="$1 enum"/> </condition> </extension> - </context> </include>

1 0

[commit] r7205 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 13 Jan '08

13 Jan '08

Author: brian Date: Sun Jan 13 18:00:43 2008 New Revision: 7205 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: time of day example set a var open=true Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sun Jan 13 18:00:43 2008 @@ -10,6 +10,12 @@ </condition> </extension> + <extension name="tod_example" continue="true"> + <condition field="${strftime(%H%M)}" expression="^((09|1[0-7])[0-5][0-9]|1800)$"> + <action application="set" data="open=true"/> + </condition> + </extension> + <extension name="intercept"> <condition field="destination_number" expression="^886$"> <action application="answer"/>

1 0

[commit] r7204 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 13 Jan '08

13 Jan '08

Author: mikej Date: Sun Jan 13 17:49:35 2008 New Revision: 7204 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Log: fix nua_shutdown (MODENDP-75) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Sun Jan 13 17:49:35 2008 @@ -293,7 +293,7 @@ if ((event > nua_r_authenticate && event <= nua_r_ack) || event < nua_i_error || (nh && !nh->nh_valid) - || (nua->nua_shutdown && event != nua_r_shutdown)) { + ) { if (msg) msg_destroy(msg); return event;

1 0

[commit] r7203 - freeswitch/trunk/src/mod/loggers/mod_logfile
by Freeswitch SVN 13 Jan '08

13 Jan '08

Author: mikej Date: Sun Jan 13 15:11:54 2008 New Revision: 7203 Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Log: fix config parsing Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Sun Jan 13 15:11:54 2008 @@ -258,7 +258,7 @@ if ((settings = switch_xml_child(xml, "settings"))) { - for (param = switch_xml_child(settings, "map"); param; param = param->next) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); if (!strcmp(var, "logfile")) {

1 0

[commit] r7202 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 13 Jan '08

13 Jan '08

Author: mikej Date: Sun Jan 13 15:08:12 2008 New Revision: 7202 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: fix info send/receive 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 Jan 13 15:08:12 2008 @@ -760,7 +760,7 @@ return switch_rtp_queue_rfc2833(tech_pvt->rtp_session, dtmf); case DTMF_INFO: - snprintf(message, sizeof(message), "Signal=%c\r\nDuration=%d\r\n", dtmf->digit, dtmf->duration); + snprintf(message, sizeof(message), "Signal=%c\r\nDuration=%d\r\n", dtmf->digit, dtmf->duration / 8); nua_info(tech_pvt->nh, //NUTAG_WITH_THIS(tech_pvt->profile->nua), SIPTAG_CONTENT_TYPE_STR("application/dtmf-relay"), 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 Jan 13 15:08:12 2008 @@ -2097,7 +2097,7 @@ if (sip && sip->sip_content_type && sip->sip_content_type->c_type && sip->sip_content_type->c_subtype && sip->sip_payload && sip->sip_payload->pl_data) { - if (!strcasecmp(sip->sip_content_type->c_type, "dtmf") && !strcasecmp(sip->sip_content_type->c_subtype, "relay")) { + if (!strncasecmp(sip->sip_content_type->c_type, "application", 11) && !strcasecmp(sip->sip_content_type->c_subtype, "dtmf-relay")) { /* Try and find signal information in the payload */ if ((signal_ptr = switch_stristr("Signal=", sip->sip_payload->pl_data))) { /* move signal_ptr where we need it (right past Signal=) */ @@ -2110,13 +2110,13 @@ if ((signal_ptr = switch_stristr("Duration=", sip->sip_payload->pl_data))) { int tmp; - signal_ptr += 8; - if ((tmp = atoi(signal_ptr)) < 0) { + signal_ptr += 9; + if ((tmp = atoi(signal_ptr)) <= 0) { tmp = SWITCH_DEFAULT_DTMF_DURATION; } - dtmf.duration = tmp; + dtmf.duration = tmp * 8; } - } else if (!strcasecmp(sip->sip_content_type->c_type, "application") && !strcasecmp(sip->sip_content_type->c_subtype, "dtmf")) { + } else if (!strncasecmp(sip->sip_content_type->c_type, "application", 11) && !strcasecmp(sip->sip_content_type->c_subtype, "dtmf")) { dtmf.digit = *sip->sip_payload->pl_data; } else { goto fail;

1 0