April 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4890 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 08 Apr '07

08 Apr '07

Author: brian Date: Sun Apr 8 00:41:10 2007 New Revision: 4890 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix warning as error 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 Sun Apr 8 00:41:10 2007 @@ -900,7 +900,7 @@ switch_core_db_t *db = switch_core_db_handle(); struct holder holder = { 0 }; int help = 0; - char *mydata, *argv[5] = {0}; + char *mydata = NULL, *argv[5] = {0}; int argc; char *cmd = NULL, *as = NULL;

1 0

[commit] r4889 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 08 Apr '07

08 Apr '07

Author: brian Date: Sat Apr 7 23:53:35 2007 New Revision: 4889 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix segfault thanks bblack 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 Sat Apr 7 23:53:35 2007 @@ -27,6 +27,7 @@ * Michael Jerris <mike(a)jerris.com> * Johny Kadarisman <jkr888(a)gmail.com> * Paul Tinsley <jackhammer(a)gmail.com> + * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> * * * mod_commands.c -- Misc. Command Module @@ -901,19 +902,21 @@ int help = 0; char *mydata, *argv[5] = {0}; int argc; - char *cmd, *as = NULL; + char *cmd = NULL, *as = NULL; if (session) { return SWITCH_STATUS_FALSE; } - if ((mydata = strdup(data))) { - argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - } - - cmd = argv[0]; - if (argv[2] && !strcasecmp(argv[1], "as")) { - as = argv[2]; + if (data) { + if ((mydata = strdup(data))) { + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + cmd = argv[0]; + if (argv[2] && !strcasecmp(argv[1], "as")) { + as = argv[2]; + } } if (!as && stream->event) {

1 0

[commit] r4888 - freeswitch/trunk/conf
by Freeswitch SVN 07 Apr '07

07 Apr '07

Author: anthm Date: Sat Apr 7 17:23:37 2007 New Revision: 4888 Modified: freeswitch/trunk/conf/dingaling.conf.xml Log: update Modified: freeswitch/trunk/conf/dingaling.conf.xml ============================================================================== --- freeswitch/trunk/conf/dingaling.conf.xml (original) +++ freeswitch/trunk/conf/dingaling.conf.xml Sat Apr 7 17:23:37 2007 @@ -15,7 +15,6 @@ <param name="message" value="Jingle all the way"/> <param name="rtp-ip" value="auto"/> <param name="auto-login" value="true"/> - <param name="auto-reply" value="Press *Call* to call FreeSWITCH and be sure to come to ClueCon! http://www.cluecon.com"/>  <param name="sasl" value="plain"/>

1 0

[commit] r4887 - in freeswitch/trunk: libs/libdingaling/src src/mod/endpoints/mod_dingaling
by Freeswitch SVN 07 Apr '07

07 Apr '07

Author: anthm Date: Sat Apr 7 17:23:01 2007 New Revision: 4887 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: update Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Sat Apr 7 17:23:01 2007 @@ -1495,7 +1495,10 @@ handle->state = CS_NEW; } ldl_clear_flag_locked(handle, LDL_FLAG_RUNNING); - + if (!ldl_test_flag(handle, LDL_FLAG_TLS)) { + ldl_flush_queue(handle, 1); + } + while(ldl_test_flag(handle, LDL_FLAG_QUEUE_RUNNING)) { microsleep(100); } @@ -2077,10 +2080,10 @@ ldl_status ldl_global_destroy(void) { - if (ldl_test_flag(&globals, LDL_FLAG_INIT)) { + if (!ldl_test_flag(&globals, LDL_FLAG_INIT)) { return LDL_STATUS_FALSE; } - + apr_pool_destroy(globals.memory_pool); ldl_clear_flag(&globals, LDL_FLAG_INIT); apr_terminate(); Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Sat Apr 7 17:23:01 2007 @@ -1928,6 +1928,7 @@ break; } } + if (globals.init) { ldl_global_destroy(); }

1 0

[commit] r4886 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 07 Apr '07

07 Apr '07

Author: anthm Date: Sat Apr 7 17:14:21 2007 New Revision: 4886 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: merge 2 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Sat Apr 7 17:14:21 2007 @@ -1870,18 +1870,19 @@ apr_hash_set(handle->probe_hash, id, APR_HASH_KEY_STRING, &buffer); - msg = iks_make_s10n (IKS_TYPE_SUBSCRIBE, id, notice); - iks_insert_attrib(msg, "from", from); - apr_queue_push(handle->queue, msg); - started = time(NULL); for(;;) { elapsed = time(NULL) - started; if (elapsed == next) { + msg = iks_make_s10n (IKS_TYPE_SUBSCRIBE, id, notice); + iks_insert_attrib(msg, "from", from); + apr_queue_push(handle->queue, msg); + pres = iks_new("presence"); + iks_insert_attrib(pres, "xmlns", "jabber:client"); iks_insert_attrib(pres, "type", "probe"); - iks_insert_attrib(pres, "from", from); iks_insert_attrib(pres, "to", id); + iks_insert_attrib(pres, "from", from); apr_queue_push(handle->queue, pres); next += 5; }

1 0

[commit] r4885 - in freeswitch/trunk: libs/libdingaling/src src/mod/endpoints/mod_dingaling
by Freeswitch SVN 07 Apr '07

07 Apr '07

Author: anthm Date: Sat Apr 7 17:13:54 2007 New Revision: 4885 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: merge 1 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Sat Apr 7 17:13:54 2007 @@ -559,6 +559,8 @@ globals.logger(DL_LOG_DEBUG, "FixME!!! node=[%s]\n", node?node:""); } else if (pak->subtype == IKS_TYPE_GET) { if ((iq = iks_new("iq"))) { + int all = 0; + iks_insert_attrib(iq, "from", handle->login); iks_insert_attrib(iq, "to", pak->from->full); iks_insert_attrib(iq, "id", pak->id); @@ -576,13 +578,17 @@ if (!(tag = iks_insert (query, "identity"))) { goto fail; } + + if (!strcasecmp(ns, FEATURE_DISCO) && !node) { + all++; + } iks_insert_attrib(tag, "category", "gateway"); iks_insert_attrib(tag, "type", "voice"); iks_insert_attrib(tag, "name", "LibDingaLing"); for (x = 0; FEATURES[x].name; x++) { - if (!ns || !strcasecmp(ns, FEATURES[x].name)) { + if (all || !ns || !strcasecmp(ns, FEATURES[x].name)) { if (!(tag = iks_insert (query, "feature"))) { goto fail; } Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Sat Apr 7 17:13:54 2007 @@ -108,7 +108,9 @@ char *login; char *password; char *message; +#ifdef AUTO_REPLY char *auto_reply; +#endif char *dialplan; char *ip; char *extip; @@ -723,13 +725,15 @@ if (ll) { if ((xmltxt = strchr(ll, ':'))) { *xmltxt++ = '\0'; - xml = switch_xml_parse_str(xmltxt, strlen(xmltxt)); - form = switch_xml_toxml(xml); - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, level, - "%s:\n-------------------------------------------------------------------------------\n" - "%s\n", ll, form); - switch_xml_free(xml); - free(data); + if (strlen(xmltxt) > 2) { + xml = switch_xml_parse_str(xmltxt, strlen(xmltxt)); + form = switch_xml_toxml(xml); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, level, + "%s:\n-------------------------------------------------------------------------------\n" + "%s\n", ll, form); + switch_xml_free(xml); + free(data); + } } } } else { @@ -1959,8 +1963,10 @@ switch_set_flag(profile, TFLAG_TIMER); } else if (!strcasecmp(var, "dialplan")) { profile->dialplan = switch_core_strdup(module_pool, val); +#ifdef AUTO_REPLY // gotta fix looping on this } else if (!strcasecmp(var, "auto-reply")) { profile->auto_reply = switch_core_strdup(module_pool, val); +#endif } else if (!strcasecmp(var, "name")) { profile->name = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "message")) { @@ -2396,6 +2402,8 @@ switch_mutex_unlock(profile->mutex); if (is_special(to)) { ldl_handle_send_presence(profile->handle, to, from, NULL, NULL, "Click To Call", profile->avatar); + } else { + ldl_handle_send_presence(profile->handle, to, from, NULL, NULL, "Authenticated.\nCome to ClueCon!\nhttp://www.cluecon.com", profile->avatar); } #if 0 if (is_special(to)) { @@ -2491,12 +2499,13 @@ char *proto = MDL_CHAT_PROTO; char *pproto = NULL, *ffrom = NULL; char *hint; - +#ifdef AUTO_REPLY if (profile->auto_reply) { ldl_handle_send_msg(handle, (profile->user_flags & LDL_FLAG_COMPONENT) ? to : ldl_handle_get_login(profile->handle), from, "", profile->auto_reply); } +#endif if (strchr(to, '+')) { pproto = strdup(to);

1 0

[commit] r4884 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 07 Apr '07

07 Apr '07

Author: anthm Date: Sat Apr 7 16:30:28 2007 New Revision: 4884 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add some api commands 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 Sat Apr 7 16:30:28 2007 @@ -724,6 +724,55 @@ return SWITCH_STATUS_SUCCESS; } +static switch_status_t xml_wrap_api_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +{ + char *dcommand, *edata = NULL, *send = NULL, *command, *arg = NULL; + switch_stream_handle_t mystream = { 0 }; + int encoded = 0, elen = 0; + + if ((dcommand = strdup(cmd))) { + if (!strncasecmp(dcommand, "encoded ", 8)) { + encoded++; + command = dcommand + 8; + } else { + command = dcommand; + } + + if ((arg = strchr(command, ' '))) { + *arg++ = '\0'; + } + SWITCH_STANDARD_STREAM(mystream); + switch_api_execute(command, arg, NULL, &mystream); + + if (mystream.data) { + if (encoded) { + elen = (int) strlen(mystream.data) * 3; + edata = malloc(elen); + assert(edata != NULL); + memset(edata, 0, elen); + switch_url_encode(mystream.data, edata, elen); + send = edata; + } else { + send = mystream.data; + } + } + + stream->write_function(stream, + "<result>\n" + " <row id=\"1\">\n" + " <data>%s</data>\n" + " </row>\n" + "</result>\n", + send ? send : "ERROR" + ); + switch_safe_free(mystream.data); + switch_safe_free(edata); + free(dcommand); + } + + return SWITCH_STATUS_SUCCESS; +} + static switch_status_t sched_api_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { char *tm = NULL, *dcmd, *group; @@ -768,8 +817,43 @@ char *http; uint32_t count; int print_title; + switch_xml_t xml; + int rows; }; +static int show_as_xml_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + struct holder *holder = (struct holder *) pArg; + switch_xml_t row, field; + int x, f_off = 0; + char id[50]; + + if (holder->count == 0) { + if (!(holder->xml = switch_xml_new("result"))) { + return -1; + } + } + + if (!(row = switch_xml_add_child_d(holder->xml, "row", holder->rows++))) { + return -1; + } + + snprintf(id, sizeof(id), "%d", holder->rows); + switch_xml_set_attr_d(row, "id", id); + + for(x = 0; x < argc; x++) { + if ((field = switch_xml_add_child_d(row, columnNames[x], f_off++))) { + switch_xml_set_txt_d(field, argv[x]); + } else { + return -1; + } + } + + holder->count++; + + return 0; +} + static int show_callback(void *pArg, int argc, char **argv, char **columnNames) { struct holder *holder = (struct holder *) pArg; @@ -808,19 +892,31 @@ return 0; } -static switch_status_t show_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +static switch_status_t show_function(char *data, switch_core_session_t *session, switch_stream_handle_t *stream) { char sql[1024]; char *errmsg; switch_core_db_t *db = switch_core_db_handle(); struct holder holder = { 0 }; int help = 0; + char *mydata, *argv[5] = {0}; + int argc; + char *cmd, *as = NULL; if (session) { return SWITCH_STATUS_FALSE; } - if (stream->event) { + if ((mydata = strdup(data))) { + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + cmd = argv[0]; + if (argv[2] && !strcasecmp(argv[1], "as")) { + as = argv[2]; + } + + if (!as && stream->event) { holder.http = switch_event_get_header(stream->event, "http-host"); } @@ -864,23 +960,44 @@ holder.stream->write_function(holder.stream, "<table cellpadding=1 cellspacing=4 border=1>\n"); } - switch_core_db_exec(db, sql, show_callback, &holder, &errmsg); - - if (holder.http) { - holder.stream->write_function(holder.stream, "</table>"); + if (!as) { + as = "csv"; } - if (errmsg) { - stream->write_function(stream, "SQL ERR [%s]\n", errmsg); - switch_core_db_free(errmsg); - errmsg = NULL; - } else if (help) { - if (holder.count == 0) - stream->write_function(stream, "No such command.\n"); + if (!strcasecmp(as, "csv")) { + switch_core_db_exec(db, sql, show_callback, &holder, &errmsg); + if (holder.http) { + holder.stream->write_function(holder.stream, "</table>"); + } + + if (errmsg) { + stream->write_function(stream, "SQL ERR [%s]\n", errmsg); + switch_core_db_free(errmsg); + errmsg = NULL; + } else if (help) { + if (holder.count == 0) + stream->write_function(stream, "No such command.\n"); + } else { + stream->write_function(stream, "\n%u total.\n", holder.count); + } + } else if (!strcasecmp(as, "xml")) { + switch_core_db_exec(db, sql, show_as_xml_callback, &holder, &errmsg); + if (holder.xml) { + char *xmlstr = switch_xml_toxml(holder.xml); + if (xmlstr) { + holder.stream->write_function(holder.stream, "%s", xmlstr); + free(xmlstr); + } else { + holder.stream->write_function(holder.stream, "ERROR\n"); + } + } else { + holder.stream->write_function(holder.stream, "ERROR\n"); + } } else { - stream->write_function(stream, "\n%u total.\n", holder.count); + holder.stream->write_function(holder.stream, "Cannot find format %s\n", as); } + switch_safe_free(mydata); switch_core_db_close(db); return SWITCH_STATUS_SUCCESS; } @@ -914,12 +1031,21 @@ return SWITCH_STATUS_SUCCESS; } + +static switch_api_interface_t xml_wrap_api_interface = { + /*.interface_name */ "xml_wrap", + /*.desc */ "Wrap another api command in xml", + /*.function */ xml_wrap_api_function, + /*.syntax */ "<command> <args>", + /*.next */ NULL +}; + static switch_api_interface_t sched_del_api_interface = { /*.interface_name */ "sched_del", /*.desc */ "Delete a Scheduled task", /*.function */ sched_del_function, /*.syntax */ "<task_id>|<group_id>", - /*.next */ NULL + /*.next */ &xml_wrap_api_interface }; static switch_api_interface_t sched_api_api_interface = {

1 0

[commit] r4883 - in freeswitch/trunk: libs/libdingaling/src src/mod/endpoints/mod_dingaling
by Freeswitch SVN 07 Apr '07

07 Apr '07

Author: anthm Date: Sat Apr 7 11:55:07 2007 New Revision: 4883 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/libs/libdingaling/src/libdingaling.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: add dl_debug api command Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Sat Apr 7 11:55:07 2007 @@ -1391,9 +1391,9 @@ handle, (iksStreamHook *) (ldl_test_flag(handle, LDL_FLAG_COMPONENT) ? on_stream_component : on_stream)); - if (globals.debug) { - iks_set_log_hook(handle->parser, (iksLogHook *) on_log); - } + + iks_set_log_hook(handle->parser, (iksLogHook *) on_log); + strncpy(tmp, jabber_id, sizeof(tmp)-1); sl = strchr(tmp, '/'); @@ -1763,6 +1763,15 @@ } +int ldl_global_debug(int on) +{ + if (on > -1) { + globals.debug = on ? 1 : 0; + } + + return globals.debug ? 1 : 0; +} + void ldl_global_set_logger(ldl_logger_t logger) { globals.logger = logger; Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Sat Apr 7 11:55:07 2007 @@ -376,6 +376,13 @@ void ldl_session_accept_candidate(ldl_session_t *session, ldl_candidate_t *candidate); /*! + \brief turn logging on/off + \param on (TRUE or FALSE) + \return current state +*/ +int ldl_global_debug(int on); + +/*! \brief Set a custom logger \param logger the logger function */ Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Sat Apr 7 11:55:07 2007 @@ -192,6 +192,7 @@ static switch_status_t dl_login(char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t dl_logout(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t dl_pres(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_debug(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t channel_on_init(switch_core_session_t *session); static switch_status_t channel_on_hangup(switch_core_session_t *session); static switch_status_t channel_on_ring(switch_core_session_t *session); @@ -1586,12 +1587,20 @@ }; +static switch_api_interface_t debug_api_interface = { + /*.interface_name */ "dl_debug", + /*.desc */ "DingaLing Presence", + /*.function */ dl_debug, + /*.syntax */ "dl_debug [true|false]", + /*.next */ NULL +}; + static switch_api_interface_t pres_api_interface = { /*.interface_name */ "dl_pres", /*.desc */ "DingaLing Presence", /*.function */ dl_pres, /*.syntax */ "dl_pres <profile_name>", - /*.next */ NULL + /*.next */ &debug_api_interface }; static switch_api_interface_t logout_api_interface = { @@ -1998,6 +2007,27 @@ } } +static switch_status_t dl_debug(char *tf, switch_core_session_t *session, switch_stream_handle_t *stream) +{ + int on, cur; + + if (session) { + return SWITCH_STATUS_FALSE; + } + + if (tf) { + on = switch_true(tf); + cur = ldl_global_debug(on); + } else { + cur = ldl_global_debug(-1); + } + + + stream->write_function(stream, "DEBUG IS NOW %s\n", cur ? "ON" : "OFF"); + + return SWITCH_STATUS_SUCCESS; +} + static switch_status_t dl_pres(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) { mdl_profile_t *profile;

1 0

[commit] r4882 - in freeswitch/branches/mikej/sofiasip-upgrade: . libs/libsndfile src src/include
by Freeswitch SVN 07 Apr '07

07 Apr '07

Author: mikej Date: Sat Apr 7 05:04:10 2007 New Revision: 4882 Modified: freeswitch/branches/mikej/sofiasip-upgrade/bootstrap.sh freeswitch/branches/mikej/sofiasip-upgrade/libs/libsndfile/Makefile.am freeswitch/branches/mikej/sofiasip-upgrade/src/include/switch.h freeswitch/branches/mikej/sofiasip-upgrade/src/switch_apr.c freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_bridge.c freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_play_say.c Log: solaris warnings Modified: freeswitch/branches/mikej/sofiasip-upgrade/bootstrap.sh ============================================================================== --- freeswitch/branches/mikej/sofiasip-upgrade/bootstrap.sh (original) +++ freeswitch/branches/mikej/sofiasip-upgrade/bootstrap.sh Sat Apr 7 05:04:10 2007 @@ -68,9 +68,9 @@ IFS=.; set $lt_version; IFS=' ' lt_status="good" -a=$[$1+0] -b=$[$2+0] -c=$[$3+0] +if test -z "$1"; then a=0 ; else a=$1;fi +if test -z "$2"; then b=0 ; else b=$2;fi +if test -z "$3"; then c=0 ; else c=$3;fi if test "$a" -lt "2"; then if test "$b" -lt "5" -o "$b" = "5" -a "$c" -lt "14" ; then Modified: freeswitch/branches/mikej/sofiasip-upgrade/libs/libsndfile/Makefile.am ============================================================================== --- freeswitch/branches/mikej/sofiasip-upgrade/libs/libsndfile/Makefile.am (original) +++ freeswitch/branches/mikej/sofiasip-upgrade/libs/libsndfile/Makefile.am Sat Apr 7 05:04:10 2007 @@ -1,10 +1,11 @@ -## Process this file with automake to produce Makefile.in +# Process this file with automake to produce Makefile.in -SUBDIRS = man doc Win32 Octave src examples regtest tests +SUBDIRS = Win32 Octave src +# man doc Win32 examples regtest tests DIST_SUBDIRS = $(SUBDIRS) EXTRA_DIST = reconfigure.mk acinclude.m4 libsndfile.spec.in \ sndfile.pc.in Mingw-make-dist.sh - + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = sndfile.pc Modified: freeswitch/branches/mikej/sofiasip-upgrade/src/include/switch.h ============================================================================== --- freeswitch/branches/mikej/sofiasip-upgrade/src/include/switch.h (original) +++ freeswitch/branches/mikej/sofiasip-upgrade/src/include/switch.h Sat Apr 7 05:04:10 2007 @@ -50,8 +50,7 @@ #define FREESWITCH_PEN "27880" #define FREESWITCH_OID_PREFIX ".1.3.6.1.4.1." FREESWITCH_PEN #define FREESWITCH_ITAD "543" - - +#define __EXTENSIONS__ 1 #include <stdlib.h> #include <stdio.h> #include <stdarg.h> @@ -60,7 +59,7 @@ #include <setjmp.h> #include <ctype.h> #include <fcntl.h> -#include <string.h> +#include <strings.h> #include <sys/stat.h> #include <limits.h> #include <sys/types.h> Modified: freeswitch/branches/mikej/sofiasip-upgrade/src/switch_apr.c ============================================================================== --- freeswitch/branches/mikej/sofiasip-upgrade/src/switch_apr.c (original) +++ freeswitch/branches/mikej/sofiasip-upgrade/src/switch_apr.c Sat Apr 7 05:04:10 2007 @@ -381,7 +381,7 @@ SWITCH_DECLARE(switch_status_t) switch_socket_shutdown(switch_socket_t * sock, switch_shutdown_how_e how) { - return apr_socket_shutdown(sock, how); + return apr_socket_shutdown(sock, (apr_shutdown_how_e)how); } SWITCH_DECLARE(switch_status_t) switch_socket_close(switch_socket_t * sock) Modified: freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_bridge.c (original) +++ freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_bridge.c Sat Apr 7 05:04:10 2007 @@ -31,7 +31,6 @@ #include <switch.h> static const switch_state_handler_table_t audio_bridge_peer_state_handlers; -static const switch_state_handler_table_t originate_state_handlers; /* Bridge Related Stuff*/ /*********************************************************************************/ Modified: freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_play_say.c (original) +++ freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_play_say.c Sat Apr 7 05:04:10 2007 @@ -77,7 +77,7 @@ return (switch_say_method_t) x; } -static switch_say_method_t get_say_type_by_name(char *name) +static switch_say_type_t get_say_type_by_name(char *name) { int x = 0; for (x = 0; SAY_TYPE_NAMES[x]; x++) { @@ -86,7 +86,7 @@ } } - return (switch_say_method_t) x; + return (switch_say_type_t) x; }

1 0

[commit] r4881 - in freeswitch/trunk: conf src src/include
by Freeswitch SVN 07 Apr '07

07 Apr '07

Author: anthm Date: Fri Apr 6 23:07:43 2007 New Revision: 4881 Modified: freeswitch/trunk/conf/freeswitch_combined.xml freeswitch/trunk/conf/switch.conf.xml freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_rtp.c Log: added patch from http://jira.freeswitch.org/browse/FSCORE-25 Modified: freeswitch/trunk/conf/freeswitch_combined.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch_combined.xml (original) +++ freeswitch/trunk/conf/freeswitch_combined.xml Fri Apr 6 23:07:43 2007 @@ -7,6 +7,9 @@ <settings>  <param name="max-sessions" value="1000"/> +  +  +  </settings>  <variables> Modified: freeswitch/trunk/conf/switch.conf.xml ============================================================================== --- freeswitch/trunk/conf/switch.conf.xml (original) +++ freeswitch/trunk/conf/switch.conf.xml Fri Apr 6 23:07:43 2007 @@ -2,6 +2,9 @@ <settings>  <param name="max-sessions" value="1000"/> +  +  +  </settings>  <variables> Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Fri Apr 6 23:07:43 2007 @@ -27,6 +27,7 @@ * * * switch_channel.h -- Media Channel Interface + * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> * */ /** @@ -53,6 +54,20 @@ */ SWITCH_DECLARE(void) switch_rtp_init(switch_memory_pool_t *pool); +/*! + \brief Set/Get RTP start port + \param port new value (if > 0) + \return the current RTP start port +*/ +SWITCH_DECLARE(switch_port_t) switch_rtp_set_start_port(switch_port_t port); + +/*! + \brief Set/Get RTP end port + \param port new value (if > 0) + \return the current RTP end port +*/ +SWITCH_DECLARE(switch_port_t) switch_rtp_set_end_port(switch_port_t port); + /*! \brief Request a new port to be used for media \return the new port to use Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Apr 6 23:07:43 2007 @@ -26,6 +26,7 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * Michael Jerris <mike(a)jerris.com> * Paul D. Tinsley <pdt at jackhammer.org> + * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> * * * switch_core.c -- Main Core Library @@ -445,6 +446,12 @@ if (!strcasecmp(var, "max-sessions")) { switch_core_session_limit(atoi(val)); } + else if (!strcasecmp(var, "rtp-start-port")) { + switch_rtp_set_start_port(atoi(val)); + } + else if (!strcasecmp(var, "rtp-end-port")) { + switch_rtp_set_end_port(atoi(val)); + } } } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Apr 6 23:07:43 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> * * * switch_rtp.c -- RTP @@ -50,6 +51,8 @@ #define MASTER_KEY_LEN 30 #define RTP_MAGIC_NUMBER 42 +static switch_port_t START_PORT = RTP_START_PORT; +static switch_port_t END_PORT = RTP_END_PORT; static switch_port_t NEXT_PORT = RTP_START_PORT; static switch_mutex_t *port_lock = NULL; @@ -263,6 +266,43 @@ global_init = 1; } +SWITCH_DECLARE(switch_port_t) switch_rtp_set_start_port(switch_port_t port) +{ + if (port) { + if (port_lock) { + switch_mutex_lock(port_lock); + } + if (NEXT_PORT == START_PORT) { + NEXT_PORT = port; + } + START_PORT = port; + if (NEXT_PORT < START_PORT) { + NEXT_PORT = START_PORT; + } + if (port_lock) { + switch_mutex_unlock(port_lock); + } + } + return START_PORT; +} + +SWITCH_DECLARE(switch_port_t) switch_rtp_set_end_port(switch_port_t port) +{ + if (port) { + if (port_lock) { + switch_mutex_lock(port_lock); + } + END_PORT = port; + if (NEXT_PORT > END_PORT) { + NEXT_PORT = START_PORT; + } + if (port_lock) { + switch_mutex_unlock(port_lock); + } + } + return END_PORT; +} + SWITCH_DECLARE(switch_port_t) switch_rtp_request_port(void) { switch_port_t port; @@ -270,8 +310,8 @@ switch_mutex_lock(port_lock); port = NEXT_PORT; NEXT_PORT += 2; - if (NEXT_PORT > RTP_END_PORT) { - NEXT_PORT = RTP_START_PORT; + if (NEXT_PORT > END_PORT) { + NEXT_PORT = START_PORT; } switch_mutex_unlock(port_lock); return port;

1 0