- Freeswitch-trunk - FreeSWITCH Mailing Lists

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

08 Mar '09

Author: silik0n Date: Sun Mar 8 03:36:02 2009 New Revision: 12522 Log: dont specify the full URL and we will use the same HTTP server the flex was loaded from. This prevents running off the file system 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 Sun Mar 8 03:36:02 2009 @@ -62,7 +62,7 @@  <mx:RemoteObject id="freeswitch" destination="freeswitch" source="freeswitch" - endpoint="http://192.168.1.140/feeder/gateway.php" showBusyCursor="true"/> + endpoint="/feeder/gateway.php" showBusyCursor="true"/> <mx:TabNavigator width="100%" height="100%"> <mx:Canvas label="Channels" width="100%" height="100%" show="freeswitch.getChannels();">

1 0

[commit] r12521 - freeswitch/trunk/src
by FreeSWITCH SVN 08 Mar '09

08 Mar '09

Author: mrene Date: Sat Mar 7 23:43:51 2009 New Revision: 12521 Log: RLIMIT_RTPID isnt defined on OSX Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sat Mar 7 23:43:51 2009 @@ -809,7 +809,10 @@ setrlimit(RLIMIT_DATA, &rlp); setrlimit(RLIMIT_FSIZE, &rlp); setrlimit(RLIMIT_NPROC, &rlp); +#ifdef RLIMIT_RTPRIO setrlimit(RLIMIT_RTPRIO, &rlp); +#endif + #if !defined(__OpenBSD__) && !defined(__NetBSD__) setrlimit(RLIMIT_AS, &rlp); #endif

1 0

[commit] r12520 - freeswitch/trunk/scripts/contrib/swk
by FreeSWITCH SVN 08 Mar '09

08 Mar '09

Author: silik0n Date: Sat Mar 7 23:43:37 2009 New Revision: 12520 Log: Start A README File Added: freeswitch/trunk/scripts/contrib/swk/README Added: freeswitch/trunk/scripts/contrib/swk/README ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/README Sat Mar 7 23:43:37 2009 @@ -0,0 +1,3 @@ +for the Flex stuff you need the amf-php lib and the thing amf-php/freeswitch.php module + +more stuff coming in here soon

1 0

[commit] r12519 - in freeswitch/trunk/scripts/contrib/swk/flex/amf-test1: bin-debug src
by FreeSWITCH SVN 08 Mar '09

08 Mar '09

Author: silik0n Date: Sat Mar 7 23:39:39 2009 New Revision: 12519 Log: add working auto refreshing conference monitor, add originate form and make it work, add a few buttons for future use Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/playerProductInstall.swf (contents, props changed) freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/originateForm.mxml Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/playerProductInstall.swf ============================================================================== Binary file. No diff available. 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 7 23:39:39 2009 @@ -3,32 +3,60 @@ <mx:Script> <![CDATA[ + + import flash.utils.Timer; + import flash.events.TimerEvent; + import mx.controls.dataGridClasses.DataGridColumn; import mx.events.DataGridEvent; import mx.controls.Alert; import mx.rpc.events.FaultEvent; import mx.rpc.events.ResultEvent; import mx.collections.ArrayCollection; - - /** - * This function is called when an item was edited in the data grid. - * Calls the saveData() method on the PHP server - */ - /* - private function save(event:DataGridEvent):void { - var dataGrid:DataGrid = event.target as DataGrid; - var dsColumnIndex:Number = event.columnIndex; - var col:DataGridColumn = dataGrid.columns[dsColumnIndex]; - var newValue:String = dataGrid.itemEditorInstance[col.editorDataField]; - var dsFieldName:String = event.dataField; - var author:VOAuthor = event.itemRenderer.data as VOAuthor; - if (newValue == author[dsFieldName]) - return; - //get the new value for the first name or last name - author[dsFieldName] = newValue; - myRemote.saveData(author); + import mx.managers.PopUpManager; + import mx.core.IFlexDisplayObject; + private var confTimer:Timer; + + private function initConfTab():void{ + freeswitch.getConferenceList(); + freeswitch.getConferenceUsers(confPicker.selectedItem ); + confTimerLabel.text="Init..."; + confTimer = new Timer(10000, 0); + confTimer.addEventListener(TimerEvent.TIMER, onConfRefresh); + confTimer.start(); + confTimerLabel.text = confTimer.running.toString(); + } + + private function onConfRefresh(evt:TimerEvent):void { + confTimerLabel.text="Refreshing"; + freeswitch.getConferenceUsers(confPicker.selectedItem); + confTimerLabel.text="Refreshed"; + confTimerSecCount.text = confTimer.currentCount.toString(); + } + + private function confAutoRefreshControl():void { + if (confAutoRefreshCheckBox.selected) { + confTimer.start(); + confTimerLabel.text="running"; + confTimerLabel.text = confTimer.running.toString(); + confTimerSecCount.text = confTimer.currentCount.toString(); + } else { + confTimer.stop(); + confTimerLabel.text="stopped"; + confTimerLabel.text = confTimer.running.toString(); + confTimerSecCount.text = confTimer.currentCount.toString(); + } + } + + private function confTimerChangeTime():void { + confTimer.delay = confAutoRefreshTimeSlider.value * 1000; } - */ + + public function doOriginate():void { + var origWindow:IFlexDisplayObject = + PopUpManager.createPopUp(this, originateForm, false); + } + ]]> </mx:Script> @@ -36,12 +64,10 @@ <mx:RemoteObject id="freeswitch" destination="freeswitch" source="freeswitch" endpoint="http://192.168.1.140/feeder/gateway.php" showBusyCursor="true"/> - <mx:TabNavigator width="100%" height="100%"> - <mx:Canvas label="Channels" width="100%" height="100%"> + <mx:Canvas label="Channels" width="100%" height="100%" show="freeswitch.getChannels();"> <mx:VBox top="0" left="0" width="100%" height="100%"> - <mx:Button label="Get data" click="{freeswitch.getChannels()}" /> -  + <mx:Button label="Get data" click="freeswitch.getChannels();" /> <mx:DataGrid id="channelsGrid" dataProvider="{freeswitch.getChannels.lastResult}" width="100%" height="100%"> <mx:columns> <mx:DataGridColumn dataField="uuid" editable="false"/> @@ -55,11 +81,15 @@ </mx:DataGrid> </mx:VBox> </mx:Canvas> - <mx:Canvas label="Calls" width="100%" height="100%"> - <mx:VBox top="0" left="0" width="100%" height="100%"> - <mx:Button label="Get data" click="{freeswitch.getCalls()}" /> + <mx:Canvas label="Calls" width="100%" height="100%" show="freeswitch.getCalls();"> + + <mx:Button label="Refresh" click="freeswitch.getCalls();" /> + <mx:Button label="Originate" click="doOriginate();" x="79"/> + <mx:Button label="Kill UUID" click="{freeswitch.getCalls()}" x="166"/> + <mx:Button label="Status" click="{freeswitch.getCalls()}" x="251"/> + <mx:Button label="Status" click="{freeswitch.getCalls()}" x="322"/>  - <mx:DataGrid id="callsGrid" dataProvider="{freeswitch.getCalls.lastResult}" width="100%" height="100%"> + <mx:DataGrid id="callsGrid" dataProvider="{freeswitch.getCalls.lastResult}" top="30" bottom="0" left="0" right="0"> <mx:columns> <mx:DataGridColumn dataField="created"/> <mx:DataGridColumn dataField="caller_uuid"/> @@ -69,37 +99,42 @@ <mx:DataGridColumn dataField="caller_dest_num"/> </mx:columns> </mx:DataGrid> - </mx:VBox> + </mx:Canvas> - <mx:Canvas label="Conference" width="100%" height="100%"> - <mx:ComboBox id="confPicker" horizontalCenter="0" top="10" dataProvider="{freeswitch.getConferenceList.lastResult}"></mx:ComboBox> -  - <mx:DataGrid id="conferenceGrid" dataProvider="{freeswitch.getConferenceUsers.lastResult}" width="100%" top="43" bottom="115"> + <mx:Canvas label="Conference" width="100%" height="100%" show="initConfTab();"> + <mx:ComboBox id="confPicker" horizontalCenter="0" top="10" dataProvider="{freeswitch.getConferenceList.lastResult}" + change="{freeswitch.getConferenceUsers(confPicker.selectedItem)}"></mx:ComboBox> + <mx:DataGrid id="conferenceGrid" dataProvider="{freeswitch.getConferenceUsers.lastResult}" width="100%" top="43" bottom="145"> <mx:columns> - <mx:DataGridColumn headerText="id" dataField="0"/> - <mx:DataGridColumn headerText="clid_name" dataField="3"/> - <mx:DataGridColumn headerText="clid_num" dataField="4"/> - <mx:DataGridColumn headerText="flags" dataField="5"/> - <mx:DataGridColumn headerText="channel" dataField="1"/> - <mx:DataGridColumn headerText="uuid" dataField="2"/> - <mx:DataGridColumn headerText="volume" dataField="7"/> - <mx:DataGridColumn headerText="mic_gain" dataField="6"/> - <mx:DataGridColumn headerText="noise_floor" dataField="8"/> + <mx:DataGridColumn dataField="id"/> + <mx:DataGridColumn dataField="caller_name"/> + <mx:DataGridColumn dataField="caller_number" /> + <mx:DataGridColumn dataField="channel" /> + <mx:DataGridColumn dataField="uuid"/> + <mx:DataGridColumn dataField="volume"/> + <mx:DataGridColumn dataField="gain"/> + <mx:DataGridColumn dataField="noise"/> + <mx:DataGridColumn dataField="flags"/> </mx:columns> </mx:DataGrid> - <mx:Button label="Play File" click="{freeswitch.getConferenceList()}" horizontalCenter="-167" bottom="85"/> - <mx:Button label="Speak" click="{freeswitch.getConferenceUsers(confPicker.selectedItem)}" horizontalCenter="-90" bottom="85"/> - <mx:Button label="Kick" click="{freeswitch.getCalls()}" horizontalCenter="-13" bottom="85"/> - <mx:Button label="DTMF" click="{freeswitch.getCalls()}" horizontalCenter="74" bottom="85"/> - <mx:Button label="Transfer" click="{freeswitch.getCalls()}" horizontalCenter="165" bottom="85"/> - <mx:Button label="Mute" click="{freeswitch.getCalls()}" horizontalCenter="-177" bottom="55"/> - <mx:Button label="Unmute" click="{freeswitch.getCalls()}" horizontalCenter="-85" bottom="55"/> - <mx:Button label="Volume" click="{freeswitch.getCalls()}" horizontalCenter="-3" bottom="55"/> - <mx:Button label="Gain" click="{freeswitch.getCalls()}" horizontalCenter="71" bottom="55"/> - <mx:Button label="Dial" click="{freeswitch.getCalls()}" horizontalCenter="152" bottom="55"/> - <mx:Button label="Lock" click="{freeswitch.getCalls()}" horizontalCenter="-53" bottom="25"/> - <mx:Button label="Unlock" click="{freeswitch.getCalls()}" horizontalCenter="36" bottom="25"/> - + <mx:Button label="Play File" click="{freeswitch.getConferenceList()}" horizontalCenter="-138" bottom="85"/> + <mx:Button label="Speak" click="{freeswitch.getConferenceUsers(confPicker.selectedItem)}" horizontalCenter="-61" bottom="85"/> + <mx:Button label="Kick" horizontalCenter="2" bottom="85"/> + <mx:Button label="DTMF" click="{freeswitch.getCalls()}" horizontalCenter="64" bottom="85"/> + <mx:Button label="Transfer" click="{freeswitch.getCalls()}" horizontalCenter="137" bottom="85"/> + <mx:Button label="Mute" click="{freeswitch.getCalls()}" horizontalCenter="-136" bottom="55"/> + <mx:Button label="Unmute" click="{freeswitch.getCalls()}" horizontalCenter="-65" bottom="55"/> + <mx:Button label="Volume" click="{freeswitch.getCalls()}" horizontalCenter="13" bottom="55"/> + <mx:Button label="Gain" click="{freeswitch.getCalls()}" horizontalCenter="81" bottom="55"/> + <mx:Button label="Dial" click="{freeswitch.getCalls()}" horizontalCenter="138" bottom="55"/> + <mx:Button label="Lock" click="{freeswitch.getCalls()}" horizontalCenter="-36" bottom="25"/> + <mx:Button label="Unlock" click="{freeswitch.getCalls()}" horizontalCenter="30" bottom="25"/> + <mx:CheckBox id="confAutoRefreshCheckBox" label="AutoRefresh" right="204" top="10" selected="true" click="confAutoRefreshControl();"/> + <mx:HSlider id="confAutoRefreshTimeSlider" right="37" top="10" width="162" minimum="5" maximum="120" snapInterval="5" value="15"/> + <mx:Label id="confTimerLabel" text="STOPPED" right="339" top="12"/> + <mx:Label width="23" id="lblRefreshInterval" text="{confAutoRefreshTimeSlider.value.toString()}" right="10" top="12"/> + <mx:Label id="confTimerSecCount" text="Label" right="433" top="12"/> + <mx:TextInput bottom="115" width="406" horizontalCenter="-1"/> </mx:Canvas> </mx:TabNavigator> Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/originateForm.mxml ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/originateForm.mxml Sat Mar 7 23:39:39 2009 @@ -0,0 +1,47 @@ +<?xml version="1.0"?> +<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" creationComplete="doInit();" height="306" title="Originate"> + <mx:Script> + <![CDATA[ + import mx.managers.PopUpManager; + import mx.controls.Alert; + import mx.rpc.events.ResultEvent; + + private function doInit():void { + PopUpManager.centerPopUp(this); + } + + private function doCall():void { + parentApplication.freeswitch.originate(call_url.text, exten.text, dialplan.text, context.text, cid_name.text, cid_number.text, timeout.text); + PopUpManager.removePopUp(this); + } + ]]> + </mx:Script> + + <mx:Form width="100%"> + <mx:FormItem label="Call URL" width="100%"> + <mx:TextInput id="call_url" width="100%"/> + </mx:FormItem> + <mx:FormItem label="Extension" width="100%"> + <mx:TextInput id="exten" width="100%"/> + </mx:FormItem> + <mx:FormItem label="DialPlan" width="100%"> + <mx:TextInput id="dialplan" width="100%" text="XML"/> + </mx:FormItem> + <mx:FormItem label="Context" width="100%"> + <mx:TextInput id="context" width="100%" text="default"/> + </mx:FormItem> + <mx:FormItem label="CallerID Name" width="100%"> + <mx:TextInput id="cid_name" width="100%" text="FS_AMF_PHP"/> + </mx:FormItem> + <mx:FormItem label="CallerID Number" width="100%"> + <mx:TextInput id="cid_number" width="100%" text="default"/> + </mx:FormItem> + <mx:FormItem label="Timeout" width="100%"> + <mx:TextInput id="timeout" width="100%" text="30"/> + </mx:FormItem> + </mx:Form> + <mx:HBox horizontalAlign="center" width="314"> + <mx:Button click="doCall();" label="Place Call"/> + <mx:Button click="PopUpManager.removePopUp(this);" label="Cancel"/> + </mx:HBox> +</mx:TitleWindow> \ No newline at end of file

1 0

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

08 Mar '09

Author: silik0n Date: Sat Mar 7 23:37:10 2009 New Revision: 12518 Log: get rid of unused code Removed: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/com/

1 0

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

08 Mar '09

Author: silik0n Date: Sat Mar 7 23:36:39 2009 New Revision: 12517 Log: make the conference data more prettier and easier to use Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Sat Mar 7 23:36:39 2009 @@ -76,11 +76,31 @@ $y=0; foreach($data as $row){ if ($row!="" && substr($row, 0, 10) != "Conference"){ - $conf_data[$y] = explode(";", $row); + $temp_data = explode(";", $row); + $conf_data[$y]['id'] = $temp_data[0]; + $conf_data[$y]['channel'] = $temp_data[1]; + $conf_data[$y]['uuid'] = $temp_data[2]; + $conf_data[$y]['caller_name'] = $temp_data[3]; + $conf_data[$y]['caller_number'] = $temp_data[4]; + $conf_data[$y]['flags'] = $temp_data[5]; + $conf_data[$y]['gain'] = $temp_data[6]; + $conf_data[$y]['volume'] = $temp_data[7]; + $conf_data[$y]['noise'] = $temp_data[8]; + $conf_data[$y]['hear'] = 0; + $conf_data[$y]['speak'] = 0; + $conf_data[$y]['talk'] = 0; + $conf_data[$y]['video'] = 0; + $temp_flags = explode("|", $temp_data[5]); + foreach ($temp_flags as $flag){ + if ($flag == "hear") $conf_data[$y]['hear'] = 1; + if ($flag == "speak") $conf_data[$y]['speak'] = 1; + if ($flag == "talk") $conf_data[$y]['talk'] = 1; + if ($flag == "video") $conf_data[$y]['video'] = 1; + } + $y++; } } - return $conf_data; }

1 0

[commit] r12516 - freeswitch/trunk/debian
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: nicholas Date: Sat Mar 7 12:45:27 2009 New Revision: 12516 Log: openzap issue related in the issue FSBUILD-127 fixed Modified: freeswitch/trunk/debian/freeswitch.install Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Sat Mar 7 12:45:27 2009 @@ -32,12 +32,12 @@ opt/freeswitch/mod/mod_portaudio.so* opt/freeswitch/mod/mod_sofia.so* opt/freeswitch/mod/mod_openzap.so -opt/freeswitch/mod/ozmod_analog_em.so -opt/freeswitch/mod/ozmod_analog.so -opt/freeswitch/mod/ozmod_isdn.so +opt/freeswitch/mod/ozmod_analog_em.so* +opt/freeswitch/mod/ozmod_analog.so* +opt/freeswitch/mod/ozmod_isdn.so* opt/freeswitch/mod/ozmod_ss7_boost.so -opt/freeswitch/mod/ozmod_wanpipe.so -opt/freeswitch/mod/ozmod_zt.so +opt/freeswitch/mod/ozmod_wanpipe.so* +opt/freeswitch/mod/ozmod_zt.so* opt/freeswitch/mod/mod_event_*.so* opt/freeswitch/mod/mod_native_file.so* opt/freeswitch/mod/mod_sndfile.so* @@ -53,6 +53,7 @@ opt/freeswitch/conf/tetris.ttml opt/freeswitch/conf/fur_elise.ttml opt/freeswitch/conf/openzap.conf +opt/freeswitch/conf/wanpipe.conf opt/freeswitch/conf/dialplan/public.xml opt/freeswitch/conf/dialplan/default.xml opt/freeswitch/conf/dialplan/features.xml @@ -89,6 +90,7 @@ opt/freeswitch/conf/voicemail.tpl opt/freeswitch/conf/freeswitch.xml opt/freeswitch/conf/extensions.conf +opt/freeswitch/conf/autoload_configs/openzap.conf.xml opt/freeswitch/conf/autoload_configs/ivr.conf.xml opt/freeswitch/conf/autoload_configs/shout.conf.xml opt/freeswitch/conf/autoload_configs/voicemail.conf.xml

1 0

[commit] r12515 - in freeswitch/trunk/src: . include/private
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: anthm Date: Sat Mar 7 11:45:37 2009 New Revision: 12515 Log: separate throttle mutex from session hash mutex Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Sat Mar 7 11:45:37 2009 @@ -190,6 +190,7 @@ uint32_t flags; switch_time_t timestamp; switch_mutex_t *throttle_mutex; + switch_mutex_t *session_hash_mutex; switch_mutex_t *global_mutex; switch_mutex_t *global_var_mutex; uint32_t sps_total; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sat Mar 7 11:45:37 2009 @@ -1064,6 +1064,7 @@ switch_mutex_init(&runtime.throttle_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool); + switch_mutex_init(&runtime.session_hash_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool); switch_mutex_init(&runtime.global_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool); switch_mutex_init(&runtime.global_var_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool); switch_core_set_globals(); Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Sat Mar 7 11:45:37 2009 @@ -53,7 +53,7 @@ switch_core_session_t *session = NULL; if (uuid_str) { - switch_mutex_lock(runtime.throttle_mutex); + switch_mutex_lock(runtime.session_hash_mutex); if ((session = switch_core_hash_find(session_manager.session_table, uuid_str))) { /* Acquire a read lock on the session */ #ifdef SWITCH_DEBUG_RWLOCKS @@ -68,7 +68,7 @@ session = NULL; } } - switch_mutex_unlock(runtime.throttle_mutex); + switch_mutex_unlock(runtime.session_hash_mutex); } /* if its not NULL, now it's up to you to rwunlock this */ @@ -84,7 +84,7 @@ if (!var_val) return; - switch_mutex_lock(runtime.throttle_mutex); + switch_mutex_lock(runtime.session_hash_mutex); for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); if (val) { @@ -99,7 +99,7 @@ } } } - switch_mutex_unlock(runtime.throttle_mutex); + switch_mutex_unlock(runtime.session_hash_mutex); } SWITCH_DECLARE(void) switch_core_session_hupall_endpoint(const switch_endpoint_interface_t *endpoint_interface, switch_call_cause_t cause) @@ -108,7 +108,7 @@ void *val; switch_core_session_t *session; - switch_mutex_lock(runtime.throttle_mutex); + switch_mutex_lock(runtime.session_hash_mutex); for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); if (val) { @@ -121,7 +121,7 @@ } } } - switch_mutex_unlock(runtime.throttle_mutex); + switch_mutex_unlock(runtime.session_hash_mutex); } SWITCH_DECLARE(void) switch_core_session_hupall(switch_call_cause_t cause) @@ -132,7 +132,7 @@ uint32_t loops = 0; while (session_manager.session_count > 0) { - switch_mutex_lock(runtime.throttle_mutex); + switch_mutex_lock(runtime.session_hash_mutex); for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); if (val) { @@ -143,7 +143,7 @@ } } } - switch_mutex_unlock(runtime.throttle_mutex); + switch_mutex_unlock(runtime.session_hash_mutex); switch_yield(1000000); if (++loops == 30) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Giving up with %d session%s remaining\n", @@ -159,7 +159,7 @@ switch_core_session_t *session = NULL; switch_status_t status = SWITCH_STATUS_FALSE; - switch_mutex_lock(runtime.throttle_mutex); + switch_mutex_lock(runtime.session_hash_mutex); if ((session = switch_core_hash_find(session_manager.session_table, uuid_str)) != 0) { /* Acquire a read lock on the session or forget it the channel is dead */ if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { @@ -169,7 +169,7 @@ switch_core_session_rwunlock(session); } } - switch_mutex_unlock(runtime.throttle_mutex); + switch_mutex_unlock(runtime.session_hash_mutex); return status; } @@ -179,7 +179,7 @@ switch_core_session_t *session = NULL; switch_status_t status = SWITCH_STATUS_FALSE; - switch_mutex_lock(runtime.throttle_mutex); + switch_mutex_lock(runtime.session_hash_mutex); if ((session = switch_core_hash_find(session_manager.session_table, uuid_str)) != 0) { /* Acquire a read lock on the session or forget it the channel is dead */ if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { @@ -189,7 +189,7 @@ switch_core_session_rwunlock(session); } } - switch_mutex_unlock(runtime.throttle_mutex); + switch_mutex_unlock(runtime.session_hash_mutex); return status; } @@ -847,12 +847,12 @@ switch_scheduler_del_task_group((*session)->uuid_str); - switch_mutex_lock(runtime.throttle_mutex); + switch_mutex_lock(runtime.session_hash_mutex); switch_core_hash_delete(session_manager.session_table, (*session)->uuid_str); if (session_manager.session_count) { session_manager.session_count--; } - switch_mutex_unlock(runtime.throttle_mutex); + switch_mutex_unlock(runtime.session_hash_mutex); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DESTROY) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data((*session)->channel, event); @@ -1030,11 +1030,11 @@ switch_event_create(&event, SWITCH_EVENT_CHANNEL_UUID); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Old-Unique-ID", session->uuid_str); - switch_mutex_lock(runtime.throttle_mutex); + switch_mutex_lock(runtime.session_hash_mutex); switch_core_hash_delete(session_manager.session_table, session->uuid_str); switch_set_string(session->uuid_str, use_uuid); switch_core_hash_insert(session_manager.session_table, session->uuid_str, session); - switch_mutex_unlock(runtime.throttle_mutex); + switch_mutex_unlock(runtime.session_hash_mutex); switch_channel_event_set_data(session->channel, event); switch_event_fire(&event); @@ -1136,12 +1136,13 @@ switch_queue_create(&session->message_queue, SWITCH_MESSAGE_QUEUE_LEN, session->pool); switch_queue_create(&session->event_queue, SWITCH_EVENT_QUEUE_LEN, session->pool); switch_queue_create(&session->private_event_queue, SWITCH_EVENT_QUEUE_LEN, session->pool); - switch_mutex_lock(runtime.throttle_mutex); - session->id = session_manager.session_id++; + + switch_mutex_lock(runtime.session_hash_mutex); switch_core_hash_insert(session_manager.session_table, session->uuid_str, session); + session->id = session_manager.session_id++; session_manager.session_count++; - switch_mutex_unlock(runtime.throttle_mutex); - + switch_mutex_unlock(runtime.session_hash_mutex); + return session; }

1 0

[commit] r12514 - in freeswitch/trunk/libs/spandsp/src: . spandsp
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: mikej Date: Sat Mar 7 11:35:39 2009 New Revision: 12514 Log: update to snapshot spandsp-20090308 Modified: freeswitch/trunk/libs/spandsp/src/gsm0610_local.h freeswitch/trunk/libs/spandsp/src/spandsp/adsi.h freeswitch/trunk/libs/spandsp/src/spandsp/version.h Modified: freeswitch/trunk/libs/spandsp/src/gsm0610_local.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/gsm0610_local.h (original) +++ freeswitch/trunk/libs/spandsp/src/gsm0610_local.h Sat Mar 7 11:35:39 2009 @@ -25,7 +25,7 @@ * This code is based on the widely used GSM 06.10 code available from * http://kbs.cs.tu-berlin.de/~jutta/toast.html * - * $Id: gsm0610_local.h,v 1.13 2009/01/16 15:49:59 steveu Exp $ + * $Id: gsm0610_local.h,v 1.14 2009/03/07 16:47:30 steveu Exp $ */ #if !defined(_GSM0610_LOCAL_H_) @@ -216,8 +216,6 @@ #if defined(__GNUC__) && defined(__i386__) -void gsm0610_vec_vsraw(const int16_t *p, int n, int bits); - int32_t gsm0610_vec_iprod(const int16_t *p, const int16_t *q, int n); int32_t gsm0610_vec_maxmin(const int16_t *p, int n, int16_t *out); Modified: freeswitch/trunk/libs/spandsp/src/spandsp/adsi.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/adsi.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/adsi.h Sat Mar 7 11:35:39 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: adsi.h,v 1.36 2009/02/10 13:06:47 steveu Exp $ + * $Id: adsi.h,v 1.37 2009/03/04 12:15:15 steveu Exp $ */ /*! \file */ @@ -249,7 +249,7 @@ /*! Message waiting/not waiting */ #define MCLASS_VISUAL_INDICATOR 0x0B -/*! Definitions for CLIP (Calling Line Identity Presentation) */ +/*! Definitions for CLIP (Calling Line Identity Presentation) (from ETS 300 659-1) */ enum { /*! Multiple data message caller ID */ @@ -262,31 +262,37 @@ CLIP_MDMF_SMS = 0x89 }; -/*! CLIP message IDs */ +/*! CLIP message IDs (from ETS 300 659-1) */ enum { /*! Date and time (MMDDHHMM) */ CLIP_DATETIME = 0x01, - /*! Caller number */ + /*! Caller number (AKA calling line identity) */ CLIP_CALLER_NUMBER = 0x02, - /*! Dialed number */ + /*! Dialed number (AKA called line identity) */ CLIP_DIALED_NUMBER = 0x03, - /*! Caller number absent: 'O' or 'P' */ + /*! Caller number absent: 'O' or 'P' (AKA reason for absence of calling line identity) */ CLIP_ABSENCE1 = 0x04, - /*! Caller's name */ + /*! Caller's name (AKA calling party name) */ CLIP_CALLER_NAME = 0x07, - /*! Caller's name absent: 'O' or 'P' */ + /*! Caller's name absent: 'O' or 'P' (AKA reason for absence of calling party name) */ CLIP_ABSENCE2 = 0x08, /*! Visual indicator */ CLIP_VISUAL_INDICATOR = 0x0B, /*! Message ID */ CLIP_MESSAGE_ID = 0x0D, - /*! Voice call, ring-back-when-free call, or msg waiting call */ + /*! Complementary calling line identity */ + CLIP_COMPLEMENTARY_CALLER_NUMBER = 0x10, + /*! Call type - voice call (1), ring-back-when-free call (2), calling name delivery (3) or msg waiting call(0x81) */ CLIP_CALLTYPE = 0x11, /*! Number of messages */ CLIP_NUM_MSG = 0x13, + /*! Type of forwarded call */ + CLIP_TYPE_OF_FORWARDED_CALL = 0x15, + /*! Type of calling user */ + CLIP_TYPE_OF_CALLING_USER = 0x16, /*! Redirecting number */ - CLIP_REDIR_NUMBER = 0x03, + CLIP_REDIR_NUMBER = 0x1A, /*! Charge */ CLIP_CHARGE = 0x20, /*! Duration of the call */ Modified: freeswitch/trunk/libs/spandsp/src/spandsp/version.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/version.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/version.h Sat Mar 7 11:35:39 2009 @@ -30,9 +30,9 @@ /* The date and time of the version are in UTC form. */ -#define SPANDSP_RELEASE_DATE 20090301 -#define SPANDSP_RELEASE_TIME 125126 -#define SPANDSP_RELEASE_DATETIME_STRING "20090301 125126" +#define SPANDSP_RELEASE_DATE 20090307 +#define SPANDSP_RELEASE_TIME 165620 +#define SPANDSP_RELEASE_DATETIME_STRING "20090307 165620" #endif /*- End of file ------------------------------------------------------------*/

1 0

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

07 Mar '09

Author: anthm Date: Sat Mar 7 11:00:48 2009 New Revision: 12513 Log: fix include Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sat Mar 7 11:00:48 2009 @@ -36,7 +36,7 @@ /* Best viewed in a 160 x 60 VT100 Terminal or so the line below at least fits across your screen*/ /*************************************************************************************************************************************************************/ #include "mod_sofia.h" - +#include "sofia-sip/sip_extra.h" SWITCH_MODULE_LOAD_FUNCTION(mod_sofia_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sofia_shutdown); SWITCH_MODULE_DEFINITION(mod_sofia, mod_sofia_load, mod_sofia_shutdown, NULL);

1 0