June 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13854 - freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: mikej Date: Thu Jun 18 18:15:59 2009 New Revision: 13854 Log: fix sofia and apr includes stomping on each other on older apr versions Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c ============================================================================== --- freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c (original) +++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c Thu Jun 18 18:15:59 2009 @@ -20,12 +20,14 @@ typedef struct mrcp_sofia_session_t mrcp_sofia_session_t; #define NUA_HMAGIC_T mrcp_sofia_session_t -#include <apr_general.h> #include <sofia-sip/su.h> #include <sofia-sip/nua.h> #include <sofia-sip/sip_status.h> #include <sofia-sip/sdp.h> #include <sofia-sip/sofia_features.h> +#undef strcasecmp +#undef strncasecmp +#include <apr_general.h> #include "mrcp_sofiasip_client_agent.h" #include "mrcp_session.h" Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c ============================================================================== --- freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c (original) +++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c Thu Jun 18 18:15:59 2009 @@ -20,12 +20,14 @@ typedef struct mrcp_sofia_session_t mrcp_sofia_session_t; #define NUA_HMAGIC_T mrcp_sofia_session_t -#include <apr_general.h> #include <sofia-sip/su.h> #include <sofia-sip/nua.h> #include <sofia-sip/sip_status.h> #include <sofia-sip/sdp.h> #include <sofia-sip/sofia_features.h> +#undef strcasecmp +#undef strncasecmp +#include <apr_general.h> #include "mrcp_sofiasip_server_agent.h" #include "mrcp_session.h"

1 0

[commit] r13853 - freeswitch/trunk/src/mod/formats/mod_shell_stream
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: anthm Date: Thu Jun 18 18:03:54 2009 New Revision: 13853 Log: del buffer Modified: freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c Modified: freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c Thu Jun 18 18:03:54 2009 @@ -168,6 +168,10 @@ close(context->fds[0]); } + if (context->audio_buffer) { + switch_buffer_destroy(&context->audio_buffer); + } + switch_thread_rwlock_wrlock(context->rwlock); switch_thread_rwlock_unlock(context->rwlock);

1 0

[commit] r13852 - freeswitch/trunk/src/mod/formats/mod_shell_stream
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: anthm Date: Thu Jun 18 17:52:20 2009 New Revision: 13852 Log: add rate and channel count params to executed command Modified: freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c Modified: freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c Thu Jun 18 17:52:20 2009 @@ -102,7 +102,7 @@ context->fds[0] = -1; context->fds[1] = -1; - context->command = switch_core_strdup(handle->memory_pool, path); + context->command = switch_core_sprintf(handle->memory_pool, "%s -r %d -c %d", path, handle->samplerate, handle->channels); if (pipe(context->fds)) { goto error;

1 0

[commit] r13851 - freeswitch/trunk/src/mod/formats/mod_shell_stream
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: anthm Date: Thu Jun 18 17:36:51 2009 New Revision: 13851 Log: add mod_shell_stream Added: freeswitch/trunk/src/mod/formats/mod_shell_stream/ freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c Added: freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c Thu Jun 18 17:36:51 2009 @@ -0,0 +1,224 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005-2009, Anthony Minessale II <anthm(a)freeswitch.org> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthm(a)freeswitch.org> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthm(a)freeswitch.org> + * + * mod_shell_stream.c -- Local Streaming Audio + * + */ +#include <switch.h> + +#define MY_BUF_LEN 1024 * 32 +#define MY_BLOCK_SIZE MY_BUF_LEN + + +SWITCH_MODULE_LOAD_FUNCTION(mod_shell_stream_load); + +SWITCH_MODULE_DEFINITION(mod_shell_stream, mod_shell_stream_load, NULL, NULL); + +struct shell_stream_context { + int fds[2]; + int pid; + char *command; + switch_buffer_t *audio_buffer; + switch_mutex_t *mutex; + switch_thread_rwlock_t *rwlock; + int running; +}; + +typedef struct shell_stream_context shell_stream_context_t; + + +static void *SWITCH_THREAD_FUNC buffer_thread_run(switch_thread_t *thread, void *obj) +{ + shell_stream_context_t *context = (shell_stream_context_t *) obj; + switch_byte_t data[MY_BUF_LEN]; + ssize_t rlen; + + context->running = 1; + + if (switch_thread_rwlock_tryrdlock(context->rwlock) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n"); + goto end; + } + + while(context->running) { + + rlen = read(context->fds[0], data, MY_BUF_LEN); + + if (rlen <= 3) { + break; + } + + switch_mutex_lock(context->mutex); + switch_buffer_write(context->audio_buffer, data, rlen); + switch_mutex_unlock(context->mutex); + } + + switch_thread_rwlock_unlock(context->rwlock); + + end: + + context->running = 0; + + return NULL; +} + +static switch_status_t shell_stream_file_open(switch_file_handle_t *handle, const char *path) +{ + shell_stream_context_t *context; + switch_status_t status = SWITCH_STATUS_SUCCESS; + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + + if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This format does not support writing!\n"); + return SWITCH_STATUS_FALSE; + } + + context = switch_core_alloc(handle->memory_pool, sizeof(*context)); + + context->fds[0] = -1; + context->fds[1] = -1; + context->command = switch_core_strdup(handle->memory_pool, path); + + if (pipe(context->fds)) { + goto error; + } else { /* good to go*/ + context->pid = fork(); + + if (context->pid < 0) { /* ok maybe not */ + goto error; + } else if (context->pid) { /* parent */ + handle->private_info = context; + status = SWITCH_STATUS_SUCCESS; + close(context->fds[1]); + context->fds[1] = -1; + + if (switch_buffer_create_dynamic(&context->audio_buffer, MY_BLOCK_SIZE, MY_BUF_LEN, 0) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Write Buffer Failed!\n"); + goto error; + } + + switch_thread_rwlock_create(&context->rwlock, handle->memory_pool); + switch_mutex_init(&context->mutex, SWITCH_MUTEX_NESTED, handle->memory_pool); + + switch_threadattr_create(&thd_attr, handle->memory_pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&thread, thd_attr, buffer_thread_run, context, handle->memory_pool); + context->running = 2; + + while(context->running == 2) { + switch_cond_next(); + } + + goto end; + } else { /* child */ + close(context->fds[0]); + dup2(context->fds[1], STDOUT_FILENO); + switch_system(context->command, SWITCH_TRUE); + printf("EOF"); + close(context->fds[1]); + exit(0); + } + } + + error: + + close(context->fds[0]); + close(context->fds[1]); + status = SWITCH_STATUS_FALSE; + + + end: + + return status; +} + +static switch_status_t shell_stream_file_close(switch_file_handle_t *handle) +{ + shell_stream_context_t *context = handle->private_info; + + context->running = 0; + + if (context->fds[0] > -1) { + close(context->fds[0]); + } + + switch_thread_rwlock_wrlock(context->rwlock); + switch_thread_rwlock_unlock(context->rwlock); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t shell_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len) +{ + shell_stream_context_t *context = handle->private_info; + switch_status_t status = SWITCH_STATUS_SUCCESS; + switch_size_t rlen = *len * 2; + + while(context->running && switch_buffer_inuse(context->audio_buffer) < rlen) { + switch_cond_next(); + } + + switch_mutex_lock(context->mutex); + *len = switch_buffer_read(context->audio_buffer, data, rlen) / 2; + switch_mutex_unlock(context->mutex); + + return status; +} + +/* Registration */ + +static char *supported_formats[SWITCH_MAX_CODECS] = { 0 }; + +SWITCH_MODULE_LOAD_FUNCTION(mod_shell_stream_load) +{ + switch_file_interface_t *file_interface; + supported_formats[0] = "shell_stream"; + + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE); + file_interface->interface_name = modname; + file_interface->extens = supported_formats; + file_interface->file_open = shell_stream_file_open; + file_interface->file_close = shell_stream_file_close; + file_interface->file_read = shell_stream_file_read; + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4: + */

1 0

[commit] r13850 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: brian Date: Thu Jun 18 16:45:57 2009 New Revision: 13850 Log: cp fail Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Thu Jun 18 16:45:57 2009 @@ -101,7 +101,7 @@   -  +  </modules> </configuration>

1 0

[commit] r13849 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: brian Date: Thu Jun 18 16:42:34 2009 New Revision: 13849 Log: w00t Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Thu Jun 18 16:42:34 2009 @@ -99,5 +99,9 @@  <load module="mod_say_en"/>  + +  +  + </modules> </configuration>

1 0

[commit] r13848 - freeswitch/trunk/docs
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: brian Date: Thu Jun 18 15:38:57 2009 New Revision: 13848 Log: adding agl3.0 for zrtp Added: freeswitch/trunk/docs/zrtp_agpl-3.0.txt Added: freeswitch/trunk/docs/zrtp_agpl-3.0.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/docs/zrtp_agpl-3.0.txt Thu Jun 18 15:38:57 2009 @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>.

1 0

[commit] r13847 - freeswitch/trunk/src
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: anthm Date: Thu Jun 18 14:47:29 2009 New Revision: 13847 Log: doh Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu Jun 18 14:47:29 2009 @@ -1002,7 +1002,7 @@ if (ovars) { var_event = ovars; } else { - if (switch_event_create(&var_event, SWITCH_EVENT_GENERAL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_create_plain(&var_event, SWITCH_EVENT_CHANNEL_DATA) != SWITCH_STATUS_SUCCESS) { abort(); } } @@ -1516,7 +1516,7 @@ local_clobber = switch_true(lc); } - if (!local_clobber) { + if (local_clobber) { if (var_event) { switch_event_t *event; switch_event_header_t *header; @@ -1549,7 +1549,7 @@ } } - if (local_clobber) { + if (!local_clobber) { if (var_event) { switch_event_t *event; switch_event_header_t *header;

1 0

[commit] r13846 - freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: ledr Date: Thu Jun 18 13:34:09 2009 New Revision: 13846 Log: Initial commit Added: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/Makefile freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/structure.sql freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/test_data.sql freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml Added: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/Makefile Thu Jun 18 13:34:09 2009 @@ -0,0 +1,3 @@ +BASE=../../../.. +include $(BASE)/build/modmake.rules +LOCAL_CFLAGS += `if test -f $(BASE)/.libs/libfreeswitch_la-switch_odbc.o ; then echo -DSWITCH_HAVE_ODBC; fi ;` Added: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Thu Jun 18 13:34:09 2009 @@ -0,0 +1,468 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005-2009, Anthony Minessale II <anthm(a)freeswitch.org> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthm(a)freeswitch.org> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthm(a)freeswitch.org> + * Other FreeSWITCH module contributors that I borrowed code from + * Leon de Rooij <leon(a)scarlet-internet.nl> + * + * + * mod_xml_odbc.c -- use fs odbc to realtime create xml directory + * perhaps later also config, dialplan, etc ? + * + */ +#include <switch.h> +#ifdef SWITCH_HAVE_ODBC +#include <switch_odbc.h> +#endif + +typedef enum { + XML_ODBC_DIRECTORY +} xml_odbc_query_type_t; + +SWITCH_MODULE_LOAD_FUNCTION(mod_xml_odbc_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_odbc_shutdown); +SWITCH_MODULE_DEFINITION(mod_xml_odbc, mod_xml_odbc_load, mod_xml_odbc_shutdown, NULL); + +typedef struct xml_binding { + char *bindings; +} xml_binding_t; + +static struct { + char *dbname; + char *odbc_dsn; + char *query_domain_key_user; + char *query_domain_params; + char *query_domain_variables; + char *query_user_attrs; + char *query_user_params; + char *query_user_variables; + char *query_groups; + switch_mutex_t *mutex; + switch_memory_pool_t *pool; +#ifdef SWITCH_HAVE_ODBC + switch_odbc_handle_t *master_odbc; +#else + void *filler1; +#endif +} globals; + +typedef struct did_uid_helper { + char *domain_id; + char *user_id; +} did_uid_helper_t; + +static int did_uid_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + did_uid_helper_t *h = (did_uid_helper_t *) pArg; + + h->domain_id = strdup(argv[0]); + h->user_id = strdup(argv[1]); + + return 0; +} + +static int set_xml_attr_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + switch_xml_t *xml = (switch_xml_t *) pArg; + switch_xml_set_attr_d(*xml, argv[0], argv[1]); + return 0; +} + +typedef struct xml_helper { + switch_xml_t xml; + char *str; + int off; +} xml_helper_t; + +static int add_xml_child_with_nvpair_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + xml_helper_t *h = (xml_helper_t *) pArg; + switch_xml_t xml = NULL; + + if ((xml = switch_xml_add_child_d(h->xml, h->str, h->off++))) { + switch_xml_set_attr_d(xml, "name", argv[0]); + switch_xml_set_attr_d(xml, "value", argv[1]); + } + + return 0; +} + +static int add_xml_group_and_user_callback(void *pArg, int argc, char **argv, char **columnName) +{ + xml_helper_t *h = (xml_helper_t *) pArg; + switch_xml_t xml = NULL; + + if ((xml = switch_xml_add_child_d(h->xml, "group", h->off++))) { + switch_xml_set_attr_d(xml, "name", argv[0]); + if ((xml = switch_xml_add_child_d(xml, "users", h->off++))) { + if ((xml = switch_xml_add_child_d(xml, "user", h->off++))) { + switch_xml_set_attr_d(xml, "id", h->str); + switch_xml_set_attr_d(xml, "type", "pointer"); + } + } + } + + return 0; +} + +static int xml_odbc_result_not_found(switch_xml_t xml, int *off) +{ + switch_xml_t sub = NULL; + + if ((sub = switch_xml_add_child_d(xml, "section", *off++))) { + switch_xml_set_attr_d(sub, "name", "result"); + if ((sub = switch_xml_add_child_d(sub, "result", *off++))) { + switch_xml_set_attr_d(sub, "status", "not found"); + } + } + + return 0; +} + +static switch_xml_t xml_odbc_search(const char *section, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *params, void *user_data) +{ + xml_binding_t *binding = (xml_binding_t *) user_data; + switch_event_header_t *hi; + + switch_xml_t xml = NULL, sub = NULL, sub2 = NULL, sub3 = NULL; + + char *dir_user = NULL, *dir_domain = NULL, *dir_key = NULL; + char *sql; + + int off = 0, ret = 1; + + xml_odbc_query_type_t query_type; + + did_uid_helper_t pdata; + xml_helper_t pdata2; + + if (!binding) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No bindings... sorry bud returning now\n"); + return NULL; + } + + if (!strcmp(section, "directory")) { + query_type = XML_ODBC_DIRECTORY; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid section\n"); + return NULL; + } + + if (params) { + if ((hi = params->headers)) { + for (; hi; hi = hi->next) { + switch (query_type) { + case XML_ODBC_DIRECTORY: + +//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DEBUG in xml_odbc_search with header name=[%s], value=[%s]\n", hi->name, hi->value); + + if (!strcmp(hi->name, "user")) { + dir_user = strdup(hi->value); + } else if (!strcmp(hi->name, "domain")) { + dir_domain = strdup(hi->value); + } else if (!strcmp(hi->name, "key")) { + dir_key = strdup(hi->value); + } + break; + } + } + switch (query_type) { + case XML_ODBC_DIRECTORY: + //if (dir_user && dir_domain) { + if (dir_domain) { + if ((xml = switch_xml_new("document"))) { + switch_xml_set_attr_d(xml, "type", "freeswitch/xml"); + + if (!dir_user) { +// sql = switch_mprintf("SELECT count(*) FROM dir_domains WHERE name = '%q';", dir_domain); +// if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, count_callback, &pdata10741) == SWITCH_ODBC_SUCCESS) { +// TODO: Factor out the domain search thing (with params and variables) from below, and call it from here as well.. +// xml_odbc_result_not_found(xml, &off); +// } else { + xml_odbc_result_not_found(xml, &off); +// } + + } else { + sql = switch_mprintf(globals.query_domain_key_user, dir_domain, dir_key, dir_user); + if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, did_uid_callback, &pdata) == SWITCH_ODBC_SUCCESS) { + if (!pdata.domain_id || !pdata.user_id) { + xml_odbc_result_not_found(xml, &off); + + } else { + if ((sub = switch_xml_add_child_d(xml, "section", off++))) { + switch_xml_set_attr_d(sub, "name", "directory"); + + if ((sub = switch_xml_add_child_d(sub, "domain", off++))) { + switch_xml_set_attr_d(sub, "name", dir_domain); + + if ((sub2 = switch_xml_add_child_d(sub, "params", off++))) { + sql = switch_mprintf(globals.query_domain_params, pdata.domain_id); + pdata2.xml = sub2; + pdata2.off = off; + pdata2.str = "param"; + if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, add_xml_child_with_nvpair_callback, &pdata2) == SWITCH_ODBC_SUCCESS) { + } + } + + if ((sub2 = switch_xml_add_child_d(sub, "variables", off++))) { + sql = switch_mprintf(globals.query_domain_variables, pdata.domain_id); + pdata2.xml = sub2; + pdata2.off = off; + pdata2.str = "variable"; + if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, add_xml_child_with_nvpair_callback, &pdata2) == SWITCH_ODBC_SUCCESS) { + } + } + + if ((sub = switch_xml_add_child_d(sub, "groups", off++))) { + + if ((sub2 = switch_xml_add_child_d(sub, "group", off++))) { + switch_xml_set_attr_d(sub2, "name", "default"); + + if ((sub2 = switch_xml_add_child_d(sub2, "users", off++))) { + + if ((sub2 = switch_xml_add_child_d(sub2, "user", off++))) { + + sql = switch_mprintf(globals.query_user_attrs, pdata.user_id); + if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, set_xml_attr_callback, &sub2)) { + } + + if ((sub3 = switch_xml_add_child_d(sub2, "params", off++))) { + sql = switch_mprintf(globals.query_user_params, pdata.user_id); + pdata2.xml = sub3; + pdata2.off = off; + pdata2.str = "param"; + if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, add_xml_child_with_nvpair_callback, &pdata2) == SWITCH_ODBC_SUCCESS) { + } + } + + if ((sub3 = switch_xml_add_child_d(sub2, "variables", off++))) { + sql = switch_mprintf(globals.query_user_variables, pdata.user_id); + pdata2.xml = sub3; + pdata2.off = off; + pdata2.str = "variable"; + if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, add_xml_child_with_nvpair_callback, &pdata2) == SWITCH_ODBC_SUCCESS) { + } + } + + } + + } + + } + + sql = switch_mprintf(globals.query_groups, pdata.user_id); + pdata2.xml = sub; + pdata2.off = off; + pdata2.str = dir_user; + if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, add_xml_group_and_user_callback, &pdata2) == SWITCH_ODBC_SUCCESS) { + } + + } + } + } + } + } + } + } + +//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DEBUG DUMP OF XML GENERATED:\n\n%s\n\n", switch_xml_toxml(xml, SWITCH_FALSE)); + + free(dir_user); + dir_user = NULL; + + free(dir_key); + dir_key = NULL; + + free(dir_domain); + dir_domain = NULL; + + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "Something bad happened during the query construction phase likely exten(%s) or domain(%s) is null\n", dir_user, dir_domain); + goto cleanup; + + } + break; + } + + } else { + goto cleanup; + + } + } + + ret = 0; + + cleanup: + + if (ret) { + switch_xml_free(xml); + return NULL; + } + + return xml; +} + +static switch_status_t do_config() +{ + char *cf = "xml_odbc.conf"; + switch_xml_t cfg, xml, bindings_tag, binding_tag, param; + xml_binding_t *binding = NULL; + + //switch_core_db_t *db; + switch_status_t status = SWITCH_STATUS_SUCCESS; + + char *odbc_user = NULL; + char *odbc_pass = NULL; + char *sql = NULL; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + if (!(bindings_tag = switch_xml_child(cfg, "bindings"))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing <bindings> tag!\n"); + goto done; + } + + for (binding_tag = switch_xml_child(bindings_tag, "binding"); binding_tag; binding_tag = binding_tag->next) { + char *bname = (char*) switch_xml_attr_soft(binding_tag, "name"); + + for (param = switch_xml_child(binding_tag, "param"); param; param = param->next) { + char *var = NULL; + char *val = NULL; + + var = (char *) switch_xml_attr_soft(param, "name"); + val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "odbc-dsn") && !switch_strlen_zero(val)) { + globals.odbc_dsn = switch_core_strdup(globals.pool, val); + if ((odbc_user = strchr(globals.odbc_dsn, ':'))) { + *odbc_user++ = '\0'; + if ((odbc_pass = strchr(odbc_user, ':'))) { + *odbc_pass++ = '\0'; + } + } + } else if (!strcasecmp(var, "query-domain-key-user") && !switch_strlen_zero(val)) { + globals.query_domain_key_user = strdup(val); + } else if (!strcasecmp(var, "query-domain-params") && !switch_strlen_zero(val)) { + globals.query_domain_params = strdup(val); + } else if (!strcasecmp(var, "query-domain-variables") && !switch_strlen_zero(val)) { + globals.query_domain_variables = strdup(val); + } else if (!strcasecmp(var, "query-user-attrs") && !switch_strlen_zero(val)) { + globals.query_user_attrs = strdup(val); + } else if (!strcasecmp(var, "query-user-params") && !switch_strlen_zero(val)) { + globals.query_user_params = strdup(val); + } else if (!strcasecmp(var, "query-user-variables") && !switch_strlen_zero(val)) { + globals.query_user_variables = strdup(val); + } else if (!strcasecmp(var, "query-groups") && !switch_strlen_zero(val)) { + globals.query_groups = strdup(val); + } + } + + if (switch_strlen_zero(globals.odbc_dsn) || switch_strlen_zero(odbc_user) || switch_strlen_zero(odbc_pass)) { + globals.dbname = "xml_odbc"; + } + + if (!(binding = malloc(sizeof(*binding)))) { + goto done; + } + memset(binding, 0, sizeof(*binding)); + + binding->bindings = strdup(bname); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML ODBC Fetch Function [%s]\n", + switch_strlen_zero(bname) ? "N/A" : bname, binding->bindings ? binding->bindings : "all"); + switch_xml_bind_search_function(xml_odbc_search, switch_xml_parse_section_string(bname), binding); + binding = NULL; + } + +#ifdef SWITCH_HAVE_ODBC + if (globals.odbc_dsn) { + + if (!(globals.master_odbc = switch_odbc_handle_new(globals.odbc_dsn, odbc_user, odbc_pass))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); + status = SWITCH_STATUS_FALSE; + goto done; + } + + if (switch_odbc_handle_connect(globals.master_odbc) != SWITCH_ODBC_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); + status = SWITCH_STATUS_FALSE; + goto done; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", globals.odbc_dsn); + } +#endif + + done: + + switch_safe_free(sql); + + return status; +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_xml_odbc_load) +{ + + switch_core_new_memory_pool(&globals.pool); + switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool); + + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + +#ifndef SWITCH_HAVE_ODBC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "You must have ODBC support in FreeSWITCH to use this module\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "\t./configure --enable-core-odbc-support\n"); + return SWITCH_STATUS_FALSE; +#endif + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "XML ODBC module loading...\n"); + + if (do_config() != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to load xml_odbc config file\n"); + return SWITCH_STATUS_FALSE; + } + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_odbc_shutdown) +{ + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4: + */ Added: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/structure.sql ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/structure.sql Thu Jun 18 13:34:09 2009 @@ -0,0 +1,73 @@ +CREATE TABLE `dir_domains` ( + `id` INT NOT NULL AUTO_INCREMENT, + `name` VARCHAR(255) NOT NULL, + PRIMARY KEY (`id`), + KEY `dir_domains_name` (`name`) +); + +CREATE TABLE `dir_domain_params` ( + `id` INT NOT NULL AUTO_INCREMENT, + `dir_domain_id` INT NOT NULL, + `name` VARCHAR(255) NOT NULL, + `value` VARCHAR(255) NOT NULL, + PRIMARY KEY (`id`), + FOREIGN KEY (`dir_domain_id`) REFERENCES `dir_domains` (`id`) +); + +CREATE TABLE `dir_domain_variables` ( + `id` INT NOT NULL AUTO_INCREMENT, + `dir_domain_id` INT NOT NULL, + `name` VARCHAR(255) NOT NULL, + `value` VARCHAR(255) NOT NULL, + PRIMARY KEY (`id`), + FOREIGN KEY (`dir_domain_id`) REFERENCES `dir_domains` (`id`) +); + +CREATE TABLE `dir_groups` ( + `id` INT NOT NULL AUTO_INCREMENT, + `name` VARCHAR(255) NOT NULL, + PRIMARY KEY (`id`) +); + +CREATE TABLE `dir_groups_users` ( + `dir_group_id` INT NOT NULL, + `dir_user_id` INT NOT NULL, + FOREIGN KEY (`dir_group_id`) REFERENCES `dir_groups` (`id`), + FOREIGN KEY (`dir_user_id`) REFERENCES `dir_users` (`id`) +); + +CREATE TABLE `dir_users` ( + `id` INT NOT NULL AUTO_INCREMENT, + `dir_domain_id` INT NOT NULL, + PRIMARY KEY (`id`), + FOREIGN KEY (`dir_domain_id`) REFERENCES `dir_domains` (`id`) +); + +CREATE TABLE `dir_user_attrs` ( + `id` INT NOT NULL AUTO_INCREMENT, + `dir_user_id` INT NOT NULL, + `name` VARCHAR(255) NOT NULL, + `value` VARCHAR(255) NOT NULL, + PRIMARY KEY (`id`), + FOREIGN KEY (`dir_user_id`) REFERENCES `dir_users` (`id`), + KEY `dir_user_attrs_name` (`name`), + KEY `dir_user_attrs_value` (`value`) +); + +CREATE TABLE `dir_user_params` ( + `id` INT NOT NULL AUTO_INCREMENT, + `dir_user_id` INT NOT NULL, + `name` VARCHAR(255) NOT NULL, + `value` VARCHAR(255) NOT NULL, + PRIMARY KEY (`id`), + FOREIGN KEY (`dir_user_id`) REFERENCES `dir_users` (`id`) +); + +CREATE TABLE `dir_user_variables` ( + `id` INT NOT NULL AUTO_INCREMENT, + `dir_user_id` INT NOT NULL, + `name` VARCHAR(255) NOT NULL, + `value` VARCHAR(255) NOT NULL, + PRIMARY KEY (`id`), + FOREIGN KEY (`dir_user_id`) REFERENCES `dir_users` (`id`) +); Added: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/test_data.sql ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/test_data.sql Thu Jun 18 13:34:09 2009 @@ -0,0 +1,9 @@ +INSERT INTO `dir_domains` (`id`, `name`) VALUES (1, '172.31.0.76'); +INSERT INTO `dir_domain_params` (`id`, `dir_domain_id`, `name`, `value`) VALUES (1, 1, 'dom_param_name', 'dom_param_value'); +INSERT INTO `dir_domain_variables` (`id`, `dir_domain_id`, `name`, `value`) VALUES (1, 1, 'dom_variable_name', 'dom_variable_value'); +INSERT INTO `dir_groups` (`id`, `name`) VALUES (1, 'prepay'), (2, 'annoying_customers'); +INSERT INTO `dir_groups_users` (`dir_group_id`, `dir_user_id`) VALUES (1, 1), (2, 1); +INSERT INTO `dir_users` (`id`, `dir_domain_id`) VALUES (1, 1); +INSERT INTO `dir_user_attrs` (`id`, `dir_user_id`, `name`, `value`) VALUES (1, 1, 'id', 'someuser'), (2, 1, 'mailbox', '1234'); +INSERT INTO `dir_user_params` (`id`, `dir_user_id`, `name`, `value`) VALUES (1, 1, 'password', 'topsecret'), (2, 1, 'vm-password', '0000'); +INSERT INTO `dir_user_variables` (`id`, `dir_user_id`, `name`, `value`) VALUES (1, 1, 'accountcode', '1234'), (2, 1, 'user_context', 'default'), (3, 1, 'vm_extension', '1234'); Added: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml Thu Jun 18 13:34:09 2009 @@ -0,0 +1,35 @@ +<configuration name="xml_odbc.conf" description="XML ODBC Configuration"> + <bindings> + <binding name="directory"> + <param name="odbc-dsn" value="freeswitch:freeswitch:secret"/> + + <param name="query-domain-key-user" value="SELECT + dir_domains.id AS domain_id, + dir_users.id AS user_id + FROM + dir_domains, + dir_users, + dir_user_attrs + WHERE + dir_domains.name = '%q' AND + dir_user_attrs.name = '%q' AND + dir_user_attrs.value = '%q' AND + dir_domains.id = dir_users.dir_domain_id AND + dir_users.id = dir_user_attrs.dir_user_id;"/> + + <param name="query-domain-params" value="SELECT name, value FROM dir_domain_params WHERE dir_domain_id = '%q';"/> + + <param name="query-domain-variables" value="SELECT name, value FROM dir_domain_variables WHERE dir_domain_id = '%q';"/> + + <param name="query-user-attrs" value="SELECT name, value FROM dir_user_attrs WHERE dir_user_id = '%q';"/> + + <param name="query-user-params" value="SELECT name, value FROM dir_user_params WHERE dir_user_id = '%q';"/> + + <param name="query-user-variables" value="SELECT name, value FROM dir_user_variables WHERE dir_user_id = '%q';"/> + + <param name="query-groups" value="SELECT dir_groups.name FROM dir_groups, dir_groups_users + WHERE dir_groups_users.dir_user_id = '%q' AND dir_groups_users.dir_group_id = dir_groups.id;"/> + + </binding> + </bindings> +</configuration>

1 0

[commit] r13845 - freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: mrene Date: Thu Jun 18 13:26:50 2009 New Revision: 13845 Log: Fix bad ptr in mrcp profile Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c Thu Jun 18 13:26:50 2009 @@ -3171,7 +3171,7 @@ mpf_rtp_config_t *rtp_config = NULL; /* get profile attributes */ - const char *name = switch_xml_attr(profile, "name"); + const char *name = apr_pstrdup(pool, switch_xml_attr(profile, "name")); const char *version = switch_xml_attr(profile, "version"); if (switch_strlen_zero(name) || switch_strlen_zero(version)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "<profile> missing name or version attribute\n");

1 0