- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12806 - in freeswitch/trunk/src: . mod/applications/mod_commands
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: anthm Date: Fri Mar 27 12:49:10 2009 New Revision: 12806 Log: MODAPP-227 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_core_sqldb.c 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 Fri Mar 27 12:49:10 2009 @@ -2525,7 +2525,7 @@ return SWITCH_STATUS_SUCCESS; } -#define SHOW_SYNTAX "codec|application|api|dialplan|file|timer|calls [count]|channels [count]|aliases|complete|chat|endpoint|management|say|interfaces|interface_types" +#define SHOW_SYNTAX "codec|application|api|dialplan|file|timer|calls [count]|channels [count]|aliases|complete|chat|endpoint|management|modules|say|interfaces|interface_types" SWITCH_STANDARD_API(show_function) { char sql[1024]; @@ -2589,18 +2589,24 @@ if (end_of(command) == 's') { end_of(command) = '\0'; } - sprintf(sql, "select type, name from interfaces where type = '%s' order by type,name", command); + sprintf(sql, "select type, name, key from interfaces where name = '%s' order by type,name", command); + } else if (!strncasecmp(command, "module", 6)) { + if (argv[1]) { + sprintf(sql, "select distinct type, name, key, filename from interfaces where key = '%s' order by type,name", argv[1]); + } else { + sprintf(sql, "select distinct type, name, key, filename from interfaces order by type,name"); + } } else if (!strcasecmp(command, "interfaces")) { - sprintf(sql, "select type, name from interfaces order by type,name"); + sprintf(sql, "select type, name, key from interfaces order by type,name"); } else if (!strcasecmp(command, "interface_types")) { sprintf(sql, "select type,count(type) as total from interfaces group by type order by type"); } else if (!strcasecmp(command, "tasks")) { sprintf(sql, "select * from %s", command); } else if (!strcasecmp(command, "application") || !strcasecmp(command, "api")) { if (argv[1] && strcasecmp(argv[1], "as")) { - sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != '' and name = '%s' order by type,name", command, argv[1]); + sprintf(sql, "select name, description, syntax, key from interfaces where type = '%s' and description != '' and name = '%s' order by type,name", command, argv[1]); } else { - sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != '' order by type,name", command); + sprintf(sql, "select name, description, syntax, key from interfaces where type = '%s' and description != '' order by type,name", command); } } else if (!strcasecmp(command, "calls")) { sprintf(sql, "select * from calls order by created_epoch"); @@ -2629,10 +2635,10 @@ holder.print_title = 0; if ((cmdname = strchr(command, ' ')) && strcasecmp(cmdname, "as")) { *cmdname++ = '\0'; - switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api' and name = '%s' order by name", + switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description, key from interfaces where type = 'api' and name = '%s' order by name", cmdname); } else { - switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api' order by name"); + switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description, key from interfaces where type = 'api' order by name"); } } else { stream->write_function(stream, "-USAGE: %s\n", SHOW_SYNTAX); @@ -2651,6 +2657,8 @@ holder.delim = ","; } + /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL: %s.\n", sql); */ + if (!strcasecmp(as, "delim") || !strcasecmp(as, "csv")) { if (switch_strlen_zero(holder.delim)) { if (!(holder.delim = argv[3])) { Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Fri Mar 27 12:49:10 2009 @@ -368,10 +368,12 @@ const char *name = switch_event_get_header_nil(event, "name"); const char *description = switch_event_get_header_nil(event, "description"); const char *syntax = switch_event_get_header_nil(event, "syntax"); + const char *key = switch_event_get_header_nil(event, "key"); + const char *filename = switch_event_get_header_nil(event, "filename"); if (!switch_strlen_zero(type) && !switch_strlen_zero(name)) { sql = - switch_mprintf("insert into interfaces (type,name,description,syntax) values('%q','%q','%q','%q')", - type, name, switch_str_nil(description), switch_str_nil(syntax) + switch_mprintf("insert into interfaces (type,name,description,syntax,key,filename) values('%q','%q','%q','%q','%q','%q')", + type, name, switch_str_nil(description), switch_str_nil(syntax), switch_str_nil(key), switch_str_nil(filename) ); } break; @@ -477,6 +479,8 @@ " type VARCHAR(255),\n" " name VARCHAR(255),\n" " description VARCHAR(255),\n" + " key VARCHAR(255),\n" + " filename VARCHAR(255),\n" " syntax VARCHAR(255)\n" ");\n"; char create_tasks_sql[] =

1 0

[commit] r12805 - freeswitch/trunk/libs/esl/ruby
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: mikej Date: Fri Mar 27 10:29:50 2009 New Revision: 12805 Log: fix ruby linking on debian (ESL-7) Modified: freeswitch/trunk/libs/esl/ruby/Makefile Modified: freeswitch/trunk/libs/esl/ruby/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/ruby/Makefile (original) +++ freeswitch/trunk/libs/esl/ruby/Makefile Fri Mar 27 10:29:50 2009 @@ -1,6 +1,6 @@ ## no idea how to simply ask ruby which one to use LOCAL_CFLAGS=-I$(shell ruby -e 'require "rbconfig"; puts RbConfig::CONFIG["topdir"]') -LOCAL_LDFLAGS=-lruby +LOCAL_LDFLAGS=$(shell ruby -e 'require "rbconfig"; puts RbConfig::CONFIG["LIBRUBYARG"]') all: ESL.so

1 0

[commit] r12804 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: anthm Date: Fri Mar 27 10:07:49 2009 New Revision: 12804 Log: MODAPP-241 Modified: freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Mar 27 10:07:49 2009 @@ -1387,7 +1387,7 @@ } switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_VARIABLE, application_interface->interface_name); - switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_DATA_VARIABLE, expanded); + switch_channel_set_variable_var_check(channel, SWITCH_CURRENT_APPLICATION_DATA_VARIABLE, expanded, SWITCH_FALSE); switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, NULL); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE) == SWITCH_STATUS_SUCCESS) {

1 0

[commit] r12803 - freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: nmartin Date: Fri Mar 27 08:35:21 2009 New Revision: 12803 Log: evidently, Apple's Address Book stores telephone numbers willy nilly, and gives you no control over how the actual numbers are stored - added function to strip ()-. and spaces from the number before passing it to FS Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.scpt Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.scpt ============================================================================== Binary files. No diff available.

1 0

[commit] r12802 - in freeswitch/trunk/conf: . directory/default
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: mikej Date: Thu Mar 26 20:44:28 2009 New Revision: 12802 Log: You can lead a horse to water But you can't make him drink You can send a kid to college But you can't make him think PLEASE THINK! /b Modified: freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml freeswitch/trunk/conf/directory/default/brian.xml freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1000" mailbox="1000"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1000"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1001" mailbox="1001"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1001"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1002" mailbox="1002"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1002"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1003" mailbox="1003"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1003"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1004" mailbox="1004"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1004"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1005" mailbox="1005"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1005"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1006" mailbox="1006"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1006"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1007" mailbox="1007"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1007"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1008" mailbox="1008"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1008"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1009" mailbox="1009"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1009"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1010" mailbox="1010"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1010"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1011" mailbox="1011"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1011"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1012" mailbox="1012"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1012"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1013" mailbox="1013"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1013"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1014" mailbox="1014"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1014"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1015" mailbox="1015"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1015"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1016" mailbox="1016"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1016"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1017" mailbox="1017"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1017"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1018" mailbox="1018"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1018"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1019" mailbox="1019"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1019"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Thu Mar 26 20:44:28 2009 @@ -43,8 +43,8 @@ </gateways> <params>  - <param name="password" value="1234"/> - <param name="vm-password" value="1234"/> + <param name="password" value="${default_password}"/> + <param name="vm-password" value="9999"/>    Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,20 @@ +<include>  + + WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING + + YOU SHOULD CHANGE THIS default_password value if you don't want to be subject to any + toll fraud in the future. It's your responsibility to secure your own system. + + This default config is used to demonstrate the feature set of FreeSWITCH. + + WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING + --> + <X-PRE-PROCESS cmd="set" data="default_password=1234"/> +  + <X-PRE-PROCESS cmd="set" data="sound_prefix=$${base_dir}/sounds/en/us/callie"/> <!-- This setting is what sets the default domain FreeSWITCH will use if all else fails. @@ -175,3 +188,4 @@ <X-PRE-PROCESS cmd="set" data="external_tls_port=5081"/> <X-PRE-PROCESS cmd="set" data="external_ssl_enable=false"/> <X-PRE-PROCESS cmd="set" data="external_ssl_dir=$${base_dir}/conf/ssl"/> +</include>

1 0

[commit] r12801 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: anthm Date: Thu Mar 26 19:27:07 2009 New Revision: 12801 Log: reduce exponential mwi notifies Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Mar 26 19:27:07 2009 @@ -477,6 +477,8 @@ sofia_presence_handle_sip_i_publish(nua, profile, nh, sofia_private, sip, tags); break; case nua_i_register: + //nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT(sip->sip_contact), NUTAG_WITH_THIS(nua), TAG_END()); + //nua_handle_destroy(nh); sofia_reg_handle_sip_i_register(nua, profile, nh, sofia_private, sip, tags); break; case nua_i_state: Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Thu Mar 26 19:27:07 2009 @@ -283,6 +283,8 @@ switch_event_header_t *hp; struct mwi_helper h = { 0 }; char *pname = NULL; + const char *call_id; + const char *sub_call_id; switch_assert(event != NULL); @@ -296,6 +298,9 @@ return; } + call_id = switch_event_get_header(event, "call-id"); + sub_call_id = switch_event_get_header(event, "sub-call-id"); + dup_account = strdup(account); switch_assert(dup_account != NULL); sofia_glue_get_user_host(dup_account, &user, &host); @@ -339,30 +344,39 @@ stream.write_function(&stream, "\r\n"); - sql = switch_mprintf("select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," - "full_via,expires,user_agent,accept,profile_name" - ",'%q','%q' from sip_subscriptions where event='message-summary' " - "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%')", - stream.data, host, user, host, host); - - switch_assert(sql != NULL); - sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback, &h); - - switch_safe_free(sql); - - sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q' from sip_registrations where sip_user='%q' and sip_host='%q'", - stream.data, user, host); - + sql = NULL; + if (sub_call_id) { + sql = switch_mprintf("select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," + "full_via,expires,user_agent,accept,profile_name" + ",'%q','%q' from sip_subscriptions where event='message-summary' " + "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%' and call_id='%q')", + stream.data, host, user, host, host, sub_call_id); + } else if (!call_id) { + sql = switch_mprintf("select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," + "full_via,expires,user_agent,accept,profile_name" + ",'%q','%q' from sip_subscriptions where event='message-summary' " + "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%')", + stream.data, host, user, host, host); + } + + if (sql) { + sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback, &h); + switch_safe_free(sql); + + } else if (call_id) { + sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q' " + "from sip_registrations where sip_user='%q' and sip_host='%q' and call_id='%q'", + stream.data, user, host, call_id); + switch_assert(sql != NULL); + sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback2, &h); + } - switch_assert(sql != NULL); - sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback2, &h); switch_safe_free(sql); - switch_safe_free(stream.data); - switch_safe_free(dup_account); + if (profile) { sofia_glue_release_profile(profile); } @@ -791,6 +805,7 @@ if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", user, host); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "VM-Sofia-Profile", profile->name); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "VM-sub-call-id", argv[7]); switch_event_fire(&event); } return 0; 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 Thu Mar 26 19:27:07 2009 @@ -1137,6 +1137,7 @@ if (switch_event_create(&s_event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", to_user, reg_host); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "VM-Sofia-Profile", profile->name); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "VM-Call-ID", call_id); } } else { if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_UNREGISTER) == SWITCH_STATUS_SUCCESS) {

1 0

[commit] r12800 - freeswitch/trunk/scripts/contrib/swk/php/amfphp
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: silik0n Date: Thu Mar 26 18:06:23 2009 New Revision: 12800 Log: fix some errors on generic DB handler Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Thu Mar 26 18:06:23 2009 @@ -274,7 +274,8 @@ public function getDirDomainbyName($domain_name){ $query = sprintf("select * from domains where name = '%s'", $domain_name); - $stmt = $this->dbh->query($query); + $dbh = $this->getDbh(); + $stmt = $dbh->query($query); $results = $stmt->fetchAll(); return $results[0]; } @@ -336,7 +337,8 @@ /* Directory User Methods */ public function getDirUsersByDomainUidByUsername($domain_uid, $user_name){ $query = sprintf("select * from users where domains_uid = '%s' and username = '%s'", $domain_uid, $user_name); - $stmt = $this->dbh->query($query); + $dbh = $this->getDbh(); + $stmt = $dbh->query($query); $results = $stmt->fetchAll(); return $results[0]; } @@ -360,6 +362,13 @@ return $results; } + public function addDirDomainUser($domains_uid, $username, $mailbox, $cidr, $enabled) { + $dbh = $this->getDbh(); + $query = sprintf('insert into users (domains_uid, username, mailbox, cidr, enabled) values (%s, "%s", "%s", "%s", %s)', + $domain_uid, $username, $mailbox, $cidr, $enabled); + return $dbh->exec($query); + } + public function addDirDomainUserParam($users_uid, $name, $value) { $dbh = $this->getDbh(); $query = sprintf('insert into user_params (users_uid, name, value) values (%s, "%s", "%s")', $users_uid, $name, $value); @@ -415,7 +424,8 @@ public function getDirGroupsByDomianUidByUserUid($domain_uid, $user_uid){ $query = sprintf("select a.uid as groupUid, a.name as groupName, b.uid as usersUid from groups as a, group_members as b where a.uid = b.groups_uid and b.domains_uid = %s and b.users_uid = %s", $domain_uid, $user_uid) ; - $stmt = $this->dbh->query($query); + $dbh = $this->getDbh(); + $stmt = $dbh->query($query); $results = $stmt->fetchAll(); return $results; }

1 0

[commit] r12799 - freeswitch/trunk/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: gmaruzz Date: Thu Mar 26 17:02:32 2009 New Revision: 12799 Log: skypiax: added another SWITCH_API_COMMANDS to send skype_api command to the named client: skypiax interface_name skype_API_msg Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Thu Mar 26 17:02:32 2009 @@ -41,6 +41,8 @@ SWITCH_MODULE_DEFINITION(mod_skypiax, mod_skypiax_load, mod_skypiax_shutdown, NULL); SWITCH_STANDARD_API(sk_function); #define SK_SYNTAX "list || console || skype_API_msg" +SWITCH_STANDARD_API(skypiax_function); +#define SKYPIAX_SYNTAX "interface_name skype_API_msg" static struct { int debug; @@ -1044,7 +1046,8 @@ if (running){ - SWITCH_ADD_API(commands_api_interface, "sk", "Skypiax commands", sk_function, SK_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "sk", "Skypiax console commands", sk_function, SK_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "skypiax", "Skypiax interface commands", skypiax_function, SKYPIAX_SYNTAX); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } @@ -1416,6 +1419,62 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_STANDARD_API(skypiax_function) +{ + char *mycmd = NULL, *argv[10] = { 0 }; + int argc = 0; + private_t *tech_pvt=NULL; + + + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + if (!argc) { + stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX); + goto end; + } + + if (argc < 2) { + stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX); + goto end; + } + + if (argv[0]) { + int i; + int found =0; + + for (i = 0; !found && i < SKYPIAX_MAX_INTERFACES; i++) { + /* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */ + if (strlen(globals.SKYPIAX_INTERFACES[i].name) + && + (strncmp + (globals.SKYPIAX_INTERFACES[i].name, argv[0], + strlen(argv[0])) == 0)) { + tech_pvt=&globals.SKYPIAX_INTERFACES[i]; + stream->write_function(stream,"Using interface: globals.SKYPIAX_INTERFACES[%d].name=|||%s|||\n", i, globals.SKYPIAX_INTERFACES[i].name); + found = 1; + break; + } + + } + if(!found){ + stream->write_function(stream,"ERROR: A Skypiax interface with name='%s' was not found\n", argv[0]); + switch_safe_free(mycmd); + + return SWITCH_STATUS_SUCCESS; + } else { + skypiax_signaling_write(tech_pvt, (char *)&cmd[ strlen(argv[0]) + 1 ] ); + } + } else { + stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX); + } +end: + switch_safe_free(mycmd); + + return SWITCH_STATUS_SUCCESS; +} +

1 0

[commit] r12798 - freeswitch/trunk/scripts/contrib/swk/php/amfphp
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: silik0n Date: Thu Mar 26 17:01:48 2009 New Revision: 12798 Log: the start of merging the xml_curl fork to the amf fork Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Thu Mar 26 17:01:48 2009 @@ -272,6 +272,13 @@ return $results; } + public function getDirDomainbyName($domain_name){ + $query = sprintf("select * from domains where name = '%s'", $domain_name); + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results[0]; + } + public function getDirDomain($domains_uid){ $dbh = $this->getDbh(); $query = sprintf("select * from domain_params where domains_uid = $domains_uid"); @@ -327,6 +334,13 @@ /* Directory User Methods */ + public function getDirUsersByDomainUidByUsername($domain_uid, $user_name){ + $query = sprintf("select * from users where domains_uid = '%s' and username = '%s'", $domain_uid, $user_name); + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results[0]; + } + public function getDirUser($user_uid){ $dbh = $this->getDbh(); $query = sprintf("select * from user_params where users_uid = $user_uid"); @@ -399,6 +413,13 @@ return $results; } + public function getDirGroupsByDomianUidByUserUid($domain_uid, $user_uid){ + $query = sprintf("select a.uid as groupUid, a.name as groupName, b.uid as usersUid from groups as a, group_members as b where a.uid = b.groups_uid and b.domains_uid = %s and b.users_uid = %s", $domain_uid, $user_uid) ; + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results; + } + public function getDirGroup($groups_uid){ $dbh = $this->getDbh(); $query = sprintf("select a.uid as groupMemberUid, a.users_uid as usersUid, b.username as usersUsername from group_members as a, users as b where a.groups_uid = $groups_uid and a.users_uid = b.uid") ;

1 0

[commit] r12797 - freeswitch/trunk/src
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: anthm Date: Thu Mar 26 15:08:30 2009 New Revision: 12797 Log: update Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Mar 26 15:08:30 2009 @@ -1590,6 +1590,8 @@ static void *SWITCH_THREAD_FUNC system_thread(switch_thread_t *thread, void *obj) { struct system_thread_handle *sth = (struct system_thread_handle *)obj; + +#if 0 // if we are a luser we can never turn this back down, didn't we already set the stack size? #if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) struct rlimit rlim; @@ -1599,9 +1601,11 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed! (%s)\n", strerror(errno)); } #endif +#endif sth->ret = system(sth->cmd); +#if 0 #if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) rlim.rlim_cur = SWITCH_THREAD_STACKSIZE; rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; @@ -1610,6 +1614,7 @@ } #endif +#endif switch_mutex_lock(sth->mutex); switch_thread_cond_signal(sth->cond);

1 0