- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10935 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 23 Dec '08

23 Dec '08

Author: anthm Date: Tue Dec 23 17:15:39 2008 New Revision: 10935 Log: sync Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Tue Dec 23 17:15:39 2008 @@ -155,6 +155,39 @@ return -1; } +#ifndef HAVE_EDITLINE +static char command_buf[2048] = ""; + +static const char *basic_gets(int *cnt) +{ + int x = 0; + + printf("%s", prompt_str); + + memset(&command_buf, 0, sizeof(command_buf)); + for (x = 0; x < (sizeof(command_buf) - 1); x++) { + int c = getchar(); + if (c < 0) { + int y = read(fileno(stdin), command_buf, sizeof(command_buf) - 1); + command_buf[y - 1] = '\0'; + break; + } + + command_buf[x] = (char) c; + + if (command_buf[x] == '\n') { + command_buf[x] = '\0'; + break; + } + } + + *cnt = x; + + return command_buf; + +} +#endif + int main(int argc, char *argv[]) { esl_handle_t handle = {{0}}; @@ -287,6 +320,8 @@ #ifdef HAVE_EDITLINE line = el_gets(el, &count); +#else + line = basic_gets(&count); #endif if (count > 1) {

1 0

[commit] r10934 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 23 Dec '08

23 Dec '08

Author: silik0n Date: Tue Dec 23 17:01:01 2008 New Revision: 10934 Log: update Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Tue Dec 23 17:01:01 2008 @@ -231,8 +231,6 @@ printf("password: %s\n", optarg); esl_set_string(profile[0].pass, optarg); break; - printf("profile: %s\n", optarg); - break; case 'h': case '?': printf("%s [-H <host>] [-P <port>] [-s <secret>] [-p <port>]\n", argv[0]);

1 0

[commit] r10933 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 23 Dec '08

23 Dec '08

Author: silik0n Date: Tue Dec 23 16:54:47 2008 New Revision: 10933 Log: update Added: freeswitch/trunk/conf/autoload_configs/easyroute.conf.xml Added: freeswitch/trunk/conf/autoload_configs/easyroute.conf.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/autoload_configs/easyroute.conf.xml Tue Dec 23 16:54:47 2008 @@ -0,0 +1,14 @@ +<configuration name="easyroute.conf" description="EasyRoute Module"> + <settings> +  + <param name="db-username" value="root"/> + <param name="db-password" value="password"/> + <param name="db-dsn" value="easyroute"/> + +  + <param name="default-techprofile" value="sofia/default"/> + +  + <param name="default-gateway" value="192.168.66.6"/> + </settings> +</configuration>

1 0

[commit] r10932 - freeswitch/trunk/scripts
by FreeSWITCH SVN 23 Dec '08

23 Dec '08

Author: silik0n Date: Tue Dec 23 16:53:49 2008 New Revision: 10932 Log: update Added: freeswitch/trunk/scripts/easyroute_mysql.sql Added: freeswitch/trunk/scripts/easyroute_mysql.sql ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/easyroute_mysql.sql Tue Dec 23 16:53:49 2008 @@ -0,0 +1,78 @@ +-- MySQL dump 10.10 +-- +-- Host: localhost Database: easyroute +-- ------------------------------------------------------ +-- Server version 5.0.26-log + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Table structure for table `gateways` +-- + +DROP TABLE IF EXISTS `gateways`; +CREATE TABLE `gateways` ( + `gateway_id` int(10) unsigned NOT NULL auto_increment, + `gateway_ip` varchar(16) NOT NULL, + `group` varchar(15) NOT NULL, + `limit` int(10) unsigned NOT NULL, + `techprofile` varchar(128) NOT NULL, + PRIMARY KEY (`gateway_id`), + KEY `gateway_ip` (`gateway_ip`,`group`) +) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='Gateways Table'; + +-- +-- Dumping data for table `gateways` +-- + +LOCK TABLES `gateways` WRITE; +/*!40000 ALTER TABLE `gateways` DISABLE KEYS */; +INSERT INTO `gateways` VALUES (1,'192.168.99.1','mustang',50,'sofia/default'); +/*!40000 ALTER TABLE `gateways` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `numbers` +-- + +DROP TABLE IF EXISTS `numbers`; +CREATE TABLE `numbers` ( + `number_id` int(10) unsigned NOT NULL auto_increment, + `gateway_id` int(10) unsigned NOT NULL, + `number` varchar(16) NOT NULL, + `acctcode` varchar(16) NOT NULL, + `translated` varchar(16) NOT NULL, + PRIMARY KEY (`number_id`), + UNIQUE KEY `number` (`number`), + KEY `gateway_id` (`gateway_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Numbers Table'; + +-- +-- Dumping data for table `numbers` +-- + +LOCK TABLES `numbers` WRITE; +/*!40000 ALTER TABLE `numbers` DISABLE KEYS */; +INSERT INTO `numbers` VALUES (1,1,'19018577141','999999', '9018577141'),(2,1,'19995551212','666666', '9995551212'); +/*!40000 ALTER TABLE `numbers` ENABLE KEYS */; +UNLOCK TABLES; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2008-02-28 21:41:43

1 0

[commit] r10931 - freeswitch/trunk/build
by FreeSWITCH SVN 23 Dec '08

23 Dec '08

Author: silik0n Date: Tue Dec 23 16:52:50 2008 New Revision: 10931 Log: update Modified: freeswitch/trunk/build/modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Tue Dec 23 16:52:50 2008 @@ -11,6 +11,7 @@ applications/mod_limit applications/mod_expr applications/mod_esf +#applications/mod_easyroute applications/mod_fsv #applications/mod_soundtouch #applications/mod_rss

1 0

[commit] r10930 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 23 Dec '08

23 Dec '08

Author: silik0n Date: Tue Dec 23 16:50:57 2008 New Revision: 10930 Log: update Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/Makefile Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/Makefile ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/Makefile (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/Makefile Tue Dec 23 16:50:57 2008 @@ -1,3 +1,3 @@ BASE=../../../.. -include /usr/src/freeswitch.trunk/build/modmake.rules +include $(BASE)/build/modmake.rules LOCAL_CFLAGS += `if test -f $(BASE)/.libs/libfreeswitch_la-switch_odbc.o ; then echo -DSWITCH_HAVE_ODBC; fi ;`

1 0

[commit] r10929 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 23 Dec '08

23 Dec '08

Author: silik0n Date: Tue Dec 23 16:49:17 2008 New Revision: 10929 Log: its not hard, its easy Added: freeswitch/trunk/src/mod/applications/mod_easyroute/ freeswitch/trunk/src/mod/applications/mod_easyroute/Makefile freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Added: freeswitch/trunk/src/mod/applications/mod_easyroute/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/Makefile Tue Dec 23 16:49:17 2008 @@ -0,0 +1,3 @@ +BASE=../../../.. +include /usr/src/freeswitch.trunk/build/modmake.rules +LOCAL_CFLAGS += `if test -f $(BASE)/.libs/libfreeswitch_la-switch_odbc.o ; then echo -DSWITCH_HAVE_ODBC; fi ;` Added: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Tue Dec 23 16:49:17 2008 @@ -0,0 +1,361 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * 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 <anthmct(a)yahoo.com> + * + * The Initial Developer of this module is + * Ken Rice <krice at rmktek dot com> + * + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Ken Rice <krice at rmktek dot com> + * + * mod_easyroute.c -- EasyRoute + * Take Incoming DIDs and Lookup where to send them as well as retrieve + * the number of channels they are allowed you use + * + * Big Thanks to CP, for funding this work. + * + */ + +#include <switch.h> + +#ifdef SWITCH_HAVE_ODBC +#include <switch_odbc.h> +#endif + +typedef struct easyroute_results{ + char limit[16]; + char destnum[16]; + char dialstring[256]; + char group[16]; + char acctcode[17]; + char translated[17]; +} easyroute_results_t; + + +typedef struct route_callback { + char gateway[129]; + char group[129]; + char techprofile[129]; + char limit[129]; + char acctcode[129]; + char translated[17]; +} route_callback_t; + +static struct { + char *db_username; + char *db_password; + char *db_dsn; + char *default_techprofile; + char *default_gateway; + switch_mutex_t *mutex; +#ifdef SWITCH_HAVE_ODBC + switch_odbc_handle_t *master_odbc; +#else + void *filler1; +#endif +} globals; + +SWITCH_MODULE_LOAD_FUNCTION(mod_easyroute_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_easyroute_shutdown); +SWITCH_MODULE_DEFINITION(mod_easyroute, mod_easyroute_load, mod_easyroute_shutdown, NULL); + +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_db_username, globals.db_username); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_db_password, globals.db_password); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_db_dsn, globals.db_dsn); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_default_techprofile, globals.default_techprofile); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_default_gateway, globals.default_gateway); + +static int route_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + route_callback_t *cbt = (route_callback_t *) pArg; + + switch_copy_string(cbt->gateway, argv[0], 128); + switch_copy_string(cbt->group, argv[1], 128); + switch_copy_string(cbt->limit, argv[2], 128); + switch_copy_string(cbt->techprofile, argv[3], 128); + switch_copy_string(cbt->acctcode, argv[4], 128); + switch_copy_string(cbt->translated, argv[5], 16); + + return 0; +} + + + +static switch_status_t load_config(void) +{ + char *cf = "easyroute.conf"; + switch_xml_t cfg, xml = NULL, param, settings; + switch_status_t status = SWITCH_STATUS_SUCCESS; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + status = SWITCH_STATUS_FALSE; + goto done; + } + + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + if (!strcasecmp(var, "db_username")) { + set_global_db_username(val); + } else if (!strcasecmp(var, "db_password")) { + set_global_db_password(val); + } else if (!strcasecmp(var, "db_dsn")) { + set_global_db_dsn(val); + } else if (!strcasecmp(var, "default-techprofile")) { + set_global_default_techprofile(val); + } else if (!strcasecmp(var, "default-gateway")) { + set_global_default_gateway(val); + } + } + } + +done: + if (!globals.db_username) { + set_global_db_username("root"); + } + if (!globals.db_password) { + set_global_db_password("land99rover"); + } + if (!globals.db_dsn) { + set_global_db_dsn("easyroute"); + } + + +#ifdef SWITCH_HAVE_ODBC + if (globals.db_dsn) { + if (!(globals.master_odbc = switch_odbc_handle_new(globals.db_dsn, globals.db_username, globals.db_password))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); + status = SWITCH_STATUS_FALSE; + goto reallydone; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Opened ODBC Database!\n"); + } + 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 reallydone; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Opened ODBC Database!\n"); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", globals.db_dsn); + if (switch_odbc_handle_exec(globals.master_odbc, "select count(*) from numbers", NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot find SQL Database! (Where\'s the numbers table\?\?)\n"); + } + if (switch_odbc_handle_exec(globals.master_odbc, "select count(*) from gateways", NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot find SQL Database! (Where\'s the gateways table\?\?)\n"); + } + } else { +#endif + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Connection (did you enable it?!)\n"); +#ifdef SWITCH_HAVE_ODBC + } +#endif + +reallydone: + + if (xml) { + switch_xml_free(xml); + } + if (!globals.default_techprofile) { + set_global_default_techprofile("sofia/default"); + } + if (!globals.default_gateway) { + set_global_default_gateway("192.168.1.1"); + } + return status; +} + +static char SQL_LOOKUP[] = "SELECT gateways.gateway_ip, gateways.group, gateways.limit, gateways.techprofile, numbers.acctcode, numbers.translated from gateways, numbers where numbers.number = \"%s\" and numbers.gateway_id = gateways.gateway_id limit 1;"; + +static switch_status_t route_lookup(char *dn, easyroute_results_t *results) +{ + switch_status_t sstatus = SWITCH_STATUS_SUCCESS; + char sql[1024] = ""; + route_callback_t pdata; + + memset(&pdata, 0, sizeof(pdata)); + + snprintf(sql, 1025, SQL_LOOKUP, dn); + + if (globals.mutex){ + switch_mutex_lock(globals.mutex); + } + /* Do the Query */ +#ifdef SWITCH_HAVE_ODBC + if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, route_callback, &pdata) == SWITCH_ODBC_SUCCESS){ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL Query\n[%s]\n", sql); + char tmp_profile[129]; + char tmp_gateway[16]; + + if (switch_strlen_zero(pdata.limit)) { + switch_set_string(results->limit, "9999" ); + } else { + switch_set_string(results->limit, pdata.limit ); + } + + if (switch_strlen_zero(pdata.techprofile)){ + switch_set_string(tmp_profile, globals.default_techprofile); + } else { + switch_set_string(tmp_profile, pdata.techprofile); + } + + if (switch_strlen_zero(pdata.gateway)){ + switch_set_string(tmp_gateway, globals.default_gateway); + } else { + switch_set_string(tmp_gateway, pdata.gateway); + } + + if (switch_strlen_zero(pdata.translated)){ + switch_set_string(results->translated, dn); + } else { + switch_set_string(results->translated, pdata.translated); + } + + switch_snprintf(results->dialstring, 256, "%s/%s@%s", tmp_profile , results->translated, tmp_gateway); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "THE ROUTE [%s]", results->dialstring); + + if (switch_strlen_zero(pdata.group)){ + switch_set_string(results->group, ""); + } else { + switch_set_string(results->group, pdata.group); + } + + if (switch_strlen_zero(pdata.acctcode)){ + switch_set_string(results->acctcode, ""); + } else { + switch_set_string(results->acctcode, pdata.acctcode); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "DB Error Setting Default Route!\n"); + switch_set_string(results->limit, "9999"); + switch_snprintf(results->dialstring, 256, "%s/%s@%s", globals.default_techprofile, dn, globals.default_gateway); + switch_set_string(results->group, ""); + switch_set_string(results->acctcode, ""); + } +#endif + if (globals.mutex){ + switch_mutex_unlock(globals.mutex); + } + return sstatus; +} + +SWITCH_STANDARD_APP(easyroute_app_function) +{ + int argc = 0; + char *argv[4] = { 0 }; + char *mydata = NULL; + char *destnum = NULL; + easyroute_results_t results; + switch_channel_t *channel = switch_core_session_get_channel(session); + + if (!channel) { + return; + } + + if (!(mydata = switch_core_session_strdup(session, data))) { + return; + } + + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + destnum = argv[0]; + route_lookup(destnum, &results); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "EASY ROUTE DEST: [%s]\n", results.dialstring); + switch_channel_set_variable(channel, "easy_destnum", results.destnum); + switch_channel_set_variable(channel, "easy_dialstring", results.dialstring); + switch_channel_set_variable(channel, "easy_group", results.group); + switch_channel_set_variable(channel, "easy_limit", results.limit); + switch_channel_set_variable(channel, "easy_acctcode", results.acctcode); + } +} + +SWITCH_STANDARD_API(easyroute_function) +{ + int argc = 0; + char *argv[4] = { 0 }; + char *mydata = NULL; + char *destnum = NULL; + easyroute_results_t results; + + if (session) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This function cannot be called from the dialplan.\n"); + return SWITCH_STATUS_FALSE; + } + + if (!cmd || !(mydata = strdup(cmd))) { + stream->write_function(stream, "Usage: easyroute <number>\n"); + return SWITCH_STATUS_SUCCESS; + } + + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + destnum = argv[0]; + + if (!route_lookup(destnum, &results) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "No Match!\n"); + return SWITCH_STATUS_SUCCESS; + } + + stream->write_function(stream, "Number \tLimit \tGroup \tAcctCode \tDialstring\n"); + stream->write_function(stream, "%-10s\t%-10s\t%-10s\t%-10s\t%s\n", destnum, results.limit, results.group, results.acctcode, results.dialstring); + } else { + stream->write_function(stream, "Invalid Input!\n"); + } + + return SWITCH_STATUS_SUCCESS; + +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_easyroute_load) +{ + switch_api_interface_t *api_interface; + switch_application_interface_t *app_interface; + + memset(&globals, 0, sizeof(globals)); + load_config(); + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + SWITCH_ADD_API(api_interface, "easyroute", "EasyRoute", easyroute_function, ""); + SWITCH_ADD_APP(app_interface, "easyroute", "Perform an easyroute lookup", "Perform an easyroute lookup", easyroute_app_function, "<number>", SAF_SUPPORT_NOMEDIA); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_easyroute_shutdown) +{ + switch_odbc_handle_connect(globals.master_odbc); + return SWITCH_STATUS_UNLOAD; +} + +/* 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 expandtab: + */

1 0

[commit] r10928 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 23 Dec '08

23 Dec '08

Author: gmaruzz Date: Tue Dec 23 16:11:02 2008 New Revision: 10928 Log: skypiax: windows mysteries :-(, do not works correctly, let's check how to individuate the correct window to sendmessage to Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Tue Dec 23 16:11:02 2008 @@ -502,6 +502,68 @@ #ifdef WIN32 +#if 1 +/*******************************************************/ +int CALLBACK EnumWindowsProc(HWND hwnd, LPARAM param) +{ DWORD pID; + DWORD TpID; + struct skypiax_interface *p = NULL; + + TpID = GetWindowThreadProcessId(hwnd, &pID); + + if (TpID == (DWORD)param) + { + NOTICA("HWND=%p\n", SKYPIAX_P_LOG, hwnd); + win32_hGlobal_SkypeAPIWindowHandle = hwnd; + return 0; + }else{ + DEBUGA_SKYPE("HWND=%p\n", SKYPIAX_P_LOG, hwnd); + return 1; + } +} + + + + + +int LaunchSkype(void) +{ + PROCESS_INFORMATION pi; + STARTUPINFO si = {0}; + struct skypiax_interface *p = NULL; + int ret=1; + int times=0; + + + si.cb = sizeof(si); + + CreateProcess( "C:\\Program Files\\Skype\\Phone\\Skype.exe", + "/secondary /username:skypiax4 /password:", // Command line. + NULL, // Process handle not inheritable. + NULL, // Thread handle not inheritable. + FALSE, // Set handle inheritance to FALSE. + NORMAL_PRIORITY_CLASS, // No creation flags. + NULL, // Use parent's environment block. + NULL, // Use parent's starting directory. + &si, // Pointer to STARTUPINFO structure. + &pi // Pointer to PROCESS_INFORMATION structure. + ); + + + while(ret){ + ret = EnumWindows(&EnumWindowsProc, pi.dwThreadId); + switch_sleep(10000); + times++; + if (times == 1000) + break; + } + NOTICA("HWND=%p\n", SKYPIAX_P_LOG, win32_hGlobal_SkypeAPIWindowHandle); + return 1; + +} +/*******************************************************/ +#endif //NOTDEF + enum { SKYPECONTROLAPI_ATTACH_SUCCESS = 0, /* Client is successfully @@ -581,13 +643,16 @@ if (uiMessage == win32_uiGlobal_MsgID_SkypeControlAPIAttach) { switch (ulParam) { case SKYPECONTROLAPI_ATTACH_SUCCESS: + NOTICA(" OK, we have to find the subwindow, or something like HWND=%p\n", SKYPIAX_P_LOG, win32_hGlobal_SkypeAPIWindowHandle); NOTICA("\n\n\tConnected to Skype API!\n", SKYPIAX_P_LOG); win32_hGlobal_SkypeAPIWindowHandle = (HWND) uiParam; + NOTICA(" OK, we have to find the subwindow, or something like HWND=%p\n", SKYPIAX_P_LOG, win32_hGlobal_SkypeAPIWindowHandle); switch_sleep(5000); win32_AsteriskHandlesSkype->win32_hGlobal_SkypeAPIWindowHandle = win32_hGlobal_SkypeAPIWindowHandle; break; case SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION: + NOTICA("HWND=%u\n", SKYPIAX_P_LOG, win32_hGlobal_SkypeAPIWindowHandle); WARNINGA ("\n\n\tIf I do not immediately connect to Skype API,\n\tplease give the Skype client authorization to be connected \n\tby Asterisk and to not ask you again.\n\n", SKYPIAX_P_LOG); @@ -600,6 +665,12 @@ break; case SKYPECONTROLAPI_ATTACH_API_AVAILABLE: DEBUGA_SKYPE("Skype API available\n", SKYPIAX_P_LOG); + + NOTICA("HWND=%u\n", SKYPIAX_P_LOG, win32_hGlobal_SkypeAPIWindowHandle); + SendMessage + (HWND_BROADCAST, win32_uiGlobal_MsgID_SkypeControlAPIDiscover, + (WPARAM) win32_hInit_MainWindowHandle, 0); + NOTICA("HWND=%u\n", SKYPIAX_P_LOG, win32_hGlobal_SkypeAPIWindowHandle); break; default: WARNINGA("GOT AN UNKNOWN SKYPE WINDOWS MSG\n", SKYPIAX_P_LOG); @@ -694,6 +765,10 @@ //DWORD MsgWaitResult; p = obj; + LaunchSkype(); + + NOTICA("HWND=%u\n", SKYPIAX_P_LOG, win32_hGlobal_SkypeAPIWindowHandle); + switch_file_pipe_create(&p->AsteriskHandlesAst.fdesc[0], &p->AsteriskHandlesAst.fdesc[1], skypiax_module_pool); //switch_file_pipe_timeout_set(p->AsteriskHandlesAst.fdesc[0], 100);

1 0

[commit] r10927 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 23 Dec '08

23 Dec '08

Author: silik0n Date: Tue Dec 23 15:25:10 2008 New Revision: 10927 Log: switch to using getopt so we can specify host, port and password on the command line Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Tue Dec 23 15:25:10 2008 @@ -35,10 +35,10 @@ return; } + static const char* COLORS[] = { ESL_SEQ_DEFAULT_COLOR, ESL_SEQ_FRED, ESL_SEQ_FRED, ESL_SEQ_FRED, ESL_SEQ_FMAGEN, ESL_SEQ_FCYAN, ESL_SEQ_FGREEN, ESL_SEQ_FYELLOW }; - static void *msg_thread_run(esl_thread_t *me, void *obj) { @@ -167,6 +167,7 @@ esl_config_t cfg; cli_profile_t *profile = &profiles[0]; int cur = 0; + int opt; strncpy(profiles[0].host, "localhost", sizeof(profiles[0].host)); strncpy(profiles[0].pass, "ClueCon", sizeof(profiles[0].pass)); @@ -215,15 +216,41 @@ esl_config_close_file(&cfg); } - if (argv[1]) { - if (get_profile(argv[1], &profile)) { - esl_log(ESL_LOG_INFO, "Chosen profile %s does not exist using builtin default\n", argv[1]); + while ((opt = getopt (argc, argv, "H:U:P:S:p:h?")) != -1){ + switch (opt) + { + case 'H': + printf("Host: %s\n", optarg); + esl_set_string(profile[0].host, optarg); + break; + case 'P': + printf("Port: %s\n", optarg); + profile[0].port= (esl_port_t)atoi(optarg); + break; + case 'p': + printf("password: %s\n", optarg); + esl_set_string(profile[0].pass, optarg); + break; + printf("profile: %s\n", optarg); + break; + case 'h': + case '?': + printf("%s [-H <host>] [-P <port>] [-s <secret>] [-p <port>]\n", argv[0]); + return 0; + default: + opt = 0; + } + } + + if (optind < argc) { + if (get_profile(argv[optind], &profile)) { + esl_log(ESL_LOG_INFO, "Chosen profile %s does not exist using builtin default\n", argv[optind]); profile = &profiles[0]; } else { esl_log(ESL_LOG_INFO, "Chosen profile %s\n", profile->name); } } - + esl_log(ESL_LOG_INFO, "Using profile %s\n", profile->name); gethostname(hostname, sizeof(hostname));

1 0

[commit] r10926 - freeswitch/trunk/conf/directory
by FreeSWITCH SVN 23 Dec '08

23 Dec '08

Author: brian Date: Tue Dec 23 14:53:35 2008 New Revision: 10926 Log: more docs Modified: freeswitch/trunk/conf/directory/default.xml Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Tue Dec 23 14:53:35 2008 @@ -40,6 +40,11 @@ <group name="sales"> <users> +  <user id="1000" type="pointer"/> <user id="1001" type="pointer"/> <user id="1002" type="pointer"/>

1 0