March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

14 Mar '09

Author: silik0n Date: Sat Mar 14 05:39:08 2009 New Revision: 12600 Log: ok getting ready for domain user and group manager to feed the data into a DB then server up with xml_curl 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 Sat Mar 14 05:39:08 2009 @@ -126,18 +126,16 @@ </mx:DataGrid> <mx:Button label="Play File" click="freeswitch.confPlayfile(confPicker.selectedItem, comboConfPlayfile.selectedItem.data);;" horizontalCenter="-40" bottom="85"/> <mx:Button label="Speak" click="{freeswitch.getConferenceUsers(confPicker.selectedItem)}" horizontalCenter="221" bottom="25"/> - <mx:Button label="Refersh Confs" click="{freeswitch.getConferenceList()}" horizontalCenter="-276" bottom="115"/> - <mx:Button label="Refresh Conf Users" click="{freeswitch.getConferenceUsers(confPicker.selectedItem)}" horizontalCenter="-262" bottom="85"/> - <mx:Button label="Kick" click="{freeswitch.kickConferenceUser(confPicker.selectedItem, conferenceGrid.selectedItem.id)}" horizontalCenter="-155" bottom="85"/> + <mx:Button label="Refresh Confs" click="{freeswitch.getConferenceList()}" horizontalCenter="-276" bottom="115"/> + <mx:Button label="Refresh Users" click="{freeswitch.getConferenceUsers(confPicker.selectedItem)}" horizontalCenter="-162" bottom="115"/> + <mx:Button label="Kick" click="{freeswitch.kickConferenceUser(confPicker.selectedItem, conferenceGrid.selectedItem.id)}" horizontalCenter="-162" bottom="55"/> <mx:Button label="DTMF" click="{freeswitch.getCalls()}" horizontalCenter="98" bottom="25"/> <mx:Button label="Transfer" click="{freeswitch.getCalls()}" horizontalCenter="24" bottom="25"/> <mx:Button label="Mute" click="{freeswitch.confMute(confPicker.selectedItem, conferenceGrid.selectedItem.id)}" horizontalCenter="-303" bottom="55"/> - <mx:Button label="Unmute" click="{freeswitch.confUnmute(confPicker.selectedItem, conferenceGrid.selectedItem.id)}" horizontalCenter="-230" bottom="55"/> - <mx:Button label="Volume" click="{freeswitch.getCalls()}" horizontalCenter="-295" bottom="25"/> - <mx:Button label="Gain" click="{freeswitch.getCalls()}" horizontalCenter="-227" bottom="25"/> + <mx:Button label="Unmute" click="{freeswitch.confUnmute(confPicker.selectedItem, conferenceGrid.selectedItem.id)}" horizontalCenter="-232" bottom="55"/> <mx:Button label="Dial" click="{freeswitch.getCalls()}" horizontalCenter="158" bottom="25"/> - <mx:Button label="Lock" click="freeswitch.confLock(confPicker.selectedItem);" horizontalCenter="-156" bottom="55"/> - <mx:Button label="Unlock" click="freeswitch.confUnlock(confPicker.selectedItem);" horizontalCenter="-162" bottom="25"/> + <mx:Button label="Lock" click="freeswitch.confLock(confPicker.selectedItem);" horizontalCenter="-302" bottom="85"/> + <mx:Button label="Unlock" click="freeswitch.confUnlock(confPicker.selectedItem);" horizontalCenter="-236" bottom="85"/> <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"/> @@ -146,6 +144,71 @@ <mx:TextInput bottom="55" width="406" horizontalCenter="126"/> <mx:ComboBox id="comboConfPlayfile" width="324" horizontalCenter="167" bottom="85" labelField="label" dataProvider="{freeswitch.getConfPlayfiles.lastResult}" ></mx:ComboBox> </mx:Canvas> + <mx:Canvas label="Directory" width="100%" height="100%"> + <mx:TabNavigator x="0" y="0" width="100%" height="100%"> + <mx:Canvas label="Domains" width="100%" height="100%"> + <mx:HDividedBox x="0" y="0" width="100%" height="100%"> + <mx:Canvas width="20%" height="100%"> + <mx:DataGrid width="100%" horizontalCenter="0" top="0" bottom="40"> + <mx:columns> + <mx:DataGridColumn headerText="domain" dataField="name"/> + </mx:columns> + </mx:DataGrid> + <mx:Button label="Refresh Domains" horizontalCenter="0" bottom="10"/> + </mx:Canvas> + <mx:Canvas width="80%" height="100%"> + <mx:Form id="formDomain" x="0" y="0" width="100%" height="100%"> + </mx:Form> + </mx:Canvas> + </mx:HDividedBox> + </mx:Canvas> + <mx:Canvas label="Users" width="100%" height="100%"> + <mx:HDividedBox x="0" y="0" width="100%" height="100%"> + <mx:Canvas width="20%" height="100%"> + <mx:ComboBox top="10" horizontalCenter="0"></mx:ComboBox> + <mx:DataGrid width="100%" horizontalCenter="0" top="40" bottom="70"> + <mx:columns> + <mx:DataGridColumn headerText="User" dataField="user_id"/> + </mx:columns> + </mx:DataGrid> + <mx:Button label="Refresh Users" horizontalCenter="0" bottom="10"/> + <mx:Button label="Refresh Domains" horizontalCenter="0" bottom="40"/> + </mx:Canvas> + <mx:Canvas width="80%" height="100%"> + <mx:Form id="formUser" x="0" y="0" width="100%" height="100%"> + </mx:Form> + </mx:Canvas> + </mx:HDividedBox> + </mx:Canvas> + <mx:Canvas label="Groups" width="100%" height="100%"> + <mx:HDividedBox x="0" y="0" width="100%" height="100%"> + <mx:Canvas width="20%" height="100%"> + <mx:ComboBox top="10" horizontalCenter="0"></mx:ComboBox> + <mx:DataGrid width="100%" horizontalCenter="0" top="40" bottom="70"> + <mx:columns> + <mx:DataGridColumn headerText="Group" dataField="user_id"/> + </mx:columns> + </mx:DataGrid> + <mx:Button label="Refresh Groups" horizontalCenter="0" bottom="10"/> + <mx:Button label="Refresh Domains" horizontalCenter="0" bottom="40"/> + </mx:Canvas> + <mx:Canvas width="80%" height="100%"> + <mx:DataGrid width="45%" left="10" top="0" bottom="70"> + <mx:columns> + <mx:DataGridColumn headerText="Member" dataField="col1"/> + </mx:columns> + </mx:DataGrid> + <mx:DataGrid width="45%" right="10" top="0" bottom="70"> + <mx:columns> + <mx:DataGridColumn headerText="Available to Join" dataField="col1"/> + </mx:columns> + </mx:DataGrid> + <mx:Button x="10" y="572" label="Refresh"/> + </mx:Canvas> + </mx:HDividedBox> + </mx:Canvas> + </mx:TabNavigator> + </mx:Canvas> </mx:TabNavigator> </mx:Application> \ No newline at end of file

1 0

[commit] r12599 - in freeswitch/trunk/scripts/contrib/swk: . flex/amf-test1/bin-debug
by FreeSWITCH SVN 14 Mar '09

14 Mar '09

Author: silik0n Date: Sat Mar 14 03:13:56 2009 New Revision: 12599 Log: lets add a little instructions and a working swf for those that want to test. Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/main.swf (contents, props changed) Modified: freeswitch/trunk/scripts/contrib/swk/README Modified: freeswitch/trunk/scripts/contrib/swk/README ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/README (original) +++ freeswitch/trunk/scripts/contrib/swk/README Sat Mar 14 03:13:56 2009 @@ -1,3 +1,30 @@ -for the Flex stuff you need the amf-php lib and the thing amf-php/freeswitch.php module +This Software is licensed under the MPL. + +REQUIREMENTS: + +To Use: +Flash9 or Flash10 +PHP 5 +AMFPHP http://www.amfphp.org/ +FreeSWITCH ESL PHP Extensions +And of course a WebServer + +To Develop: +All of the Above +Adobe Flex Development Environment. (This is available from Adobe's website in both paid and free formats.) + + +To Install: + +Install AMFPHP as per http://www.amfphp.org/docs/installingamfphp.html +Rename the 'amfphp' directory to feeder. This is done to avoid robot scanners, bu I am sure that eventually they'll start looking for that. + +copy the freeswitch.php file into the AMFPHP services directory. + +make the files in amf-test1/bin-debug available on your webserver and point a browser at it. + +If you are developing in flex you need to load the swf from your development webserver so that it can properly locate the service. + +Any questions, feel free to find me as SwK via IRC at #freeswitch on irc.freenode.net + -more stuff coming in here soon Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/main.swf ============================================================================== Binary file. No diff available.

1 0

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

14 Mar '09

Author: silik0n Date: Sat Mar 14 02:49:07 2009 New Revision: 12598 Log: get the Conf monitor/controller mostly working, can now playback soundfiles, (un)lock, (un)mute, and kick members 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 Sat Mar 14 02:49:07 2009 @@ -7,25 +7,26 @@ 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; - import mx.managers.PopUpManager; - import mx.core.IFlexDisplayObject; - private var confTimer:Timer; + 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; + import mx.managers.PopUpManager; + import mx.core.IFlexDisplayObject; + private var confTimer:Timer; private function initConfTab():void{ + freeswitch.getConfPlayfiles(null); 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(); - } + 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"; @@ -60,8 +61,6 @@ var origWindow:IFlexDisplayObject = PopUpManager.createPopUp(this, statusForm, false); } - - ]]> </mx:Script> @@ -125,24 +124,27 @@ <mx:DataGridColumn dataField="flags"/> </mx:columns> </mx:DataGrid> - <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:Button label="Play File" click="freeswitch.confPlayfile(confPicker.selectedItem, comboConfPlayfile.selectedItem.data);;" horizontalCenter="-40" bottom="85"/> + <mx:Button label="Speak" click="{freeswitch.getConferenceUsers(confPicker.selectedItem)}" horizontalCenter="221" bottom="25"/> + <mx:Button label="Refersh Confs" click="{freeswitch.getConferenceList()}" horizontalCenter="-276" bottom="115"/> + <mx:Button label="Refresh Conf Users" click="{freeswitch.getConferenceUsers(confPicker.selectedItem)}" horizontalCenter="-262" bottom="85"/> + <mx:Button label="Kick" click="{freeswitch.kickConferenceUser(confPicker.selectedItem, conferenceGrid.selectedItem.id)}" horizontalCenter="-155" bottom="85"/> + <mx:Button label="DTMF" click="{freeswitch.getCalls()}" horizontalCenter="98" bottom="25"/> + <mx:Button label="Transfer" click="{freeswitch.getCalls()}" horizontalCenter="24" bottom="25"/> + <mx:Button label="Mute" click="{freeswitch.confMute(confPicker.selectedItem, conferenceGrid.selectedItem.id)}" horizontalCenter="-303" bottom="55"/> + <mx:Button label="Unmute" click="{freeswitch.confUnmute(confPicker.selectedItem, conferenceGrid.selectedItem.id)}" horizontalCenter="-230" bottom="55"/> + <mx:Button label="Volume" click="{freeswitch.getCalls()}" horizontalCenter="-295" bottom="25"/> + <mx:Button label="Gain" click="{freeswitch.getCalls()}" horizontalCenter="-227" bottom="25"/> + <mx:Button label="Dial" click="{freeswitch.getCalls()}" horizontalCenter="158" bottom="25"/> + <mx:Button label="Lock" click="freeswitch.confLock(confPicker.selectedItem);" horizontalCenter="-156" bottom="55"/> + <mx:Button label="Unlock" click="freeswitch.confUnlock(confPicker.selectedItem);" horizontalCenter="-162" 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:TextInput bottom="55" width="406" horizontalCenter="126"/> + <mx:ComboBox id="comboConfPlayfile" width="324" horizontalCenter="167" bottom="85" labelField="label" dataProvider="{freeswitch.getConfPlayfiles.lastResult}" ></mx:ComboBox> </mx:Canvas> </mx:TabNavigator>

1 0

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

14 Mar '09

Author: silik0n Date: Sat Mar 14 02:47:11 2009 New Revision: 12597 Log: get the Conf monitor/controller mostly working, can now playback soundfiles, (un)lock, (un)mute, and kick members 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 14 02:47:11 2009 @@ -51,57 +51,11 @@ return $body; } - public function getConferenceList() { - $e = $this->esl->sendRecv("api conference list"); + public function killUuid($uuid) { + $e = $this->esl->sendRecv("api uuid_kill $uuid"); $body = $e->getBody(); - $data=explode("\n", $body); - $y=0; - foreach($data as $row){ - if(substr($row, 0, 10)=="Conference"){ - $temp_data = explode(" ", $row); - $conf_data[$y] = $temp_data[1]; - $y++; - } - } - - return $conf_data; - } - - public function getConferenceUsers($conference_name) { - $e = $this->esl->sendRecv("api conference $conference_name list"); - $body = $e->getBody(); - - $data=explode("\n", $body); - $y=0; - foreach($data as $row){ - if ($row!="" && substr($row, 0, 10) != "Conference"){ - $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; + return $body; } public function getChannels() { @@ -161,8 +115,131 @@ $e = $this->esl->sendRecv($dialstring); $body = $e->getBody(); - return $dialstring . "\n" . $body; + return $body; + } + + public function kickConferenceUser($conference, $member) { + $e = $this->esl->sendRecv("api conference $conference kick $member"); + $body = $e->getBody(); + return $body; + } + + public function getConferenceList() { + $e = $this->esl->sendRecv("api conference list"); + $body = $e->getBody(); + + $data=explode("\n", $body); + $y=0; + foreach($data as $row){ + if(substr($row, 0, 10)=="Conference"){ + $temp_data = explode(" ", $row); + $conf_data[$y] = $temp_data[1]; + $y++; + } + } + return $conf_data; + } + + public function getConferenceUsers($conference_name) { + $e = $this->esl->sendRecv("api conference $conference_name list"); + $body = $e->getBody(); + + $data=explode("\n", $body); + $y=0; + foreach($data as $row){ + if ($row!="" && substr($row, 0, 10) != "Conference"){ + $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; + $conf_data[$y]['floor'] = 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; + if ($flag == "floor") $conf_data[$y]['floor'] = 1; + } + $y++; + } + } + return $conf_data; + } + + public function getConfPlayfiles($list_dir) { + if($list_dir != "") { + $templist = glob($list_dir); + } else { + $templist = glob("/usr/local/freeswitch/sounds/en/us/callie/*/*/*"); + } + + $x=0; + foreach($templist as $file){ + $temp_file = explode("/", $file); + $filelist[$x]['label'] = $temp_file[count($temp_file)-1]; + $filelist[$x]['data'] = $file; + // $filelist[$x] = $file; + $x++; + } + + return $filelist; + } + + public function confPlayfile($conference, $file_path){ + $playfile = "api conference $conference play " . $file_path['data']; + $e = $this->esl->sendRecv($playfile); + $body = $e->getBody(); + return $body; + } + + public function confLock($conference){ + $playfile = "api conference $conference lock"; + $e = $this->esl->sendRecv($playfile); + $body = $e->getBody(); + return $body; + } + + public function confUnlock($conference){ + $playfile = "api conference $conference unlock"; + $e = $this->esl->sendRecv($playfile); + $body = $e->getBody(); + return $body; + } + + public function confMute($conference, $member){ + $playfile = "api conference $conference mute $member"; + $e = $this->esl->sendRecv($playfile); + $body = $e->getBody(); + return $body; + } + + public function confUnmute($conference, $member){ + $playfile = "api conference $conference unmute $member"; + $e = $this->esl->sendRecv($playfile); + $body = $e->getBody(); + return $body; } } +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ ?>

1 0

[commit] r12596 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 13 Mar '09

13 Mar '09

Author: brian Date: Fri Mar 13 17:31:25 2009 New Revision: 12596 Log: sigh Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Mar 13 17:31:25 2009 @@ -193,11 +193,9 @@ </extension>  <extension name="Local_Extension"> <condition field="destination_number" expression="^(10[01][0-9])$">

1 0

[commit] r12595 - freeswitch/trunk/src
by FreeSWITCH SVN 13 Mar '09

13 Mar '09

Author: anthm Date: Fri Mar 13 17:01:39 2009 New Revision: 12595 Log: avoiding sillyness Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Mar 13 17:01:39 2009 @@ -320,6 +320,19 @@ continue; } } + + if (!ans_a && !ans_b) { + switch_channel_t *un = ans_a ? chan_b : chan_a; + + if (switch_channel_answer(un) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(un)); + goto end_of_bridge_loop; + } + + if (ans_a) ans_b++; else ans_a++; + } + + #ifndef SWITCH_VIDEO_IN_THREADS if (switch_channel_test_flag(chan_a, CF_VIDEO) && switch_channel_test_flag(chan_b, CF_VIDEO)) { /* read video from 1 channel and write it to the other */

1 0

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

13 Mar '09

Author: andrew Date: Fri Mar 13 14:55:55 2009 New Revision: 12594 Log: Unlock the session like we should be doing Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Fri Mar 13 14:55:55 2009 @@ -584,6 +584,9 @@ ei_x_encode_atom(rbuf, "error"); ei_x_encode_atom(rbuf, "badsession"); } + /* release the lock returned by switch_core_locate_session */ + switch_core_session_rwunlock(session); + } else { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error");

1 0

[commit] r12593 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 13 Mar '09

13 Mar '09

Author: anthm Date: Fri Mar 13 14:18:05 2009 New Revision: 12593 Log: pad buffer Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_oop.cpp (original) +++ freeswitch/trunk/libs/esl/src/esl_oop.cpp Fri Mar 13 14:18:05 2009 @@ -63,7 +63,7 @@ return NULL; } - len = strlen(cmd) + (arg ? strlen(arg) : 0) + 5; + len = strlen(cmd) + (arg ? strlen(arg) : 0) + 10; cmd_buf = (char *) malloc(len); assert(cmd_buf); @@ -92,7 +92,7 @@ return NULL; } - len = strlen(cmd) + (arg ? strlen(arg) : 0) + 8; + len = strlen(cmd) + (arg ? strlen(arg) : 0) + 10; cmd_buf = (char *) malloc(len); assert(cmd_buf);

1 0

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

13 Mar '09

Author: andrew Date: Fri Mar 13 12:33:17 2009 New Revision: 12592 Log: Make handlecall return more correct errors; sync freeswitch.erl with git version Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl Fri Mar 13 12:33:17 2009 @@ -14,13 +14,13 @@ -module(freeswitch). --export([send/2, api/3, bgapi/3, event/2, +-export([send/2, api/3, api/2, bgapi/3, bgapi/4, event/2, nixevent/2, noevents/1, close/1, get_event_header/2, get_event_body/1, get_event_name/1, getpid/1, sendmsg/3, - sendevent/3, handlecall/2, start_fetch_handler/4, + sendevent/3, handlecall/2, handlecall/3, start_fetch_handler/4, start_log_handler/3, start_event_handler/3]). --define(TIMEOUT, 10000). +-define(TIMEOUT, 5000). %% @doc Return the value for a specific header in an event or `{error,notfound}'. get_event_header([], _Needle) -> @@ -63,11 +63,18 @@ api(Node, Cmd, Args) -> {api, Node} ! {api, Cmd, Args}, receive - X -> X + {ok, X} -> + {ok, X}; + {error, X} -> + {error, X} after ?TIMEOUT -> timeout end. +%% @doc Same as @link{api/3} except there's no additional arguments. +api(Node, Cmd) -> + api(Node, Cmd, ""). + %% @doc Make a backgrounded API call to FreeSWITCH. The asynchronous reply is %% sent to calling process after it is received. This function %% returns the result of the initial bgapi call or `timeout' if FreeSWITCH fails @@ -104,11 +111,48 @@ {api, X} -> X end. +%% @doc Make a backgrounded API call to FreeSWITCH. The asynchronous reply is +%% passed as the argument to `Fun' after it is received. This function +%% returns the result of the initial bgapi call or `timeout' if FreeSWITCH fails +%% to respond. +bgapi(Node, Cmd, Args, Fun) -> + Self = self(), + % spawn a new process so that both responses go here instead of directly to + % the calling process. + spawn(fun() -> + {bgapi, Node} ! {bgapi, Cmd, Args}, + receive + {error, Reason} -> + % send the error condition to the calling process + Self ! {api, {error, Reason}}; + {ok, JobID} -> + % send the reply to the calling process + Self ! {api, ok}, + receive % wait for the job's reply + {bgok, JobID, Reply} -> + % Call the function with the reply + Fun(ok, Reply); + {bgerror, JobID, Reply} -> + Fun(error, Reply) + end + after ?TIMEOUT -> + % send a timeout to the calling process + Self ! {api, timeout} + end + end), + + % get the initial result of the command, NOT the asynchronous response, and + % return it + receive + {api, X} -> X + end. + %% @doc Request to receive any events in the list `List'. event(Node, Events) when is_list(Events) -> {event, Node} ! list_to_tuple(lists:append([event], Events)), receive - X -> X + ok -> ok; + {error, Reason} -> {error, Reason} after ?TIMEOUT -> timeout end; @@ -130,7 +174,8 @@ noevents(Node) -> {noevents, Node} ! noevents, receive - X -> X + ok -> ok; + {error, Reason} -> {error, Reason} after ?TIMEOUT -> timeout end. @@ -139,7 +184,7 @@ close(Node) -> {close, Node} ! exit, receive - X -> X + ok -> ok after ?TIMEOUT -> timeout end. @@ -150,7 +195,8 @@ sendevent(Node, EventName, Headers) -> {sendevent, Node} ! {sendevent, EventName, Headers}, receive - X -> X + ok -> ok; + {error, Reason} -> {error, Reason} after ?TIMEOUT -> timeout end. @@ -160,7 +206,8 @@ sendmsg(Node, UUID, Headers) -> {sendmsg, Node} ! {sendmsg, UUID, Headers}, receive - X -> X + ok -> ok; + {error, Reason} -> {error, Reason} after ?TIMEOUT -> timeout end. @@ -171,17 +218,29 @@ getpid(Node) -> {getpid, Node} ! getpid, receive - X -> X + {ok, Pid} when is_pid(Pid) -> {ok, Pid} after ?TIMEOUT -> timeout end. %% @doc Request that FreeSWITCH send any events pertaining to call `UUID' to %% `Process' where process is a registered process name. -handlecall(Node, Process) -> - {handlecall, Node} ! {handlecall, Process}, +handlecall(Node, UUID, Process) -> + {handlecall, Node} ! {handlecall, UUID, Process}, receive - X -> X + ok -> ok; + {error, Reason} -> {error, Reason} + after ?TIMEOUT -> + timeout + end. + +%% @doc Request that FreeSWITCH send any events pertaining to call `UUID' to +%% the calling process. +handlecall(Node, UUID) -> + {handlecall, Node} ! {handlecall, UUID}, + receive + ok -> ok; + {error, Reason} -> {error, Reason} after ?TIMEOUT -> timeout end. Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Fri Mar 13 12:33:17 2009 @@ -568,11 +568,17 @@ ei_x_encode_atom(rbuf, "badarg"); } else { switch_core_session_t *session; - if (!switch_strlen_zero_buf(uuid_str) && (session = switch_core_session_locate(uuid_str))) { - /* create a new session list element and attach it to this listener */ - if ((arity==2 && attach_call_to_pid(listener, &msg->from, session)) || - (arity==3 && attach_call_to_registered_process(listener, reg_name, session))) { - ei_x_encode_atom(rbuf, "ok"); + if (!switch_strlen_zero_buf(uuid_str) && SWITCH_UUID_FORMATTED_LENGTH == strlen(uuid_str)) { + if ((session = switch_core_session_locate(uuid_str))) { + /* create a new session list element and attach it to this listener */ + if ((arity==2 && attach_call_to_pid(listener, &msg->from, session)) || + (arity==3 && attach_call_to_registered_process(listener, reg_name, session))) { + ei_x_encode_atom(rbuf, "ok"); + } else { + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "session_attach_failed"); + } } else { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error");

1 0

[commit] r12591 - freeswitch/trunk/src
by FreeSWITCH SVN 13 Mar '09

13 Mar '09

Author: mrene Date: Fri Mar 13 10:13:18 2009 New Revision: 12591 Log: tweak Modified: freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Fri Mar 13 10:13:18 2009 @@ -143,6 +143,8 @@ switch_bool_t changed = SWITCH_FALSE; switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function; + switch_assert(item->ptr); + if (value) { matched_count++; } @@ -236,7 +238,7 @@ /* We have a preallocated buffer */ char *dest = (char*)item->ptr; - if (!dest || strncasecmp(dest, newstring, string_options->length)) { + if (strncasecmp(dest, newstring, string_options->length)) { switch_copy_string(dest, newstring, string_options->length); changed = SWITCH_TRUE; }

1 0