November 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6240 - freeswitch/trunk
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: mikej Date: Tue Nov 13 15:03:56 2007 New Revision: 6240 Modified: freeswitch/trunk/configure.in Log: don't make 64 bit build default Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Tue Nov 13 15:03:56 2007 @@ -123,9 +123,9 @@ ;; esac -# Enable debugging +# Enable 64 bit build AC_ARG_ENABLE(64, -[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="yes"]) +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) # tweak compiler specific flags if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then

1 0

[commit] r6239 - in freeswitch/trunk/src/mod: applications/mod_dptools applications/mod_limit endpoints/mod_sofia
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: anthm Date: Tue Nov 13 14:58:44 2007 New Revision: 6239 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix some stuff and add set_user func Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Nov 13 14:58:44 2007 @@ -86,6 +86,67 @@ } } + +#define SET_USER_SYNTAX "<user>@<domain>" +SWITCH_STANDARD_APP(set_user_function) +{ + switch_xml_t x_domain, xml = NULL, x_user, x_param, x_params; + char *user, *mailbox, *domain; + switch_channel_t *channel; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (switch_strlen_zero(data)) { + goto error; + } + + user = switch_core_session_strdup(session, data); + + if (!(domain = strchr(user, '@'))) { + goto error; + } + + *domain++ = '\0'; + + if (switch_xml_locate_user(user, domain, NULL, &xml, &x_domain, &x_user, NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", user, domain); + goto done; + } + + if ((mailbox = (char *)switch_xml_attr(x_user, "mailbox"))) { + switch_channel_set_variable(channel, "mailbox", mailbox); + } + + if ((x_params = switch_xml_child(x_user, "variables"))) { + for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr(x_param, "name"); + const char *val = switch_xml_attr(x_param, "value"); + + if (var && val) { + switch_channel_set_variable(channel, var, val); + } + } + } + + switch_channel_set_variable(channel, "user_name", user); + switch_channel_set_variable(channel, "domain_name", domain); + + goto done; + + error: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No user@domain specified.\n"); + + done: + + if (xml) { + switch_xml_free(xml); + } + + +} + + SWITCH_STANDARD_APP(ring_ready_function) { switch_channel_t *channel; @@ -1390,6 +1451,7 @@ SWITCH_ADD_APP(app_interface, "sched_broadcast", SCHED_BROADCAST_DESCR, SCHED_BROADCAST_DESCR, sched_broadcast_function, "[+]<time> <path> [aleg|bleg|both]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "sched_transfer", SCHED_TRANSF_DESCR, SCHED_TRANSF_DESCR, sched_transfer_function, "[+]<time> <extension> <dialplan> <context>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "execute_extension", "Execute an extension", "Execute an extension", exe_function, EXE_SYNTAX, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "set_user", "Set a User", "Set a User", set_user_function, SET_USER_SYNTAX, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "stop_dtmf", "stop inband dtmf", "Stop detecting inband dtmf.", stop_dtmf_session_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "start_dtmf", "Detect dtmf", "Detect inband dtmf on the session", dtmf_session_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "stop_dtmf_generate", "stop inband dtmf generation", "Stop generating inband dtmf.", Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Tue Nov 13 14:58:44 2007 @@ -390,14 +390,14 @@ } -#define DB_USAGE "[add|del]/<realm>/<key>/<val>" +#define DB_USAGE "[insert|delete]/<realm>/<key>/<val>" #define DB_DESC "save data" SWITCH_STANDARD_APP(db_function) { switch_channel_t *channel; int argc = 0; - char *argv[3] = { 0 }; + char *argv[4] = { 0 }; char *mydata = NULL; char *sql = NULL; @@ -408,15 +408,15 @@ mydata = switch_core_session_strdup(session, data); argc = switch_separate_string(mydata, '/', argv, (sizeof(argv) / sizeof(argv[0]))); } - + printf("WTF [%s] %d\n", argv[0], argc); if (argc < 4) { goto error; } - - if (!strcasecmp(argv[0], "add")) { + + if (!strcasecmp(argv[0], "insert")) { sql = switch_mprintf("insert into db_data values('%q','%q','%q','%q');", globals.hostname, argv[1], argv[2], argv[3]); - } else if (!strcasecmp(argv[0], "del")) { + } else if (!strcasecmp(argv[0], "delete")) { sql = switch_mprintf("delete from db_data where realm='%q' and data_key='%q'", argv[1], argv[2]); } @@ -454,7 +454,7 @@ goto error; } - if (!strcasecmp(argv[0], "add")) { + if (!strcasecmp(argv[0], "insert")) { if (argc < 3) { goto error; } @@ -468,7 +468,7 @@ switch_safe_free(sql); stream->write_function(stream, "+OK"); goto done; - } else if (!strcasecmp(argv[0], "del")) { + } else if (!strcasecmp(argv[0], "delete")) { if (argc < 3) { goto error; } @@ -515,7 +515,7 @@ } -#define GROUP_USAGE "[add|del]:<group name>:<val>" +#define GROUP_USAGE "[insert|delete]:<group name>:<val>" #define GROUP_DESC "save data" SWITCH_STANDARD_APP(group_function) @@ -539,12 +539,12 @@ return; } - if (!strcasecmp(argv[0], "add")) { + if (!strcasecmp(argv[0], "insert")) { sql = switch_mprintf("insert into group_data values('%q','%q','%q');", globals.hostname, argv[1], argv[2]); assert(sql); limit_execute_sql(sql, globals.mutex); switch_safe_free(sql); - } else if (!strcasecmp(argv[0], "del")) { + } else if (!strcasecmp(argv[0], "delete")) { sql = switch_mprintf("delete from group_data where groupname='%q' and url='%q';", argv[1], argv[2]); assert(sql); limit_execute_sql(sql, globals.mutex); @@ -643,11 +643,11 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_APP(app_interface, "limit", "Limit", LIMIT_DESC, limit_function, LIMIT_USAGE, SAF_NONE); - SWITCH_ADD_APP(app_interface, "db_insert", "Insert to the db", DB_DESC, db_function, DB_USAGE, SAF_NONE); + SWITCH_ADD_APP(app_interface, "db", "Insert to the db", DB_DESC, db_function, DB_USAGE, SAF_NONE); SWITCH_ADD_APP(app_interface, "group", "Manage a group", GROUP_DESC, group_function, GROUP_USAGE, SAF_NONE); SWITCH_ADD_API(commands_api_interface, "db", "db get/set", db_api_function, "[get|set]/<realm>/<key>/<value>"); - SWITCH_ADD_API(commands_api_interface, "group", "group [add|del|call]", group_api_function, "[add|del|call] <group name> <url>"); + SWITCH_ADD_API(commands_api_interface, "group", "group [insert|delete|call]", group_api_function, "[insert|delete|call] <group name> <url>"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; 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 Tue Nov 13 14:58:44 2007 @@ -1994,8 +1994,6 @@ if (!switch_strlen_zero(from_user)) { - switch_channel_set_variable(channel, "sip_mailbox", from_user); - if (*from_user == '+') { switch_channel_set_variable(channel, "sip_from_user_stripped", (const char *) (from_user + 1)); } else { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Tue Nov 13 14:58:44 2007 @@ -981,6 +981,9 @@ switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, "sip_mailbox", "%s", mailbox); switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, "sip_auth_username", "%s", username); switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, "sip_auth_realm", "%s", realm); + switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, "mailbox", "%s", mailbox); + switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, "user_name", "%s", username); + switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, "domain_name", "%s", realm); if ((xparams = switch_xml_child(user, "variables"))) { for (param = switch_xml_child(xparams, "variable"); param; param = param->next) {

1 0

[commit] r6238 - in freeswitch/trunk: . src
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: anthm Date: Tue Nov 13 13:47:08 2007 New Revision: 6238 Added: freeswitch/trunk/src/switch_time.c - copied, changed from r6237, /freeswitch/trunk/src/softtimer.c Removed: freeswitch/trunk/src/softtimer.c Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/configure.in freeswitch/trunk/src/switch_apr.c Log: some time changes Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue Nov 13 13:47:08 2007 @@ -56,7 +56,7 @@ src/switch_log.c\ src/switch_xml.c\ src/switch_config.c\ -src/softtimer.c\ +src/switch_time.c\ libs/stfu/stfu.c\ src/switch_cpp.cpp\ libs/libteletone/src/libteletone_detect.c\ Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Tue Nov 13 13:47:08 2007 @@ -188,6 +188,9 @@ AC_CHECK_FUNCS([gethostname vasprintf mmap mlock mlockall usleep]) AC_CHECK_FUNCS([sched_setscheduler setpriority setrlimit setgroups initgroups]) +AC_CHECK_LIB(rt, clock_gettime, [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define if you have clock_gettime()])]) +AC_CHECK_LIB(rt, clock_nanosleep, [AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define if you have clock_nanosleep()])]) + AC_CHECK_DECL([RLIMIT_MEMLOCK], [AC_DEFINE([HAVE_RLIMIT_MEMLOCK],[1],[RLIMIT_MEMLOCK constant for setrlimit])],, [#ifdef HAVE_SYS_RESOURCE_H Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Tue Nov 13 13:47:08 2007 @@ -233,7 +233,13 @@ SWITCH_DECLARE(switch_time_t) switch_time_now(void) { +#ifdef HAVE_CLOCK_GETTIME + struct timespec ts; + clock_gettime(CLOCK_REALTIME,&ts); + return ts.tv_sec * APR_USEC_PER_SEC + (ts.tv_nsec/1000); +#else return (switch_time_t) apr_time_now(); +#endif } SWITCH_DECLARE(switch_status_t) switch_time_exp_gmt_get(switch_time_t * result, switch_time_exp_t * input) @@ -256,17 +262,6 @@ return apr_time_exp_gmt((apr_time_exp_t *) result, input); } -SWITCH_DECLARE(void) switch_sleep(switch_interval_time_t t) -{ -#if defined(HAVE_USLEEP) - usleep(t); -#elif defined(WIN32) - Sleep((DWORD) ((t) / 1000)); -#else - apr_sleep(t); -#endif -} - SWITCH_DECLARE(switch_status_t) switch_rfc822_date(char *date_str, switch_time_t t) { Copied: freeswitch/trunk/src/switch_time.c (from r6237, /freeswitch/trunk/src/softtimer.c) ============================================================================== --- /freeswitch/trunk/src/softtimer.c (original) +++ freeswitch/trunk/src/switch_time.c Tue Nov 13 13:47:08 2007 @@ -80,6 +80,29 @@ #define IDLE_SPEED 100 +SWITCH_DECLARE(void) switch_sleep(switch_interval_time_t t) +{ + +#if defined(HAVE_CLOCK_NANOSLEEP) + struct timespec ts; + ts.tv_sec = t / APR_USEC_PER_SEC; + ts.tv_nsec = (t % APR_USEC_PER_SEC) * 1000; + + clock_nanosleep(CLOCK_REALTIME, 0, &ts, NULL); + +#elif defined(HAVE_USLEEP) + usleep(t); +#elif defined(WIN32) + Sleep((DWORD) ((t) / 1000)); +#else + apr_sleep(t); +#endif + + +} + + + static switch_status_t timer_init(switch_timer_t *timer) { timer_private_t *private_info;

1 0

[commit] r6236 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: tuyan Date: Tue Nov 13 00:05:23 2007 New Revision: 6236 Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/fsrtp.h Log: initial class structure for handling rtp pairs Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/fsrtp.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/fsrtp.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/fsrtp.h Tue Nov 13 00:05:23 2007 @@ -0,0 +1,45 @@ + +#ifndef __FREESWITCH_RTP_H_ +#define __FREESWITCH_RTP_H_ + +#define HAVE_APR +#include <switch.h> +#include <switch_version.h> +#include <ptlib.h> +#include <opal/buildopts.h> +#include <opal/connection.h> +#include <opal/rtp.h> + +// keeps the freeswitch - opal rtp mapping +class FSRTPPairs : public PObject +{ + PCLASSINFO(FSRTPPairs, PObject); + public: + FSRTPPairs(); + ~FSRTPPairs(); + + private: + switch_rtp_t *fsrtp; + RTP_UDP *opalrtp; + +}; + +// fsrtp session is different from opalrtp session +// we just keep the rtp sessions in fsrtpsession +// +class FSRTPSession : public PObject +{ + PCLASSINFO(FSRTPSession, PObject); + public: + FSRTPSession(WORD port, BOOL isOpalRTP = FALSE); + + private: + class RTPPairsDictionary : public PSafeDictionary<PString, FSRTPPairs> + { + virtual void DeleteObject(PObject * object) const; + + }rtpPairs; + +}; + +#endif //__FREESWITCH_RTP_H_

1 0

[commit] r6235 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: mikej Date: Mon Nov 12 22:59:11 2007 New Revision: 6235 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: add bugfix portion of MDXMLINT-17 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Mon Nov 12 22:59:11 2007 @@ -58,7 +58,10 @@ struct config_data *config_data = data; int x; x = write(config_data->fd, ptr, realsize); - return realsize; + if ( x != (int)realsize) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write! %d out of %d\n", x, realsize); + } + return x; }

1 0

[commit] r6234 - in freeswitch/trunk/src: . include
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: mikej Date: Mon Nov 12 22:47:07 2007 New Revision: 6234 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/switch_ivr_play_say.c freeswitch/trunk/src/switch_utils.c Log: add missing "execute" handler to phrase macro. (not yet tested) Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Mon Nov 12 22:47:07 2007 @@ -300,6 +300,7 @@ SWITCH_DECLARE(switch_bool_t) switch_is_number(const char *str); SWITCH_DECLARE(char *) switch_strip_spaces(const char *str); +SWITCH_DECLARE(char *) switch_separate_paren_args(char *str); SWITCH_DECLARE(const char *) switch_stristr(const char *str, const char *instr); SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip); SWITCH_DECLARE(char *) switch_replace_char(char *str, char from, char to, switch_bool_t dup); Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Mon Nov 12 22:47:07 2007 @@ -260,7 +260,22 @@ done = 1; break; } else if (!strcasecmp(func, "execute")) { + switch_application_interface_t *app; + char *cmd, *cmd_args; + status = SWITCH_STATUS_FALSE; + cmd = switch_core_session_strdup(session, odata); + cmd_args = switch_separate_paren_args(cmd); + + if (!cmd_args ) { + cmd_args = ""; + } + + if ((app = switch_loadable_module_get_application_interface(cmd)) != NULL) { + status = switch_core_session_exec(session, app, cmd_args); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Application %s\n", cmd); + } } else if (!strcasecmp(func, "say")) { switch_say_interface_t *si; if ((si = switch_loadable_module_get_say_interface(module_name))) { Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Nov 12 22:47:07 2007 @@ -288,6 +288,36 @@ return s; } + +SWITCH_DECLARE(char *) switch_separate_paren_args(char *str) +{ + char *e, *args; + switch_size_t br; + + if ((args = strchr(str, '('))) { + e = args - 1; + *args++ = '\0'; + while(*e == ' ') { + *e-- = '\0'; + } + e = args; + br = 1; + while(e && *e) { + if (*e == '(') { + br++; + } else if (br > 1 && *e == ')') { + br--; + } else if (br == 1 && *e == ')') { + *e = '\0'; + break; + } + e++; + } + } + + return args; +} + SWITCH_DECLARE(switch_bool_t) switch_is_number(const char *str) { const char *p;

1 0

[commit] r6233 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: tuyan Date: Mon Nov 12 21:59:52 2007 New Revision: 6233 Added: freeswitch/trunk/src/mod/endpoints/mod_opal/fsrtp.cxx freeswitch/trunk/src/mod/endpoints/mod_opal/fsrtp.h Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am Log: files for rtp pairs for external and internal usage Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am Mon Nov 12 21:59:52 2007 @@ -19,7 +19,7 @@ # enabled the debug compile for opal and pwlib mod_LTLIBRARIES = mod_opal.la -mod_opal_la_SOURCES = mod_opal.cpp fsmanager.cxx fsep.cxx fsmediastream.cxx fscon.cxx opal_h323.cxx opal_sip.cxx opal_h323con.cxx +mod_opal_la_SOURCES = mod_opal.cpp fsmanager.cxx fsep.cxx fsmediastream.cxx fscon.cxx opal_h323.cxx opal_sip.cxx opal_h323con.cxx fsrtp.cxx mod_opal_la_CPPFLAGS = $(AM_CPPFLAGS) -D_REENTRANT -fno-exceptions -Wall -g3 -ggdb -O0 -D_DEBUG -I/home/tuyan/CODE/OPAL/pwlib/include -DPTRACING -I/home/tuyan/CODE/OPAL/opal/include -felide-constructors -Wreorder -I$(OPALDIR)/include -I$(PWLIBDIR)/include mod_opal_la_LIBADD = $(switch_builddir)/libfreeswitch.la mod_opal_la_LDFLAGS = -avoid-version -module -no-undefined -export-symbols-regex ^switch_module_.*$ -rpath $(PREFIX)/$(libdir) -L$(PWLIBDIR)/lib -L$(OPALDIR)/lib -lopal_linux_x86_d -lpt_linux_x86_d -lpthread -lexpat -lSDL -lresolv -ldl -fPIC -DPIC Added: freeswitch/trunk/src/mod/endpoints/mod_opal/fsrtp.cxx ============================================================================== Added: freeswitch/trunk/src/mod/endpoints/mod_opal/fsrtp.h ==============================================================================

1 0

[commit] r6232 - freeswitch/trunk
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: anthm Date: Mon Nov 12 19:45:20 2007 New Revision: 6232 Modified: freeswitch/trunk/bootstrap.sh Log: create modules.conf on bootstrap if it does not exist Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Mon Nov 12 19:45:20 2007 @@ -7,6 +7,11 @@ js js/nsprpub libdingaling libetpan libresample libsndfile pcre sofia-sip \ speex sqlite srtp xmlrpc-c"; + +if [ ! -f modules.conf ]; then + cp build/modules.conf.in modules.conf +fi + # keep automake from making us magically GPL, and to stop complaining about missing files. cp -f docs/COPYING . cp -f docs/AUTHORS .

1 0

[commit] r6231 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: anthm Date: Mon Nov 12 19:39:18 2007 New Revision: 6231 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: change Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Nov 12 19:39:18 2007 @@ -1,7 +1,7 @@ <context name="default"> <extension name="global"> <condition> - <action application="set" data="use_profile=${qq(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> + <action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> </condition> </extension> <!--

1 0

[commit] r6230 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: anthm Date: Mon Nov 12 19:33:31 2007 New Revision: 6230 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: change qq to cond but let qq still work for the time being Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Nov 12 19:33:31 2007 @@ -106,7 +106,7 @@ O_LE } o_t; -SWITCH_STANDARD_API(qq_function) +SWITCH_STANDARD_API(cond_function) { int argc; char *mydata = NULL, *argv[3]; @@ -1740,7 +1740,9 @@ SWITCH_ADD_API(commands_api_interface, "sched_del", "Delete a Scheduled task", sched_del_function, "<task_id>|<group_id>"); SWITCH_ADD_API(commands_api_interface, "xml_wrap", "Wrap another api command in xml", xml_wrap_api_function, "<command> <args>"); SWITCH_ADD_API(commands_api_interface, "is_lan_addr", "see if an ip is a lan addr", lan_addr_function, "<ip>"); - SWITCH_ADD_API(commands_api_interface, "qq", "Eval a conditional", qq_function, "<expr> ? <true val> : <false val>"); + SWITCH_ADD_API(commands_api_interface, "cond", "Eval a conditional", cond_function, "<expr> ? <true val> : <false val>"); + // remove me before final release + SWITCH_ADD_API(commands_api_interface, "qq", "Eval a conditional", cond_function, "<expr> ? <true val> : <false val>"); SWITCH_ADD_API(commands_api_interface, "regex", "Eval a regex", regex_function, "<data>|<pattern>[|<subst string>]"); /* indicate that the module should continue to be loaded */

1 0