June 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13981 - freeswitch/trunk/contrib/mod/endpoints/mod_khomp
by FreeSWITCH SVN 26 Jun '09

26 Jun '09

Author: intralanman Date: Fri Jun 26 13:18:45 2009 New Revision: 13981 Log: starting to move mods into mirrored src structure Added: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/ - copied from r13980, /freeswitch/trunk/contrib/jmesquita/mod_khomp/

1 0

[commit] r13980 - freeswitch/trunk/src/mod/applications/mod_lcr/sql
by FreeSWITCH SVN 26 Jun '09

26 Jun '09

Author: intralanman Date: Fri Jun 26 13:02:18 2009 New Revision: 13980 Log: i guess i should have put this here when it got promoted to prime time Added: freeswitch/trunk/src/mod/applications/mod_lcr/sql/ - copied from r13974, /freeswitch/trunk/contrib/intralanman/C/lcr/sql/ freeswitch/trunk/src/mod/applications/mod_lcr/sql/postgres-8.3.sql - copied unchanged from r13979, /freeswitch/trunk/contrib/intralanman/C/lcr/sql/postgres-8.3.sql

1 0

[commit] r13979 - freeswitch/trunk/contrib/intralanman/C/lcr/sql
by FreeSWITCH SVN 26 Jun '09

26 Jun '09

Author: intralanman Date: Fri Jun 26 13:00:39 2009 New Revision: 13979 Log: forgot to update the pg schema when i updated mysql Modified: freeswitch/trunk/contrib/intralanman/C/lcr/sql/postgres-8.3.sql Modified: freeswitch/trunk/contrib/intralanman/C/lcr/sql/postgres-8.3.sql ============================================================================== --- freeswitch/trunk/contrib/intralanman/C/lcr/sql/postgres-8.3.sql (original) +++ freeswitch/trunk/contrib/intralanman/C/lcr/sql/postgres-8.3.sql Fri Jun 26 13:00:39 2009 @@ -43,6 +43,7 @@ id serial NOT NULL, digits NUMERIC(20, 0), rate numeric(11,5) NOT NULL, + intra numeric(11,5) NOT NULL, carrier_id integer NOT NULL REFERENCES carriers(id), lead_strip integer NOT NULL DEFAULT 0, trail_strip integer NOT NULL DEFAULT 0,

1 0

[commit] r13978 - freeswitch/trunk/contrib/3c
by FreeSWITCH SVN 26 Jun '09

26 Jun '09

Author: intralanman Date: Fri Jun 26 12:39:31 2009 New Revision: 13978 Log: we have a new contributor :-) Added: freeswitch/trunk/contrib/3c/

1 0

[commit] r13977 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 26 Jun '09

26 Jun '09

Author: brian Date: Fri Jun 26 12:33:19 2009 New Revision: 13977 Log: mod_sofia: BOUNTY-7 and MODENDP-146 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 Jun 26 12:33:19 2009 @@ -4695,6 +4695,10 @@ if ((rpid = sip_remote_party_id(sip))) { if (rpid->rpid_url && rpid->rpid_url->url_user) { from_user = rpid->rpid_url->url_user; + if (!switch_strlen_zero(from_user)) { + switch_channel_set_variable(channel, SOFIA_SIP_HEADER_PREFIX "Remote-Party-ID", from_user); + } + } if (!switch_strlen_zero(rpid->rpid_display)) { displayname = rpid->rpid_display; @@ -4705,6 +4709,9 @@ if ((passerted = sip_p_asserted_identity(sip))) { if (passerted->paid_url && passerted->paid_url->url_user) { from_user = passerted->paid_url->url_user; + if (!switch_strlen_zero(from_user)) { + switch_channel_set_variable(channel, SOFIA_SIP_HEADER_PREFIX "P-Asserted-Identity", from_user); + } } if (!switch_strlen_zero(passerted->paid_display)) { displayname = passerted->paid_display; @@ -4715,6 +4722,10 @@ if ((ppreferred = sip_p_preferred_identity(sip))) { if (ppreferred->ppid_url && ppreferred->ppid_url->url_user) { from_user = ppreferred->ppid_url->url_user; + if (!switch_strlen_zero(from_user)) { + switch_channel_set_variable(channel, SOFIA_SIP_HEADER_PREFIX "P-Preferred-Identity", from_user); + } + } if (!switch_strlen_zero(ppreferred->ppid_display)) { displayname = ppreferred->ppid_display; @@ -5082,6 +5093,11 @@ } if ((privacy = sip_privacy(sip))) { + char *full_priv_header = sip_header_as_string(nh->nh_home, (void *) privacy); + if (!switch_strlen_zero(full_priv_header)) { + switch_channel_set_variable(channel, SOFIA_SIP_HEADER_PREFIX "Privacy", full_priv_header); + } + if (msg_params_find(privacy->priv_values, "id")) { switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); }

1 0

[commit] r13976 - in freeswitch/trunk/contrib/mod: Makefile Makefile.am Makefile.in
by FreeSWITCH SVN 26 Jun '09

26 Jun '09

Author: intralanman Date: Fri Jun 26 10:55:54 2009 New Revision: 13976 Log: where'd those come from? Removed: freeswitch/trunk/contrib/mod/Makefile/ freeswitch/trunk/contrib/mod/Makefile.am/ freeswitch/trunk/contrib/mod/Makefile.in/

1 0

[commit] r13975 - in freeswitch/trunk/contrib/mod: . Makefile Makefile.am Makefile.in applications asr_tts codecs dialplans directories endpoints event_handlers formats languages loggers say timers xml_int
by FreeSWITCH SVN 26 Jun '09

26 Jun '09

Author: intralanman Date: Fri Jun 26 10:43:40 2009 New Revision: 13975 Log: setting up contrib/mod to mirror src/mod's structure Added: freeswitch/trunk/contrib/mod/ freeswitch/trunk/contrib/mod/Makefile/ freeswitch/trunk/contrib/mod/Makefile.am/ freeswitch/trunk/contrib/mod/Makefile.in/ freeswitch/trunk/contrib/mod/applications/ freeswitch/trunk/contrib/mod/asr_tts/ freeswitch/trunk/contrib/mod/codecs/ freeswitch/trunk/contrib/mod/dialplans/ freeswitch/trunk/contrib/mod/directories/ freeswitch/trunk/contrib/mod/endpoints/ freeswitch/trunk/contrib/mod/event_handlers/ freeswitch/trunk/contrib/mod/formats/ freeswitch/trunk/contrib/mod/languages/ freeswitch/trunk/contrib/mod/loggers/ freeswitch/trunk/contrib/mod/say/ freeswitch/trunk/contrib/mod/timers/ freeswitch/trunk/contrib/mod/xml_int/

1 0

[commit] r13974 - in freeswitch/trunk/contrib/ledr/mod_xml_odbc: . xml_odbc_templates
by FreeSWITCH SVN 26 Jun '09

26 Jun '09

Author: ledr Date: Fri Jun 26 09:09:47 2009 New Revision: 13974 Log: Added Makefile again, created directory template compatible with swk's sql schema Added: freeswitch/trunk/contrib/ledr/mod_xml_odbc/Makefile freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory_swk.xml Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml Added: freeswitch/trunk/contrib/ledr/mod_xml_odbc/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/Makefile Fri Jun 26 09:09:47 2009 @@ -0,0 +1,2 @@ +BASE=../../.. +include $(BASE)/build/modmake.rules Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c ============================================================================== --- freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c (original) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Fri Jun 26 09:09:47 2009 @@ -174,14 +174,10 @@ new_value = switch_event_expand_headers(params, value); if (!strcasecmp(name, "break-to")) { -// if (xml_odbc_render_template(new_value, params, xml_out, off) == SWITCH_STATUS_FALSE) { -// if (!switch_strlen_zero(no_template_break_to)) { /* have a look at this again, not too happy about this next_template_name thing.. */ - switch_event_del_header(params, "next_template_name"); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "next_template_name", value); - return SWITCH_STATUS_FALSE; -// } -// } + switch_event_del_header(params, "next_template_name"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "next_template_name", value); + return SWITCH_STATUS_FALSE; } else if (!strcasecmp(name, "query")) { query_helper.xml_in = xml_in; query_helper.xml_out = xml_out; Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml ============================================================================== --- freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml (original) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml Fri Jun 26 09:09:47 2009 @@ -9,6 +9,7 @@ --> <binding name="directory"> <param name="odbc-dsn" value="freeswitch:freeswitch:secret"/> +  <param name="template" value="directory"/> </binding> <!-- Added: freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory_swk.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory_swk.xml Fri Jun 26 09:09:47 2009 @@ -0,0 +1,90 @@ +<include> + <template name="directory_swk" description="based on swk's shipment sql"> + <document type="freeswitch/xml"> + <xml-odbc-do name="query" on-empty-result-break-to="not_found" value=" + SELECT + domains.uid AS domains_uid, + users.uid AS users_uid, + users.cidr, + users.mailbox + FROM + domains, + users + WHERE + users.username = '${user}' AND + domains.name = '${domain}' AND + users.domains_uid = domains.uid AND + domains.enabled = '1' AND + users.enabled = '1';"/> + <section name="directory"> + <domain name="${domain}"> + <params> + <xml-odbc-do name="query" value=" + SELECT + name, value + FROM + domain_params + WHERE + domains_uid = '${domains_uid}';"> + <param name="${name}" value="${value}"/> + </xml-odbc-do> + </params> + <variables> + <xml-odbc-do name="query" value=" + SELECT + name, value + FROM + domain_variables + WHERE + domains_uid = '${domains_uid}';"> + <variable name="${name}" value="${value}"/> + </xml-odbc-do> + </variables> + <groups> + <group name="default"> + <users> + <user id="${user}" mailbox="${mailbox}" cidr="${cidr}"> + <params> + <xml-odbc-do name="query" on-empty-result-break-to="not_found" value=" + SELECT + name, value + FROM + user_params + WHERE + users_uid = '${users_uid}';"> + <param name="${name}" value="${value}"/> + </xml-odbc-do> + </params> + <variables> + <xml-odbc-do name="query" value=" + SELECT + name, value + FROM + user_variables + WHERE + users_uid = '${users_uid}';"> + <variable name="${name}" value="${value}"/> + </xml-odbc-do> + </variables> + </user> + </users> + </group> + <xml-odbc-do name="query" value=" + SELECT + name AS group_name + FROM + groups, + group_members + WHERE + group_members.groups_uid = groups.uid AND + users_uid = '${users_uid}';"> + <group name="${group_name}"> + <user id="${user}" type="pointer"/> + </group> + </xml-odbc-do> + </groups> + </domain> + </section> + </document> + </template> +</include>

1 0

[commit] r13973 - freeswitch/trunk/contrib/jmesquita/mod_khomp
by FreeSWITCH SVN 26 Jun '09

26 Jun '09

Author: raulfragoso Date: Thu Jun 25 23:28:55 2009 New Revision: 13973 Log: Callback for audio listener missed a CM_LISTEN command to work Modified: freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp Modified: freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp ============================================================================== --- freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp (original) +++ freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp Thu Jun 25 23:28:55 2009 @@ -1165,6 +1165,9 @@ channel = switch_core_session_get_channel(session); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Call will be answered on board %u, channel %u. [EV_CONNECT]\n", e->DeviceId, obj); switch_channel_mark_answered(channel); + /* Start listening for audio */ + const size_t buffer_size = 16; + k3l->command(e->DeviceId, obj, CM_LISTEN, (const char *) &buffer_size); } catch (K3LAPI::invalid_session & err) {

1 0

[commit] r13972 - freeswitch/trunk/contrib/jmesquita/mod_khomp
by FreeSWITCH SVN 26 Jun '09

26 Jun '09

Author: raulfragoso Date: Thu Jun 25 22:37:09 2009 New Revision: 13972 Log: Replace tabs with spaces Modified: freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp Modified: freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp ============================================================================== --- freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp (original) +++ freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp Thu Jun 25 22:37:09 2009 @@ -1272,14 +1272,14 @@ default: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New Event has just arrived on %u with untreated code: %x\n", obj, e->Code); } - + return ksSuccess; } static void Kstdcall khomp_audio_listener (int32 deviceid, int32 mixer, byte * read_buffer, int32 read_size) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New audio buffer for deviceid %d, mixer %d, with size %d\n", deviceid, mixer, read_size); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New audio buffer for deviceid %d, mixer %d, with size %d\n", deviceid, mixer, read_size); } /* For Emacs:

1 0