April 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8079 - in freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl: . configuration sql
by Freeswitch SVN 10 Apr '08

10 Apr '08

Author: intralanman Date: Thu Apr 10 00:49:07 2008 New Revision: 8079 Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/spidermonkey.conf.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/sql/mysql-4.0.sql freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0-with-samples.sql freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0.sql Log: a couple updates to allow mailboxes in schema and php (thanks to dasbus) fixed typo in spidermonkey (thanks to danchris) and fixed a pretty old boo boo where attribute continue was in condition instead of break Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/spidermonkey.conf.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/spidermonkey.conf.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/spidermonkey.conf.php Thu Apr 10 00:49:07 2008 @@ -26,7 +26,7 @@ private function get_params() { return array( - 'mod_spidermonkey_teleone', + 'mod_spidermonkey_teletone', 'mod_spidermonkey_odbc', 'mod_spidermonkey_core_db' ); Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php Thu Apr 10 00:49:07 2008 @@ -59,7 +59,7 @@ $cf = $row['condition_field']; $ce = $row['condition_expression']; $rcd = $row['re_cdata']; - $cc = empty($row['condition_continue']) ? '0' : $row['condition_continue']; + $cc = empty($row['cond_break']) ? '0' : $row['cond_break']; $dp_array[$ct]["$et;$ec"]["$cf;$ce;$cc;$rcd"][] = array( 'type'=>$type, 'application'=>$app, @@ -120,7 +120,7 @@ //$this -> debug($c_split[2]); if ($c_split[2] != '0') { $this -> xmlw -> writeAttribute( - 'continue', $c_split[2] + 'break', $c_split[2] ); } //$this -> debug($app_array); Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php Thu Apr 10 00:49:07 2008 @@ -261,8 +261,11 @@ $this -> write_global_vars(); for ($i=0; $i<$directory_count; $i++) { + $username = $directory[$i]['username']; + $mailbox = empty($directory[$i]['mailbox']) ? $username : $directory[$i]['mailbox']; $this -> xmlw -> startElement('user'); - $this -> xmlw -> writeAttribute('id', $directory[$i]['username']); + $this -> xmlw -> writeAttribute('id', $username); + $this -> xmlw -> writeAttribute('mailbox', $mailbox); $this -> write_params($directory[$i]['id']); $this -> write_variables($directory[$i]['id']); $this -> write_gateways($directory[$i]['id']); Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/sql/mysql-4.0.sql ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/sql/mysql-4.0.sql (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/sql/mysql-4.0.sql Thu Apr 10 00:49:07 2008 @@ -1,524 +1,625 @@ --- MySQL dump 10.11 --- --- Host: localhost Database: freeswitch --- ------------------------------------------------------ --- Server version 5.0.45-community-nt -/*!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,MYSQL40' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `conference_advertise` --- - -DROP TABLE IF EXISTS `conference_advertise`; -CREATE TABLE `conference_advertise` ( - `id` int(10) unsigned NOT NULL auto_increment, - `room` varchar(64) NOT NULL, - `status` varchar(128) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `unique_room` (`room`) -) TYPE=InnoDB AUTO_INCREMENT=8; - --- --- Table structure for table `conference_controls` --- - -DROP TABLE IF EXISTS `conference_controls`; -CREATE TABLE `conference_controls` ( - `id` int(10) unsigned NOT NULL auto_increment, - `conf_group` varchar(64) NOT NULL, - `action` varchar(64) NOT NULL, - `digits` varchar(16) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `unique_group_action` (`conf_group`,`action`) -) TYPE=InnoDB AUTO_INCREMENT=25; - --- --- Table structure for table `conference_profiles` --- - -DROP TABLE IF EXISTS `conference_profiles`; -CREATE TABLE `conference_profiles` ( - `id` int(10) unsigned NOT NULL auto_increment, - `profile_name` varchar(64) NOT NULL, - `param_name` varchar(64) NOT NULL, - `param_value` varchar(64) NOT NULL, - PRIMARY KEY (`id`), - KEY `unique_profile_param` (`profile_name`,`param_name`) -) TYPE=InnoDB AUTO_INCREMENT=13; - --- --- Table structure for table `db_data` --- - -DROP TABLE IF EXISTS `db_data`; -CREATE TABLE `db_data` ( - `hostname` varchar(255) default NULL, - `realm` varchar(255) default NULL, - `data_key` varchar(255) default NULL, - `data` varchar(255) default NULL -) TYPE=MyISAM; - --- --- Table structure for table `dialplan` --- - -DROP TABLE IF EXISTS `dialplan`; -CREATE TABLE `dialplan` ( - `id` int(11) NOT NULL auto_increment, - `context` varchar(64) NOT NULL, - `extension` varchar(64) NOT NULL, - `condition_field` varchar(64) NOT NULL, - `condition_expression` varchar(64) NOT NULL, - `application_name` varchar(64) NOT NULL, - `application_data` text, - `weight` int(11) NOT NULL, - `type` varchar(16) NOT NULL default 'action', - `ext_continue` smallint(1) NOT NULL default '0', - `global_weight` int(11) NOT NULL default '10000', - `condition_continue` varchar(8) default NULL, - PRIMARY KEY (`id`) -) TYPE=MyISAM AUTO_INCREMENT=112; - --- --- Table structure for table `dingaling_profile_params` --- - -DROP TABLE IF EXISTS `dingaling_profile_params`; -CREATE TABLE `dingaling_profile_params` ( - `id` int(10) unsigned NOT NULL auto_increment, - `dingaling_id` int(10) unsigned NOT NULL, - `param_name` varchar(64) NOT NULL, - `param_value` varchar(64) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `unique_type_name` (`dingaling_id`,`param_name`), - CONSTRAINT `dingaling_profile` FOREIGN KEY (`dingaling_id`) REFERENCES `dingaling_profiles` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) TYPE=InnoDB AUTO_INCREMENT=5; - --- --- Table structure for table `dingaling_profiles` --- - -DROP TABLE IF EXISTS `dingaling_profiles`; -CREATE TABLE `dingaling_profiles` ( - `id` int(10) unsigned NOT NULL auto_increment, - `profile_name` varchar(64) NOT NULL, - `type` varchar(64) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `unique_name` (`profile_name`) -) TYPE=InnoDB AUTO_INCREMENT=3; - --- --- Table structure for table `dingaling_settings` --- - -DROP TABLE IF EXISTS `dingaling_settings`; -CREATE TABLE `dingaling_settings` ( - `id` int(10) unsigned NOT NULL auto_increment, - `param_name` varchar(64) NOT NULL, - `param_value` varchar(64) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `unique_param` (`param_name`) -) TYPE=InnoDB AUTO_INCREMENT=3; - --- --- Table structure for table `directory` --- - -DROP TABLE IF EXISTS `directory`; -CREATE TABLE `directory` ( - `id` int(11) NOT NULL auto_increment, - `username` varchar(255) NOT NULL, - `domain` varchar(255) NOT NULL, - PRIMARY KEY (`id`) -) TYPE=MyISAM AUTO_INCREMENT=5; - --- --- Table structure for table `directory_gateway_params` --- - -DROP TABLE IF EXISTS `directory_gateway_params`; -CREATE TABLE `directory_gateway_params` ( - `id` int(10) unsigned NOT NULL auto_increment, - `d_gw_id` int(10) unsigned NOT NULL, - `param_name` varchar(64) NOT NULL, - `param_value` varchar(64) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `unique_gw_param` (`d_gw_id`,`param_name`) -) TYPE=InnoDB AUTO_INCREMENT=10; - --- --- Table structure for table `directory_gateways` --- - -DROP TABLE IF EXISTS `directory_gateways`; -CREATE TABLE `directory_gateways` ( - `id` int(10) unsigned NOT NULL auto_increment, - `directory_id` int(10) unsigned NOT NULL, - `gateway_name` varchar(128) NOT NULL, - PRIMARY KEY (`id`) -) TYPE=InnoDB AUTO_INCREMENT=4; - --- --- Table structure for table `directory_params` --- - -DROP TABLE IF EXISTS `directory_params`; -CREATE TABLE `directory_params` ( - `id` int(11) NOT NULL auto_increment, - `directory_id` int(11) default NULL, - `param_name` varchar(255) default NULL, - `param_value` varchar(255) default NULL, - PRIMARY KEY (`id`) -) TYPE=InnoDB AUTO_INCREMENT=6; - --- --- Table structure for table `directory_vars` --- - -DROP TABLE IF EXISTS `directory_vars`; -CREATE TABLE `directory_vars` ( - `id` int(11) NOT NULL auto_increment, - `directory_id` int(11) default NULL, - `var_name` varchar(255) default NULL, - `var_value` varchar(255) default NULL, - PRIMARY KEY (`id`) -) TYPE=MyISAM AUTO_INCREMENT=6; - --- --- Table structure for table `group_data` --- - -DROP TABLE IF EXISTS `group_data`; -CREATE TABLE `group_data` ( - `hostname` varchar(255) default NULL, - `groupname` varchar(255) default NULL, - `url` varchar(255) default NULL -) TYPE=MyISAM; - --- --- Table structure for table `iax_conf` --- - -DROP TABLE IF EXISTS `iax_conf`; -CREATE TABLE `iax_conf` ( - `id` int(11) NOT NULL auto_increment, - `profile_name` varchar(255) default NULL, - PRIMARY KEY (`id`) -) TYPE=InnoDB AUTO_INCREMENT=4; - --- --- Table structure for table `iax_settings` --- - -DROP TABLE IF EXISTS `iax_settings`; -CREATE TABLE `iax_settings` ( - `id` int(11) NOT NULL auto_increment, - `iax_id` int(11) default NULL, - `param_name` varchar(255) default NULL, - `param_value` varchar(255) default NULL, - PRIMARY KEY (`id`) -) TYPE=InnoDB AUTO_INCREMENT=43; - --- --- Table structure for table `ivr_conf` --- - -DROP TABLE IF EXISTS `ivr_conf`; -CREATE TABLE `ivr_conf` ( - `id` int(10) unsigned NOT NULL auto_increment, - `name` varchar(64) NOT NULL, - `greet_long` varchar(255) NOT NULL, - `greet_short` varchar(255) NOT NULL, - `invalid_sound` varchar(255) NOT NULL, - `exit_sound` varchar(255) NOT NULL, - `max_failures` int(10) unsigned NOT NULL default '3', - `timeout` int(11) NOT NULL default '5', - `tts_engine` varchar(64) default NULL, - `tts_voice` varchar(64) default NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `unique_name` (`name`) -) TYPE=InnoDB AUTO_INCREMENT=4; - --- --- Table structure for table `ivr_entries` --- - -DROP TABLE IF EXISTS `ivr_entries`; -CREATE TABLE `ivr_entries` ( - `id` int(10) unsigned NOT NULL auto_increment, - `ivr_id` int(10) unsigned NOT NULL, - `action` varchar(64) NOT NULL, - `digits` varchar(16) NOT NULL, - `params` varchar(255) default NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `unique_ivr_digits` (`ivr_id`,`digits`) -) TYPE=InnoDB AUTO_INCREMENT=11; - --- --- Table structure for table `jabber_subscriptions` --- - -DROP TABLE IF EXISTS `jabber_subscriptions`; -CREATE TABLE `jabber_subscriptions` ( - `sub_from` varchar(255) default NULL, - `sub_to` varchar(255) default NULL, - `show_pres` varchar(255) default NULL, - `status` varchar(255) default NULL -) TYPE=MyISAM; - --- --- Table structure for table `limit_conf` --- - -DROP TABLE IF EXISTS `limit_conf`; -CREATE TABLE `limit_conf` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(255) default NULL, - `value` varchar(255) default NULL, - PRIMARY KEY (`id`) -) TYPE=MyISAM AUTO_INCREMENT=2; - --- --- Table structure for table `limit_data` --- - -DROP TABLE IF EXISTS `limit_data`; -CREATE TABLE `limit_data` ( - `hostname` varchar(255) default NULL, - `realm` varchar(255) default NULL, - `id` varchar(255) default NULL, - `uuid` varchar(255) default NULL -) TYPE=MyISAM; - --- --- Table structure for table `local_stream_conf` --- - -DROP TABLE IF EXISTS `local_stream_conf`; -CREATE TABLE `local_stream_conf` ( - `id` int(11) NOT NULL auto_increment, - `directory_name` varchar(255) default NULL, - `directory_path` text, - `param_name` varchar(255) default NULL, - `param_value` varchar(255) default NULL, - PRIMARY KEY (`id`) -) TYPE=MyISAM; - --- --- Table structure for table `post_load_modules_conf` --- - -DROP TABLE IF EXISTS `post_load_modules_conf`; -CREATE TABLE `post_load_modules_conf` ( - `id` int(10) unsigned NOT NULL auto_increment, - `module_name` varchar(64) NOT NULL, - `load_module` tinyint(1) NOT NULL default '1', - `priority` int(10) unsigned NOT NULL default '1000', - PRIMARY KEY (`id`), - UNIQUE KEY `unique_mod` (`module_name`) -) TYPE=InnoDB AUTO_INCREMENT=52; - --- --- Table structure for table `rss_conf` --- - -DROP TABLE IF EXISTS `rss_conf`; -CREATE TABLE `rss_conf` ( - `id` int(11) NOT NULL auto_increment, - `directory_id` int(11) NOT NULL, - `feed` text NOT NULL, - `local_file` text NOT NULL, - `description` text, - `priority` int(11) NOT NULL default '1000', - PRIMARY KEY (`id`) -) TYPE=MyISAM AUTO_INCREMENT=15; - --- --- Table structure for table `sip_authentication` --- - -DROP TABLE IF EXISTS `sip_authentication`; -CREATE TABLE `sip_authentication` ( - `nonce` varchar(255) default NULL, - `expires` int(8) default NULL -) TYPE=MyISAM; - --- --- Table structure for table `sip_registrations` --- - -DROP TABLE IF EXISTS `sip_registrations`; -CREATE TABLE `sip_registrations` ( - `call_id` varchar(255) default NULL, - `sip_user` varchar(255) default NULL, - `sip_host` varchar(255) default NULL, - `contact` varchar(1024) default NULL, - `status` varchar(255) default NULL, - `rpid` varchar(255) default NULL, - `expires` int(11) default NULL -) TYPE=MyISAM; - --- --- Table structure for table `sip_subscriptions` --- - -DROP TABLE IF EXISTS `sip_subscriptions`; -CREATE TABLE `sip_subscriptions` ( - `proto` varchar(255) default NULL, - `sip_user` varchar(255) default NULL, - `sip_host` varchar(255) default NULL, - `sub_to_user` varchar(255) default NULL, - `sub_to_host` varchar(255) default NULL, - `event` varchar(255) default NULL, - `contact` varchar(1024) default NULL, - `call_id` varchar(255) default NULL, - `full_from` varchar(255) default NULL, - `full_via` varchar(255) default NULL, - `expires` int(11) default NULL -) TYPE=MyISAM; - --- --- Table structure for table `sofia_aliases` --- - -DROP TABLE IF EXISTS `sofia_aliases`; -CREATE TABLE `sofia_aliases` ( - `id` int(10) unsigned NOT NULL auto_increment, - `sofia_id` int(10) unsigned NOT NULL, - `alias_name` varchar(255) NOT NULL, - PRIMARY KEY (`id`) -) TYPE=InnoDB AUTO_INCREMENT=5; - --- --- Table structure for table `sofia_conf` --- - -DROP TABLE IF EXISTS `sofia_conf`; -CREATE TABLE `sofia_conf` ( - `id` int(11) NOT NULL auto_increment, - `profile_name` varchar(255) default NULL, - PRIMARY KEY (`id`) -) TYPE=InnoDB AUTO_INCREMENT=3; - --- --- Table structure for table `sofia_domains` --- - -DROP TABLE IF EXISTS `sofia_domains`; -CREATE TABLE `sofia_domains` ( - `id` int(11) NOT NULL auto_increment, - `sofia_id` int(11) default NULL, - `domain_name` varchar(255) default NULL, - `parse` tinyint(1) default NULL, - PRIMARY KEY (`id`) -) TYPE=InnoDB; - --- --- Table structure for table `sofia_gateways` --- - -DROP TABLE IF EXISTS `sofia_gateways`; -CREATE TABLE `sofia_gateways` ( - `id` int(11) NOT NULL auto_increment, - `sofia_id` int(11) default NULL, - `gateway_name` varchar(255) default NULL, - `gateway_param` varchar(255) default NULL, - `gateway_value` varchar(255) default NULL, - PRIMARY KEY (`id`) -) TYPE=InnoDB AUTO_INCREMENT=15; - --- --- Table structure for table `sofia_settings` --- - -DROP TABLE IF EXISTS `sofia_settings`; -CREATE TABLE `sofia_settings` ( - `id` int(11) NOT NULL auto_increment, - `sofia_id` int(11) default NULL, - `param_name` varchar(255) default NULL, - `param_value` varchar(255) default NULL, - PRIMARY KEY (`id`) -) TYPE=InnoDB AUTO_INCREMENT=35; - --- --- Table structure for table `voicemail_conf` --- - -DROP TABLE IF EXISTS `voicemail_conf`; -CREATE TABLE `voicemail_conf` ( - `id` int(10) unsigned NOT NULL auto_increment, - `vm_profile` varchar(64) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `unique_profile` (`vm_profile`) -) TYPE=InnoDB AUTO_INCREMENT=3; - --- --- Table structure for table `voicemail_data` --- - -DROP TABLE IF EXISTS `voicemail_data`; -CREATE TABLE `voicemail_data` ( - `created_epoch` int(8) default NULL, - `read_epoch` int(8) default NULL, - `user` varchar(255) default NULL, - `domain` varchar(255) default NULL, - `uuid` varchar(255) default NULL, - `cid_name` varchar(255) default NULL, - `cid_number` varchar(255) default NULL, - `in_folder` varchar(255) default NULL, - `file_path` varchar(255) default NULL, - `flags` varchar(255) default NULL, - `read_flags` varchar(255) default NULL -) TYPE=MyISAM; - --- --- Table structure for table `voicemail_email` --- - -DROP TABLE IF EXISTS `voicemail_email`; -CREATE TABLE `voicemail_email` ( - `id` int(10) unsigned NOT NULL auto_increment, - `voicemail_id` int(10) unsigned NOT NULL, - `param_name` varchar(64) NOT NULL, - `param_value` varchar(64) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `unique_profile_param` (`param_name`,`voicemail_id`) -) TYPE=InnoDB AUTO_INCREMENT=4; - --- --- Table structure for table `voicemail_prefs` --- - -DROP TABLE IF EXISTS `voicemail_prefs`; -CREATE TABLE `voicemail_prefs` ( - `user` varchar(255) default NULL, - `domain` varchar(255) default NULL, - `name_path` varchar(255) default NULL, - `greeting_path` varchar(255) default NULL -) TYPE=MyISAM; - --- --- Table structure for table `voicemail_settings` --- - -DROP TABLE IF EXISTS `voicemail_settings`; -CREATE TABLE `voicemail_settings` ( - `id` int(11) NOT NULL auto_increment, - `voicemail_id` int(11) default NULL, - `param_name` varchar(255) default NULL, - `param_value` varchar(255) default NULL, - PRIMARY KEY (`id`) -) TYPE=InnoDB AUTO_INCREMENT=31; -/*!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 */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2008-01-09 23:26:19 +-- MySQL dump 10.11 +-- +-- Host: localhost Database: freeswitch +-- ------------------------------------------------------ +-- Server version 5.0.32-Debian_7etch5-log +/*!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,MYSQL40' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Table structure for table `carrier_gateway` +-- + +DROP TABLE IF EXISTS `carrier_gateway`; +CREATE TABLE `carrier_gateway` ( + `id` int(11) NOT NULL auto_increment, + `carrier_id` int(11) default NULL, + `gateway` varchar(32) default NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `gateway` (`gateway`) +) TYPE=InnoDB; + +-- +-- Table structure for table `carriers` +-- + +DROP TABLE IF EXISTS `carriers`; +CREATE TABLE `carriers` ( + `id` int(11) NOT NULL auto_increment, + `Carrier_Name` varchar(255) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `conference_advertise` +-- + +DROP TABLE IF EXISTS `conference_advertise`; +CREATE TABLE `conference_advertise` ( + `id` int(10) unsigned NOT NULL auto_increment, + `room` varchar(64) NOT NULL, + `status` varchar(128) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unique_room` (`room`) +) TYPE=InnoDB; + +-- +-- Table structure for table `conference_controls` +-- + +DROP TABLE IF EXISTS `conference_controls`; +CREATE TABLE `conference_controls` ( + `id` int(10) unsigned NOT NULL auto_increment, + `conf_group` varchar(64) NOT NULL, + `action` varchar(64) NOT NULL, + `digits` varchar(16) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unique_group_action` (`conf_group`,`action`) +) TYPE=InnoDB; + +-- +-- Table structure for table `conference_profiles` +-- + +DROP TABLE IF EXISTS `conference_profiles`; +CREATE TABLE `conference_profiles` ( + `id` int(10) unsigned NOT NULL auto_increment, + `profile_name` varchar(64) NOT NULL, + `param_name` varchar(64) NOT NULL, + `param_value` varchar(64) NOT NULL, + PRIMARY KEY (`id`), + KEY `unique_profile_param` (`profile_name`,`param_name`) +) TYPE=InnoDB; + +-- +-- Table structure for table `db_data` +-- + +DROP TABLE IF EXISTS `db_data`; +CREATE TABLE `db_data` ( + `hostname` varchar(255) default NULL, + `realm` varchar(255) default NULL, + `data_key` varchar(255) default NULL, + `data` varchar(255) default NULL +) TYPE=InnoDB; + +-- +-- Table structure for table `dialplan` +-- + +DROP TABLE IF EXISTS `dialplan`; +CREATE TABLE `dialplan` ( + `id` int(11) NOT NULL auto_increment, + `context` varchar(64) NOT NULL, + `extension` varchar(64) NOT NULL, + `condition_field` varchar(64) NOT NULL, + `condition_expression` varchar(64) NOT NULL, + `application_name` varchar(64) NOT NULL, + `application_data` text, + `weight` int(11) NOT NULL, + `type` varchar(16) NOT NULL default 'action', + `ext_continue` smallint(1) NOT NULL default '0', + `global_weight` int(11) NOT NULL default '10000', + `cond_break` varchar(8) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `dingaling_profile_params` +-- + +DROP TABLE IF EXISTS `dingaling_profile_params`; +CREATE TABLE `dingaling_profile_params` ( + `id` int(10) unsigned NOT NULL auto_increment, + `dingaling_id` int(10) unsigned NOT NULL, + `param_name` varchar(64) NOT NULL, + `param_value` varchar(64) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unique_type_name` (`dingaling_id`,`param_name`), + CONSTRAINT `dingaling_profile` FOREIGN KEY (`dingaling_id`) REFERENCES `dingaling_profiles` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) TYPE=InnoDB; + +-- +-- Table structure for table `dingaling_profiles` +-- + +DROP TABLE IF EXISTS `dingaling_profiles`; +CREATE TABLE `dingaling_profiles` ( + `id` int(10) unsigned NOT NULL auto_increment, + `profile_name` varchar(64) NOT NULL, + `type` varchar(64) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unique_name` (`profile_name`) +) TYPE=InnoDB; + +-- +-- Table structure for table `dingaling_settings` +-- + +DROP TABLE IF EXISTS `dingaling_settings`; +CREATE TABLE `dingaling_settings` ( + `id` int(10) unsigned NOT NULL auto_increment, + `param_name` varchar(64) NOT NULL, + `param_value` varchar(64) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unique_param` (`param_name`) +) TYPE=InnoDB; + +-- +-- Table structure for table `directory` +-- + +DROP TABLE IF EXISTS `directory`; +CREATE TABLE `directory` ( + `id` int(11) NOT NULL auto_increment, + `username` varchar(255) NOT NULL, + `mailbox` varchar(255) NOT NULL, + `domain` varchar(255) NOT NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `directory_domains` +-- + +DROP TABLE IF EXISTS `directory_domains`; +CREATE TABLE `directory_domains` ( + `id` int(10) unsigned NOT NULL auto_increment, + `domain_name` varchar(128) NOT NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `directory_gateway_params` +-- + +DROP TABLE IF EXISTS `directory_gateway_params`; +CREATE TABLE `directory_gateway_params` ( + `id` int(10) unsigned NOT NULL auto_increment, + `d_gw_id` int(10) unsigned NOT NULL, + `param_name` varchar(64) NOT NULL, + `param_value` varchar(64) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unique_gw_param` (`d_gw_id`,`param_name`) +) TYPE=InnoDB; + +-- +-- Table structure for table `directory_gateways` +-- + +DROP TABLE IF EXISTS `directory_gateways`; +CREATE TABLE `directory_gateways` ( + `id` int(10) unsigned NOT NULL auto_increment, + `directory_id` int(10) unsigned NOT NULL, + `gateway_name` varchar(128) NOT NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `directory_global_params` +-- + +DROP TABLE IF EXISTS `directory_global_params`; +CREATE TABLE `directory_global_params` ( + `id` int(10) unsigned NOT NULL auto_increment, + `param_name` varchar(64) NOT NULL, + `param_value` varchar(128) NOT NULL, + `domain_id` int(10) unsigned NOT NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `directory_global_vars` +-- + +DROP TABLE IF EXISTS `directory_global_vars`; +CREATE TABLE `directory_global_vars` ( + `id` int(10) unsigned NOT NULL auto_increment, + `var_name` varchar(64) NOT NULL, + `var_value` varchar(128) NOT NULL, + `domain_id` int(10) unsigned NOT NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `directory_params` +-- + +DROP TABLE IF EXISTS `directory_params`; +CREATE TABLE `directory_params` ( + `id` int(11) NOT NULL auto_increment, + `directory_id` int(11) default NULL, + `param_name` varchar(255) default NULL, + `param_value` varchar(255) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `directory_vars` +-- + +DROP TABLE IF EXISTS `directory_vars`; +CREATE TABLE `directory_vars` ( + `id` int(11) NOT NULL auto_increment, + `directory_id` int(11) default NULL, + `var_name` varchar(255) default NULL, + `var_value` varchar(255) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `group_data` +-- + +DROP TABLE IF EXISTS `group_data`; +CREATE TABLE `group_data` ( + `hostname` varchar(255) default NULL, + `groupname` varchar(255) default NULL, + `url` varchar(255) default NULL +) TYPE=InnoDB; + +-- +-- Table structure for table `iax_conf` +-- + +DROP TABLE IF EXISTS `iax_conf`; +CREATE TABLE `iax_conf` ( + `id` int(11) NOT NULL auto_increment, + `profile_name` varchar(255) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `iax_settings` +-- + +DROP TABLE IF EXISTS `iax_settings`; +CREATE TABLE `iax_settings` ( + `id` int(11) NOT NULL auto_increment, + `iax_id` int(11) default NULL, + `param_name` varchar(255) default NULL, + `param_value` varchar(255) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `ivr_conf` +-- + +DROP TABLE IF EXISTS `ivr_conf`; +CREATE TABLE `ivr_conf` ( + `id` int(10) unsigned NOT NULL auto_increment, + `name` varchar(64) NOT NULL, + `greet_long` varchar(255) NOT NULL, + `greet_short` varchar(255) NOT NULL, + `invalid_sound` varchar(255) NOT NULL, + `exit_sound` varchar(255) NOT NULL, + `max_failures` int(10) unsigned NOT NULL default '3', + `timeout` int(11) NOT NULL default '5', + `tts_engine` varchar(64) default NULL, + `tts_voice` varchar(64) default NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unique_name` (`name`) +) TYPE=InnoDB; + +-- +-- Table structure for table `ivr_entries` +-- + +DROP TABLE IF EXISTS `ivr_entries`; +CREATE TABLE `ivr_entries` ( + `id` int(10) unsigned NOT NULL auto_increment, + `ivr_id` int(10) unsigned NOT NULL, + `action` varchar(64) NOT NULL, + `digits` varchar(16) NOT NULL, + `params` varchar(255) default NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unique_ivr_digits` (`ivr_id`,`digits`) +) TYPE=InnoDB; + +-- +-- Table structure for table `jabber_subscriptions` +-- + +DROP TABLE IF EXISTS `jabber_subscriptions`; +CREATE TABLE `jabber_subscriptions` ( + `sub_from` varchar(255) default NULL, + `sub_to` varchar(255) default NULL, + `show_pres` varchar(255) default NULL, + `status` varchar(255) default NULL +) TYPE=InnoDB; + +-- +-- Table structure for table `lcr` +-- + +DROP TABLE IF EXISTS `lcr`; +CREATE TABLE `lcr` ( + `id` int(11) NOT NULL auto_increment, + `digits` varchar(15) default NULL, + `rate` int(11) NOT NULL, + `carrier_id` int(11) NOT NULL, + `lead_strip` int(11) NOT NULL, + `trail_strip` int(11) NOT NULL, + `prefix` varchar(16) NOT NULL, + `suffix` varchar(16) NOT NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB AUTO_INCREMENT=6; + +-- +-- Table structure for table `limit_conf` +-- + +DROP TABLE IF EXISTS `limit_conf`; +CREATE TABLE `limit_conf` ( + `id` int(11) NOT NULL auto_increment, + `name` varchar(255) default NULL, + `value` varchar(255) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `limit_data` +-- + +DROP TABLE IF EXISTS `limit_data`; +CREATE TABLE `limit_data` ( + `hostname` varchar(255) default NULL, + `realm` varchar(255) default NULL, + `id` varchar(255) default NULL, + `uuid` varchar(255) default NULL +) TYPE=InnoDB; + +-- +-- Table structure for table `local_stream_conf` +-- + +DROP TABLE IF EXISTS `local_stream_conf`; +CREATE TABLE `local_stream_conf` ( + `id` int(11) NOT NULL auto_increment, + `directory_name` varchar(255) default NULL, + `directory_path` text, + `param_name` varchar(255) default NULL, + `param_value` varchar(255) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `post_load_modules_conf` +-- + +DROP TABLE IF EXISTS `post_load_modules_conf`; +CREATE TABLE `post_load_modules_conf` ( + `id` int(10) unsigned NOT NULL auto_increment, + `module_name` varchar(64) NOT NULL, + `load_module` tinyint(1) NOT NULL default '1', + `priority` int(10) unsigned NOT NULL default '1000', + PRIMARY KEY (`id`), + UNIQUE KEY `unique_mod` (`module_name`) +) TYPE=InnoDB; + +-- +-- Table structure for table `rss_conf` +-- + +DROP TABLE IF EXISTS `rss_conf`; +CREATE TABLE `rss_conf` ( + `id` int(11) NOT NULL auto_increment, + `directory_id` int(11) NOT NULL, + `feed` text NOT NULL, + `local_file` text NOT NULL, + `description` text, + `priority` int(11) NOT NULL default '1000', + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `sip_authentication` +-- + +DROP TABLE IF EXISTS `sip_authentication`; +CREATE TABLE `sip_authentication` ( + `nonce` varchar(255) default NULL, + `expires` int(8) default NULL +) TYPE=InnoDB; + +-- +-- Table structure for table `sip_dialogs` +-- + +DROP TABLE IF EXISTS `sip_dialogs`; +CREATE TABLE `sip_dialogs` ( + `call_id` varchar(255) default NULL, + `uuid` varchar(255) default NULL, + `sip_to_user` varchar(255) default NULL, + `sip_to_host` varchar(255) default NULL, + `sip_from_user` varchar(255) default NULL, + `sip_from_host` varchar(255) default NULL, + `contact_user` varchar(255) default NULL, + `contact_host` varchar(255) default NULL, + `state` varchar(255) default NULL, + `direction` varchar(255) default NULL, + `user_agent` varchar(255) default NULL +) TYPE=InnoDB; + +-- +-- Table structure for table `sip_registrations` +-- + +DROP TABLE IF EXISTS `sip_registrations`; +CREATE TABLE `sip_registrations` ( + `call_id` varchar(255) default NULL, + `sip_user` varchar(255) default NULL, + `sip_host` varchar(255) default NULL, + `contact` varchar(1024) default NULL, + `status` varchar(255) default NULL, + `rpid` varchar(255) default NULL, + `expires` int(11) default NULL, + `user_agent` varchar(255) default NULL +) TYPE=InnoDB; + +-- +-- Table structure for table `sip_subscriptions` +-- + +DROP TABLE IF EXISTS `sip_subscriptions`; +CREATE TABLE `sip_subscriptions` ( + `proto` varchar(255) default NULL, + `sip_user` varchar(255) default NULL, + `sip_host` varchar(255) default NULL, + `sub_to_user` varchar(255) default NULL, + `sub_to_host` varchar(255) default NULL, + `event` varchar(255) default NULL, + `contact` varchar(1024) default NULL, + `call_id` varchar(255) default NULL, + `full_from` varchar(255) default NULL, + `full_via` varchar(255) default NULL, + `expires` int(11) default NULL, + `user_agent` varchar(255) default NULL, + `accept` varchar(255) default NULL +) TYPE=InnoDB; + +-- +-- Table structure for table `sofia_aliases` +-- + +DROP TABLE IF EXISTS `sofia_aliases`; +CREATE TABLE `sofia_aliases` ( + `id` int(10) unsigned NOT NULL auto_increment, + `sofia_id` int(10) unsigned NOT NULL, + `alias_name` varchar(255) NOT NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `sofia_conf` +-- + +DROP TABLE IF EXISTS `sofia_conf`; +CREATE TABLE `sofia_conf` ( + `id` int(11) NOT NULL auto_increment, + `profile_name` varchar(255) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `sofia_domains` +-- + +DROP TABLE IF EXISTS `sofia_domains`; +CREATE TABLE `sofia_domains` ( + `id` int(11) NOT NULL auto_increment, + `sofia_id` int(11) default NULL, + `domain_name` varchar(255) default NULL, + `parse` tinyint(1) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `sofia_gateways` +-- + +DROP TABLE IF EXISTS `sofia_gateways`; +CREATE TABLE `sofia_gateways` ( + `id` int(11) NOT NULL auto_increment, + `sofia_id` int(11) default NULL, + `gateway_name` varchar(255) default NULL, + `gateway_param` varchar(255) default NULL, + `gateway_value` varchar(255) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `sofia_settings` +-- + +DROP TABLE IF EXISTS `sofia_settings`; +CREATE TABLE `sofia_settings` ( + `id` int(11) NOT NULL auto_increment, + `sofia_id` int(11) default NULL, + `param_name` varchar(255) default NULL, + `param_value` varchar(255) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `voicemail_conf` +-- + +DROP TABLE IF EXISTS `voicemail_conf`; +CREATE TABLE `voicemail_conf` ( + `id` int(10) unsigned NOT NULL auto_increment, + `vm_profile` varchar(64) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unique_profile` (`vm_profile`) +) TYPE=InnoDB; + +-- +-- Table structure for table `voicemail_data` +-- + +DROP TABLE IF EXISTS `voicemail_data`; +CREATE TABLE `voicemail_data` ( + `created_epoch` int(8) default NULL, + `read_epoch` int(8) default NULL, + `user` varchar(255) default NULL, + `domain` varchar(255) default NULL, + `uuid` varchar(255) default NULL, + `cid_name` varchar(255) default NULL, + `cid_number` varchar(255) default NULL, + `in_folder` varchar(255) default NULL, + `file_path` varchar(255) default NULL, + `flags` varchar(255) default NULL, + `read_flags` varchar(255) default NULL +) TYPE=InnoDB; + +-- +-- Table structure for table `voicemail_email` +-- + +DROP TABLE IF EXISTS `voicemail_email`; +CREATE TABLE `voicemail_email` ( + `id` int(10) unsigned NOT NULL auto_increment, + `voicemail_id` int(10) unsigned NOT NULL, + `param_name` varchar(64) NOT NULL, + `param_value` varchar(64) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unique_profile_param` (`param_name`,`voicemail_id`) +) TYPE=InnoDB; + +-- +-- Table structure for table `voicemail_prefs` +-- + +DROP TABLE IF EXISTS `voicemail_prefs`; +CREATE TABLE `voicemail_prefs` ( + `user` varchar(255) default NULL, + `domain` varchar(255) default NULL, + `name_path` varchar(255) default NULL, + `greeting_path` varchar(255) default NULL +) TYPE=InnoDB; + +-- +-- Table structure for table `voicemail_settings` +-- + +DROP TABLE IF EXISTS `voicemail_settings`; +CREATE TABLE `voicemail_settings` ( + `id` int(11) NOT NULL auto_increment, + `voicemail_id` int(11) default NULL, + `param_name` varchar(255) default NULL, + `param_value` varchar(255) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; +/*!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 */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2008-04-10 4:45:50 Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0-with-samples.sql ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0-with-samples.sql (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0-with-samples.sql Thu Apr 10 00:49:07 2008 @@ -103,9 +103,9 @@ `type` varchar(16) NOT NULL default 'action', `ext_continue` smallint(1) NOT NULL default '0', `global_weight` int(11) NOT NULL default '10000', - `condition_continue` varchar(8) default NULL, + `cond_break` varchar(8) default NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=385 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=385 DEFAULT CHARSET=utf8; -- -- Dumping data for table `dialplan` @@ -196,9 +196,10 @@ CREATE TABLE `directory` ( `id` int(11) NOT NULL auto_increment, `username` varchar(255) NOT NULL, + `mailbox` varchar(255) NOT NULL, `domain` varchar(255) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8; -- -- Dumping data for table `directory` @@ -206,7 +207,7 @@ LOCK TABLES `directory` WRITE; /*!40000 ALTER TABLE `directory` DISABLE KEYS */; -INSERT INTO `directory` VALUES (1,'1000','example.com'),(2,'1001','example.org'),(3,'1002','example.net'),(5,'1003','example.info'),(6,'1004','example.com'),(7,'1005','example.org'),(8,'1006','example.net'),(9,'1007','example.info'),(10,'1008','$${domain}'),(11,'1009','$${local_ip_v4}'); +INSERT INTO `directory` VALUES (1,'1000','','example.com'),(2,'1001','','example.org'),(3,'1002','','example.net'),(5,'1003','','example.info'),(6,'1004','','example.com'),(7,'1005','','example.org'),(8,'1006','','example.net'),(9,'1007','','example.info'),(10,'1008','','$${domain}'),(11,'1009','','$${local_ip_v4}'),(12,'tester','1000','$${domain}'); /*!40000 ALTER TABLE `directory` ENABLE KEYS */; UNLOCK TABLES; @@ -354,7 +355,7 @@ `var_name` varchar(255) default NULL, `var_value` varchar(255) default NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8; -- -- Dumping data for table `directory_vars` @@ -475,7 +476,7 @@ `name` varchar(255) default NULL, `value` varchar(255) default NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; -- -- Dumping data for table `limit_conf` @@ -496,7 +497,7 @@ `realm` varchar(255) default NULL, `id` varchar(255) default NULL, `uuid` varchar(255) default NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- -- Dumping data for table `limit_data` @@ -519,7 +520,7 @@ `param_name` varchar(255) default NULL, `param_value` varchar(255) default NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- -- Dumping data for table `local_stream_conf` @@ -567,7 +568,7 @@ `description` text, `priority` int(11) NOT NULL default '1000', PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=15 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8; -- -- Dumping data for table `rss_conf` Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0.sql ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0.sql (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0.sql Thu Apr 10 00:49:07 2008 @@ -66,7 +66,7 @@ `realm` varchar(255) default NULL, `data_key` varchar(255) default NULL, `data` varchar(255) default NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- -- Table structure for table `dialplan` @@ -85,11 +85,11 @@ `type` varchar(16) NOT NULL default 'action', `ext_continue` smallint(1) NOT NULL default '0', `global_weight` int(11) NOT NULL default '10000', - `condition_continue` varchar(8) default NULL, + `cond_break` varchar(8) default NULL, `app_cdata` tinyint(1) NOT NULL default '0', `re_cdata` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=386 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=386 DEFAULT CHARSET=utf8; -- -- Table structure for table `dingaling_profile_params` @@ -140,9 +140,10 @@ CREATE TABLE `directory` ( `id` int(11) NOT NULL auto_increment, `username` varchar(255) NOT NULL, + `mailbox` varchar(255) NOT NULL, `domain` varchar(255) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; -- -- Table structure for table `directory_gateway_params` @@ -194,7 +195,7 @@ `var_name` varchar(255) default NULL, `var_value` varchar(255) default NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8; -- -- Table structure for table `group_data` @@ -205,7 +206,7 @@ `hostname` varchar(255) default NULL, `groupname` varchar(255) default NULL, `url` varchar(255) default NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- -- Table structure for table `iax_conf` @@ -276,7 +277,7 @@ `sub_to` varchar(255) default NULL, `show_pres` varchar(255) default NULL, `status` varchar(255) default NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- -- Table structure for table `limit_conf` @@ -288,7 +289,7 @@ `name` varchar(255) default NULL, `value` varchar(255) default NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; -- -- Table structure for table `limit_data` @@ -300,7 +301,7 @@ `realm` varchar(255) default NULL, `id` varchar(255) default NULL, `uuid` varchar(255) default NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- -- Table structure for table `local_stream_conf` @@ -314,7 +315,7 @@ `param_name` varchar(255) default NULL, `param_value` varchar(255) default NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- -- Table structure for table `post_load_modules_conf` @@ -343,7 +344,7 @@ `description` text, `priority` int(11) NOT NULL default '1000', PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=15 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8; -- -- Table structure for table `sip_authentication` @@ -353,7 +354,7 @@ CREATE TABLE `sip_authentication` ( `nonce` varchar(255) default NULL, `expires` int(8) default NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- -- Table structure for table `sip_dialogs` @@ -503,7 +504,7 @@ `file_path` varchar(255) default NULL, `flags` varchar(255) default NULL, `read_flags` varchar(255) default NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- -- Table structure for table `voicemail_email` @@ -529,7 +530,7 @@ `domain` varchar(255) default NULL, `name_path` varchar(255) default NULL, `greeting_path` varchar(255) default NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- -- Table structure for table `voicemail_settings`

1 0

[commit] r8077 - in freeswitch/trunk: debian docs
by Freeswitch SVN 10 Apr '08

10 Apr '08

Author: anthm Date: Wed Apr 9 23:20:21 2008 New Revision: 8077 Modified: freeswitch/trunk/debian/changelog freeswitch/trunk/docs/ChangeLog Log: correct Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Wed Apr 9 23:20:21 2008 @@ -1,6 +1,5 @@ freeswitch (1.0~rc3-1) unstable; urgency=low - * Fix transport=tls tag incorrectly included in re-invite - Enhance xml menu system + * Enhance xml menu system fixes upstream from sofia-sip library Enhance mod_fifo added close method to ODBC spidermonkey class Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Wed Apr 9 23:20:21 2008 @@ -1,6 +1,5 @@ freeswitch (1.0.rc3) - Fix transport=tls tag incorrectly included in re-invite Enhance xml menu system Fixes upstream from sofia-sip library Enhance mod_fifo

1 0

[commit] r8074 - freeswitch/trunk/src/include
by Freeswitch SVN 10 Apr '08

10 Apr '08

Author: mikej Date: Wed Apr 9 22:28:17 2008 New Revision: 8074 Modified: freeswitch/trunk/src/include/switch_utils.h Log: missing file from last commit Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Wed Apr 9 22:28:17 2008 @@ -135,6 +135,7 @@ #define is_dtmf(key) ((key > 47 && key < 58) || (key > 64 && key < 69) || (key > 96 && key < 101) || key == 35 || key == 42 || key == 87 || key == 119) #define end_of(_s) *(_s + strlen(_s) - 1) +#define end_of_p(_s) (_s + strlen(_s) - 1) /*! \brief Test for the existance of a flag on an arbitary object \param obj the object to test

1 0

[commit] r8072 - freeswitch/trunk/src/mod/applications/mod_enum
by Freeswitch SVN 10 Apr '08

10 Apr '08

Author: anthm Date: Wed Apr 9 20:53:33 2008 New Revision: 8072 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: let enum do forked dial when 2 routes have the same weight Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Wed Apr 9 20:53:33 2008 @@ -609,6 +609,8 @@ switch_size_t l = 0, rbl = sizeof(rbuf); uint32_t cnt = 1; switch_channel_t *channel = switch_core_session_get_channel(session); + int last_order = -1, last_pref = -2; + char *last_delim = "|"; if (!(mydata = switch_core_session_strdup(session, data))) { return; @@ -633,9 +635,14 @@ for (rp = results; rp; rp = rp->next) { if (!strcasecmp(rtp->service, rp->service)) { switch_snprintf(vbuf, sizeof(vbuf), "enum_route_%d", cnt++); - switch_channel_set_variable(channel, vbuf, rp->route); - + switch_channel_set_variable(channel, vbuf, rp->route); + if (rp->preference == last_pref && rp->order == last_order) { + *last_delim = ','; + } switch_snprintf(rbp, rbl, "%s|", rp->route); + last_delim = end_of_p(rbp); + last_order = rp->order; + last_pref = rp->preference; l = strlen(rp->route) + 1; rbp += l; rbl -= l; @@ -652,6 +659,57 @@ } + +SWITCH_STANDARD_API(enum_api) +{ + int argc = 0; + char *argv[4] = { 0 }; + char *mydata = NULL; + char *dest = NULL, *root = NULL; + enum_record_t *results, *rp; + enum_route_t *rtp; + char rbuf[1024] = ""; + char *rbp = rbuf; + switch_size_t l = 0, rbl = sizeof(rbuf); + int last_order = -1, last_pref = -2; + char *last_delim = "|"; + + if (!(mydata = strdup(cmd))) { + abort(); + } + + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + dest = argv[0]; + root = argv[1]; + if (enum_lookup(root, dest, &results) == SWITCH_STATUS_SUCCESS) { + for (rtp = globals.route_order; rtp; rtp = rtp->next) { + for (rp = results; rp; rp = rp->next) { + if (!strcasecmp(rtp->service, rp->service)) { + if (rp->preference == last_pref && rp->order == last_order) { + *last_delim = ','; + } + switch_snprintf(rbp, rbl, "%s|", rp->route); + last_delim = end_of_p(rbp); + last_order = rp->order; + last_pref = rp->preference; + l = strlen(rp->route) + 1; + rbp += l; + rbl -= l; + } + } + } + *(rbuf + strlen(rbuf) - 1) = '\0'; + stream->write_function(stream, "%s", rbuf); + free_results(&results); + } + } + + switch_safe_free(mydata); + + return SWITCH_STATUS_SUCCESS; +} + + SWITCH_STANDARD_API(enum_function) { int argc = 0; @@ -728,6 +786,7 @@ /* 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, "enum", "ENUM", enum_function, ""); + SWITCH_ADD_API(api_interface, "enum_auto", "ENUM", enum_api, ""); SWITCH_ADD_APP(app_interface, "enum", "Perform an ENUM lookup", "Perform an ENUM lookup", enum_app_function, "<number> [<root>]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_DIALPLAN(dp_interface, "enum", enum_dialplan_hunt);

1 0

[commit] r8071 - freeswitch/trunk/debian
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: mikej Date: Wed Apr 9 18:58:01 2008 New Revision: 8071 Modified: freeswitch/trunk/debian/freeswitch.init Log: work on some debian-like platforms where /lib/init/vars/sh doesn't exist Modified: freeswitch/trunk/debian/freeswitch.init ============================================================================== --- freeswitch/trunk/debian/freeswitch.init (original) +++ freeswitch/trunk/debian/freeswitch.init Wed Apr 9 18:58:01 2008 @@ -51,7 +51,7 @@ # Define LSB log_* functions. # Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions +[ -x /lib/init/vars.sh ] && . /lib/lsb/init-functions # # Function that starts the daemon/service

1 0

[commit] r8070 - freeswitch/trunk/docs
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: anthm Date: Wed Apr 9 16:37:43 2008 New Revision: 8070 Modified: freeswitch/trunk/docs/ChangeLog Log: getting ready fro rc3 Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Wed Apr 9 16:37:43 2008 @@ -1,3 +1,13 @@ +freeswitch (1.0.rc3) + + Fix transport=tls tag incorrectly included in re-invite + Enhance xml menu system + Fixes upstream from sofia-sip library + Enhance mod_fifo + Added close method to ODBC spidermonkey class + Fix multiple bugs in the cpp wrapper used in mod_java and mod_python + Fix hung sip channel issue using respond app or on re-invite with bypass media after 1xx or 2xx responses + freeswitch (1.0.rc2) Fixed speex protocol negotiation issues (8k vs 16k)

1 0

[commit] r8069 - freeswitch/trunk/debian
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: mikej Date: Wed Apr 9 16:25:26 2008 New Revision: 8069 Modified: freeswitch/trunk/debian/changelog Log: getting ready for rc3 Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Wed Apr 9 16:25:26 2008 @@ -1,11 +1,22 @@ freeswitch (1.0~rc3-1) unstable; urgency=low + * Fix transport=tls tag incorrectly included in re-invite + Enhance xml menu system + fixes upstream from sofia-sip library + Enhance mod_fifo + added close method to ODBC spidermonkey class + Fix multiple bugs in the cpp wrapper used in mod_java and mod_python + Fix hung sip channel issue using respond app or on re-invite with bypass media after 1xx or 2xx responses + -- Michael Jerris <mike(a)jerris.com> Wed, 9 Apr 2008 12:58:22 -0400 + freeswitch (1.0~rc2-1) unstable; urgency=low * Fixed speex protocol negotiation issues (8k vs 16k) Fixed mod_iax race conditions Fixed ptime negotiation issues when re-packetizing Added ip based acl lists + -- Michael Jerris <mike(a)jerris.com> Wed, 9 Apr 2008 12:58:22 -0400 + freeswitch (1.0~rc1-1) unstable; urgency=low * loads of fixes new cdr-csv module

1 0

[commit] r8068 - freeswitch/trunk/debian
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: mikej Date: Wed Apr 9 15:54:49 2008 New Revision: 8068 Modified: freeswitch/trunk/debian/changelog Log: getting ready for rc3 Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Wed Apr 9 15:54:49 2008 @@ -1,3 +1,11 @@ +freeswitch (1.0~rc3-1) unstable; urgency=low + +freeswitch (1.0~rc2-1) unstable; urgency=low + * Fixed speex protocol negotiation issues (8k vs 16k) + Fixed mod_iax race conditions + Fixed ptime negotiation issues when re-packetizing + Added ip based acl lists + freeswitch (1.0~rc1-1) unstable; urgency=low * loads of fixes new cdr-csv module

1 0

[commit] r8067 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: mikej Date: Wed Apr 9 15:16:14 2008 New Revision: 8067 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix transport= tag on re-invite (FSCORE-113) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Apr 9 15:16:14 2008 @@ -2674,7 +2674,8 @@ transport_url = sip->sip_contact->m_url; } - transport = sofia_glue_url2transport(transport_url); + transport = sofia_glue_url2transport(transport_url); + tech_pvt->transport = transport; url_set_chanvars(session, sip->sip_to->a_url, sip_to); if (switch_channel_get_variable(channel, "sip_to_uri")) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Apr 9 15:16:14 2008 @@ -952,7 +952,7 @@ * Ignore transport chanvar and uri parameter for gateway connections * since all of them have been already taken care of in mod_sofia.c:sofia_outgoing_channel() */ - if (switch_strlen_zero(tech_pvt->gateway_name)) { + if (tech_pvt->transport == SOFIA_TRANSPORT_UNKNOWN && switch_strlen_zero(tech_pvt->gateway_name)) { if ((p = (char *)switch_stristr("port=", url))) { p += 5; tech_pvt->transport = sofia_glue_str2transport( p );

1 0

[commit] r8066 - freeswitch/trunk/src
by Freeswitch SVN 09 Apr '08

09 Apr '08

Author: mikej Date: Wed Apr 9 15:15:38 2008 New Revision: 8066 Modified: freeswitch/trunk/src/switch_ivr_menu.c Log: build tweak Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Wed Apr 9 15:15:38 2008 @@ -316,11 +316,11 @@ switch_ivr_phrase_macro(session, menu->confirm_macro, menu->buf, NULL, ap); - if (menu->confirm_key && switch_strlen_zero(buf)) { + if (menu->confirm_key && *buf == '\0') { switch_ivr_collect_digits_count(session, buf, sizeof(buf), 1, "#", &terminator_key, menu->timeout, 0, 0); } - if (menu->confirm_key && !switch_strlen_zero(buf)) { + if (menu->confirm_key && *buf != '\0') { if (*menu->confirm_key == *buf) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "approving digits '%s' via confirm key %s\n", menu->buf, menu->confirm_key);

1 0