March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12610 - freeswitch/trunk/scripts/contrib/swk/sql
by FreeSWITCH SVN 15 Mar '09

15 Mar '09

Author: silik0n Date: Sun Mar 15 04:38:27 2009 New Revision: 12610 Log: update SQL schema getting ready to add menus, and add some sample data Modified: freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql Modified: freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql (original) +++ freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql Sun Mar 15 04:38:27 2009 @@ -1,112 +1,97 @@ --- --- Initial Table with Sample Data for Project Shipment --- (Or atleast I'm calling it Shipment until I get a better name --- - -SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; - --- --- Database: `shipment` +-- MySQL dump 10.11 -- - --- -------------------------------------------------------- - --- --- Table structure for table `domains` --- - -CREATE TABLE IF NOT EXISTS `domains` ( - `uid` int(11) NOT NULL auto_increment COMMENT 'UID for the table Auto Assigned', - `name` varchar(128) NOT NULL COMMENT 'domaine name', - `enabled` tinyint(1) NOT NULL default '1', - PRIMARY KEY (`uid`), - UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; - --- --- Dumping data for table `domains` --- - -INSERT INTO `domains` (`uid`, `name`, `enabled`) VALUES -(1, '192.168.1.140', 1); - --- -------------------------------------------------------- +-- Host: localhost Database: shipment +-- ------------------------------------------------------ +-- Server version 5.0.45 + +/*!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 `domain_params` -- -CREATE TABLE IF NOT EXISTS `domain_params` ( +DROP TABLE IF EXISTS `domain_params`; +CREATE TABLE `domain_params` ( `uid` int(11) NOT NULL auto_increment, `domains_uid` int(11) NOT NULL, `name` varchar(64) NOT NULL, `value` varchar(256) NOT NULL, PRIMARY KEY (`uid`), KEY `domain_uid` (`domains_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; +) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1; -- -- Dumping data for table `domain_params` -- -INSERT INTO `domain_params` (`uid`, `domains_uid`, `name`, `value`) VALUES -(1, 1, 'dial-string', '{presence_id=${dialed_user}@${dialed_domain}}${sofia_contact(${dialed_user}@${dialed_domain})}'); - --- -------------------------------------------------------- +LOCK TABLES `domain_params` WRITE; +/*!40000 ALTER TABLE `domain_params` DISABLE KEYS */; +INSERT INTO `domain_params` VALUES (1,1,'dial-string','{presence_id=${dialed_user}@${dialed_domain}}${sofia_contact(${dialed_user}@${dialed_domain})}'); +/*!40000 ALTER TABLE `domain_params` ENABLE KEYS */; +UNLOCK TABLES; -- -- Table structure for table `domain_variables` -- -CREATE TABLE IF NOT EXISTS `domain_variables` ( +DROP TABLE IF EXISTS `domain_variables`; +CREATE TABLE `domain_variables` ( `uid` int(11) NOT NULL auto_increment, `domains_uid` int(11) NOT NULL, `name` varchar(64) NOT NULL, `value` varchar(128) NOT NULL, PRIMARY KEY (`uid`), KEY `domain_uid` (`domains_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=5 ; +) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=latin1; -- -- Dumping data for table `domain_variables` -- -INSERT INTO `domain_variables` (`uid`, `domains_uid`, `name`, `value`) VALUES -(1, 1, 'record_stereo', 'true'), -(2, 1, 'default_gateway', '$${default_provider}'), -(3, 1, 'default_areacode', '$${default_areacode}'), -(4, 1, 'transfer_fallback_extension', 'operator'); - --- -------------------------------------------------------- +LOCK TABLES `domain_variables` WRITE; +/*!40000 ALTER TABLE `domain_variables` DISABLE KEYS */; +INSERT INTO `domain_variables` VALUES (1,1,'record_stereo','true'),(2,1,'default_gateway','$${default_provider}'),(3,1,'default_areacode','$${default_areacode}'),(4,1,'transfer_fallback_extension','operator'); +/*!40000 ALTER TABLE `domain_variables` ENABLE KEYS */; +UNLOCK TABLES; -- --- Table structure for table `groups` +-- Table structure for table `domains` -- -CREATE TABLE IF NOT EXISTS `groups` ( - `uid` int(11) NOT NULL auto_increment, - `domains_uid` int(11) NOT NULL, - `name` varchar(64) NOT NULL, +DROP TABLE IF EXISTS `domains`; +CREATE TABLE `domains` ( + `uid` int(11) NOT NULL auto_increment COMMENT 'UID for the table Auto Assigned', + `name` varchar(128) NOT NULL COMMENT 'domaine name', + `enabled` tinyint(1) NOT NULL default '1', PRIMARY KEY (`uid`), - KEY `domain_uid` (`domains_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=4 ; + UNIQUE KEY `name` (`name`) +) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1; -- --- Dumping data for table `groups` +-- Dumping data for table `domains` -- -INSERT INTO `groups` (`uid`, `domains_uid`, `name`) VALUES -(1, 1, 'sales'), -(2, 1, 'billing'), -(3, 1, 'support'); - --- -------------------------------------------------------- +LOCK TABLES `domains` WRITE; +/*!40000 ALTER TABLE `domains` DISABLE KEYS */; +INSERT INTO `domains` VALUES (1,'192.168.1.140',1); +/*!40000 ALTER TABLE `domains` ENABLE KEYS */; +UNLOCK TABLES; -- -- Table structure for table `group_members` -- -CREATE TABLE IF NOT EXISTS `group_members` ( +DROP TABLE IF EXISTS `group_members`; +CREATE TABLE `group_members` ( `uid` int(11) NOT NULL auto_increment, `domains_uid` int(11) NOT NULL, `groups_uid` int(11) NOT NULL, @@ -114,132 +99,176 @@ `type` varchar(32) NOT NULL, PRIMARY KEY (`uid`), KEY `domain_uid` (`domains_uid`,`groups_uid`,`users_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=13 DEFAULT CHARSET=latin1; -- -- Dumping data for table `group_members` -- - --- -------------------------------------------------------- +LOCK TABLES `group_members` WRITE; +/*!40000 ALTER TABLE `group_members` DISABLE KEYS */; +INSERT INTO `group_members` VALUES (1,1,1,1,'pointer'),(2,1,1,2,'pointer'),(3,1,1,3,'pointer'),(4,1,1,4,'pointer'),(5,1,2,5,'pointer'),(6,1,2,6,'pointer'),(7,1,2,7,'pointer'),(8,1,2,8,'pointer'),(9,1,3,9,'pointer'),(10,1,3,10,'pointer'),(11,1,3,11,'pointer'),(12,1,3,12,'pointer'); +/*!40000 ALTER TABLE `group_members` ENABLE KEYS */; +UNLOCK TABLES; -- --- Table structure for table `users` +-- Table structure for table `groups` -- -CREATE TABLE IF NOT EXISTS `users` ( +DROP TABLE IF EXISTS `groups`; +CREATE TABLE `groups` ( `uid` int(11) NOT NULL auto_increment, - `domain_uid` int(11) NOT NULL, - `username` varchar(64) NOT NULL, - `mailbox` varchar(64) default NULL, - `cidr` varchar(32) default NULL, - `enabled` tinyint(1) NOT NULL default '1', + `domains_uid` int(11) NOT NULL, + `name` varchar(64) NOT NULL, PRIMARY KEY (`uid`), - KEY `domain_uid` (`domain_uid`,`username`,`mailbox`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=21 ; + KEY `domain_uid` (`domains_uid`) +) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=latin1; -- --- Dumping data for table `users` +-- Dumping data for table `groups` -- -INSERT INTO `users` (`uid`, `domain_uid`, `username`, `mailbox`, `cidr`, `enabled`) VALUES -(1, 1, '1000', '1000', NULL, 1), -(2, 1, '1001', '1001', NULL, 1), -(3, 1, '1002', '1002', NULL, 1), -(4, 1, '1003', '1003', NULL, 1), -(5, 1, '1004', '1004', NULL, 1), -(6, 1, '1005', '1005', NULL, 1), -(7, 1, '1006', '1006', NULL, 1), -(8, 1, '1007', '1007', NULL, 1), -(9, 1, '1008', '1008', NULL, 1), -(10, 1, '1009', '1009', NULL, 1), -(11, 1, '1000', '1000', NULL, 1), -(12, 1, '1011', '1011', NULL, 1), -(13, 1, '1012', '1012', NULL, 1), -(14, 1, '1013', '1013', NULL, 1), -(15, 1, '1014', '1014', NULL, 1), -(16, 1, '1015', '1015', NULL, 1), -(17, 1, '1016', '1016', NULL, 1), -(18, 1, '1017', '1017', NULL, 1), -(19, 1, '1018', '1018', NULL, 1), -(20, 1, '1019', '1019', NULL, 1); +LOCK TABLES `groups` WRITE; +/*!40000 ALTER TABLE `groups` DISABLE KEYS */; +INSERT INTO `groups` VALUES (1,1,'sales'),(2,1,'billing'),(3,1,'support'); +/*!40000 ALTER TABLE `groups` ENABLE KEYS */; +UNLOCK TABLES; --- -------------------------------------------------------- +-- +-- Table structure for table `menu_entries` +-- + +DROP TABLE IF EXISTS `menu_entries`; +CREATE TABLE `menu_entries` ( + `uid` int(11) NOT NULL auto_increment, + `menu_uid` int(11) NOT NULL, + `action` varchar(32) NOT NULL, + `digits` varchar(16) NOT NULL, + `param` varchar(256) default NULL, + PRIMARY KEY (`uid`) +) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `menu_entries` +-- + +LOCK TABLES `menu_entries` WRITE; +/*!40000 ALTER TABLE `menu_entries` DISABLE KEYS */; +INSERT INTO `menu_entries` VALUES (1,1,'menu-exec-app','1','bridge sofia/$${domain}/888(a)conference.freeswitch.org'),(2,1,'menu-exec-app','2','transfer 9996 XML default'),(3,1,'menu-exec-app','3','transfer 9999 XML default'),(4,1,'menu-sub','4','demo_ivr_submenu'),(5,1,'menu-exec-app','5','transfer 1234*256 enum'),(6,1,'menu-exec-app','/^(10[01][0-9])$','transfer $1 XML features'),(7,1,'menu-top','9',NULL),(8,2,'menu-top','*',NULL); +/*!40000 ALTER TABLE `menu_entries` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `menus` +-- + +DROP TABLE IF EXISTS `menus`; +CREATE TABLE `menus` ( + `uid` int(11) NOT NULL auto_increment, + `name` varchar(64) NOT NULL, + `greet_long` varchar(256) default NULL, + `greet_short` varchar(256) default NULL, + `invalid_sound` varchar(256) default NULL, + `exit_sound` varchar(256) default NULL, + `timeout` int(11) default NULL, + `inter_digit_timeout` int(11) default NULL, + `max_failures` int(11) default NULL, + `max_timeouts` int(11) default NULL, + `digit_len` int(11) default NULL, + PRIMARY KEY (`uid`) +) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `menus` +-- + +LOCK TABLES `menus` WRITE; +/*!40000 ALTER TABLE `menus` DISABLE KEYS */; +INSERT INTO `menus` VALUES (1,'demo_ivr','phrase:demo_ivr_main_menu','phrase:demo_ivr_main_menu_short','ivr/ivr-that_was_an_invalid_entry.wav','voicemail/vm-goodbye.wav',10000,2000,3,3,4),(2,'demo_ivr_submenu','phrase:demo_ivr_sub_menu','phrase:demo_ivr_sub_menu_short','ivr/ivr-that_was_an_invalid_entry.wav','voicemail/vm-goodbye.wav',15000,NULL,3,3,NULL); +/*!40000 ALTER TABLE `menus` ENABLE KEYS */; +UNLOCK TABLES; -- -- Table structure for table `user_params` -- -CREATE TABLE IF NOT EXISTS `user_params` ( +DROP TABLE IF EXISTS `user_params`; +CREATE TABLE `user_params` ( `uid` int(11) NOT NULL auto_increment, `users_uid` int(11) NOT NULL, `name` varchar(64) NOT NULL, `value` varchar(128) NOT NULL, PRIMARY KEY (`uid`), KEY `user_uid` (`users_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=39 ; +) ENGINE=MyISAM AUTO_INCREMENT=39 DEFAULT CHARSET=latin1; -- -- Dumping data for table `user_params` -- -INSERT INTO `user_params` (`uid`, `users_uid`, `name`, `value`) VALUES -(1, 1, 'password', '1234'), -(2, 1, 'vm-password', '1000'), -(3, 2, 'password', '1234'), -(4, 2, 'vm-password', '1002'), -(5, 3, 'password', '1234'), -(6, 3, 'vm-password', '1003'), -(7, 4, 'password', '1234'), -(8, 4, 'vm-password', '1004'), -(9, 5, 'password', '1234'), -(10, 5, 'vm-password', '1005'), -(11, 6, 'password', '1234'), -(12, 6, 'vm-password', '1006'), -(13, 7, 'password', '1234'), -(14, 7, 'vm-password', '1007'), -(15, 8, 'password', '1234'), -(16, 8, 'vm-password', '1008'), -(17, 9, 'password', '1234'), -(18, 9, 'vm-password', '1009'), -(19, 10, 'password', '1234'), -(20, 10, 'vm-password', '1010'), -(21, 11, 'password', '1234'), -(22, 11, 'vm-password', '1011'), -(23, 12, 'password', '1234'), -(24, 12, 'vm-password', '1012'), -(25, 13, 'password', '1234'), -(26, 13, 'vm-password', '1013'), -(27, 14, 'password', '1234'), -(28, 14, 'vm-password', '1014'), -(29, 15, 'password', '1234'), -(30, 15, 'vm-password', '1015'), -(31, 16, 'password', '1234'), -(32, 16, 'vm-password', '1016'), -(33, 17, 'password', '1234'), -(34, 17, 'vm-password', '1017'), -(35, 18, 'password', '1234'), -(36, 18, 'vm-password', '1018'), -(37, 19, 'password', '1234'), -(38, 19, 'vm-password', '1019'); - --- -------------------------------------------------------- +LOCK TABLES `user_params` WRITE; +/*!40000 ALTER TABLE `user_params` DISABLE KEYS */; +INSERT INTO `user_params` VALUES (1,1,'password','1234'),(2,1,'vm-password','1000'),(3,2,'password','1234'),(4,2,'vm-password','1002'),(5,3,'password','1234'),(6,3,'vm-password','1003'),(7,4,'password','1234'),(8,4,'vm-password','1004'),(9,5,'password','1234'),(10,5,'vm-password','1005'),(11,6,'password','1234'),(12,6,'vm-password','1006'),(13,7,'password','1234'),(14,7,'vm-password','1007'),(15,8,'password','1234'),(16,8,'vm-password','1008'),(17,9,'password','1234'),(18,9,'vm-password','1009'),(19,10,'password','1234'),(20,10,'vm-password','1010'),(21,11,'password','1234'),(22,11,'vm-password','1011'),(23,12,'password','1234'),(24,12,'vm-password','1012'),(25,13,'password','1234'),(26,13,'vm-password','1013'),(27,14,'password','1234'),(28,14,'vm-password','1014'),(29,15,'password','1234'),(30,15,'vm-password','1015'),(31,16,'password','1234'),(32,16,'vm-password','1016'),(33,17,'password','1234'),(34,17,'vm-password','1017'),(35,18,'password','1234'),(36,18,'vm-password','1018'),(37,19,'password','1234'),(38,19,'vm-password','1019'); +/*!40000 ALTER TABLE `user_params` ENABLE KEYS */; +UNLOCK TABLES; -- -- Table structure for table `user_variables` -- -CREATE TABLE IF NOT EXISTS `user_variables` ( +DROP TABLE IF EXISTS `user_variables`; +CREATE TABLE `user_variables` ( `uid` int(11) NOT NULL auto_increment, `users_uid` int(11) NOT NULL, `name` varchar(64) NOT NULL, `value` varchar(128) NOT NULL, PRIMARY KEY (`uid`), KEY `user_uid` (`users_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=latin1; -- -- Dumping data for table `user_variables` -- +LOCK TABLES `user_variables` WRITE; +/*!40000 ALTER TABLE `user_variables` DISABLE KEYS */; +INSERT INTO `user_variables` VALUES (1,1,'toll_allow','domestic,international,local'),(2,1,'accountcode','1000'),(3,1,'user_context','default'),(4,1,'effective_caller_id_name','Extension 1000'),(5,1,'effective_caller_id_number','1000'),(6,1,'outbound_caller_id_name','$${outbound_caller_name}'),(7,1,'outbound_caller_id_number','$${outbound_caller_id}'),(8,1,'callgroup','techsupport'); +/*!40000 ALTER TABLE `user_variables` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `users` +-- + +DROP TABLE IF EXISTS `users`; +CREATE TABLE `users` ( + `uid` int(11) NOT NULL auto_increment, + `domain_uid` int(11) NOT NULL, + `username` varchar(64) NOT NULL, + `mailbox` varchar(64) default NULL, + `cidr` varchar(32) default NULL, + `enabled` tinyint(1) NOT NULL default '1', + PRIMARY KEY (`uid`), + KEY `domain_uid` (`domain_uid`,`username`,`mailbox`) +) ENGINE=MyISAM AUTO_INCREMENT=21 DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `users` +-- + +LOCK TABLES `users` WRITE; +/*!40000 ALTER TABLE `users` DISABLE KEYS */; +INSERT INTO `users` VALUES (1,1,'1000','1000',NULL,1),(2,1,'1001','1001',NULL,1),(3,1,'1002','1002',NULL,1),(4,1,'1003','1003',NULL,1),(5,1,'1004','1004',NULL,1),(6,1,'1005','1005',NULL,1),(7,1,'1006','1006',NULL,1),(8,1,'1007','1007',NULL,1),(9,1,'1008','1008',NULL,1),(10,1,'1009','1009',NULL,1),(11,1,'1010','1010',NULL,1),(12,1,'1011','1011',NULL,1),(13,1,'1012','1012',NULL,1),(14,1,'1013','1013',NULL,1),(15,1,'1014','1014',NULL,1),(16,1,'1015','1015',NULL,1),(17,1,'1016','1016',NULL,1),(18,1,'1017','1017',NULL,1),(19,1,'1018','1018',NULL,1),(20,1,'1019','1019',NULL,1); +/*!40000 ALTER TABLE `users` 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 2009-03-15 9:30:01

1 0

[commit] r12609 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 15 Mar '09

15 Mar '09

Author: silik0n Date: Sun Mar 15 04:37:47 2009 New Revision: 12609 Log: format fixing Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Sun Mar 15 04:37:47 2009 @@ -49,10 +49,7 @@ max-failures="3"> <entry action="menu-exit" digits="*"/> <entry action="menu-playback" digits="1" param="say:You pressed 1"/> - <entry action="menu-call-transfer" digits="2" param= - - -"1000"/> + <entry action="menu-call-transfer" digits="2" param="1000"/> <entry action="menu-call-transfer" digits="3" param="1001"/> </menu> -->

1 0

[commit] r12608 - in freeswitch/trunk/scripts/contrib/swk: flex/amf-test1/src php/amfphp
by FreeSWITCH SVN 15 Mar '09

15 Mar '09

Author: silik0n Date: Sun Mar 15 00:24:32 2009 New Revision: 12608 Log: getting closer to something worth looking at DB is getting pretty close to being required (some functions will now fail if you dont have the DB setup) Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml (original) +++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml Sun Mar 15 00:24:32 2009 @@ -62,6 +62,45 @@ PopUpManager.createPopUp(this, statusForm, false); } + public function addDomainParam():void { + freeswitch.addDirDomainParam(gridDomainsDomain.selectedItem.uid, inputDomainParamName.text, inputDomainParamValue.text); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } + + public function addDomainVar():void { + freeswitch.addDirDomainVar(gridDomainsDomain.selectedItem.uid, inputDomainVarName.text, inputDomainVarValue.text); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } + + public function dgChangeDomainParam():void { + freeswitch.updateDirDomainParam(dgDomainParam.selectedItem.uid, dgDomainParam.selectedItem.name, dgDomainParam.value); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } + + public function dgChangeDomainVars():void { + freeswitch.updateDirDomainVar(dgDomainVars.selectedItem.uid, dgDomainVars.selectedItem.name, dgDomainVars.value); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } + + public function addDomainUserParam():void { + freeswitch.addDirDomainUserParam(gridDomainsDomain.selectedItem.uid, inputDomainParamName.text, inputDomainParamValue.text); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } + + public function addDomainUserVar():void { + freeswitch.addDirDomainUserVar(gridDomainsDomain.selectedItem.uid, inputDomainVarName.text, inputDomainVarValue.text); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } + + public function dgChangeDomainUserParam():void { + freeswitch.updateDirDomainUserParam(dgDomainParam.selectedItem.uid, dgDomainParam.selectedItem.name, dgDomainParam.value); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } + + public function dgChangeDomainUserVars():void { + freeswitch.updateDirDomainUserParam(dgDomainVars.selectedItem.uid, dgDomainVars.selectedItem.name, dgDomainVars.value); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } ]]> </mx:Script> @@ -165,18 +204,32 @@ <mx:Label text="Name:" horizontalCenter="-129" top="12"/> <mx:TextInput id="domainName" text="{gridDomainsDomain.selectedItem.name}" horizontalCenter="25" top="10"/> <mx:CheckBox label="Enabled" id="domainEnabled" enabled="{gridDomainsDomain.selectedItem.enabled}" right="10" top="8"/> - <mx:DataGrid left="10" top="61" bottom="42" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.params}"> + <mx:DataGrid left="10" top="40" bottom="116" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.params}" + itemEditEnd="dgChangeDomainParam();" editable="true" id="dgDomainParam"> <mx:columns> <mx:DataGridColumn headerText="Parameter" dataField="name" width="120"/> <mx:DataGridColumn headerText="Value" dataField="value"/> </mx:columns> </mx:DataGrid> - <mx:DataGrid right="10" top="61" bottom="42" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.variables}"> + <mx:DataGrid right="10" top="40" bottom="116" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.variables}" + itemEditEnd="dgChangeDomainVars();" editable="true" id="dgDomainVars"> <mx:columns> <mx:DataGridColumn headerText="Variable" dataField="name" width="120"/> <mx:DataGridColumn headerText="Data" dataField="value"/> </mx:columns> </mx:DataGrid> + <mx:Button label="Refresh Domain" bottom="10" horizontalCenter="-52"/> + <mx:Button label="Add Parameter" left="149" bottom="40" click="addDomainParam()"/> + <mx:Button label="Add Variable" bottom="40" right="168" width="99" click="addDomainVar()"/> + <mx:Button label="Add Domain" bottom="10" horizontalCenter="63"/> + <mx:Label text="Parameter" bottom="90" left="10"/> + <mx:TextInput width="121" id="inputDomainParamName" bottom="70" left="10"/> + <mx:TextInput width="272" id="inputDomainParamValue" bottom="70" left="139"/> + <mx:Label text="Variable" bottom="90" right="361"/> + <mx:TextInput width="121" id="inputDomainVarName" bottom="70" right="290"/> + <mx:TextInput width="272" id="inputDomainVarValue" bottom="70" right="10"/> + <mx:Label text="Data" bottom="90" right="251"/> + <mx:Label text="Value" bottom="90" left="139"/> </mx:Canvas> </mx:HDividedBox> </mx:Canvas> @@ -184,7 +237,8 @@ <mx:HDividedBox x="0" y="0" width="100%" height="100%"> <mx:Canvas width="20%" height="100%"> <mx:ComboBox id="userDomain" top="10" horizontalCenter="0" dataProvider="{freeswitch.getDirDomains.lastResult}" labelField="name"></mx:ComboBox> - <mx:DataGrid width="100%" horizontalCenter="0" top="40" bottom="70" dataProvider="{freeswitch.getDirUsers.lastResult}"> + <mx:DataGrid id="dgDomainUsers" width="100%" horizontalCenter="0" top="40" bottom="70" dataProvider="{freeswitch.getDirUsers.lastResult}" + click="freeswitch.getDirUser(dgDomainUsers.selectedItem.uid)"> <mx:columns> <mx:DataGridColumn headerText="User" dataField="username" /> </mx:columns> @@ -193,8 +247,37 @@ <mx:Button label="Refresh Domains" horizontalCenter="0" bottom="40" click="freeswitch.getDirDomains();"/> </mx:Canvas> <mx:Canvas width="80%" height="100%"> - <mx:Form id="formUser" x="0" y="0" width="100%" height="100%"> - </mx:Form> + <mx:Label text="UID:" horizontalCenter="-421" top="10"/> + <mx:Label text="{dgDomainUsers.selectedItem.uid}" id="userUid" horizontalCenter="-339" top="10"/> + <mx:Label text="Name:" horizontalCenter="-129" top="12"/> + <mx:TextInput id="userName" text="{dgDomainUsers.selectedItem.username}" horizontalCenter="25" top="10"/> + <mx:CheckBox label="Enabled" id="userEnabled" enabled="{dgDomainUsers.selectedItem.enabled}" right="10" top="8"/> + <mx:DataGrid left="10" top="40" bottom="116" width="45%" dataProvider="{freeswitch.getDirUser.lastResult.params}" + change="dgChangeDomainUserParam();" editable="true" id="dgDomainUserParam"> + <mx:columns> + <mx:DataGridColumn headerText="Parameter" dataField="name" width="120"/> + <mx:DataGridColumn headerText="Value" dataField="value"/> + </mx:columns> + </mx:DataGrid> + <mx:DataGrid right="10" top="40" bottom="116" width="45%" dataProvider="{freeswitch.getDirUser.lastResult.variables}" + change="dgChangeDomainVars();" editable="true" id="dgDomainUserVars"> + <mx:columns> + <mx:DataGridColumn headerText="Variable" dataField="name" width="120"/> + <mx:DataGridColumn headerText="Data" dataField="value"/> + </mx:columns> + </mx:DataGrid> + <mx:Button label="Refresh Domain" bottom="10" horizontalCenter="-52"/> + <mx:Button label="Add Parameter" left="149" bottom="40" click="addDomainUserParam()"/> + <mx:Button label="Add Variable" bottom="40" right="168" width="99" click="addDomainUserVar()"/> + <mx:Button label="Add Domain" bottom="10" horizontalCenter="63"/> + <mx:Label text="Parameter" bottom="90" left="10"/> + <mx:TextInput width="121" id="inputDomainUserParamName" bottom="70" left="10"/> + <mx:TextInput width="272" id="inputDomainUserParamValue" bottom="70" left="139"/> + <mx:Label text="Variable" bottom="90" right="361"/> + <mx:TextInput width="121" id="inputDomainUserVarName" bottom="70" right="290"/> + <mx:TextInput width="272" id="inputDomainUserVarValue" bottom="70" right="10"/> + <mx:Label text="Data" bottom="90" right="251"/> + <mx:Label text="Value" bottom="90" left="139"/> </mx:Canvas> </mx:HDividedBox> </mx:Canvas> @@ -221,7 +304,7 @@ <mx:DataGridColumn headerText="Available to Join" dataField="col1"/> </mx:columns> </mx:DataGrid> - <mx:Button x="10" y="572" label="Refresh"/> + <mx:Button label="Refresh" left="10" bottom="40"/> </mx:Canvas> </mx:HDividedBox> </mx:Canvas> 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 Sun Mar 15 00:24:32 2009 @@ -281,12 +281,19 @@ return $results; } - public function addDirDomain($domain_name){ + public function getDirUser($user_uid){ + $dbh = $this->getDbh(); - $query = sprintf('insert into domains (name) values ("%s")', $domain_name); + $query = sprintf("select * from user_params where users_uid = $user_uid"); + $stmt = $dbh->query($query); + $results['params'] = $stmt->fetchAll(); - return $dbh->exec($query); + $query = sprintf("select * from user_variables where users_uid = $user_uid"); + $stmt = $dbh->query($query); + $results['variables'] = $stmt->fetchAll(); + + return $results; } public function getDirUsers($domain_uid){ @@ -309,10 +316,35 @@ return $results; } - + public function addDirDomain($domain_name){ + $dbh = $this->getDbh(); + $query = sprintf('insert into domains (name) values ("%s")', $domain_name); + return $dbh->exec($query); + } -} -/* For Emacs: + public function addDirDomainParam($domain_uid, $name, $value) { + $dbh = $this->getDbh(); + $query = sprintf('insert into domain_params (domain_uid, name, value) values (%s, "%s", "%s")', $domain_uid, $name, $value); + return $dbh->exec($query); + } + + public function addDirDomainVar($domain_uid, $name, $value) { + $dbh = $this->getDbh(); + $query = sprintf('insert into domain_variables (domain_uid, name, value) values (%s, "%s", "%s")', $domain_uid, $name, $value); + return $dbh->exec($query); + } + + public function updateDirDomainParam($param_uid, $name, $value) { + $dbh = $this->getDbh(); + $query = sprintf('update domain_params set name = "%s", value = "%s" where uid=%s', $param_uid, $name, $value); + return $dbh->exec($query); + } + + public function updateDirDomainVar($var_uid, $name, $value) { + $dbh = $this->getDbh(); + $query = sprintf('update domain_variables set name = "%s", value = "%s" where uid=%s', $var_uid, $name, $value); + return $dbh->exec($query); + } } /* For Emacs:

1 0

[commit] r12607 - freeswitch/trunk/src
by FreeSWITCH SVN 15 Mar '09

15 Mar '09

Author: anthm Date: Sat Mar 14 20:21:34 2009 New Revision: 12607 Log: move stop up a bit Modified: freeswitch/trunk/src/switch.c Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Sat Mar 14 20:21:34 2009 @@ -270,7 +270,6 @@ int nc = 0; /* TRUE if we are running in noconsole mode */ pid_t pid = 0; int x; - int die = 0; char *usageDesc; int alt_dirs = 0; int known_opt; @@ -470,8 +469,7 @@ } if (argv[x] && !strcmp(argv[x], "-stop")) { - die++; - known_opt++; + return freeswitch_kill_background(); } if (argv[x] && !strcmp(argv[x], "-nc")) { @@ -594,10 +592,6 @@ return 255; } - if (die) { - return freeswitch_kill_background(); - } - if (alt_dirs && alt_dirs != 3) { fprintf(stderr, "You must specify all or none of -conf, -log, and -db\n"); return 255;

1 0

[commit] r12606 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 14 Mar '09

14 Mar '09

Author: andrew Date: Sat Mar 14 18:53:32 2009 New Revision: 12606 Log: Whoops Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Sat Mar 14 18:53:32 2009 @@ -490,7 +490,7 @@ } } - /* release the lock returned by switch_core_locate_session */ + /* release the lock returned by switch_core_session_locate */ switch_core_session_rwunlock(session); } else { @@ -579,14 +579,13 @@ ei_x_encode_atom(rbuf, "error"); ei_x_encode_atom(rbuf, "session_attach_failed"); } + /* release the lock returned by switch_core_session_locate */ + switch_core_session_rwunlock(session); } else { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error"); ei_x_encode_atom(rbuf, "badsession"); } - /* release the lock returned by switch_core_locate_session */ - switch_core_session_rwunlock(session); - } else { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error");

1 0

[commit] r12605 - in freeswitch/trunk/libs/esl: . src src/include
by FreeSWITCH SVN 14 Mar '09

14 Mar '09

Author: anthm Date: Sat Mar 14 14:23:07 2009 New Revision: 12605 Log: fix socket race Modified: freeswitch/trunk/libs/esl/fs_cli.c freeswitch/trunk/libs/esl/src/esl.c freeswitch/trunk/libs/esl/src/esl_event.c freeswitch/trunk/libs/esl/src/esl_oop.cpp freeswitch/trunk/libs/esl/src/include/esl.h Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Sat Mar 14 14:23:07 2009 @@ -193,8 +193,7 @@ thread_running = 1; while(thread_running && handle->connected) { - esl_status_t status = esl_recv_timed(handle, 10); - + esl_status_t status = esl_recv_event_timed(handle, 10, 1, NULL); if (status == ESL_FAIL) { esl_log(ESL_LOG_WARNING, "Disconnected.\n"); running = thread_running = 0; @@ -240,7 +239,11 @@ } if (!known) { - printf("INCOMING DATA [%s]\n%s", type, handle->last_event->body); + printf("INCOMING DATA [%s]\n%s\n", type, handle->last_event->body ? handle->last_event->body : ""); + char *foo; + esl_event_serialize(handle->last_event, &foo, ESL_FALSE); + printf("RECV EVENT\n%s\n", foo); + free(foo); } } } @@ -724,6 +727,7 @@ print_banner(stdout); esl_log(ESL_LOG_INFO, "FS CLI Ready.\nenter /help for a list of commands.\n"); + printf("%s\n", handle.last_sr_reply); while (running) { Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Sat Mar 14 14:23:07 2009 @@ -683,6 +683,7 @@ esl_mutex_lock(mutex); } + esl_event_safe_destroy(&handle->race_event); esl_event_safe_destroy(&handle->last_event); esl_event_safe_destroy(&handle->last_sr_event); esl_event_safe_destroy(&handle->last_ievent); @@ -705,20 +706,29 @@ return status; } -ESL_DECLARE(esl_status_t) esl_recv_event_timed(esl_handle_t *handle, uint32_t ms, esl_event_t **save_event) +ESL_DECLARE(esl_status_t) esl_recv_event_timed(esl_handle_t *handle, uint32_t ms, int check_q, esl_event_t **save_event) { fd_set rfds, efds; struct timeval tv = { 0 }; int max, activity; esl_status_t status = ESL_SUCCESS; + if (check_q) { + esl_mutex_lock(handle->mutex); + if (handle->race_event) { + esl_mutex_unlock(handle->mutex); + return esl_recv_event(handle, check_q, save_event); + } + esl_mutex_unlock(handle->mutex); + } + if (!handle || !handle->connected || handle->sock == -1) { return ESL_FAIL; } tv.tv_usec = ms * 1000; - esl_mutex_lock(handle->mutex); + FD_ZERO(&rfds); FD_ZERO(&efds); @@ -736,21 +746,21 @@ max = handle->sock + 1; if ((activity = select(max, &rfds, NULL, &efds, &tv)) < 0) { - status = ESL_FAIL; - goto done; + return ESL_FAIL; + } + + if (esl_mutex_trylock(handle->mutex) != ESL_SUCCESS) { + return ESL_BREAK; } if (activity && FD_ISSET(handle->sock, &rfds)) { - if (esl_recv_event(handle, save_event)) { + if (esl_recv_event(handle, check_q, save_event)) { status = ESL_FAIL; - goto done; } } else { status = ESL_BREAK; } - done: - if (handle->mutex) esl_mutex_unlock(handle->mutex); return status; @@ -758,26 +768,41 @@ } -ESL_DECLARE(esl_status_t) esl_recv_event(esl_handle_t *handle, esl_event_t **save_event) +ESL_DECLARE(esl_status_t) esl_recv_event(esl_handle_t *handle, int check_q, esl_event_t **save_event) { char *c; esl_ssize_t rrval; int crc = 0; - esl_event_t *revent = NULL; + esl_event_t *revent = NULL, *qevent = NULL; char *beg; char *hname, *hval; char *col; char *cl; esl_ssize_t len; int zc = 0; - if (!handle->connected) { return ESL_FAIL; } - + esl_mutex_lock(handle->mutex); + if (check_q && handle->race_event) { + qevent = handle->race_event; + handle->race_event = handle->race_event->next; + qevent->next = NULL; + + if (save_event) { + *save_event = qevent; + qevent = NULL; + } else { + handle->last_event = qevent; + } + + esl_mutex_unlock(handle->mutex); + return ESL_SUCCESS; + } + esl_event_safe_destroy(&handle->last_event); memset(handle->header_buf, 0, sizeof(handle->header_buf)); @@ -834,7 +859,7 @@ c++; } } - + if (!revent) { goto fail; } @@ -862,6 +887,7 @@ if (save_event) { *save_event = revent; + revent = NULL; } else { handle->last_event = revent; } @@ -992,19 +1018,50 @@ return ESL_FAIL; } + esl_mutex_lock(handle->mutex); + esl_event_safe_destroy(&handle->last_event); + esl_event_safe_destroy(&handle->last_sr_event); + + *handle->last_sr_reply = '\0'; + if ((status = esl_send(handle, cmd))) { + esl_mutex_unlock(handle->mutex); return status; } - status = esl_recv_event(handle, &handle->last_sr_event); - + recv: + + status = esl_recv_event(handle, 0, &handle->last_sr_event); + if (handle->last_sr_event) { - hval = esl_event_get_header(handle->last_sr_event, "reply-text"); + char *ct = esl_event_get_header(handle->last_sr_event,"content-type"); - if (!esl_strlen_zero(hval)) { - strncpy(handle->last_sr_reply, hval, sizeof(handle->last_sr_reply)); + if (strcasecmp(ct, "api/response") && strcasecmp(ct, "command/reply")) { + esl_event_t *ep; + + for(ep = handle->race_event; ep && ep->next; ep = ep->next); + + if (ep) { + ep->next = handle->last_sr_event; + } else { + handle->race_event = handle->last_sr_event; + } + + handle->last_sr_event = NULL; + + esl_mutex_unlock(handle->mutex); + esl_mutex_lock(handle->mutex); + goto recv; + } + + if (handle->last_sr_event) { + hval = esl_event_get_header(handle->last_sr_event, "reply-text"); + + if (!esl_strlen_zero(hval)) { + strncpy(handle->last_sr_reply, hval, sizeof(handle->last_sr_reply)); + } } } Modified: freeswitch/trunk/libs/esl/src/esl_event.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_event.c (original) +++ freeswitch/trunk/libs/esl/src/esl_event.c Sat Mar 14 14:23:07 2009 @@ -367,22 +367,25 @@ ESL_DECLARE(void) esl_event_destroy(esl_event_t **event) { - esl_event_t *ep = *event; - esl_event_header_t *hp, *this; + esl_event_t *ep = *event, *this_event; + esl_event_header_t *hp, *this_header; - if (ep) { - for (hp = ep->headers; hp;) { - this = hp; + for (ep = *event ; ep ;) { + this_event = ep; + ep = ep->next; + + for (hp = this_event->headers; hp;) { + this_header = hp; hp = hp->next; - FREE(this->name); - FREE(this->value); - memset(this, 0, sizeof(*this)); - FREE(this); - } - FREE(ep->body); - FREE(ep->subclass_name); - memset(ep, 0, sizeof(*ep)); - FREE(ep); + FREE(this_header->name); + FREE(this_header->value); + memset(this_header, 0, sizeof(*this_header)); + FREE(this_header); + } + FREE(this_event->body); + FREE(this_event->subclass_name); + memset(this_event, 0, sizeof(*this_event)); + FREE(this_event); } *event = NULL; } Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_oop.cpp (original) +++ freeswitch/trunk/libs/esl/src/esl_oop.cpp Sat Mar 14 14:23:07 2009 @@ -154,7 +154,7 @@ delete last_event_obj; } - if (esl_recv_event(&handle, NULL) == ESL_SUCCESS) { + if (esl_recv_event(&handle, 1, NULL) == ESL_SUCCESS) { esl_event_t *e = handle.last_ievent ? handle.last_ievent : handle.last_event; if (e) { esl_event_t *event; @@ -176,7 +176,7 @@ last_event_obj = NULL; } - if (esl_recv_event_timed(&handle, ms, NULL) == ESL_SUCCESS) { + if (esl_recv_event_timed(&handle, ms, 1, NULL) == ESL_SUCCESS) { esl_event_t *e = handle.last_ievent ? handle.last_ievent : handle.last_event; if (e) { esl_event_t *event; Modified: freeswitch/trunk/libs/esl/src/include/esl.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl.h Sat Mar 14 14:23:07 2009 @@ -266,6 +266,7 @@ char last_sr_reply[1024]; esl_event_t *last_event; esl_event_t *last_sr_event; + esl_event_t *race_event; esl_event_t *last_ievent; esl_event_t *info_event; int connected; @@ -334,14 +335,14 @@ ESL_DECLARE(esl_status_t) esl_connect(esl_handle_t *handle, const char *host, esl_port_t port, const char *password); ESL_DECLARE(esl_status_t) esl_disconnect(esl_handle_t *handle); ESL_DECLARE(esl_status_t) esl_send(esl_handle_t *handle, const char *cmd); -ESL_DECLARE(esl_status_t) esl_recv_event(esl_handle_t *handle, esl_event_t **save_event); -ESL_DECLARE(esl_status_t) esl_recv_event_timed(esl_handle_t *handle, uint32_t ms, esl_event_t **save_event); +ESL_DECLARE(esl_status_t) esl_recv_event(esl_handle_t *handle, int check_q, esl_event_t **save_event); +ESL_DECLARE(esl_status_t) esl_recv_event_timed(esl_handle_t *handle, uint32_t ms, int check_q, esl_event_t **save_event); ESL_DECLARE(esl_status_t) esl_send_recv(esl_handle_t *handle, const char *cmd); ESL_DECLARE(esl_status_t) esl_filter(esl_handle_t *handle, const char *header, const char *value); ESL_DECLARE(esl_status_t) esl_events(esl_handle_t *handle, esl_event_type_t etype, const char *value); -#define esl_recv(_h) esl_recv_event(_h, NULL) -#define esl_recv_timed(_h, _ms) esl_recv_event_timed(_h, _ms, NULL) +#define esl_recv(_h) esl_recv_event(_h, 0, NULL) +#define esl_recv_timed(_h, _ms) esl_recv_event_timed(_h, _ms, 0, NULL) static __inline__ int esl_safe_strcasecmp(const char *s1, const char *s2) {

1 0

[commit] r12604 - freeswitch/trunk/src
by FreeSWITCH SVN 14 Mar '09

14 Mar '09

Author: brian Date: Sat Mar 14 09:30:37 2009 New Revision: 12604 Log: refactor Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Sat Mar 14 09:30:37 2009 @@ -1305,7 +1305,8 @@ char *vdata; end = NULL; chan_type = peer_names[i]; - const char *privacy_str = NULL; + const char *current_variable; + char variable_buffer[512] = ""; while (chan_type && *chan_type && *chan_type == ' ') { chan_type++; @@ -1383,78 +1384,100 @@ myflags |= SOF_FORKED_DIAL; } } + + /* only valid in [] since it's unique to each channel leg */ - if (vdata && (var_begin = switch_stristr("origination_caller_id_number=", vdata))) { + if (vdata && (var_begin = switch_stristr("origination_uuid=", vdata))) { char tmp[512] = ""; - var_begin += strlen("origination_caller_id_number="); + var_begin += strlen("origination_uuid="); var_end = strchr(var_begin, '|'); + if (var_end) { strncpy(tmp, var_begin, var_end-var_begin); } else { strncpy(tmp, var_begin, strlen(var_begin)); } - new_profile->caller_id_number = switch_core_strdup(new_profile->pool, tmp); - myflags |= SOF_NO_EFFECTIVE_CID_NUM; + + new_profile->caller_id_name = switch_core_strdup(new_profile->pool, tmp); + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_uuid", tmp); } - if (vdata && (var_begin = switch_stristr("origination_caller_id_name=", vdata))) { - char tmp[512] = ""; - var_begin += strlen("origination_caller_id_name="); + /* The rest are valid in both {} and [] with [] taking precedence */ + + current_variable = NULL; + + if (vdata && (var_begin = switch_stristr("origination_caller_id_number=", vdata))) { + var_begin += strlen("origination_caller_id_number="); var_end = strchr(var_begin, '|'); + if (var_end) { - strncpy(tmp, var_begin, var_end-var_begin); + strncpy(variable_buffer, var_begin, var_end-var_begin); } else { - strncpy(tmp, var_begin, strlen(var_begin)); + strncpy(variable_buffer, var_begin, strlen(var_begin)); } - new_profile->caller_id_name = switch_core_strdup(new_profile->pool, tmp); - myflags |= SOF_NO_EFFECTIVE_CID_NAME; + + current_variable = variable_buffer; + } + + if (current_variable || (current_variable = switch_event_get_header(var_event, "origination_caller_id_number"))) { + new_profile->caller_id_number = switch_core_strdup(new_profile->pool, current_variable); + myflags |= SOF_NO_EFFECTIVE_CID_NUM; } - if (vdata && (var_begin = switch_stristr("origination_uuid=", vdata))) { - char tmp[512] = ""; - var_begin += strlen("origination_uuid="); + current_variable = NULL; + + if (vdata && (var_begin = switch_stristr("origination_caller_id_name=", vdata))) { + var_begin += strlen("origination_caller_id_name="); var_end = strchr(var_begin, '|'); + if (var_end) { - strncpy(tmp, var_begin, var_end-var_begin); + strncpy(variable_buffer, var_begin, var_end-var_begin); } else { - strncpy(tmp, var_begin, strlen(var_begin)); + strncpy(variable_buffer, var_begin, strlen(var_begin)); } - new_profile->caller_id_name = switch_core_strdup(new_profile->pool, tmp); - switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_uuid", tmp); - } - + current_variable = variable_buffer; + } + + if (current_variable || (current_variable = switch_event_get_header(var_event, "origination_caller_id_name"))) { + new_profile->caller_id_number = switch_core_strdup(new_profile->pool, current_variable); + myflags |= SOF_NO_EFFECTIVE_CID_NAME; + } + + current_variable = NULL; + if (vdata && (var_begin = switch_stristr("origination_privacy=", vdata))) { - char tmp[512] = ""; var_begin += strlen("origination_privacy="); var_end = strchr(var_begin, '|'); + if (var_end) { - strncpy(tmp, var_begin, var_end-var_begin); + strncpy(variable_buffer, var_begin, var_end-var_begin); } else { - strncpy(tmp, var_begin, strlen(var_begin)); + strncpy(variable_buffer, var_begin, strlen(var_begin)); } - - switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_privacy", tmp); + + current_variable = variable_buffer; } - switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "originate_early_media", oglobals.early_ok ? "true" : "false"); - - if ((privacy_str = switch_event_get_header(var_event, "origination_privacy"))) { + if (current_variable || (current_variable = switch_event_get_header(var_event, "origination_privacy"))) { new_profile->flags = SWITCH_CPF_NONE; - if (switch_stristr("screen", privacy_str)) { + if (switch_stristr("screen", current_variable)) { switch_set_flag(new_profile, SWITCH_CPF_SCREEN); } - if (switch_stristr("hide_name", privacy_str)) { + if (switch_stristr("hide_name", current_variable)) { switch_set_flag(new_profile, SWITCH_CPF_HIDE_NAME); } - if (switch_stristr("hide_number", privacy_str)) { + if (switch_stristr("hide_number", current_variable)) { switch_set_flag(new_profile, SWITCH_CPF_HIDE_NUMBER); } } - + + current_variable = NULL; + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "originate_early_media", oglobals.early_ok ? "true" : "false"); + if ((reason = switch_core_session_outgoing_channel(oglobals.session, var_event, chan_type, new_profile, &new_session, &pool, myflags)) != SWITCH_CAUSE_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create outgoing channel of type [%s] cause: [%s]\n",

1 0

[commit] r12603 - freeswitch/trunk/src
by FreeSWITCH SVN 14 Mar '09

14 Mar '09

Author: anthm Date: Sat Mar 14 09:14:51 2009 New Revision: 12603 Log: fix origination_privacy var Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Sat Mar 14 09:14:51 2009 @@ -1305,7 +1305,8 @@ char *vdata; end = NULL; chan_type = peer_names[i]; - + const char *privacy_str = NULL; + while (chan_type && *chan_type && *chan_type == ' ') { chan_type++; } @@ -1432,28 +1433,28 @@ } else { strncpy(tmp, var_begin, strlen(var_begin)); } - + + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_privacy", tmp); + } + + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "originate_early_media", oglobals.early_ok ? "true" : "false"); + + if ((privacy_str = switch_event_get_header(var_event, "origination_privacy"))) { new_profile->flags = SWITCH_CPF_NONE; - - if (switch_stristr("screen", tmp)) { + + if (switch_stristr("screen", privacy_str)) { switch_set_flag(new_profile, SWITCH_CPF_SCREEN); } - if (switch_stristr("hide_name", tmp)) { + if (switch_stristr("hide_name", privacy_str)) { switch_set_flag(new_profile, SWITCH_CPF_HIDE_NAME); } - if (switch_stristr("hide_number", tmp)) { + if (switch_stristr("hide_number", privacy_str)) { switch_set_flag(new_profile, SWITCH_CPF_HIDE_NUMBER); } - - new_profile->caller_id_name = switch_core_strdup(new_profile->pool, tmp); - switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_privacy", tmp); } - switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "originate_early_media", oglobals.early_ok ? "true" : "false"); - - if ((reason = switch_core_session_outgoing_channel(oglobals.session, var_event, chan_type, new_profile, &new_session, &pool, myflags)) != SWITCH_CAUSE_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create outgoing channel of type [%s] cause: [%s]\n",

1 0

[commit] r12602 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 14 Mar '09

14 Mar '09

Author: anthm Date: Sat Mar 14 08:56:45 2009 New Revision: 12602 Log: MODAPP-236 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Sat Mar 14 08:56:45 2009 @@ -1928,10 +1928,13 @@ switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Action", "change-password"); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-User-Password", buf); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-User", myid); + if (actual_id) { + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Actual-User", actual_id); + } switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Domain", domain_name); switch_channel_event_set_data(channel, params); - if (switch_xml_locate_user("id", myid, domain_name, switch_channel_get_variable(channel, "network_addr"), + if (switch_xml_locate_user("id", actual_id ? actual_id : myid, domain_name, switch_channel_get_variable(channel, "network_addr"), &xx_domain_root, &xx_domain, &xx_user, NULL, params) == SWITCH_STATUS_SUCCESS) { switch_xml_free(xx_domain_root); }

1 0

[commit] r12601 - in freeswitch/trunk/scripts/contrib/swk: flex/amf-test1/src php/amfphp sql
by FreeSWITCH SVN 14 Mar '09

14 Mar '09

Author: silik0n Date: Sat Mar 14 07:45:46 2009 New Revision: 12601 Log: Initial MySQL dump, some sample data (anyone wanna help getting the rest of the user directory into the DB?) starting to display the domains data and actually getting somewhere Added: freeswitch/trunk/scripts/contrib/swk/sql/ freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml (original) +++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml Sat Mar 14 07:45:46 2009 @@ -61,7 +61,8 @@ var origWindow:IFlexDisplayObject = PopUpManager.createPopUp(this, statusForm, false); } - + + ]]> </mx:Script> @@ -124,7 +125,7 @@ <mx:DataGridColumn dataField="flags"/> </mx:columns> </mx:DataGrid> - <mx:Button label="Play File" click="freeswitch.confPlayfile(confPicker.selectedItem, comboConfPlayfile.selectedItem.data);;" horizontalCenter="-40" bottom="85"/> + <mx:Button label="Play File" click="freeswitch.confPlayfile(confPicker.selectedItem, comboConfPlayfile.selectedItem.data);" horizontalCenter="-40" bottom="85"/> <mx:Button label="Speak" click="{freeswitch.getConferenceUsers(confPicker.selectedItem)}" horizontalCenter="221" bottom="25"/> <mx:Button label="Refresh Confs" click="{freeswitch.getConferenceList()}" horizontalCenter="-276" bottom="115"/> <mx:Button label="Refresh Users" click="{freeswitch.getConferenceUsers(confPicker.selectedItem)}" horizontalCenter="-162" bottom="115"/> @@ -149,30 +150,47 @@ <mx:Canvas label="Domains" width="100%" height="100%"> <mx:HDividedBox x="0" y="0" width="100%" height="100%"> <mx:Canvas width="20%" height="100%"> - <mx:DataGrid width="100%" horizontalCenter="0" top="0" bottom="40"> + <mx:DataGrid id="gridDomainsDomain" width="100%" horizontalCenter="0" top="0" bottom="40" + dataProvider="{freeswitch.getDirDomains.lastResult}" + click="freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid);"> <mx:columns> <mx:DataGridColumn headerText="domain" dataField="name"/> </mx:columns> </mx:DataGrid> - <mx:Button label="Refresh Domains" horizontalCenter="0" bottom="10"/> + <mx:Button label="Refresh Domains" horizontalCenter="0" bottom="10" click="freeswitch.getDirDomains();"/> </mx:Canvas> <mx:Canvas width="80%" height="100%"> - <mx:Form id="formDomain" x="0" y="0" width="100%" height="100%"> - </mx:Form> + <mx:Label text="UID:" horizontalCenter="-421" top="10"/> + <mx:Label text="{gridDomainsDomain.selectedItem.uid}" id="domainUid" horizontalCenter="-339" top="10"/> + <mx:Label text="Name:" horizontalCenter="-129" top="12"/> + <mx:TextInput id="domainName" text="{gridDomainsDomain.selectedItem.name}" horizontalCenter="25" top="10"/> + <mx:CheckBox label="Enabled" id="domainEnabled" enabled="{gridDomainsDomain.selectedItem.enabled}" right="10" top="8"/> + <mx:DataGrid left="10" top="61" bottom="42" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.params}"> + <mx:columns> + <mx:DataGridColumn headerText="Parameter" dataField="name" width="120"/> + <mx:DataGridColumn headerText="Value" dataField="value"/> + </mx:columns> + </mx:DataGrid> + <mx:DataGrid right="10" top="61" bottom="42" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.variables}"> + <mx:columns> + <mx:DataGridColumn headerText="Variable" dataField="name" width="120"/> + <mx:DataGridColumn headerText="Data" dataField="value"/> + </mx:columns> + </mx:DataGrid> </mx:Canvas> </mx:HDividedBox> </mx:Canvas> <mx:Canvas label="Users" width="100%" height="100%"> <mx:HDividedBox x="0" y="0" width="100%" height="100%"> <mx:Canvas width="20%" height="100%"> - <mx:ComboBox top="10" horizontalCenter="0"></mx:ComboBox> - <mx:DataGrid width="100%" horizontalCenter="0" top="40" bottom="70"> + <mx:ComboBox id="userDomain" top="10" horizontalCenter="0" dataProvider="{freeswitch.getDirDomains.lastResult}" labelField="name"></mx:ComboBox> + <mx:DataGrid width="100%" horizontalCenter="0" top="40" bottom="70" dataProvider="{freeswitch.getDirUsers.lastResult}"> <mx:columns> - <mx:DataGridColumn headerText="User" dataField="user_id"/> + <mx:DataGridColumn headerText="User" dataField="username" /> </mx:columns> </mx:DataGrid> - <mx:Button label="Refresh Users" horizontalCenter="0" bottom="10"/> - <mx:Button label="Refresh Domains" horizontalCenter="0" bottom="40"/> + <mx:Button label="Refresh Users" horizontalCenter="0" bottom="10" click="freeswitch.getDirUsers(userDomain.selectedItem.uid);"/> + <mx:Button label="Refresh Domains" horizontalCenter="0" bottom="40" click="freeswitch.getDirDomains();"/> </mx:Canvas> <mx:Canvas width="80%" height="100%"> <mx:Form id="formUser" x="0" y="0" width="100%" height="100%"> 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 Sat Mar 14 07:45:46 2009 @@ -38,12 +38,32 @@ require_once "ESL.php"; class FreeSWITCH { - var $esl; + var $esl; + var $dbh; + + private function getDbh(){ + $dbtype='mysql'; /* Set the Database type */ + $db_hostname = 'localhost'; /* Database Server hostname */ + $db_username = 'root'; /* Database Server username */ + $db_password = 'password'; /* Database Server password */ + $db_database = 'shipment'; /* DataBase Name */ + + $dbh = new PDO("$dbtype:host=$db_hostname;dbname=$db_database", $db_username, $db_password, array(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,)); + + return $dbh; + } public function __construct() { - $this->esl = new eslConnection('127.0.0.1', '8021', 'ClueCon'); + + $esl_server = "127.0.0.1"; /* ESL Server */ + $esl_port = "8021"; /* ESL Port */ + $esl_secret = "ClueCon"; /* ESL Secret */ + + $this->esl = new eslConnection($esl_server, $esl_port, $esl_secret); } - + + /*** General Whats happening Methods ***/ + public function getStatus() { $e = $this->esl->sendRecv("api status"); $body = $e->getBody(); @@ -51,13 +71,6 @@ return $body; } - public function killUuid($uuid) { - $e = $this->esl->sendRecv("api uuid_kill $uuid"); - $body = $e->getBody(); - - return $body; - } - public function getChannels() { $e = $this->esl->sendRecv("api show channels"); $body = $e->getBody(); @@ -110,6 +123,8 @@ return $data; } + /*** General API Command Methods ***/ + public function originate($call_url, $exten, $dialplan = "XML", $context= "default", $cid_name = "amf_php", $cid_number = "888", $timeout="30"){ $dialstring = "api originate $call_url $exten $dialplan $context $cid_name $cid_number $timeout"; $e = $this->esl->sendRecv($dialstring); @@ -117,6 +132,14 @@ return $body; } + + public function killUuid($uuid) { + $e = $this->esl->sendRecv("api uuid_kill $uuid"); + $body = $e->getBody(); + return $body; + } + + /*** Conference Methods ***/ public function kickConferenceUser($conference, $member) { $e = $this->esl->sendRecv("api conference $conference kick $member"); @@ -230,7 +253,67 @@ $body = $e->getBody(); return $body; } + + /*** Directory Methods ***/ + + public function getDirDomains(){ + $dbh = $this->getDbh(); + + $query = sprintf("select * from domains"); + $stmt = $dbh->query($query); + $results = $stmt->fetchAll(); + + return $results; + } + + public function getDirDomain($domain_uid){ + + $dbh = $this->getDbh(); + + $query = sprintf("select * from domain_params where domains_uid = $domain_uid"); + $stmt = $dbh->query($query); + $results['params'] = $stmt->fetchAll(); + + $query = sprintf("select * from domain_variables where domains_uid = $domain_uid"); + $stmt = $dbh->query($query); + $results['variables'] = $stmt->fetchAll(); + + return $results; + } + + public function addDirDomain($domain_name){ + $dbh = $this->getDbh(); + + $query = sprintf('insert into domains (name) values ("%s")', $domain_name); + + return $dbh->exec($query); + } + + public function getDirUsers($domain_uid){ + $dbh = $this->getDbh(); + + $query = sprintf("select * from users where domain_uid = $domain_uid"); + $stmt = $dbh->query($query); + $results = $stmt->fetchAll(); + + return $results; + } + + public function getDirGroups($domain_uid){ + $dbh = $this->getDbh(); + + $query = sprintf("select * from groups where domain_uid = $domain_uid"); + $stmt = $dbh->query($query); + $results = $stmt->fetchAll(); + + return $results; + } + + +} +/* For Emacs: + } /* For Emacs: * Local Variables: Added: freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql Sat Mar 14 07:45:46 2009 @@ -0,0 +1,245 @@ +-- +-- Initial Table with Sample Data for Project Shipment +-- (Or atleast I'm calling it Shipment until I get a better name +-- + +SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; + +-- +-- Database: `shipment` +-- + +-- -------------------------------------------------------- + +-- +-- Table structure for table `domains` +-- + +CREATE TABLE IF NOT EXISTS `domains` ( + `uid` int(11) NOT NULL auto_increment COMMENT 'UID for the table Auto Assigned', + `name` varchar(128) NOT NULL COMMENT 'domaine name', + `enabled` tinyint(1) NOT NULL default '1', + PRIMARY KEY (`uid`), + UNIQUE KEY `name` (`name`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; + +-- +-- Dumping data for table `domains` +-- + +INSERT INTO `domains` (`uid`, `name`, `enabled`) VALUES +(1, '192.168.1.140', 1); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `domain_params` +-- + +CREATE TABLE IF NOT EXISTS `domain_params` ( + `uid` int(11) NOT NULL auto_increment, + `domains_uid` int(11) NOT NULL, + `name` varchar(64) NOT NULL, + `value` varchar(256) NOT NULL, + PRIMARY KEY (`uid`), + KEY `domain_uid` (`domains_uid`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; + +-- +-- Dumping data for table `domain_params` +-- + +INSERT INTO `domain_params` (`uid`, `domains_uid`, `name`, `value`) VALUES +(1, 1, 'dial-string', '{presence_id=${dialed_user}@${dialed_domain}}${sofia_contact(${dialed_user}@${dialed_domain})}'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `domain_variables` +-- + +CREATE TABLE IF NOT EXISTS `domain_variables` ( + `uid` int(11) NOT NULL auto_increment, + `domains_uid` int(11) NOT NULL, + `name` varchar(64) NOT NULL, + `value` varchar(128) NOT NULL, + PRIMARY KEY (`uid`), + KEY `domain_uid` (`domains_uid`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=5 ; + +-- +-- Dumping data for table `domain_variables` +-- + +INSERT INTO `domain_variables` (`uid`, `domains_uid`, `name`, `value`) VALUES +(1, 1, 'record_stereo', 'true'), +(2, 1, 'default_gateway', '$${default_provider}'), +(3, 1, 'default_areacode', '$${default_areacode}'), +(4, 1, 'transfer_fallback_extension', 'operator'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `groups` +-- + +CREATE TABLE IF NOT EXISTS `groups` ( + `uid` int(11) NOT NULL auto_increment, + `domains_uid` int(11) NOT NULL, + `name` varchar(64) NOT NULL, + PRIMARY KEY (`uid`), + KEY `domain_uid` (`domains_uid`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=4 ; + +-- +-- Dumping data for table `groups` +-- + +INSERT INTO `groups` (`uid`, `domains_uid`, `name`) VALUES +(1, 1, 'sales'), +(2, 1, 'billing'), +(3, 1, 'support'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `group_members` +-- + +CREATE TABLE IF NOT EXISTS `group_members` ( + `uid` int(11) NOT NULL auto_increment, + `domains_uid` int(11) NOT NULL, + `groups_uid` int(11) NOT NULL, + `users_uid` int(11) NOT NULL, + `type` varchar(32) NOT NULL, + PRIMARY KEY (`uid`), + KEY `domain_uid` (`domains_uid`,`groups_uid`,`users_uid`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; + +-- +-- Dumping data for table `group_members` +-- + + +-- -------------------------------------------------------- + +-- +-- Table structure for table `users` +-- + +CREATE TABLE IF NOT EXISTS `users` ( + `uid` int(11) NOT NULL auto_increment, + `domain_uid` int(11) NOT NULL, + `username` varchar(64) NOT NULL, + `mailbox` varchar(64) default NULL, + `cidr` varchar(32) default NULL, + `enabled` tinyint(1) NOT NULL default '1', + PRIMARY KEY (`uid`), + KEY `domain_uid` (`domain_uid`,`username`,`mailbox`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=21 ; + +-- +-- Dumping data for table `users` +-- + +INSERT INTO `users` (`uid`, `domain_uid`, `username`, `mailbox`, `cidr`, `enabled`) VALUES +(1, 1, '1000', '1000', NULL, 1), +(2, 1, '1001', '1001', NULL, 1), +(3, 1, '1002', '1002', NULL, 1), +(4, 1, '1003', '1003', NULL, 1), +(5, 1, '1004', '1004', NULL, 1), +(6, 1, '1005', '1005', NULL, 1), +(7, 1, '1006', '1006', NULL, 1), +(8, 1, '1007', '1007', NULL, 1), +(9, 1, '1008', '1008', NULL, 1), +(10, 1, '1009', '1009', NULL, 1), +(11, 1, '1000', '1000', NULL, 1), +(12, 1, '1011', '1011', NULL, 1), +(13, 1, '1012', '1012', NULL, 1), +(14, 1, '1013', '1013', NULL, 1), +(15, 1, '1014', '1014', NULL, 1), +(16, 1, '1015', '1015', NULL, 1), +(17, 1, '1016', '1016', NULL, 1), +(18, 1, '1017', '1017', NULL, 1), +(19, 1, '1018', '1018', NULL, 1), +(20, 1, '1019', '1019', NULL, 1); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `user_params` +-- + +CREATE TABLE IF NOT EXISTS `user_params` ( + `uid` int(11) NOT NULL auto_increment, + `users_uid` int(11) NOT NULL, + `name` varchar(64) NOT NULL, + `value` varchar(128) NOT NULL, + PRIMARY KEY (`uid`), + KEY `user_uid` (`users_uid`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=39 ; + +-- +-- Dumping data for table `user_params` +-- + +INSERT INTO `user_params` (`uid`, `users_uid`, `name`, `value`) VALUES +(1, 1, 'password', '1234'), +(2, 1, 'vm-password', '1000'), +(3, 2, 'password', '1234'), +(4, 2, 'vm-password', '1002'), +(5, 3, 'password', '1234'), +(6, 3, 'vm-password', '1003'), +(7, 4, 'password', '1234'), +(8, 4, 'vm-password', '1004'), +(9, 5, 'password', '1234'), +(10, 5, 'vm-password', '1005'), +(11, 6, 'password', '1234'), +(12, 6, 'vm-password', '1006'), +(13, 7, 'password', '1234'), +(14, 7, 'vm-password', '1007'), +(15, 8, 'password', '1234'), +(16, 8, 'vm-password', '1008'), +(17, 9, 'password', '1234'), +(18, 9, 'vm-password', '1009'), +(19, 10, 'password', '1234'), +(20, 10, 'vm-password', '1010'), +(21, 11, 'password', '1234'), +(22, 11, 'vm-password', '1011'), +(23, 12, 'password', '1234'), +(24, 12, 'vm-password', '1012'), +(25, 13, 'password', '1234'), +(26, 13, 'vm-password', '1013'), +(27, 14, 'password', '1234'), +(28, 14, 'vm-password', '1014'), +(29, 15, 'password', '1234'), +(30, 15, 'vm-password', '1015'), +(31, 16, 'password', '1234'), +(32, 16, 'vm-password', '1016'), +(33, 17, 'password', '1234'), +(34, 17, 'vm-password', '1017'), +(35, 18, 'password', '1234'), +(36, 18, 'vm-password', '1018'), +(37, 19, 'password', '1234'), +(38, 19, 'vm-password', '1019'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `user_variables` +-- + +CREATE TABLE IF NOT EXISTS `user_variables` ( + `uid` int(11) NOT NULL auto_increment, + `users_uid` int(11) NOT NULL, + `name` varchar(64) NOT NULL, + `value` varchar(128) NOT NULL, + PRIMARY KEY (`uid`), + KEY `user_uid` (`users_uid`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; + +-- +-- Dumping data for table `user_variables` +-- + +

1 0