March 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12641 - in freeswitch/trunk: libs/libdingaling/src src/mod/endpoints/mod_dingaling
by FreeSWITCH SVN 17 Mar '09

17 Mar '09

Author: anthm Date: Tue Mar 17 10:24:47 2009 New Revision: 12641 Log: MODENDP-198 MODENDP-199 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Tue Mar 17 10:24:47 2009 @@ -389,6 +389,7 @@ if (!strcasecmp(type, "initiate") || !strcasecmp(type, "accept")) { dl_signal = LDL_SIGNAL_INITIATE; + if (!strcasecmp(type, "accept")) { msg = "accept"; } @@ -1432,10 +1433,10 @@ ldl_set_flag_locked(handle, LDL_FLAG_QUEUE_RUNNING); - while (ldl_test_flag((&globals), LDL_FLAG_READY) && ldl_test_flag(handle, LDL_FLAG_RUNNING)) { + while (ldl_test_flag(handle, LDL_FLAG_RUNNING)) { ldl_flush_queue(handle, 0); - if (handle->loop_callback(handle) != LDL_STATUS_SUCCESS) { + if (handle->loop_callback(handle) != LDL_STATUS_SUCCESS || !ldl_test_flag((&globals), LDL_FLAG_READY)) { int fd; if ((fd = iks_fd(handle->parser)) > -1) { @@ -1470,6 +1471,7 @@ while (ldl_test_flag((&globals), LDL_FLAG_READY) && ldl_test_flag(handle, LDL_FLAG_RUNNING)) { int e; char tmp[512], *sl; + int fd; handle->parser = iks_stream_new(ldl_test_flag(handle, LDL_FLAG_COMPONENT) ? IKS_NS_COMPONENT : IKS_NS_CLIENT, handle, @@ -1570,6 +1572,10 @@ ldl_clear_flag_locked(handle, LDL_FLAG_CONNECTED); ldl_clear_flag_locked(handle, LDL_FLAG_AUTHORIZED); handle->state = CS_NEW; + + if ((fd = iks_fd(handle->parser)) > -1) { + shutdown(fd, 0x02); + } while(ldl_test_flag(handle, LDL_FLAG_QUEUE_RUNNING)) { microsleep(100); @@ -2224,7 +2230,7 @@ int8_t ldl_handle_ready(ldl_handle_t *handle) { - return (int8_t)ldl_test_flag(handle, LDL_FLAG_READY); + return (int8_t) (ldl_test_flag(handle, LDL_FLAG_READY) && ldl_test_flag((&globals), LDL_FLAG_READY)); } ldl_status ldl_handle_init(ldl_handle_t **handle, Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Mar 17 10:24:47 2009 @@ -873,11 +873,16 @@ tech_pvt->local_port, tech_pvt->remote_ip, tech_pvt->remote_port); flags = SWITCH_RTP_FLAG_DATAWAIT | SWITCH_RTP_FLAG_GOOGLEHACK | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_RAW_WRITE | SWITCH_RTP_FLAG_AUTO_CNG; + if (switch_test_flag(tech_pvt->profile, TFLAG_TIMER)) { flags |= SWITCH_RTP_FLAG_USE_TIMER; } + if (switch_true(switch_channel_get_variable(channel, "disable_rtp_auto_adjust"))) { + flags &= ~SWITCH_RTP_FLAG_AUTOADJ; + } + if (!(tech_pvt->rtp_session = switch_rtp_new(tech_pvt->profile->ip, tech_pvt->local_port, tech_pvt->remote_ip, @@ -1131,7 +1136,9 @@ if (!do_candidates(tech_pvt, 0)) { goto out; } - switch_channel_answer(channel); + if (switch_test_flag(tech_pvt, TFLAG_TRANSPORT_ACCEPT)) { + switch_channel_answer(channel); + } } ret = SWITCH_STATUS_SUCCESS; @@ -2549,7 +2556,7 @@ status = LDL_STATUS_FALSE; goto done; } - + } else { if (dl_signal != LDL_SIGNAL_INITIATE && !msg) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session is already dead\n"); @@ -2746,6 +2753,7 @@ if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { if (!strcasecmp(msg, "accept")) { switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); + switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); if (!do_candidates(tech_pvt, 0)) { terminate_session(&session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); status = LDL_STATUS_FALSE; @@ -2909,7 +2917,7 @@ } if (!strcasecmp(subject, "candidates")) { - switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); + //switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); }

1 0

[commit] r12640 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 17 Mar '09

17 Mar '09

Author: mrene Date: Tue Mar 17 08:25:02 2009 New Revision: 12640 Log: Fix a bunch of const (-Wcast-qual checking start) Modified: freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/switch_apr.c freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Tue Mar 17 08:25:02 2009 @@ -124,7 +124,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_create_subclass_detailed(const char *file, const char *func, int line, switch_event_t **event, switch_event_types_t event_id, const char *subclass_name); -#define switch_event_create_subclass(_e, _eid, _sn) switch_event_create_subclass_detailed(__FILE__, (char * )__SWITCH_FUNC__, __LINE__, _e, _eid, _sn) +#define switch_event_create_subclass(_e, _eid, _sn) switch_event_create_subclass_detailed(__FILE__, (const char * )__SWITCH_FUNC__, __LINE__, _e, _eid, _sn) /*! \brief Set the priority of an event @@ -202,7 +202,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_fire_detailed(const char *file, const char *func, int line, switch_event_t **event, void *user_data); SWITCH_DECLARE(void) switch_event_prep_for_delivery_detailed(const char *file, const char *func, int line, switch_event_t *event); -#define switch_event_prep_for_delivery(_event) switch_event_prep_for_delivery_detailed(__FILE__, (char * )__SWITCH_FUNC__, __LINE__, _event) +#define switch_event_prep_for_delivery(_event) switch_event_prep_for_delivery_detailed(__FILE__, (const char * )__SWITCH_FUNC__, __LINE__, _event) /*! @@ -310,7 +310,7 @@ _In_z_ const char *alt_event_type, _In_ int event_count, _In_z_ const char *unique_id, _In_z_ const char *channel_state, _In_z_ const char *answer_state, _In_z_ const char *call_direction); -#define switch_event_create_pres_in(event) switch_event_create_pres_in_detailed(__FILE__, (char * )__SWITCH_FUNC__, __LINE__, \ +#define switch_event_create_pres_in(event) switch_event_create_pres_in_detailed(__FILE__, (const char * )__SWITCH_FUNC__, __LINE__, \ proto, login, from, from_domain, status, event_type, alt_event_type, event_count, \ unique_id, channel_state, answer_state, call_direction) @@ -345,7 +345,7 @@ \return SWITCH_STATUS_SUCCESS if the operation was successful \note the body supplied by this function will supersede an existing body the event may have */ -#define switch_event_fire(event) switch_event_fire_detailed(__FILE__, (char * )__SWITCH_FUNC__, __LINE__, event, NULL) +#define switch_event_fire(event) switch_event_fire_detailed(__FILE__, (const char * )__SWITCH_FUNC__, __LINE__, event, NULL) /*! \brief Fire an event filling in most of the arguements with obvious values and allowing user_data to be sent @@ -354,7 +354,7 @@ \return SWITCH_STATUS_SUCCESS if the operation was successful \note the body supplied by this function will supersede an existing body the event may have */ -#define switch_event_fire_data(event, data) switch_event_fire_detailed(__FILE__, (char * )__SWITCH_FUNC__, __LINE__, event, data) +#define switch_event_fire_data(event, data) switch_event_fire_detailed(__FILE__, (const char * )__SWITCH_FUNC__, __LINE__, event, data) SWITCH_DECLARE(char *) switch_event_build_param_string(switch_event_t *event, const char *prefix, switch_hash_t *vars_map); Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Tue Mar 17 08:25:02 2009 @@ -786,7 +786,7 @@ SWITCH_DECLARE(switch_status_t) switch_pollset_add(switch_pollset_t *pollset, const switch_pollfd_t *descriptor) { - return apr_pollset_add((apr_pollset_t *)pollset, (apr_pollfd_t *)descriptor); + return apr_pollset_add((apr_pollset_t *)pollset, (const apr_pollfd_t *)descriptor); } SWITCH_DECLARE(switch_status_t) switch_poll(switch_pollfd_t *aprset, int32_t numsock, int32_t *nsds, switch_interval_time_t timeout) Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Mar 17 08:25:02 2009 @@ -489,7 +489,7 @@ switch_assert(channel != NULL); switch_mutex_lock(channel->profile_mutex); - if (!channel->variables || !(v = switch_event_get_header(channel->variables, (char *) varname))) { + if (!channel->variables || !(v = switch_event_get_header(channel->variables, varname))) { switch_caller_profile_t *cp = channel->caller_profile; if (cp) { @@ -969,7 +969,7 @@ switch_channel_clear_flag(channel, CF_TAGGED); if (channel->state >= CS_ROUTING && channel->state <= CS_HANGUP) { - switch_channel_presence(channel, "unknown", (char *) state_names[state], NULL); + switch_channel_presence(channel, "unknown", (const char *) state_names[state], NULL); } if (state < CS_HANGUP) { @@ -978,10 +978,8 @@ if (state == CS_ROUTING) { switch_channel_event_set_data(channel, event); } else { - char state_num[25]; - switch_snprintf(state_num, sizeof(state_num), "%d", state); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-State", (char *) switch_channel_state_name(state)); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-State-Number", (char *) state_num); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-State", switch_channel_state_name(state)); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State-Number", "%d", state); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Name", channel->name); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Unique-ID", switch_core_session_get_uuid(channel->session)); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Call-Direction",

1 0

[commit] r12639 - in freeswitch/trunk/scripts/contrib/swk: flex/amf-test1/bin-debug flex/amf-test1/bin-debug/assets flex/amf-test1/bin-debug/assets/icons flex/amf-test1/bin-debug/assets/images flex/amf-test1/bin-debug/assets/xml flex/amf-test1/bin-debug/images flex/amf-test1/bin-debug/map flex/amf-test1/src php/amfphp
by FreeSWITCH SVN 17 Mar '09

17 Mar '09

Author: silik0n Date: Tue Mar 17 06:13:30 2009 New Revision: 12639 Log: Ok Have at it boys... the UI is working, you can add/delete/modify Domains and Users, groups still needs work, and we need a script to feed that Data into something that xml_curl can handle as well as example configs... this is coming soon Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/icons/ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/icons/ai.jpg (contents, props changed) freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/icons/air.jpg (contents, props changed) freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/icons/fl.jpg (contents, props changed) freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/icons/fw.jpg (contents, props changed) freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/icons/fx.jpg (contents, props changed) freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/icons/ps.jpg (contents, props changed) freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/images/ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/images/tab.png (contents, props changed) freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/images/tab_selected.png (contents, props changed) freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/xml/ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/xml/listData.xml freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/images/ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/map/ Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/main.swf freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/newGroupForm.mxml freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/newUserForm.mxml freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/icons/ai.jpg ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/icons/air.jpg ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/icons/fl.jpg ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/icons/fw.jpg ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/icons/fx.jpg ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/icons/ps.jpg ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/images/tab.png ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/images/tab_selected.png ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/xml/listData.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/assets/xml/listData.xml Tue Mar 17 06:13:30 2009 @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<items> + <item> + <image>assets/icons/fx.jpg</image> + </item> + <item> + <image>assets/icons/ai.jpg</image> + </item> + <item> + <image>assets/icons/ps.jpg</image> + </item> + <item> + <image>assets/icons/fw.jpg</image> + </item> + <item> + <image>assets/icons/fl.jpg</image> + </item> + <item> + <image>assets/icons/air.jpg</image> + </item> +</items> \ No newline at end of file Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/main.swf ============================================================================== Binary files. 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 Tue Mar 17 06:13:30 2009 @@ -10,6 +10,7 @@ import mx.controls.dataGridClasses.DataGridColumn; import mx.events.DataGridEvent; + import mx.events.ListEvent; import mx.controls.Alert; import mx.rpc.events.FaultEvent; import mx.rpc.events.ResultEvent; @@ -88,34 +89,56 @@ freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); } - public function dgChangeDomainParam():void { - freeswitch.updateDirDomainParam(dgDomainParam.selectedItem.uid, dgDomainParam.selectedItem.name, dgDomainParam.value); + public function dgChangeDomainParam(event:DataGridEvent):void { + freeswitch.updateDirDomainParam(dgDomainParam.selectedItem.uid, dgDomainParam.selectedItem.name, TextInput(event.currentTarget.itemEditorInstance).text); freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); } - public function dgChangeDomainVars():void { - freeswitch.updateDirDomainVar(dgDomainVars.selectedItem.uid, dgDomainVars.selectedItem.name, dgDomainVars.value); + public function dgChangeDomainVars(event:DataGridEvent):void { + freeswitch.updateDirDomainVar(dgDomainVars.selectedItem.uid, dgDomainVars.selectedItem.name, TextInput(event.currentTarget.itemEditorInstance).text); freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); } - public function addDomainUserParam():void { - freeswitch.addDirDomainUserParam(gridDomainsDomain.selectedItem.uid, inputDomainUserParamName.text, inputDomainUserParamValue.text); + public function dgDeleteDomainParam():void { + freeswitch.deleteDirDomainParam(dgDomainParam.selectedItem.uid); freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); } - public function addDomainUserVar():void { - freeswitch.addDirDomainUserVar(gridDomainsDomain.selectedItem.uid, inputDomainUserVarName.text, inputDomainUserVarValue.text); + public function dgDeleteDomainVars():void { + freeswitch.deleteDirDomainVar(dgDomainVars.selectedItem.uid); freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); } - public function dgChangeDomainUserParam():void { - freeswitch.updateDirDomainUserParam(dgDomainParam.selectedItem.uid, dgDomainParam.selectedItem.name, dgDomainParam.value); - freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + public function addDomainUserParam():void { + freeswitch.addDirDomainUserParam(dgDomainUsers.selectedItem.uid, inputDomainUserParamName.text, inputDomainUserParamValue.text); + freeswitch.getDirUser(dgDomainUsers.selectedItem.uid); } - public function dgChangeDomainUserVars():void { - freeswitch.updateDirDomainUserParam(dgDomainVars.selectedItem.uid, dgDomainVars.selectedItem.name, dgDomainVars.value); - freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + public function addDomainUserVar():void { + freeswitch.addDirDomainUserVar(dgDomainUsers.selectedItem.uid, inputDomainUserVarName.text, inputDomainUserVarValue.text); + freeswitch.getDirUser(dgDomainUsers.selectedItem.uid); + } + + public function dgChangeDomainUserParam(event:DataGridEvent):void { + freeswitch.updateDirDomainUserParam(dgDomainUsers.selectedItem.uid, dgDomainParam.selectedItem.name, TextInput(event.currentTarget.itemEditorInstance).text); + freeswitch.getDirUser(dgDomainUsers.selectedItem.uid); + } + + 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.getDirUser(dgDomainUsers.selectedItem.uid); + } + + public function dgDeleteDomainUserParam():void { + freeswitch.deleteDirDomainUserParam(dgDomainUserParam.selectedItem.uid); + freeswitch.getDirUser(dgDomainUsers.selectedItem.uid); + } + + public function dgdeleteDomainUserVars():void { + freeswitch.deleteDirDomainUserVar(dgDomainUserVars.selectedItem.uid); + freeswitch.getDirUser(dgDomainUsers.selectedItem.uid); } public function doGroupAdd():void { @@ -227,7 +250,7 @@ <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:Canvas label="Directory" width="100%" height="100%" show="freeswitch.getDirDomains();"> <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%"> @@ -244,45 +267,46 @@ <mx:Button label="Delete Domain" click="doNewDomainForm();" horizontalCenter="0" bottom="40"/> </mx:Canvas> <mx:Canvas width="80%" height="100%"> - <mx:Label text="UID:" horizontalCenter="-421" top="10"/> - <mx:Label text="{gridDomainsDomain.selectedItem.uid}" id="domainUid" horizontalCenter="-339" top="10"/> - <mx:Label text="Name:" horizontalCenter="-129" top="12"/> - <mx:TextInput id="domainName" text="{gridDomainsDomain.selectedItem.name}" horizontalCenter="25" top="10"/> - <mx:CheckBox label="Enabled" id="domainEnabled" enabled="{gridDomainsDomain.selectedItem.enabled}" right="10" top="8"/> - <mx:DataGrid left="10" top="40" bottom="116" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.params}" - itemEditEnd="dgChangeDomainParam();" editable="true" id="dgDomainParam"> + <mx:Label text="UID:" top="10" left="10"/> + <mx:Label text="{gridDomainsDomain.selectedItem.uid}" id="domainUid" top="10" left="49"/> + <mx:Label text="Name:" top="12" left="174"/> + <mx:TextInput id="domainName" text="{gridDomainsDomain.selectedItem.name}" top="10" left="224"/> +  + <mx:DataGrid left="10" top="40" bottom="86" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.params}" + itemEditEnd="dgChangeDomainParam(event);" editable="true" id="dgDomainParam"> <mx:columns> <mx:DataGridColumn headerText="Parameter" dataField="name" width="120" editable="false" /> <mx:DataGridColumn headerText="Value" dataField="value"/> </mx:columns> </mx:DataGrid> - <mx:DataGrid right="10" top="40" bottom="116" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.variables}" - itemEditEnd="dgChangeDomainVars();" editable="true" id="dgDomainVars"> + <mx:DataGrid right="10" top="40" bottom="86" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.variables}" + itemEditEnd="dgChangeDomainVars(event);" editable="true" id="dgDomainVars"> <mx:columns> <mx:DataGridColumn headerText="Variable" dataField="name" width="120" editable="false"/> <mx:DataGridColumn headerText="Data" dataField="value"/> </mx:columns> </mx:DataGrid> - <mx:Button label="Refresh Domain" bottom="10" horizontalCenter="0"/> - <mx:Button label="Add Parameter" left="139" bottom="40" click="addDomainParam()"/> - <mx:Button label="Add Variable" bottom="40" right="183" width="99" click="addDomainVar()"/> - <mx:Label text="Parameter" bottom="90" left="10"/> - <mx:TextInput width="121" id="inputDomainParamName" bottom="70" left="10"/> - <mx:TextInput width="272" id="inputDomainParamValue" bottom="70" left="139"/> - <mx:Label text="Variable" bottom="90" right="361"/> - <mx:TextInput width="121" id="inputDomainVarName" bottom="70" right="290"/> - <mx:TextInput width="272" id="inputDomainVarValue" bottom="70" right="10"/> - <mx:Label text="Data" bottom="90" right="251"/> - <mx:Label text="Value" bottom="90" left="139"/> - <mx:Button label="Delete Param" left="26" bottom="40"/> - <mx:Button label="Delete Variable" bottom="40" right="290"/> + <mx:Button label="Refresh Domain" right="10" top="10" height="22"/> + <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"/> + <mx:TextInput width="121" id="inputDomainParamName" bottom="40" left="10"/> + <mx:TextInput width="272" id="inputDomainParamValue" bottom="40" left="139"/> + <mx:Label text="Variable" bottom="60" right="361"/> + <mx:TextInput width="121" id="inputDomainVarName" bottom="40" right="290"/> + <mx:TextInput width="272" id="inputDomainVarValue" bottom="40" right="10"/> + <mx:Label text="Data" bottom="60" right="251"/> + <mx:Label text="Value" bottom="60" left="139"/> + <mx:Button label="Delete Param" left="26" bottom="10" click="dgDeleteDomainParam()"/> + <mx:Button label="Delete Variable" bottom="10" right="290" click="dgDeleteDomainVars()"/> </mx:Canvas> </mx:HDividedBox> </mx:Canvas> - <mx:Canvas label="Users" width="100%" height="100%"> + <mx:Canvas label="Users" width="100%" height="100%" show="freeswitch.getDirUsers(userDomain.selectedItem.uid);"> <mx:HDividedBox x="0" y="0" width="100%" height="100%"> <mx:Canvas width="20%" height="100%"> - <mx:ComboBox id="userDomain" top="10" horizontalCenter="0" dataProvider="{freeswitch.getDirDomains.lastResult}" labelField="name"></mx:ComboBox> + <mx:ComboBox id="userDomain" top="10" horizontalCenter="0" dataProvider="{freeswitch.getDirDomains.lastResult}" + labelField="name" change="freeswitch.getDirUsers(userDomain.selectedItem.uid);"></mx:ComboBox> <mx:DataGrid id="dgDomainUsers" width="100%" horizontalCenter="0" top="40" bottom="130" dataProvider="{freeswitch.getDirUsers.lastResult}" click="freeswitch.getDirUser(dgDomainUsers.selectedItem.uid)"> <mx:columns> @@ -299,16 +323,16 @@ <mx:Label text="{dgDomainUsers.selectedItem.uid}" id="userUid" top="10" left="49"/> <mx:Label text="Name:" top="12" left="173"/> <mx:TextInput id="userName" text="{dgDomainUsers.selectedItem.username}" top="10" left="224"/> - <mx:CheckBox label="Enabled" id="userEnabled" enabled="{dgDomainUsers.selectedItem.enabled}" right="330" top="8" left="493"/> +  <mx:DataGrid left="10" top="40" bottom="86" width="45%" dataProvider="{freeswitch.getDirUser.lastResult.params}" - change="dgChangeDomainUserParam();" editable="true" id="dgDomainUserParam"> + itemEditEnd="dgChangeDomainUserParam(event);" editable="true" id="dgDomainUserParam"> <mx:columns> <mx:DataGridColumn headerText="Parameter" dataField="name" width="120" editable="false"/> <mx:DataGridColumn headerText="Value" dataField="value"/> </mx:columns> </mx:DataGrid> <mx:DataGrid right="10" top="40" bottom="86" width="45%" dataProvider="{freeswitch.getDirUser.lastResult.variables}" - change="dgChangeDomainVars();" editable="true" id="dgDomainUserVars"> + itemEditEnd="dgChangeDomainUserVars(event);" editable="true" id="dgDomainUserVars"> <mx:columns> <mx:DataGridColumn headerText="Variable" dataField="name" width="120" editable="false"/> <mx:DataGridColumn headerText="Data" dataField="value"/> @@ -316,7 +340,7 @@ </mx:DataGrid> <mx:Button label="Refresh User" right="10" top="8" height="22"/> <mx:Button label="Add Parameter" left="139" bottom="10" click="addDomainUserParam()"/> - <mx:Button label="Delete Param" bottom="10" left="26"/> + <mx:Button label="Delete Param" bottom="10" left="26" click="dgDeleteDomainUserParam();"/> <mx:Button label="Add Variable" bottom="10" right="183" width="99" click="addDomainUserVar()"/> <mx:Label text="Parameter" bottom="60" left="10"/> <mx:TextInput width="121" id="inputDomainUserParamName" bottom="40" left="10"/> @@ -326,11 +350,11 @@ <mx:TextInput width="272" id="inputDomainUserVarValue" bottom="40" right="10"/> <mx:Label text="Data" bottom="60" right="251"/> <mx:Label text="Value" bottom="60" left="139"/> - <mx:Button label="Delete Variable" bottom="10" right="290"/> + <mx:Button label="Delete Variable" bottom="10" right="290" click="dgdeleteDomainUserVars();"/> </mx:Canvas> </mx:HDividedBox> </mx:Canvas> - <mx:Canvas label="Groups" width="100%" height="100%"> + <mx:Canvas label="Groups" width="100%" height="100%" show="freeswitch.getDirGroups(groupsDomain.selectedItem.uid)"> <mx:HDividedBox x="0" y="0" width="100%" height="100%"> <mx:Canvas width="20%" height="100%"> <mx:ComboBox top="10" horizontalCenter="0" id="groupsDomain" dataProvider="{freeswitch.getDirDomains.lastResult}" labelField="name"></mx:ComboBox> @@ -344,22 +368,26 @@ <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="0" bottom="70" dataProvider="{freeswitch.getDirGroup.lastResult.members}" + <mx:DataGrid 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="0" bottom="70" dataProvider="{freeswitch.getDirGroup.lastResult.nonmembers}" + <mx:DataGrid width="45%" right="10" top="38" bottom="70" dataProvider="{freeswitch.getDirGroup.lastResult.nonmembers}" dragEnabled="true" dragMoveEnabled="true" dropEnabled="true"> <mx:columns> <mx:DataGridColumn headerText="Available to Join" dataField="usersUsername"/> </mx:columns> </mx:DataGrid> - <mx:Button label="Refresh" left="10" bottom="40" click="freeswitch.getDirGroup(dgDirGroups.selectedItem.uid)"/> - <mx:Label text="New Group" right="274" bottom="42"/> - <mx:TextInput width="256" right="10" bottom="40" id="textNewGroup"/> - <mx:Button label="Create Group" right="10" bottom="10" click="doGroupAdd();"/> + <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: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"/> + <mx:Label text="Name:" top="12" left="173"/> + <mx:TextInput id="groupName" text="{dgDirGroups.selectedItem.name}" top="10" left="224"/> </mx:Canvas> </mx:HDividedBox> </mx:Canvas> Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/newGroupForm.mxml ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/newGroupForm.mxml (original) +++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/newGroupForm.mxml Tue Mar 17 06:13:30 2009 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" creationComplete="doInit();" height="306" title="Add Domain"> +<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" creationComplete="doInit();" height="306" title="Add Group"> <mx:Script> <![CDATA[ import mx.managers.PopUpManager; @@ -16,30 +16,31 @@ } ]]> </mx:Script> - - <mx:Form width="100%"> - <mx:FormItem label="Domain Name" width="100%"> - <mx:TextInput id="domainName" width="100%"/> - </mx:FormItem> - <mx:FormItem label="Dial String" width="100%"> - <mx:TextInput id="dialString" width="100%"/> - </mx:FormItem> - <mx:FormItem label="default_gateway" width="100%"> - <mx:TextInput id="defaultGateway" width="100%"/> - </mx:FormItem> - <mx:FormItem label="Default Areacode" width="100%"> - <mx:TextInput id="defaultAreacode" width="100%"/> - </mx:FormItem> - <mx:FormItem label="Xfer Fallback Exten" width="100%"> - <mx:TextInput id="xferFallbackExten" width="100%"/> - </mx:FormItem> - <mx:FormItem label="Record Stereo"> - <mx:CheckBox id="recordStereo" /> - </mx:FormItem> - - </mx:Form> - <mx:HBox horizontalAlign="center" width="314"> - <mx:Button click="doCall();" label="Add Domain"/> - <mx:Button click="PopUpManager.removePopUp(this);" label="Cancel"/> - </mx:HBox> + <mx:Canvas width="320" height="293"> + <mx:Form top="26" bottom="80.7" width="90%" horizontalCenter="0"> + <mx:FormItem label="Domain Name" width="100%"> + <mx:TextInput id="domainName" width="100%"/> + </mx:FormItem> + <mx:FormItem label="Dial String" width="100%"> + <mx:TextInput id="dialString" width="100%"/> + </mx:FormItem> + <mx:FormItem label="default_gateway" width="100%"> + <mx:TextInput id="defaultGateway" width="100%"/> + </mx:FormItem> + <mx:FormItem label="Default Areacode" width="100%"> + <mx:TextInput id="defaultAreacode" width="100%"/> + </mx:FormItem> + <mx:FormItem label="Xfer Fallback Exten" width="100%"> + <mx:TextInput id="xferFallbackExten" width="100%"/> + </mx:FormItem> + <mx:FormItem label="Record Stereo"> + <mx:CheckBox id="recordStereo" /> + </mx:FormItem> + + </mx:Form> + <mx:HBox horizontalAlign="center" width="314" horizontalCenter="0" bottom="52"> + <mx:Button click="doCall();" label="Add Domain"/> + <mx:Button click="PopUpManager.removePopUp(this);" label="Cancel"/> + </mx:HBox> + </mx:Canvas> </mx:TitleWindow> \ No newline at end of file Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/newUserForm.mxml ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/newUserForm.mxml (original) +++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/newUserForm.mxml Tue Mar 17 06:13:30 2009 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" creationComplete="doInit();" height="306" title="Add User"> +<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" creationComplete="doInit();" height="366" title="Add User" width="429"> <mx:Script> <![CDATA[ import mx.managers.PopUpManager; @@ -16,32 +16,35 @@ } ]]> </mx:Script> - - <mx:Form width="100%"> - <mx:FormItem label="UserName" width="100%"> - <mx:TextInput id="username" width="100%"/> - </mx:FormItem> - <mx:FormItem label="Mailbox" width="100%"> - <mx:TextInput id="mailbox" width="100%"/> - </mx:FormItem> - <mx:FormItem label="CIDR" width="100%"> - <mx:TextInput id="cidr" width="100%"/> - </mx:FormItem> - <mx:FormItem label="Password" width="100%"> - <mx:TextInput id="password" width="100%"/> - </mx:FormItem> - <mx:FormItem label="VM PIN" width="100%"> - <mx:TextInput id="vm_password" width="100%"/> - </mx:FormItem> - <mx:FormItem label="CallerID Name" width="100%"> - <mx:TextInput id="cid_name" width="100%"/> - </mx:FormItem> - <mx:FormItem label="CallerID Number" width="100%"> - <mx:TextInput id="cid_number" width="100%"/> - </mx:FormItem> - </mx:Form> - <mx:HBox horizontalAlign="center" width="314"> - <mx:Button click="doCall();" label="Add User"/> - <mx:Button click="PopUpManager.removePopUp(this);" label="Cancel"/> - </mx:HBox> + <mx:Canvas width="100%" height="100%"> + + + <mx:Form width="90%" horizontalCenter="0" top="19" bottom="117"> + <mx:FormItem label="UserName" width="100%"> + <mx:TextInput id="username" width="100%"/> + </mx:FormItem> + <mx:FormItem label="Mailbox" width="100%"> + <mx:TextInput id="mailbox" width="100%"/> + </mx:FormItem> + <mx:FormItem label="CIDR" width="100%"> + <mx:TextInput id="cidr" width="100%"/> + </mx:FormItem> + <mx:FormItem label="Password" width="100%"> + <mx:TextInput id="password" width="100%"/> + </mx:FormItem> + <mx:FormItem label="VM PIN" width="100%"> + <mx:TextInput id="vm_password" width="100%"/> + </mx:FormItem> + <mx:FormItem label="CallerID Name" width="100%"> + <mx:TextInput id="cid_name" width="100%"/> + </mx:FormItem> + <mx:FormItem label="CallerID Number" width="100%"> + <mx:TextInput id="cid_number" width="100%"/> + </mx:FormItem> + </mx:Form> + <mx:HBox horizontalAlign="center" width="314" horizontalCenter="0" bottom="20"> + <mx:Button click="doCall();" label="Add User"/> + <mx:Button click="PopUpManager.removePopUp(this);" label="Cancel"/> + </mx:HBox> + </mx:Canvas> </mx:TitleWindow> \ No newline at end of file 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 Tue Mar 17 06:13:30 2009 @@ -89,11 +89,15 @@ } } $i++; - if ($i == $total_count - 4){ + if ($i == $total_count - 3){ break; } } - return $data; + if ($none != 1) { + return $data; + } else { + return "OK: No Calls"; + } } public function getCalls() { @@ -289,13 +293,25 @@ public function updateDirDomainParam($param_uid, $name, $value) { $dbh = $this->getDbh(); - $query = sprintf('update domain_params set name = "%s", value = "%s" where uid=%s', $param_uid, $name, $value); + $query = sprintf('update domain_params set name = "%s", value = "%s" where uid=%s', $name, $value, $param_uid); return $dbh->exec($query); } public function updateDirDomainVar($var_uid, $name, $value) { $dbh = $this->getDbh(); - $query = sprintf('update domain_variables set name = "%s", value = "%s" where uid=%s', $var_uid, $name, $value); + $query = sprintf('update domain_variables set name = "%s", value = "%s" where uid=%s', $name, $value, $var_uid); + return $dbh->exec($query); + } + + public function deleteDirDomainParam($param_uid) { + $dbh = $this->getDbh(); + $query = sprintf('delete from domain_params where uid=%s', $param_uid); + return $dbh->exec($query); + } + + public function deleteDirDomainVar($var_uid) { + $dbh = $this->getDbh(); + $query = sprintf('delete from domain_variables where uid=%s', $var_uid); return $dbh->exec($query); } @@ -334,16 +350,36 @@ public function updateDirDomainUserParam($param_uid, $name, $value) { $dbh = $this->getDbh(); - $query = sprintf('update user_params set name = "%s", value = "%s" where uid=%s', $param_uid, $name, $value); + $query = sprintf('update user_params set name = "%s", value = "%s" where uid=%s', $name, $value, $param_uid); return $dbh->exec($query); } public function updateDirDomainUserVar($var_uid, $name, $value) { $dbh = $this->getDbh(); - $query = sprintf('update user_variables set name = "%s", value = "%s" where uid=%s', $var_uid, $name, $value); + $query = sprintf('update user_variables set name = "%s", value = "%s" where uid=%s', $name, $value, $var_uid); return $dbh->exec($query); } + public function deleteDirDomainUserParam($param_uid) { + $dbh = $this->getDbh(); + $query = sprintf('delete from user_params where uid=%s', $param_uid); + if ($dbh->exec($query) < 1) { + return "FAILED " . $query; + } else { + return "SUCESS"; + } + } + + public function deleteDirDomainUserVar($var_uid) { + $dbh = $this->getDbh(); + $query = sprintf('delete from user_variables where uid=%s', $var_uid); + if ($dbh->exec($query) < 1) { + return "FAILED " . $query; + } else { + return "SUCESS"; + } + } + /* Directory Group Methods */ public function getDirGroups($domains_uid){ $dbh = $this->getDbh();

1 0

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

17 Mar '09

Author: andrew Date: Mon Mar 16 21:35:06 2009 New Revision: 12638 Log: Cleanups/fixes while tracking down stuck channels Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.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 Mon Mar 16 21:35:06 2009 @@ -490,7 +490,7 @@ } } - /* release the lock returned by switch_core_session_locate */ + /* release the lock returned by session locate */ switch_core_session_rwunlock(session); } else { @@ -579,7 +579,7 @@ ei_x_encode_atom(rbuf, "error"); ei_x_encode_atom(rbuf, "session_attach_failed"); } - /* release the lock returned by switch_core_session_locate */ + /* release the lock returned by session locate */ switch_core_session_rwunlock(session); } else { ei_x_encode_tuple_header(rbuf, 2); Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Mon Mar 16 21:35:06 2009 @@ -311,8 +311,6 @@ if (!session_element) return; - return; - switch_mutex_lock(listener->session_mutex); for(s = listener->session_list; s; s = s->next) { if (s == session_element) { @@ -322,12 +320,12 @@ } else { listener->session_list = s->next; } - if (!(session = switch_core_session_locate(session_element->uuid_str))) { + if ((session = switch_core_session_locate(session_element->uuid_str))) { switch_channel_clear_flag(switch_core_session_get_channel(session), CF_CONTROLLED); - /* this allows the application threads to exit */ - switch_clear_flag_locked(s, LFLAG_SESSION_ALIVE); switch_core_session_rwunlock(session); } + /* this allows the application threads to exit */ + switch_clear_flag_locked(s, LFLAG_SESSION_ALIVE); break; } last = s; @@ -460,17 +458,20 @@ /* Send a message to the associated registered process to let it know there is a call. Message is a tuple of the form {call, <call-event>} */ - if (!(session = switch_core_session_locate(session_element->uuid_str))) - return SWITCH_STATUS_FALSE; - - channel = switch_core_session_get_channel(session); - switch_core_session_rwunlock(session); + if (switch_event_create(&call_event, SWITCH_EVENT_CHANNEL_DATA) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); return SWITCH_STATUS_MEMERR; } + + if (!(session = switch_core_session_locate(session_element->uuid_str))) + return SWITCH_STATUS_FALSE; + + channel = switch_core_session_get_channel(session); + switch_caller_profile_event_set_data(switch_channel_get_caller_profile(channel), "Channel", call_event); switch_channel_event_set_data(channel, call_event); + switch_core_session_rwunlock(session); switch_event_add_header_string(call_event, SWITCH_STACK_BOTTOM, "Content-Type", "command/reply"); switch_event_add_header_string(call_event, SWITCH_STACK_BOTTOM, "Reply-Text", "+OK\n"); @@ -538,11 +539,11 @@ switch_mutex_unlock(listener->sock_mutex); ei_x_free(&ebuf); - /* event is a hangup, so this session can be removed */ - if (pevent->event_id == SWITCH_EVENT_CHANNEL_HANGUP) { + /* event is a channel destroy, so this session can be removed */ + if (pevent->event_id == SWITCH_EVENT_CHANNEL_DESTROY) { switch_core_session_t *session; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hangup event for attached session for %s\n", sp->uuid_str); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Destroy event for attached session for %s\n", sp->uuid_str); /* remove session from list */ if (last) @@ -552,10 +553,10 @@ if ((session = switch_core_session_locate(sp->uuid_str))) { switch_channel_clear_flag(switch_core_session_get_channel(session), CF_CONTROLLED); - /* this allows the application threads to exit */ - switch_clear_flag_locked(sp, LFLAG_SESSION_ALIVE); switch_core_session_rwunlock(session); } + /* this allows the application threads to exit */ + switch_clear_flag_locked(sp, LFLAG_SESSION_ALIVE); removed = 1; ei_x_new_with_version(&ebuf); @@ -882,10 +883,10 @@ for (s = listener->session_list; s; s = s->next) { if ((session = switch_core_session_locate(s->uuid_str))) { switch_channel_clear_flag(switch_core_session_get_channel(session), CF_CONTROLLED); - /* this allows the application threads to exit */ - switch_clear_flag_locked(s, LFLAG_SESSION_ALIVE); switch_core_session_rwunlock(session); } + /* this allows the application threads to exit */ + switch_clear_flag_locked(s, LFLAG_SESSION_ALIVE); } switch_mutex_unlock(listener->session_mutex); @@ -1148,7 +1149,6 @@ while (!(p = switch_core_hash_find(listener->spawn_pid_hash, hash)) || p == &globals.WAITING) { if (i > 50) { /* half a second timeout */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for outbound pid\n"); - /*switch_core_session_rwunlock(session);*/ remove_session_elem_from_listener(listener,session_element); switch_core_hash_insert(listener->spawn_pid_hash, hash, &globals.TIMEOUT); /* TODO lock this? */ return NULL;

1 0

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

17 Mar '09

Author: andrew Date: Mon Mar 16 19:05:17 2009 New Revision: 12637 Log: Don't hold a pointer to the session, store the uuid instead and use switch_core_session_locate/switch_core_session_rwunlock Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Mon Mar 16 19:05:17 2009 @@ -151,8 +151,8 @@ switch_mutex_lock(listener->session_mutex); for (s = listener->session_list; s; s = s->next) { /* check the event uuid against the uuid of each session */ - if (!strcmp(uuid, switch_core_session_get_uuid(s->session))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending event to attached session for %s\n", switch_core_session_get_uuid(s->session)); + if (!strcmp(uuid, s->uuid_str)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending event to attached session for %s\n", s->uuid_str); if (switch_event_dup(&clone, event) == SWITCH_STATUS_SUCCESS) { /* add the event to the queue for this session */ if (switch_queue_trypush(s->event_queue, clone) != SWITCH_STATUS_SUCCESS) { @@ -303,26 +303,32 @@ switch_mutex_unlock(listener->session_mutex); } -static void remove_session_elem_from_listener(listener_t *listener, session_elem_t *session) +static void remove_session_elem_from_listener(listener_t *listener, session_elem_t *session_element) { session_elem_t *s, *last = NULL; + switch_core_session_t *session; - if (!session) + if (!session_element) + return; + return; switch_mutex_lock(listener->session_mutex); for(s = listener->session_list; s; s = s->next) { - if (s == session) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removing session\n"); + if (s == session_element) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removing session element\n"); if (last) { last->next = s->next; } else { listener->session_list = s->next; } - switch_channel_clear_flag(switch_core_session_get_channel(s->session), CF_CONTROLLED); - /* this allows the application threads to exit */ - switch_clear_flag_locked(s, LFLAG_SESSION_ALIVE); - switch_core_session_rwunlock(s->session); + if (!(session = switch_core_session_locate(session_element->uuid_str))) { + switch_channel_clear_flag(switch_core_session_get_channel(session), CF_CONTROLLED); + /* this allows the application threads to exit */ + switch_clear_flag_locked(s, LFLAG_SESSION_ALIVE); + switch_core_session_rwunlock(session); + } + break; } last = s; } @@ -444,16 +450,21 @@ } -static switch_status_t notify_new_session(listener_t *listener, switch_core_session_t *session, struct erlang_process process) +static switch_status_t notify_new_session(listener_t *listener, session_elem_t *session_element) { int result; + switch_core_session_t *session; switch_event_t *call_event=NULL; switch_channel_t *channel=NULL; /* Send a message to the associated registered process to let it know there is a call. Message is a tuple of the form {call, <call-event>} */ + if (!(session = switch_core_session_locate(session_element->uuid_str))) + return SWITCH_STATUS_FALSE; + channel = switch_core_session_get_channel(session); + switch_core_session_rwunlock(session); if (switch_event_create(&call_event, SWITCH_EVENT_CHANNEL_DATA) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); return SWITCH_STATUS_MEMERR; @@ -470,7 +481,7 @@ ei_encode_switch_event(&lbuf, call_event); switch_mutex_lock(listener->sock_mutex); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending initial call event\n"); - result = ei_sendto(listener->ec, listener->sockfd, &process, &lbuf); + result = ei_sendto(listener->ec, listener->sockfd, &session_element->process, &lbuf); switch_mutex_unlock(listener->sock_mutex); @@ -503,7 +514,7 @@ } if (!switch_test_flag(sp, LFLAG_OUTBOUND_INIT)) { - status = notify_new_session(listener, sp->session, sp->process); + status = notify_new_session(listener, sp); if (status != SWITCH_STATUS_SUCCESS) break; switch_set_flag(sp, LFLAG_OUTBOUND_INIT); @@ -516,6 +527,7 @@ to distinguish them from normal events (if they are sent to the same process) */ ei_x_buff ebuf; + ei_x_new_with_version(&ebuf); ei_x_encode_tuple_header(&ebuf, 2); ei_x_encode_atom(&ebuf, "call_event"); @@ -528,7 +540,9 @@ /* event is a hangup, so this session can be removed */ if (pevent->event_id == SWITCH_EVENT_CHANNEL_HANGUP) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hangup event for attached session for %s\n", switch_core_session_get_uuid(sp->session)); + switch_core_session_t *session; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hangup event for attached session for %s\n", sp->uuid_str); /* remove session from list */ if (last) @@ -536,10 +550,12 @@ else listener->session_list = sp->next; - switch_channel_clear_flag(switch_core_session_get_channel(sp->session), CF_CONTROLLED); - /* this allows the application threads to exit */ - switch_clear_flag_locked(sp, LFLAG_SESSION_ALIVE); - switch_core_session_rwunlock(sp->session); + if ((session = switch_core_session_locate(sp->uuid_str))) { + switch_channel_clear_flag(switch_core_session_get_channel(session), CF_CONTROLLED); + /* this allows the application threads to exit */ + switch_clear_flag_locked(sp, LFLAG_SESSION_ALIVE); + switch_core_session_rwunlock(session); + } removed = 1; ei_x_new_with_version(&ebuf); @@ -650,7 +666,7 @@ remove_binding(NULL, pid); /* TODO - why don't we pass the listener as the first argument? */ if ((s = find_session_elem_by_pid(listener, pid))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Outbound session for %s exited unexpectedly!\n", - switch_core_session_get_uuid(s->session)); + s->uuid_str); /* TODO - if a spawned process that was handling an outbound call fails.. what do we do with the call? */ remove_session_elem_from_listener(listener, s); } @@ -821,6 +837,7 @@ { listener_t *listener = (listener_t *) obj; session_elem_t* s; + switch_core_session_t *session; switch_mutex_lock(globals.listener_mutex); prefs.threads++; @@ -863,11 +880,12 @@ /* clean up all the attached sessions */ switch_mutex_lock(listener->session_mutex); for (s = listener->session_list; s; s = s->next) { - switch_channel_clear_flag(switch_core_session_get_channel(s->session), CF_CONTROLLED); - /* this allows the application threads to exit */ - switch_clear_flag_locked(s, LFLAG_SESSION_ALIVE); - /* */ - switch_core_session_rwunlock(s->session); + if ((session = switch_core_session_locate(s->uuid_str))) { + switch_channel_clear_flag(switch_core_session_get_channel(session), CF_CONTROLLED); + /* this allows the application threads to exit */ + switch_clear_flag_locked(s, LFLAG_SESSION_ALIVE); + switch_core_session_rwunlock(session); + } } switch_mutex_unlock(listener->session_mutex); @@ -1030,7 +1048,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to get session read lock\n"); } else { - session_element->session = session; session_element->process.type = ERLANG_REG_PROCESS; session_element->process.reg_name = switch_core_strdup(switch_core_session_get_pool(session),reg_name); switch_set_flag(session_element, LFLAG_SESSION_ALIVE); @@ -1056,7 +1073,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to get session read lock\n"); } else { - session_element->session = session; + memcpy(session_element->uuid_str, switch_core_session_get_uuid(session), SWITCH_UUID_FORMATTED_LENGTH); session_element->process.type = ERLANG_PID; memcpy(&session_element->process.pid, pid, sizeof(erlang_pid)); switch_set_flag(session_element, LFLAG_SESSION_ALIVE); @@ -1078,8 +1095,7 @@ session_elem_t* session_element=NULL; if (!(session_element = switch_core_alloc(switch_core_session_get_pool(session), sizeof(*session_element)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to allocate session element\n"); - } - else { + } else { if (SWITCH_STATUS_SUCCESS != switch_core_session_read_lock(session)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to get session read lock\n"); } @@ -1087,7 +1103,8 @@ char hash[100]; int i = 0; void *p = NULL; - session_element->session = session; + + memcpy(session_element->uuid_str, switch_core_session_get_uuid(session), SWITCH_UUID_FORMATTED_LENGTH); erlang_pid *pid; erlang_ref ref; @@ -1131,7 +1148,7 @@ while (!(p = switch_core_hash_find(listener->spawn_pid_hash, hash)) || p == &globals.WAITING) { if (i > 50) { /* half a second timeout */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for outbound pid\n"); - switch_core_session_rwunlock(session); + /*switch_core_session_rwunlock(session);*/ remove_session_elem_from_listener(listener,session_element); switch_core_hash_insert(listener->spawn_pid_hash, hash, &globals.TIMEOUT); /* TODO lock this? */ return NULL; @@ -1152,8 +1169,7 @@ switch_clear_flag(session_element, LFLAG_OUTBOUND_INIT); switch_clear_flag(session_element, LFLAG_WAITING_FOR_PID); - /* this hangs because it can never get hold of the socket mutex */ - ei_link(listener, ei_self(listener->ec), pid); + ei_link(listener, ei_self(listener->ec), pid); } } return session_element; @@ -1327,7 +1343,7 @@ switch_mutex_lock(l->session_mutex); if ((sp = l->session_list)) { while(sp) { - stream->write_function(stream, "Outbound session for %s\n", switch_core_session_get_uuid(sp->session)); + stream->write_function(stream, "Outbound session for %s\n", sp->uuid_str); sp = sp->next; } } else { Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Mon Mar 16 19:05:17 2009 @@ -55,7 +55,7 @@ }; struct session_elem { - switch_core_session_t *session; + char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; switch_mutex_t *flag_mutex; uint32_t flags; struct erlang_process process;

1 0

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

16 Mar '09

Author: mrene Date: Mon Mar 16 18:52:28 2009 New Revision: 12636 Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Mon Mar 16 18:52:28 2009 @@ -2691,7 +2691,7 @@ } } - if (channel && sip && (status >= 300 || status < 399) && switch_channel_test_flag(channel, CF_OUTBOUND)) { + if (channel && sip && (status >= 300 && status < 399) && switch_channel_test_flag(channel, CF_OUTBOUND)) { sip_contact_t * p_contact = sip->sip_contact; int i = 0; char var_name[80];

1 0

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

16 Mar '09

Author: andrew Date: Mon Mar 16 18:31:55 2009 New Revision: 12635 Log: Send a "call_hangup" to outbound/handlecall sessions when the relevant channel is hungup Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Mon Mar 16 18:31:55 2009 @@ -516,7 +516,7 @@ to distinguish them from normal events (if they are sent to the same process) */ ei_x_buff ebuf; - ei_x_new_with_version(&ebuf); + ei_x_new_with_version(&ebuf); ei_x_encode_tuple_header(&ebuf, 2); ei_x_encode_atom(&ebuf, "call_event"); ei_encode_switch_event(&ebuf, pevent); @@ -524,6 +524,7 @@ switch_mutex_lock(listener->sock_mutex); ei_sendto(listener->ec, listener->sockfd, &sp->process, &ebuf); switch_mutex_unlock(listener->sock_mutex); + ei_x_free(&ebuf); /* event is a hangup, so this session can be removed */ if (pevent->event_id == SWITCH_EVENT_CHANNEL_HANGUP) { @@ -534,7 +535,6 @@ last->next = sp->next; else listener->session_list = sp->next; - switch_channel_clear_flag(switch_core_session_get_channel(sp->session), CF_CONTROLLED); /* this allows the application threads to exit */ @@ -542,13 +542,18 @@ switch_core_session_rwunlock(sp->session); removed = 1; + ei_x_new_with_version(&ebuf); + ei_x_encode_atom(&ebuf, "call_hangup"); + switch_mutex_lock(listener->sock_mutex); + ei_sendto(listener->ec, listener->sockfd, &sp->process, &ebuf); + switch_mutex_unlock(listener->sock_mutex); + ei_x_free(&ebuf); + /* TODO if this listener was created outbound, and the last session has been detached should the listener also exit? Does it matter? */ } - - ei_x_free(&ebuf); switch_event_destroy(&pevent); } if (!removed)

1 0

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

16 Mar '09

Author: andrew Date: Mon Mar 16 17:58:36 2009 New Revision: 12634 Log: Fix removing sessions from linked list; fix a deadlock added in previous commit Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Mon Mar 16 17:58:36 2009 @@ -487,6 +487,7 @@ session_elem_t *last,*sp; switch_status_t status = SWITCH_STATUS_SUCCESS; void *pop; + int removed = 0; /* check up on all the attached sessions - if they have not yet sent an initial call event to the associated erlang process then do so if they have pending events in their queues then send them @@ -496,6 +497,7 @@ sp = listener->session_list; last = NULL; while(sp) { + removed = 0; if (switch_test_flag(sp, LFLAG_WAITING_FOR_PID)) { break; } @@ -538,6 +540,7 @@ /* this allows the application threads to exit */ switch_clear_flag_locked(sp, LFLAG_SESSION_ALIVE); switch_core_session_rwunlock(sp->session); + removed = 1; /* TODO if this listener was created outbound, and the last session has been detached @@ -548,7 +551,8 @@ ei_x_free(&ebuf); switch_event_destroy(&pevent); } - last = sp; + if (!removed) + last = sp; sp = sp->next; } switch_mutex_unlock(listener->session_mutex); @@ -1321,10 +1325,10 @@ stream->write_function(stream, "Outbound session for %s\n", switch_core_session_get_uuid(sp->session)); sp = sp->next; } - switch_mutex_unlock(l->session_mutex); } else { stream->write_function(stream, "No active sessions for %s\n", argv[1]); } + switch_mutex_unlock(l->session_mutex); break; } }

1 0

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

16 Mar '09

Author: mrene Date: Mon Mar 16 17:44:27 2009 New Revision: 12633 Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 Mon Mar 16 17:44:27 2009 @@ -3332,14 +3332,13 @@ void sofia_glue_sql_close(sofia_profile_t *profile) { #ifdef SWITCH_HAVE_ODBC - if (profile->odbc_dsn) { + if (profile->master_odbc) { switch_odbc_handle_destroy(&profile->master_odbc); - return; } -#endif - +#else switch_core_db_close(profile->master_db); profile->master_db = NULL; +#endif }

1 0

[commit] r12632 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: mrene Date: Mon Mar 16 17:44:14 2009 New Revision: 12632 Log: mod_limit: close odbc handle Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Mon Mar 16 17:44:14 2009 @@ -1106,6 +1106,13 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_limit_shutdown) { + + #ifdef SWITCH_HAVE_ODBC + if (globals.master_odbc) { + switch_odbc_handle_destroy(&globals.master_odbc); + } + #endif + switch_event_free_subclass(LIMIT_EVENT_USAGE); switch_xml_config_cleanup(config_settings);

1 0