- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12666 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 19 Mar '09

19 Mar '09

Author: mrene Date: Wed Mar 18 23:11:51 2009 New Revision: 12666 Log: Add Menu-Name param to ivr menu xml_locate function Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Wed Mar 18 23:11:51 2009 @@ -1156,18 +1156,20 @@ { switch_channel_t *channel = switch_core_session_get_channel(session); switch_event_t *params; + const char *name = (const char*)data; if (channel) { switch_xml_t cxml = NULL, cfg = NULL, xml_menus = NULL, xml_menu = NULL; /* Open the config from the xml registry */ switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Menu-Name", name); switch_assert(params); switch_channel_event_set_data(channel, params); if ((cxml = switch_xml_open_cfg(ivr_cf_name, &cfg, params)) != NULL) { if ((xml_menus = switch_xml_child(cfg, "menus"))) { - xml_menu = switch_xml_find_child(xml_menus, "menu", "name", (char *) data); + xml_menu = switch_xml_find_child(xml_menus, "menu", "name", name); /* if the menu was found */ if (xml_menu != NULL) { @@ -1182,7 +1184,7 @@ && switch_ivr_menu_stack_xml_build(xml_ctx, &menu_stack, xml_menus, xml_menu) == SWITCH_STATUS_SUCCESS) { switch_xml_free(cxml); cxml = NULL; - switch_ivr_menu_execute(session, menu_stack, (char *) data, NULL); + switch_ivr_menu_execute(session, menu_stack, (char*)name, NULL); switch_ivr_menu_stack_free(menu_stack); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to create menu\n");

1 0

[commit] r12665 - freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src
by FreeSWITCH SVN 19 Mar '09

19 Mar '09

Author: silik0n Date: Wed Mar 18 21:34:55 2009 New Revision: 12665 Log: unscrew a couple of events hitting the wrong methods, fix non-working refresh buttons Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml 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 Wed Mar 18 21:34:55 2009 @@ -4,6 +4,7 @@ <mx:Script> <![CDATA[ + import mx.events.DragEvent; import flash.utils.Timer; import flash.events.TimerEvent; @@ -127,7 +128,7 @@ public function dgChangeDomainUserVars(event:DataGridEvent):void { var _rowIndex:Number=event.rowIndex; var _columnIndex:Number= event.columnIndex; - freeswitch.updateDirDomainUserParam(dgDomainUserVars.selectedItem.uid, dgDomainUserVars.selectedItem.name, TextInput(event.currentTarget.itemEditorInstance).text); + freeswitch.updateDirDomainUserVars(dgDomainUserVars.selectedItem.uid, dgDomainUserVars.selectedItem.name, TextInput(event.currentTarget.itemEditorInstance).text); freeswitch.getDirUser(dgDomainUsers.selectedItem.uid); } @@ -149,6 +150,11 @@ Alert.show('You must have a domain Selected', 'Invalid Domain', mx.controls.Alert.OK); } } + + public function nonMemberDrop(event:DragEvent):void { + Alert.show('Dropped UID?', '-' + '-' +'-', mx.controls.Alert.OK); + } + ]]> </mx:Script> @@ -286,7 +292,7 @@ <mx:DataGridColumn headerText="Data" dataField="value"/> </mx:columns> </mx:DataGrid> - <mx:Button label="Refresh Domain" right="10" top="10" height="22"/> + <mx:Button label="Refresh Domain" right="10" top="10" height="22" click="freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid);"/> <mx:Button label="Add Parameter" left="139" bottom="10" click="addDomainParam()"/> <mx:Button label="Add Variable" bottom="10" right="183" width="99" click="addDomainVar()"/> <mx:Label text="Parameter" bottom="60" left="10"/> @@ -338,7 +344,7 @@ <mx:DataGridColumn headerText="Data" dataField="value"/> </mx:columns> </mx:DataGrid> - <mx:Button label="Refresh User" right="10" top="8" height="22"/> + <mx:Button label="Refresh User" right="10" top="8" height="22" click="freeswitch.getDirUser(dgDomainUsers.selectedItem.uid)"/> <mx:Button label="Add Parameter" left="139" bottom="10" click="addDomainUserParam()"/> <mx:Button label="Delete Param" bottom="10" left="26" click="dgDeleteDomainUserParam();"/> <mx:Button label="Add Variable" bottom="10" right="183" width="99" click="addDomainUserVar()"/> @@ -368,21 +374,21 @@ <mx:Button label="Refresh Domains" horizontalCenter="0" bottom="10" click="freeswitch.getDirDomains()"/> </mx:Canvas> <mx:Canvas width="80%" height="100%"> - <mx:DataGrid width="45%" left="10" top="38" bottom="70" dataProvider="{freeswitch.getDirGroup.lastResult.members}" + <mx:DataGrid id="dgGroupMembers" width="45%" left="10" top="38" bottom="70" dataProvider="{freeswitch.getDirGroup.lastResult.members}" dragEnabled="true" dragMoveEnabled="true" dropEnabled="true"> <mx:columns> <mx:DataGridColumn headerText="Member" dataField="usersUsername"/> </mx:columns> </mx:DataGrid> - <mx:DataGrid width="45%" right="10" top="38" bottom="70" dataProvider="{freeswitch.getDirGroup.lastResult.nonmembers}" - dragEnabled="true" dragMoveEnabled="true" dropEnabled="true"> + <mx:DataGrid id="dgGroupNonMembers" width="45%" right="10" top="38" bottom="70" dataProvider="{freeswitch.getDirGroup.lastResult.nonmembers}" + dragEnabled="true" dragMoveEnabled="true" dropEnabled="true" dragDrop="nonMemberDrop(event);"> <mx:columns> <mx:DataGridColumn headerText="Available to Join" dataField="usersUsername"/> </mx:columns> </mx:DataGrid> <mx:Button label="Refresh" click="freeswitch.getDirGroup(dgDirGroups.selectedItem.uid)" right="10" width="71" top="10" height="22"/> - <mx:Label text="New Group" bottom="42" left="10" width="63"/> - <mx:TextInput bottom="40" id="textNewGroup" left="81" width="256"/> + <mx:Label text="New Group" bottom="42" left="10" width="81"/> + <mx:TextInput bottom="40" id="textNewGroup" left="99" width="256"/> <mx:Button label="Create Group" bottom="10" click="doGroupAdd();" left="81" width="101"/> <mx:Label text="UID:" top="10" left="10"/> <mx:Label text="{dgDirGroups.selectedItem.uid}" id="groupUID" top="10" left="49"/>

1 0

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

19 Mar '09

Author: silik0n Date: Wed Mar 18 21:31:03 2009 New Revision: 12664 Log: consistancy 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 Wed Mar 18 21:31:03 2009 @@ -243,13 +243,13 @@ DROP TABLE IF EXISTS `users`; CREATE TABLE `users` ( `uid` int(11) NOT NULL auto_increment, - `domain_uid` int(11) NOT NULL, + `domains_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`) + KEY `domain_uid` (`domains_uid`,`username`,`mailbox`) ) ENGINE=MyISAM AUTO_INCREMENT=21 DEFAULT CHARSET=latin1; --

1 0

[commit] r12663 - freeswitch/trunk/scripts/contrib/swk/php/xml_curl
by FreeSWITCH SVN 19 Mar '09

19 Mar '09

Author: silik0n Date: Wed Mar 18 20:55:58 2009 New Revision: 12663 Log: fix user groups Modified: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php Modified: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php Wed Mar 18 20:55:58 2009 @@ -142,6 +142,13 @@ return $results; } + public function getDirGroupsByDomianUidByUserUid($domain_uid, $user_uid){ + $query = sprintf("select a.uid as groupUid, a.name as groupName, b.uid as usersUid from groups as a, group_members as b where a.uid = b.groups_uid and b.domains_uid = %s and b.users_uid = %s", $domain_uid, $user_uid) ; + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results; + } + } /* For Emacs: * Local Variables: Modified: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php Wed Mar 18 20:55:58 2009 @@ -19,6 +19,7 @@ $key_value="192.168.1.140"; $user="1000"; */ + if ($section == "directory" && $tag_name == "domain" && $key_name == "name") { $db_domain = $fsd->getDirDomainbyName($key_value); } else { @@ -31,7 +32,7 @@ $db_user_settings = $fsd->getDirUser($db_user['uid']); -$db_groups = $fsd->getDirGroups($db_domain['uid']); +$db_groups = $fsd->getDirGroupsByDomianUidByUserUid($db_domain['uid'], $db_user['uid']); printf(" <?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"); printf(" <document type=\"freeswitch/xml\">\n"); @@ -54,18 +55,14 @@ printf(" </user>\n"); printf(" </users>\n"); printf(" </group>\n"); -/* This is Broken need to talk to someone about this part... maybe I should load this at boot time instead foreach($db_groups as $db_group){ - $db_members = $fsd->getDirGroup($db_group['uid']); - printf(" <group name=\"%s\">\n", $db_group['name']); + printf(" <group name=\"%s\">\n", $db_group['groupName']); printf(" <users>\n"); - foreach($db_members['members'] as $db_member){ - printf(" <user id=\"%s\" type=\"pointer\"/>\n", $db_member['usersUsername']); - } + printf(" <user id=\"%s\" type=\"pointer\"/>\n", $user); printf(" </users>\n"); printf(" </group>\n"); } -*/ + printf(" </groups>\n"); printf(" </domain>\n"); printf(" </section>\n");

1 0

[commit] r12662 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Mar '09

19 Mar '09

Author: brian Date: Wed Mar 18 20:06:21 2009 New Revision: 12662 Log: bracketless if's are not allowed doh Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 18 20:06:21 2009 @@ -624,10 +624,11 @@ SWITCH_DECLARE(void) switch_rtp_set_max_missed_packets(switch_rtp_t *rtp_session, uint32_t max) { - if (rtp_session->missed_count >= max) + if (rtp_session->missed_count >= max) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, - "new max missed packets(%d->%d) greater than current missed packets(%d). RTP will timeout.\n", - rtp_session->missed_count, max, rtp_session->missed_count); + "new max missed packets(%d->%d) greater than current missed packets(%d). RTP will timeout.\n", + rtp_session->missed_count, max, rtp_session->missed_count); + } rtp_session->max_missed_packets = max; }

1 0

[commit] r12661 - freeswitch/trunk/scripts/contrib/swk/php/esl_cdr
by FreeSWITCH SVN 18 Mar '09

18 Mar '09

Author: silik0n Date: Wed Mar 18 18:39:48 2009 New Revision: 12661 Log: mysql schema for this script Added: freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.mysql.sql Added: freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.mysql.sql ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.mysql.sql Wed Mar 18 18:39:48 2009 @@ -0,0 +1,33 @@ +CREATE TABLE IF NOT EXISTS `cdr` ( + `uuid` varchar(100) NOT NULL, + `acctcode` varchar(100) NOT NULL, + `ani` varchar(100) NOT NULL, + `e164_ani` varchar(100) NOT NULL, + `dnis` varchar(100) NOT NULL, + `e164_dnis` varchar(100) NOT NULL, + `translated_dnis` varchar(100) NOT NULL, + `src_host` varchar(100) NOT NULL, + `read_codec` varchar(100) NOT NULL, + `write_codec` varchar(100) NOT NULL, + `clid_name` varchar(100) NOT NULL, + `clid_number` varchar(100) NOT NULL, + `src_sdp` varchar(100) NOT NULL, + `dest_sdp` varchar(100) NOT NULL, + `originate_disposition` varchar(100) NOT NULL, + `bridge_to_uuid` varchar(100) NOT NULL, + `endpoint_disposition` varchar(100) NOT NULL, + `sip_hangup_disposition` varchar(100) NOT NULL, + `term_cause` varchar(100) NOT NULL, + `hangup_cause` varchar(100) NOT NULL, + `start_stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `answer_stamp` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `progress_media_stamp` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `end_stamp` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `duration` int(11) NOT NULL, + `billsec` int(11) NOT NULL, + `progress_mediasec` int(11) NOT NULL, + `billmin` varchar(100) NOT NULL, + `carrier_id` varchar(100) NOT NULL, + `cust_cost` varchar(100) NOT NULL, + `carrier_cost` varchar(100) NOT NULL +)

1 0

[commit] r12660 - freeswitch/trunk/src
by FreeSWITCH SVN 18 Mar '09

18 Mar '09

Author: brian Date: Wed Mar 18 15:36:30 2009 New Revision: 12660 Log: FSRTP-1 Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 18 15:36:30 2009 @@ -624,6 +624,11 @@ SWITCH_DECLARE(void) switch_rtp_set_max_missed_packets(switch_rtp_t *rtp_session, uint32_t max) { + if (rtp_session->missed_count >= max) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "new max missed packets(%d->%d) greater than current missed packets(%d). RTP will timeout.\n", + rtp_session->missed_count, max, rtp_session->missed_count); + rtp_session->max_missed_packets = max; }

1 0

[commit] r12659 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 18 Mar '09

18 Mar '09

Author: brian Date: Wed Mar 18 14:17:31 2009 New Revision: 12659 Log: add undocumented features to the config file example someone wiki this please Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Wed Mar 18 14:17:31 2009 @@ -124,6 +124,10 @@   +  +  +  +

1 0

[commit] r12658 - in freeswitch/trunk: conf/autoload_configs src/mod/languages/mod_python
by FreeSWITCH SVN 18 Mar '09

18 Mar '09

Author: brian Date: Wed Mar 18 13:56:36 2009 New Revision: 12658 Log: MODLANG-105 Modified: freeswitch/trunk/conf/autoload_configs/python.conf.xml freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Modified: freeswitch/trunk/conf/autoload_configs/python.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/python.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/python.conf.xml Wed Mar 18 13:56:36 2009 @@ -4,13 +4,13 @@   -  -  +  +  </settings> </configuration> Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Wed Mar 18 13:56:36 2009 @@ -388,6 +388,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Python Framework Loading...\n"); + globals.pool = pool; + if (!Py_IsInitialized()) { // initialize python system @@ -408,7 +410,6 @@ PyEval_ReleaseLock(); } - globals.pool = pool; do_config(); /* connect my internal structure to the blank pointer passed to me */

1 0

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

18 Mar '09

Author: brian Date: Wed Mar 18 13:54:16 2009 New Revision: 12657 Log: MODENDP-201 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Wed Mar 18 13:54:16 2009 @@ -1737,7 +1737,7 @@ nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_delta + SUB_OVERLAP, exp_delta + SUB_OVERLAP); } - nua_respond(nh, SIP_202_ACCEPTED, SIPTAG_CONTACT_STR(contact_str), NUTAG_WITH_THIS(nua), + nua_respond(nh, SIP_202_ACCEPTED, SIPTAG_CONTACT_STR(contactstr), NUTAG_WITH_THIS(nua), SIPTAG_SUBSCRIPTION_STATE_STR(sstr), SIPTAG_EXPIRES_STR(exp_delta_str), TAG_IF(sticky, NUTAG_PROXY(sticky)), TAG_END());

1 0