- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

26 Jun '09

Author: raulfragoso Date: Thu Jun 25 22:28:46 2009 New Revision: 13971 Log: Initial implementation for audio buffers 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:28:46 2009 @@ -131,9 +131,10 @@ static void printLinks(switch_stream_handle_t* stream, unsigned int device, unsigned int link); static void printChannels(switch_stream_handle_t* stream, unsigned int device, unsigned int link); /* Handles callbacks and events from the boards */ -static int32 Kstdcall EventCallBack(int32 obj, K3L_EVENT * e); +static int32 Kstdcall khomp_event_callback(int32 obj, K3L_EVENT * e); KLibraryStatus khomp_channel_from_event(unsigned int KDeviceId, unsigned int KChannel, K3L_EVENT * event); - +/* Callback for receiving audio buffers from the boards */ +static void Kstdcall khomp_audio_listener (int32 deviceid, int32 mixer, byte * read_buffer, int32 read_size); /* Will init part of our private structure and setup all the read/write buffers */ @@ -658,6 +659,9 @@ Spawn our k3l global var that will be used along the module for sending info to the boards */ + k3lSetGlobalParam (klpResetFwOnStartup, 1); + k3lSetGlobalParam (klpDisableInternalVoIP, 1); + k3l = new K3LAPI(); /* Start the API and connect to KServer */ @@ -670,7 +674,8 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "K3L started.\n"); - k3lRegisterEventHandler( EventCallBack ); + k3lRegisterEventHandler( khomp_event_callback ); + k3lRegisterAudioListener (NULL, khomp_audio_listener); /* Add all the specific API functions */ SWITCH_ADD_API(api_interface, "khomp", "Khomp Menu", khomp, KHOMP_SYNTAX); @@ -1104,7 +1109,7 @@ } -static int32 Kstdcall EventCallBack(int32 obj, K3L_EVENT * e) +static int32 Kstdcall khomp_event_callback(int32 obj, K3L_EVENT * e) { /* TODO: How do we make sure channels inside FreeSWITCH only change to valid states on K3L? */ switch(e->Code) @@ -1272,6 +1277,11 @@ } +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); +} + /* For Emacs: * Local Variables: * mode:c

1 0

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

26 Jun '09

Author: raulfragoso Date: Thu Jun 25 19:35:19 2009 New Revision: 13970 Log: Fixed Makefile for new folder structure Modified: freeswitch/trunk/contrib/jmesquita/mod_khomp/Makefile Modified: freeswitch/trunk/contrib/jmesquita/mod_khomp/Makefile ============================================================================== --- freeswitch/trunk/contrib/jmesquita/mod_khomp/Makefile (original) +++ freeswitch/trunk/contrib/jmesquita/mod_khomp/Makefile Thu Jun 25 19:35:19 2009 @@ -3,4 +3,4 @@ LOCAL_OBJS= ./commons/k3lapi.o -include ../../../../build/modmake.rules +include ../../../build/modmake.rules

1 0

[commit] r13969 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: brian Date: Thu Jun 25 18:44:13 2009 New Revision: 13969 Log: more docs 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 Thu Jun 25 18:44:13 2009 @@ -55,6 +55,10 @@ <param name="hold-music" value="$${hold_music}"/> <param name="apply-nat-acl" value="rfc1918.auto"/>  +    <param name="apply-inbound-acl" value="domains"/>

1 0

[commit] r13968 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: mikej Date: Thu Jun 25 18:21:33 2009 New Revision: 13968 Log: MODEVENT-44 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Thu Jun 25 18:21:33 2009 @@ -52,6 +52,7 @@ switch_hash_t *template_hash; char *log_dir; char *default_template; + int masterfileonly; int shutdown; int rotate; int debug; @@ -226,7 +227,7 @@ log_line = switch_channel_expand_variables(channel, a_template_str); - if (accountcode) { + if ((accountcode) && (!globals.masterfileonly)) { path = switch_mprintf("%s%s%s.csv", log_dir, SWITCH_PATH_SEPARATOR, accountcode); assert(path); write_cdr(path, log_line); @@ -338,6 +339,8 @@ globals.rotate = switch_true(val); } else if (!strcasecmp(var, "default-template")) { globals.default_template = switch_core_strdup(pool, val); + } else if (!strcasecmp(var, "master-file-only")) { + globals.masterfileonly = switch_true(val); } } }

1 0

[commit] r13967 - in freeswitch/trunk: conf/jingle_profiles src/mod/endpoints/mod_dingaling
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: brian Date: Thu Jun 25 16:38:44 2009 New Revision: 13967 Log: adding auto-nat options to dingaling Modified: freeswitch/trunk/conf/jingle_profiles/client.xml freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Modified: freeswitch/trunk/conf/jingle_profiles/client.xml ============================================================================== --- freeswitch/trunk/conf/jingle_profiles/client.xml (original) +++ freeswitch/trunk/conf/jingle_profiles/client.xml Thu Jun 25 16:38:44 2009 @@ -9,7 +9,7 @@ <param name="context" value="public"/> <param name="message" value="Jingle all the way"/> <param name="rtp-ip" value="$${bind_server_ip}"/> -  +  <param name="auto-login" value="true"/>  <param name="sasl" value="plain"/> @@ -27,5 +27,6 @@ <param name="vad" value="both"/>   + <param name="local-network-acl" value="localnet.auto"/> </x-profile> </include> Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Jun 25 16:38:44 2009 @@ -104,7 +104,7 @@ switch_event_node_t *probe_node; switch_event_node_t *out_node; switch_event_node_t *roster_node; - + int auto_nat; } globals; struct mdl_profile { @@ -135,6 +135,7 @@ uint32_t user_flags; char *acl[MAX_ACL]; uint32_t acl_count; + char *local_network; }; typedef struct mdl_profile mdl_profile_t; @@ -841,6 +842,12 @@ switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec); switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec); + if(globals.auto_nat && tech_pvt->profile->local_network && + !switch_check_network_list_ip(tech_pvt->remote_ip, tech_pvt->profile->local_network)) { + switch_port_t external_port = 0; + switch_nat_add_mapping((switch_port_t)tech_pvt->local_port, SWITCH_NAT_UDP, &external_port); + tech_pvt->local_port = external_port; + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SETUP RTP %s:%d -> %s:%d\n", tech_pvt->profile->ip, tech_pvt->local_port, tech_pvt->remote_ip, tech_pvt->remote_port); @@ -1194,6 +1201,11 @@ tech_pvt->rtp_session = NULL; } + if(globals.auto_nat && tech_pvt->profile->local_network && + !switch_check_network_list_ip(tech_pvt->remote_ip, tech_pvt->profile->local_network)) { + switch_nat_del_mapping((switch_port_t)tech_pvt->local_port, SWITCH_NAT_UDP); + } + if (switch_core_codec_ready(&tech_pvt->read_codec)) { switch_core_codec_destroy(&tech_pvt->read_codec); } @@ -1943,10 +1955,22 @@ profile->name = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "message") && !switch_strlen_zero(val)) { profile->message = switch_core_strdup(module_pool, val); + } else if (!strcasecmp(var, "local-network-acl")) { + profile->local_network = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "rtp-ip")) { profile->ip = switch_core_strdup(module_pool, strcasecmp(switch_str_nil(val), "auto") ? switch_str_nil(val) : globals.guess_ip); } else if (!strcasecmp(var, "ext-rtp-ip")) { - profile->extip = switch_core_strdup(module_pool, strcasecmp(switch_str_nil(val), "auto") ? switch_str_nil(val) : globals.guess_ip); + char *ip = globals.guess_ip; + if (!strcasecmp(val, "auto-nat")) { + ip = globals.auto_nat ? switch_core_get_variable("nat_public_addr") : globals.guess_ip; + } else if (strcasecmp(val, "auto")) { + globals.auto_nat = 0; + ip = globals.guess_ip; + } else { + globals.auto_nat = 0; + ip = switch_strlen_zero(val) ? globals.guess_ip : val; + } + profile->extip = switch_core_strdup(module_pool, ip); } else if (!strcasecmp(var, "server") && !switch_strlen_zero(val)) { profile->server = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "rtp-timer-name") && !switch_strlen_zero(val)) { @@ -2184,6 +2208,7 @@ memset(&globals, 0, sizeof(globals)); globals.running = 1; + globals.auto_nat = (switch_core_get_variable("nat_type") ? 1 : 0); switch_find_local_ip(globals.guess_ip, sizeof(globals.guess_ip), NULL, AF_INET);

1 0

[commit] r13966 - freeswitch/trunk/libs/esl/php
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

1 0

[commit] r13965 - freeswitch/trunk/src
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: anthm Date: Thu Jun 25 14:50:00 2009 New Revision: 13965 Log: make session.ready work on uninit session containers Modified: freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Thu Jun 25 14:50:00 2009 @@ -874,7 +874,12 @@ SWITCH_DECLARE(bool) CoreSession::ready() { this_check(false); - sanity_check(false); + + if (!session) { + return false; + } + sanity_check(false); + return switch_channel_ready(channel) != 0; }

1 0