March 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12671 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Thu Mar 19 20:23:38 2009 New Revision: 12671 Log: refactor signal_bridge 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 Thu Mar 19 20:23:38 2009 @@ -687,6 +687,29 @@ switch_core_session_t *other_session; switch_event_t *event; + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE))) { + switch_channel_set_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); + } + + switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); + + if (uuid && (other_session = switch_core_session_locate(uuid))) { + switch_channel_t *other_channel = switch_core_session_get_channel(other_session); + const char *sbv = switch_channel_get_variable(other_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE); + + if (!switch_strlen_zero(sbv) && !strcmp(sbv, switch_core_session_get_uuid(session))) { + + switch_channel_set_variable(other_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); + switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL); + + if (switch_channel_up(other_channel)) { + switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); + } + } + + switch_core_session_rwunlock(other_session); + } + if (switch_channel_test_flag(channel, CF_ORIGINATOR)) { switch_channel_clear_flag(channel, CF_ORIGINATOR); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_UNBRIDGE) == SWITCH_STATUS_SUCCESS) { @@ -694,29 +717,7 @@ switch_event_fire(&event); } } - - if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE)) - && (other_session = switch_core_session_locate(uuid))) { - switch_channel_t *other_channel = switch_core_session_get_channel(other_session); - const char *sbv = switch_channel_get_variable(other_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE); - - if (!switch_strlen_zero(sbv) && !strcmp(sbv, switch_core_session_get_uuid(session))) { - - switch_channel_set_variable(other_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); - - switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); - switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL); - - if (switch_channel_up(other_channel)) { - switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); - } - } - - switch_channel_set_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); - - switch_core_session_rwunlock(other_session); - } - + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12670 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Thu Mar 19 20:22:40 2009 New Revision: 12670 Log: make -vg imply -waste so valgrind runs won't re-exec Modified: freeswitch/trunk/src/switch.c Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Thu Mar 19 20:22:40 2009 @@ -611,7 +611,7 @@ } #if defined(HAVE_SETRLIMIT) && !defined(__sun) - if (!waste) { + if (!waste && !(flags & SCF_VG)) { memset(&rlp, 0, sizeof(rlp)); getrlimit(RLIMIT_STACK, &rlp); if (rlp.rlim_max > SWITCH_THREAD_STACKSIZE) {

1 0

[commit] r12669 - in freeswitch/trunk/src: . mod/endpoints/mod_portaudio
by FreeSWITCH SVN 19 Mar '09

19 Mar '09

Author: anthm Date: Thu Mar 19 13:30:56 2009 New Revision: 12669 Log: fix audio issue in portaudio Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Mar 19 13:30:56 2009 @@ -124,7 +124,8 @@ private_t *call_list; int ring_interval; GFLAGS flags; - switch_timer_t timer; + switch_timer_t read_timer; + switch_timer_t write_timer; switch_timer_t hold_timer; int dual_streams; time_t deactivate_timer; @@ -249,7 +250,7 @@ } while (switch_channel_get_state(channel) == CS_INIT && !switch_test_flag(tech_pvt, TFLAG_ANSWER)) { - switch_size_t olen = globals.timer.samples; + switch_size_t olen = globals.read_timer.samples; if (switch_micro_time_now() - last >= waitsec) { char buf[512]; @@ -268,7 +269,7 @@ } if (ring_file) { - if (switch_core_timer_next(&globals.timer) != SWITCH_STATUS_SUCCESS) { + if (switch_core_timer_next(&globals.read_timer) != SWITCH_STATUS_SUCCESS) { switch_core_file_close(&fh); break; } @@ -279,7 +280,7 @@ } if (globals.ring_stream) { - WriteAudioStream(globals.ring_stream, abuf, (long) olen, &globals.timer); + WriteAudioStream(globals.ring_stream, abuf, (long) olen, &globals.write_timer); } } else { switch_yield(10000); @@ -355,8 +356,12 @@ switch_core_codec_destroy(&globals.write_codec); } - if (globals.timer.timer_interface) { - switch_core_timer_destroy(&globals.timer); + if (globals.read_timer.timer_interface) { + switch_core_timer_destroy(&globals.read_timer); + } + + if (globals.write_timer.timer_interface) { + switch_core_timer_destroy(&globals.write_timer); } if (globals.hold_timer.timer_interface) { @@ -597,14 +602,13 @@ switch_mutex_lock(globals.device_lock); samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, - globals.read_codec.implementation->samples_per_packet, &globals.timer); + globals.read_codec.implementation->samples_per_packet, &globals.read_timer); switch_mutex_unlock(globals.device_lock); if (samples) { globals.read_frame.datalen = samples * 2; globals.read_frame.samples = samples; - //switch_core_timer_check(&globals.timer, SWITCH_TRUE); *frame = &globals.read_frame; if (!switch_test_flag((&globals), GFLAG_MOUTH)) { @@ -649,7 +653,7 @@ if (globals.audio_stream) { if (switch_test_flag((&globals), GFLAG_EAR)) { - WriteAudioStream(globals.audio_stream, (short *) frame->data, (int) (frame->datalen / sizeof(SAMPLE)), &globals.timer); + WriteAudioStream(globals.audio_stream, (short *) frame->data, (int) (frame->datalen / sizeof(SAMPLE)), &globals.write_timer); } status = SWITCH_STATUS_SUCCESS; } @@ -1278,8 +1282,12 @@ destroy_codecs(); } - if (globals.timer.timer_interface) { - switch_core_timer_sync(&globals.timer); + if (globals.read_timer.timer_interface) { + switch_core_timer_sync(&globals.read_timer); + } + + if (globals.write_timer.timer_interface) { + switch_core_timer_sync(&globals.write_timer); } if (globals.audio_stream) { @@ -1310,13 +1318,26 @@ } } - if (!globals.timer.timer_interface) { - if (switch_core_timer_init(&globals.timer, + if (!globals.read_timer.timer_interface) { + if (switch_core_timer_init(&globals.read_timer, + globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, + module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); + return SWITCH_STATUS_FALSE; + } + } + + + if (!globals.write_timer.timer_interface) { + if (switch_core_timer_init(&globals.write_timer, globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, module_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); switch_core_codec_destroy(&globals.read_codec); switch_core_codec_destroy(&globals.write_codec); + switch_core_timer_destroy(&globals.read_timer); return SWITCH_STATUS_FALSE; } } @@ -1328,7 +1349,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup hold timer failed!\n"); switch_core_codec_destroy(&globals.read_codec); switch_core_codec_destroy(&globals.write_codec); - switch_core_timer_destroy(&globals.timer); + switch_core_timer_destroy(&globals.read_timer); + switch_core_timer_destroy(&globals.write_timer); return SWITCH_STATUS_FALSE; } } @@ -1366,7 +1388,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open audio device\n"); switch_core_codec_destroy(&globals.read_codec); switch_core_codec_destroy(&globals.write_codec); - switch_core_timer_destroy(&globals.timer); + switch_core_timer_destroy(&globals.read_timer); + switch_core_timer_destroy(&globals.write_timer); switch_core_timer_destroy(&globals.hold_timer); return SWITCH_STATUS_FALSE; } @@ -1963,8 +1986,8 @@ playfile, seconds, samples, globals.read_codec.implementation->actual_samples_per_second); while (switch_core_file_read(&fh, abuf, &olen) == SWITCH_STATUS_SUCCESS) { - WriteAudioStream(globals.audio_stream, abuf, (long) olen, &globals.timer); - switch_core_timer_next(&globals.timer); + WriteAudioStream(globals.audio_stream, abuf, (long) olen, &globals.read_timer); + switch_core_timer_next(&globals.read_timer); samples -= (int) olen; if (samples <= 0) { break; @@ -1993,8 +2016,8 @@ int i; for(i = 0; i < 400; i++) { if ((samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, - globals.read_codec.implementation->samples_per_packet, &globals.timer))) { - WriteAudioStream(globals.audio_stream, globals.read_frame.data, (long) samples, &globals.timer); + globals.read_codec.implementation->samples_per_packet, &globals.read_timer))) { + WriteAudioStream(globals.audio_stream, globals.read_frame.data, (long) samples, &globals.write_timer); success = 1; } switch_yield(10000); Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c Thu Mar 19 13:30:56 2009 @@ -146,17 +146,15 @@ char *p = (char *) data; long numBytes = aStream->bytesPerFrame * numFrames; - while (numBytes > 0) { - bytesWritten = PaUtil_WriteRingBuffer(&aStream->outFIFO, p, numBytes); - numBytes -= bytesWritten; - p += bytesWritten; - if (numBytes > 0) { - if (switch_core_timer_check(timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { - PaUtil_FlushRingBuffer(&aStream->outFIFO); - return 0; - } - switch_cond_next(); - } + switch_core_timer_next(timer); + + bytesWritten = PaUtil_WriteRingBuffer(&aStream->outFIFO, p, numBytes); + numBytes -= bytesWritten; + p += bytesWritten; + + if (numBytes > 0) { + PaUtil_FlushRingBuffer(&aStream->outFIFO); + return 0; } return numFrames; } @@ -170,30 +168,31 @@ long bytesRead = 0; char *p = (char *) data; long avail, totalBytes = 0, neededBytes = aStream->bytesPerFrame * numFrames; + int max = 5000; - for (;;) { - avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFO); - - if (switch_core_timer_check(timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { - break; - } + switch_core_timer_next(timer); + + while(totalBytes < neededBytes && --max > 0) { + avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFO); + //printf("AVAILABLE BYTES %ld pass %d\n", avail, 5000 - max); if (avail >= neededBytes * 6) { PaUtil_FlushRingBuffer(&aStream->inFIFO); avail = 0; - } - - bytesRead = 0; + } else { - if (totalBytes < neededBytes && avail >= neededBytes) { - bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, neededBytes); - totalBytes += bytesRead; - } + bytesRead = 0; + + if (totalBytes < neededBytes && avail >= neededBytes) { + bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, neededBytes); + totalBytes += bytesRead; + } - if (bytesRead) { - p += bytesRead; - } else { - switch_cond_next(); + if (bytesRead) { + p += bytesRead; + } else { + switch_cond_next(); + } } } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Mar 19 13:30:56 2009 @@ -1990,12 +1990,12 @@ } if (rtp_session->timer.interval && - (rtp_session->timer.samplecount - rtp_session->last_write_samplecount) > rtp_session->samples_per_interval * 2) { + (rtp_session->timer.samplecount - rtp_session->last_write_samplecount) > rtp_session->samples_per_interval * 10) { m++; } if (!rtp_session->timer.interval && - ((unsigned)((switch_micro_time_now() - rtp_session->last_write_timestamp))) > (rtp_session->ms_per_packet *2)) { + ((unsigned)((switch_micro_time_now() - rtp_session->last_write_timestamp))) > (rtp_session->ms_per_packet * 10)) { m++; }

1 0

[commit] r12668 - freeswitch/trunk/patches
by FreeSWITCH SVN 19 Mar '09

19 Mar '09

Author: anthm Date: Thu Mar 19 11:20:43 2009 New Revision: 12668 Log: update Modified: freeswitch/trunk/patches/pa.diff Modified: freeswitch/trunk/patches/pa.diff ============================================================================== --- freeswitch/trunk/patches/pa.diff (original) +++ freeswitch/trunk/patches/pa.diff Thu Mar 19 11:20:43 2009 @@ -195,60 +195,60 @@ + bytesWritten = PaUtil_WriteRingBuffer(&aStream->outFIFO, p, numBytes); + numBytes -= bytesWritten; + p += bytesWritten; -+ ++ + if (numBytes > 0) { + PaUtil_FlushRingBuffer(&aStream->outFIFO); + return 0; } return numFrames; } -@@ -171,32 +169,28 @@ +@@ -170,31 +168,32 @@ + long bytesRead = 0; char *p = (char *) data; long avail, totalBytes = 0, neededBytes = aStream->bytesPerFrame * numFrames; ++ int max = 5000; - for (;;) { - avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFO); -+ switch_core_timer_next(timer); -+ -+ avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFO); - +- - if (switch_core_timer_check(timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { - break; - } -+ if (avail >= neededBytes * 6) { -+ PaUtil_FlushRingBuffer(&aStream->inFIFO); -+ avail = 0; -+ } ++ switch_core_timer_next(timer); -- if (avail >= neededBytes * 6) { -- PaUtil_FlushRingBuffer(&aStream->inFIFO); -- avail = 0; ++ while(totalBytes < neededBytes && --max > 0) { ++ ++ avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFO); ++ //printf("AVAILABLE BYTES %ld pass %d\n", avail, 5000 - max); + if (avail >= neededBytes * 6) { + PaUtil_FlushRingBuffer(&aStream->inFIFO); + avail = 0; - } -+ bytesRead = 0; ++ } else { - bytesRead = 0; -- ++ bytesRead = 0; ++ ++ if (totalBytes < neededBytes && avail >= neededBytes) { ++ bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, neededBytes); ++ totalBytes += bytesRead; ++ } + - if (totalBytes < neededBytes && avail >= neededBytes) { - bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, neededBytes); - totalBytes += bytesRead; -- } ++ if (bytesRead) { ++ p += bytesRead; ++ } else { ++ switch_cond_next(); ++ } + } - - if (bytesRead) { - p += bytesRead; - } else { - switch_cond_next(); - } -+ if (totalBytes < neededBytes && avail >= neededBytes) { -+ bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, neededBytes); -+ totalBytes += bytesRead; } -+ if (bytesRead) { -+ p += bytesRead; -+ } else { -+ switch_cond_next(); -+ } -+ return totalBytes / aStream->bytesPerFrame; - } -

1 0

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

19 Mar '09

Author: mrene Date: Wed Mar 18 23:15:14 2009 New Revision: 12667 Log: tweaqk Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Wed Mar 18 23:15:14 2009 @@ -1163,8 +1163,8 @@ /* Open the config from the xml registry */ switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Menu-Name", name); switch_assert(params); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Menu-Name", name); switch_channel_event_set_data(channel, params); if ((cxml = switch_xml_open_cfg(ivr_cf_name, &cfg, params)) != NULL) {

1 0

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

19 Mar '09

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

1 0

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

19 Mar '09

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

1 0

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

19 Mar '09

Author: silik0n Date: Wed Mar 18 21:31:03 2009 New Revision: 12664 Log: consistancy Modified: freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql Modified: freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql (original) +++ freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql Wed Mar 18 21:31:03 2009 @@ -243,13 +243,13 @@ DROP TABLE IF EXISTS `users`; CREATE TABLE `users` ( `uid` int(11) NOT NULL auto_increment, - `domain_uid` int(11) NOT NULL, + `domains_uid` int(11) NOT NULL, `username` varchar(64) NOT NULL, `mailbox` varchar(64) default NULL, `cidr` varchar(32) default NULL, `enabled` tinyint(1) NOT NULL default '1', PRIMARY KEY (`uid`), - KEY `domain_uid` (`domain_uid`,`username`,`mailbox`) + KEY `domain_uid` (`domains_uid`,`username`,`mailbox`) ) ENGINE=MyISAM AUTO_INCREMENT=21 DEFAULT CHARSET=latin1; --

1 0

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

19 Mar '09

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

1 0

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

19 Mar '09

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

1 0