November 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6311 - freeswitch/trunk/src/mod/endpoints/mod_iax
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: mikej Date: Fri Nov 16 14:48:02 2007 New Revision: 6311 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Log: allow iax to receive in call messages. 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 Fri Nov 16 14:48:02 2007 @@ -850,6 +850,29 @@ } +static switch_status_t channel_receive_event(switch_core_session_t *session, switch_event_t *event) +{ + switch_channel_t *channel; + struct private_object *tech_pvt; + char *body; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + + if (!(body = switch_event_get_body(event))) { + body = ""; + } + + iax_send_text(tech_pvt->iax_session, body); + + return SWITCH_STATUS_SUCCESS; +} + + switch_state_handler_table_t iax_state_handlers = { /*.on_init */ channel_on_init, /*.on_ring */ channel_on_ring, @@ -867,7 +890,8 @@ /*.waitfor_read */ channel_waitfor_read, /*.waitfor_write */ channel_waitfor_write, /*.send_dtmf */ channel_send_dtmf, - /*.receive_message*/ channel_receive_message + /*.receive_message*/ channel_receive_message, + /*.receive_event */ channel_receive_event }; SWITCH_MODULE_LOAD_FUNCTION(mod_iax_load)

1 0

[commit] r6310 - in freeswitch/trunk/src: . include mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: anthm Date: Fri Nov 16 14:11:16 2007 New Revision: 6310 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/switch_channel.c Log: move param gen func to the core Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Fri Nov 16 14:11:16 2007 @@ -456,6 +456,7 @@ \note it's necessary to test if the return val is the same as the input and free the string if it is not. */ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel, char *in); +SWITCH_DECLARE(char *) switch_channel_build_param_string(switch_channel_t *channel, switch_caller_profile_t *caller_profile); /** @} */ Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Fri Nov 16 14:11:16 2007 @@ -181,102 +181,15 @@ static switch_status_t dialplan_xml_locate(switch_core_session_t *session, switch_caller_profile_t *caller_profile, switch_xml_t * root, switch_xml_t * node) { - switch_status_t status = SWITCH_STATUS_GENERR; + char *data; switch_channel_t *channel; - switch_stream_handle_t stream = { 0 }; - switch_size_t encode_len = 1024, new_len = 0; - char *encode_buf = NULL; - const char *prof[12] = { 0 }, *prof_names[12] = {0}; - char *e = NULL; - switch_event_header_t *hi; - uint32_t x = 0; + switch_status_t status = SWITCH_STATUS_GENERR; channel = switch_core_session_get_channel(session); + data = switch_channel_build_param_string(channel, caller_profile); - SWITCH_STANDARD_STREAM(stream); - - if (!(encode_buf = malloc(encode_len))) { - goto done; - } - - prof[0] = caller_profile->context; - prof[1] = caller_profile->destination_number; - prof[2] = caller_profile->caller_id_name; - prof[3] = caller_profile->caller_id_number; - prof[4] = caller_profile->network_addr; - prof[5] = caller_profile->ani; - prof[6] = caller_profile->aniii; - prof[7] = caller_profile->rdnis; - prof[8] = caller_profile->source; - prof[9] = caller_profile->chan_name; - prof[10] = caller_profile->uuid; - - prof_names[0] = "context"; - prof_names[1] = "destination_number"; - prof_names[2] = "caller_id_name"; - prof_names[3] = "caller_id_number"; - prof_names[4] = "network_addr"; - prof_names[5] = "ani"; - prof_names[6] = "aniii"; - prof_names[7] = "rdnis"; - prof_names[8] = "source"; - prof_names[9] = "chan_name"; - prof_names[10] = "uuid"; - - for (x = 0; prof[x]; x++) { - if (switch_strlen_zero(prof[x])) { - continue; - } - new_len = (strlen(prof[x]) * 3) + 1; - if (encode_len < new_len) { - char *tmp; - - encode_len = new_len; - - if (!(tmp = realloc(encode_buf, encode_len))) { - goto done; - } - - encode_buf = tmp; - } - switch_url_encode(prof[x], encode_buf, encode_len - 1); - stream.write_function(&stream, "%s=%s&", prof_names[x], encode_buf); - } - - if ((hi = switch_channel_variable_first(channel))) { - for (; hi; hi = hi->next) { - char *var = hi->name; - char *val = hi->value; - - new_len = (strlen((char *) var) * 3) + 1; - if (encode_len < new_len) { - char *tmp; - - encode_len = new_len; - - tmp = realloc(encode_buf, encode_len); - assert(tmp); - encode_buf = tmp; - } - - switch_url_encode((char *) val, encode_buf, encode_len - 1); - stream.write_function(&stream, "%s=%s&", (char *) var, encode_buf); - - } - switch_channel_variable_last(channel); - } - - e = (char *) stream.data + (strlen((char *) stream.data) - 1); - - if (e && *e == '&') { - *e = '\0'; - } - - status = switch_xml_locate("dialplan", NULL, NULL, NULL, root, node, stream.data); - - done: - switch_safe_free(stream.data); - switch_safe_free(encode_buf); + status = switch_xml_locate("dialplan", NULL, NULL, NULL, root, node, data); + switch_safe_free(data); return status; } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Nov 16 14:11:16 2007 @@ -1510,6 +1510,106 @@ return data; } +SWITCH_DECLARE(char *) switch_channel_build_param_string(switch_channel_t *channel, switch_caller_profile_t *caller_profile) +{ + switch_stream_handle_t stream = { 0 }; + switch_size_t encode_len = 1024, new_len = 0; + char *encode_buf = NULL; + const char *prof[12] = { 0 }, *prof_names[12] = {0}; + char *e = NULL; + switch_event_header_t *hi; + uint32_t x = 0; + + SWITCH_STANDARD_STREAM(stream); + + encode_buf = malloc(encode_len); + assert(encode_buf); + + if (!caller_profile) { + caller_profile = switch_channel_get_caller_profile(channel); + } + + assert(caller_profile != NULL); + + prof[0] = caller_profile->context; + prof[1] = caller_profile->destination_number; + prof[2] = caller_profile->caller_id_name; + prof[3] = caller_profile->caller_id_number; + prof[4] = caller_profile->network_addr; + prof[5] = caller_profile->ani; + prof[6] = caller_profile->aniii; + prof[7] = caller_profile->rdnis; + prof[8] = caller_profile->source; + prof[9] = caller_profile->chan_name; + prof[10] = caller_profile->uuid; + + prof_names[0] = "context"; + prof_names[1] = "destination_number"; + prof_names[2] = "caller_id_name"; + prof_names[3] = "caller_id_number"; + prof_names[4] = "network_addr"; + prof_names[5] = "ani"; + prof_names[6] = "aniii"; + prof_names[7] = "rdnis"; + prof_names[8] = "source"; + prof_names[9] = "chan_name"; + prof_names[10] = "uuid"; + + for (x = 0; prof[x]; x++) { + if (switch_strlen_zero(prof[x])) { + continue; + } + new_len = (strlen(prof[x]) * 3) + 1; + if (encode_len < new_len) { + char *tmp; + + encode_len = new_len; + + if (!(tmp = realloc(encode_buf, encode_len))) { + abort(); + } + + encode_buf = tmp; + } + switch_url_encode(prof[x], encode_buf, encode_len - 1); + stream.write_function(&stream, "%s=%s&", prof_names[x], encode_buf); + } + + if ((hi = switch_channel_variable_first(channel))) { + for (; hi; hi = hi->next) { + char *var = hi->name; + char *val = hi->value; + + new_len = (strlen((char *) var) * 3) + 1; + if (encode_len < new_len) { + char *tmp; + + encode_len = new_len; + + tmp = realloc(encode_buf, encode_len); + assert(tmp); + encode_buf = tmp; + } + + switch_url_encode((char *) val, encode_buf, encode_len - 1); + stream.write_function(&stream, "%s=%s&", (char *) var, encode_buf); + + } + switch_channel_variable_last(channel); + } + + e = (char *) stream.data + (strlen((char *) stream.data) - 1); + + if (e && *e == '&') { + *e = '\0'; + } + + switch_safe_free(encode_buf); + + return stream.data; +} + + /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r6309 - freeswitch/trunk/src/mod/applications/mod_rss
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: anthm Date: Fri Nov 16 13:54:40 2007 New Revision: 6309 Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Log: add config override var Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Fri Nov 16 13:54:40 2007 @@ -179,16 +179,20 @@ char *argv[3], *feed_list[TTS_MAX_ENTRIES] = { 0 }, *feed_names[TTS_MAX_ENTRIES] = { 0}; int argc, feed_index = 0; - char *cf = "rss.conf"; + const char *cf = "rss.conf"; switch_xml_t cfg, cxml, feeds, feed; char buf[1024]; int32_t jumpto = -1; uint32_t matches = 0; switch_input_args_t args = { 0 }; + const char *vcf = NULL; channel = switch_core_session_get_channel(session); assert(channel != NULL); + if ((vcf = switch_channel_get_variable(channel, "rss_alt_config"))) { + cf = vcf; + } if (!(cxml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf);

1 0

[commit] r6308 - freeswitch/trunk
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: anthm Date: Fri Nov 16 13:11:14 2007 New Revision: 6308 Modified: freeswitch/trunk/Makefile.am Log: install recursion into conf folder Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Nov 16 13:11:14 2007 @@ -162,10 +162,12 @@ $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ done @if [ ! -f $(DESTDIR)$(PREFIX)/conf/freeswitch.xml ] ; then \ - $(INSTALL) conf/*.xml $(DESTDIR)$(PREFIX)/conf ; \ - $(INSTALL) conf/sip_profiles/*.xml $(DESTDIR)$(PREFIX)/conf/sip_profiles ; \ - $(INSTALL) conf/dialplan/*.xml $(DESTDIR)$(PREFIX)/conf/dialplan ; \ - $(INSTALL) conf/directory/*.xml $(DESTDIR)$(PREFIX)/conf/directory ; \ + for conffile in `find conf -name \*.xml && find conf -name \*.conf` ; do \ + dir=`echo $$conffile | sed -e 's|/[^/]*$$||'`; \ + filename=`echo $$conffile | sed -e 's|^.*/||'`; \ + test -d $(DESTDIR)$(PREFIX)/$$dir || $(mkinstalldirs) $(DESTDIR)$(prefix)/$$dir ; \ + $(INSTALL) $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \ + done ; \ fi .version:

1 0

[commit] r6307 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: anthm Date: Fri Nov 16 09:55:18 2007 New Revision: 6307 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: adj 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 Fri Nov 16 09:55:18 2007 @@ -1568,6 +1568,7 @@ char *dialplan = globals.dialplan; char *cid_name = globals.cid_name; char *cid_num = globals.cid_num; + char ip[25] = "0.0.0.0"; switch_core_session_add_stream(session, NULL); if ((tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t))) != 0) { @@ -1602,10 +1603,12 @@ if (!switch_strlen_zero(argv[5])) { tech_pvt->codec_ms = atoi(argv[5]); } + + switch_find_local_ip(ip, sizeof(ip), AF_INET); if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), NULL, dialplan, cid_name, cid_num, - NULL, NULL, NULL, NULL, modname, NULL, + ip, NULL, NULL, NULL, modname, NULL, dest)) != 0) { char name[128]; snprintf(name, sizeof(name), "PortAudio/%s",

1 0

[commit] r6306 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: brian Date: Fri Nov 16 09:04:43 2007 New Revision: 6306 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: another tweak.. info will answer many questions on a default instal Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Nov 16 09:04:43 2007 @@ -2,7 +2,6 @@ <extension name="global" continue="true"> <condition> <action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> - <action application="info"/> </condition> <!-- This will setup some variables if the user isn't authenticated. numbering_plan is required for the demo to function properly. @@ -10,6 +9,9 @@ <condition field="${numbering_plan}" condition="^1$"> <action application="set_user" data="default@${domain}"/> </condition> + <condition> + <action application="info"/> + </condition> </extension> <!--

1 0

[commit] r6305 - freeswitch/trunk/conf
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: brian Date: Fri Nov 16 09:03:40 2007 New Revision: 6305 Modified: freeswitch/trunk/conf/openmrcp.conf.xml Log: tweak Modified: freeswitch/trunk/conf/openmrcp.conf.xml ============================================================================== --- freeswitch/trunk/conf/openmrcp.conf.xml (original) +++ freeswitch/trunk/conf/openmrcp.conf.xml Fri Nov 16 09:03:40 2007 @@ -1,5 +1,5 @@  -<configuration name="mod_openmrcp.conf" description="mod_openmrcp configuration"> +<configuration name="openmrcp.conf" description="mod_openmrcp configuration"> <settings> <param name="asr_default_profile" value="openmrcp-v2"/> <param name="tts_default_profile" value="openmrcp-v2"/>

1 0

[commit] r6304 - freeswitch/trunk/conf
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: brian Date: Fri Nov 16 09:01:55 2007 New Revision: 6304 Modified: freeswitch/trunk/conf/modules.conf.xml Log: mybad Modified: freeswitch/trunk/conf/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/modules.conf.xml (original) +++ freeswitch/trunk/conf/modules.conf.xml Fri Nov 16 09:01:55 2007 @@ -27,7 +27,7 @@    - <load module="mod_portaudio"/> +   <load module="mod_sofia"/>

1 0

[commit] r6303 - in freeswitch/trunk/conf: . dialplan
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: brian Date: Fri Nov 16 09:01:02 2007 New Revision: 6303 Modified: freeswitch/trunk/conf/cdr.conf.xml freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/modules.conf.xml Log: woops Modified: freeswitch/trunk/conf/cdr.conf.xml ============================================================================== --- freeswitch/trunk/conf/cdr.conf.xml (original) +++ freeswitch/trunk/conf/cdr.conf.xml Fri Nov 16 09:01:02 2007 @@ -1,4 +1,4 @@ -<configuration name="mod_cdr.conf" description="CDR Configuration"> +<configuration name="cdr.conf" description="CDR Configuration"> <pddcdr> <param name="path" value="/work/temp/pddcdr"/>  Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Nov 16 09:01:02 2007 @@ -2,6 +2,7 @@ <extension name="global" continue="true"> <condition> <action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> + <action application="info"/> </condition>  <load module="mod_console"/>  @@ -26,7 +27,7 @@    -  + <load module="mod_portaudio"/>  <load module="mod_sofia"/>

1 0

[commit] r6302 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: brian Date: Fri Nov 16 08:47:33 2007 New Revision: 6302 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: lets actually use the var we set. Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Nov 16 08:47:33 2007 @@ -46,7 +46,7 @@  <extension name="FS_Conf_SIP"> <condition field="destination_number" expression="^888$"> - <action application="bridge" data="sofia/default/888(a)conference.freeswitch.org"/> + <action application="bridge" data="sofia/${use_profile}/888(a)conference.freeswitch.org"/> </condition> </extension>

1 0