March 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

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

18 Mar '09

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

1 0

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

18 Mar '09

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

1 0

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

18 Mar '09

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

1 0

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

18 Mar '09

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

1 0

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

18 Mar '09

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

1 0

[commit] r12656 - freeswitch/trunk/patches
by FreeSWITCH SVN 18 Mar '09

18 Mar '09

Author: anthm Date: Wed Mar 18 13:45:39 2009 New Revision: 12656 Log: add Added: freeswitch/trunk/patches/pa.diff Added: freeswitch/trunk/patches/pa.diff ============================================================================== --- (empty file) +++ freeswitch/trunk/patches/pa.diff Wed Mar 18 13:45:39 2009 @@ -0,0 +1,254 @@ +Index: src/mod/endpoints/mod_portaudio/mod_portaudio.c +=================================================================== +--- src/mod/endpoints/mod_portaudio/mod_portaudio.c (revision 12655) ++++ src/mod/endpoints/mod_portaudio/mod_portaudio.c (working copy) +@@ -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,10 +356,14 @@ + 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) { + switch_core_timer_destroy(&globals.hold_timer); + } +@@ -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,10 +1282,14 @@ + 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) { + return SWITCH_STATUS_SUCCESS; + } +@@ -1310,8 +1318,8 @@ + } + } + +- 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"); +@@ -1321,6 +1329,19 @@ + } + } + ++ ++ 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; ++ } ++ } ++ + if (!globals.hold_timer.timer_interface) { + if (switch_core_timer_init(&globals.hold_timer, + globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, +@@ -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); +Index: src/mod/endpoints/mod_portaudio/pablio.c +=================================================================== +--- src/mod/endpoints/mod_portaudio/pablio.c (revision 12655) ++++ src/mod/endpoints/mod_portaudio/pablio.c (working copy) +@@ -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; + } +@@ -171,32 +169,28 @@ + char *p = (char *) data; + long avail, totalBytes = 0, neededBytes = aStream->bytesPerFrame * numFrames; + +- 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; ++ } + +- if (avail >= neededBytes * 6) { +- PaUtil_FlushRingBuffer(&aStream->inFIFO); +- avail = 0; +- } ++ bytesRead = 0; + +- 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 (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] r12655 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 18 Mar '09

18 Mar '09

Author: brian Date: Wed Mar 18 11:02:50 2009 New Revision: 12655 Log: We get status of 100 on a 302. This will fix a bug reported from IRC. 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 Wed Mar 18 11:02:50 2009 @@ -2691,7 +2691,7 @@ } } - if (channel && sip && (status >= 300 && status < 399) && switch_channel_test_flag(channel, CF_OUTBOUND)) { + if (channel && sip && status == 100 && 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] r12654 - in freeswitch/trunk/scripts/contrib/swk: . php/xml_curl
by FreeSWITCH SVN 18 Mar '09

18 Mar '09

Author: silik0n Date: Wed Mar 18 04:38:18 2009 New Revision: 12654 Log: xml_curl of the directory is now working... this means you can manage the users from the UI see the README for installation instructions Added: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/ 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/README Modified: freeswitch/trunk/scripts/contrib/swk/README ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/README (original) +++ freeswitch/trunk/scripts/contrib/swk/README Wed Mar 18 04:38:18 2009 @@ -23,8 +23,30 @@ make the files in amf-test1/bin-debug available on your webserver and point a browser at it. +copy the php/xml_curl directory to your webserver + +make sure you have mod_xml_curl built and installed and enabled + uncomment it in the modules.conf in your source tree + uncomment it in your modules.conf.xml in the conf/autoload_configs/modules.conf.xml + + +edit the gateway_url param in conf/autoload_configs/xml_curl.conf.xml to enabale the directory binding +EXAMPLE: + <param name="gateway-url" value="http://localhost/xml_curl/directory.php" bindings="directory"/> + + +rename conf/directory/default.xml to conf/directory/default.xml.NOLOAD + this is no longer required as we are now loading the directory using xml_curl + + 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 +Any questions, feel free to find me as SwK via IRC at #freeswitch on irc.freenode.net or krice AT freeswitch DOT org + +TODO: +Fix Groups and Group Editing +Fix Conference Controls +Rework PHP Class Files for both the amfphp service and the xml_curl there is no need to maintain these seperately as they share a fair ammount of code +anything else I can come up with Added: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php Wed Mar 18 04:38:18 2009 @@ -0,0 +1,156 @@ +<?php + +/* + * FreeSWITCH AMF-PHP ESL Client Library + * Copyright (C) 2009, Ken Rice <krice(a)tollfreegateway.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Ken Rice <krice(a)tollfreegateway.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Ken Rice <krice(a)tollfreegateway.com> + * + * freeswitch.php -- Initial Class file for XML_CURL responses for Codename: SHIPMENT + * + *************************************************************************************************** + * + * This Requires the FreeSWITCH ESL Extension to be installed properly on your system. + * + */ + +// require_once "ESL.php"; + +class FSDirectory { + // var $esl; + + var $dbh; + + public function __construct(){ + $dbtype='mysql'; /* Set the Database type */ + // $db_hostname = 'localhost'; /* Database Server hostname */ + $db_hostname = '192.168.1.140'; /* Database Server hostname */ + $db_port = '3306'; /* Database Server Port */ + $db_username = 'root'; /* Database Server username */ + $db_password = 'password'; /* Database Server password */ + $db_database = 'shipment'; /* DataBase Name */ + if ($dbtype == 'mysql') { + $pdo_flags = array(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,); + } + $this->dbh = new PDO("$dbtype:host=$db_hostname;port=$db_port;dbname=$db_database", $db_username, $db_password, $pdo_flags); + + } + + private function getESL() { + $esl_server = "127.0.0.1"; /* ESL Server */ + $esl_port = "8021"; /* ESL Port */ + $esl_secret = "ClueCon"; /* ESL Secret */ + $this->esl = new eslConnection($esl_server, $esl_port, $esl_secret); + } + + /* + public function getStatus() { + $e = $this->esl->sendRecv("api status"); + $body = $e->getBody(); + return $body; + } + */ + + /*** Directory Methods ***/ + + /* Directory Domain Methods */ + public function getDirDomains(){ + $query = sprintf("select * from domains"); + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results; + } + + public function getDirDomainbyName($domain_name){ + $query = sprintf("select * from domains where name = '%s'", $domain_name); + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results[0]; + } + + public function getDirDomain($domains_uid){ + $query = sprintf("select * from domain_params where domains_uid = $domains_uid"); + $stmt = $this->dbh->query($query); + $results['params'] = $stmt->fetchAll(); + $query = sprintf("select * from domain_variables where domains_uid = $domains_uid"); + $stmt = $this->dbh->query($query); + $results['variables'] = $stmt->fetchAll(); + return $results; + } + + /* Directory User Methods */ + public function getDirUser($user_uid){ + $query = sprintf("select * from user_params where users_uid = $user_uid"); + $stmt = $this->dbh->query($query); + $results['params'] = $stmt->fetchAll(); + $query = sprintf("select * from user_variables where users_uid = $user_uid"); + $stmt = $this->dbh->query($query); + $results['variables'] = $stmt->fetchAll(); + return $results; + } + + public function getDirUsers($domains_uid){ + $query = sprintf("select * from users where domains_uid = $domains_uid"); + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results; + } + + public function getDirUsersByDomainUidByUsername($domain_uid, $user_name){ + $query = sprintf("select * from users where domains_uid = '%s' and username = '%s'", $domain_uid, $user_name); + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results[0]; + } + + /* Directory Group Methods */ + public function getDirGroups($domains_uid){ + $query = sprintf("select * from groups where domains_uid = $domains_uid"); + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results; + } + + public function getDirGroup($groups_uid){ + $query = sprintf("select a.uid as groupMemberUid, a.users_uid as usersUid, b.username as usersUsername from group_members as a, users as b where a.groups_uid = $groups_uid and a.users_uid = b.uid") ; + $stmt = $this->dbh->query($query); + $results['members'] = $stmt->fetchAll(); + $query = sprintf("select uid as usersUid, username as usersUsername from users where uid not in (select users_uid from group_members where groups_uid = $groups_uid) and domains_uid = (select domains_uid from groups where uid = $groups_uid)"); + $stmt = $this->dbh->query($query); + $results['nonmembers'] = $stmt->fetchAll(); + return $results; + } + +} +/* 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: + */ +?> Added: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php Wed Mar 18 04:38:18 2009 @@ -0,0 +1,73 @@ +<? + +require_once "FSDirectory.php"; + + +header ("content-type: text/xml"); + +foreach ($_REQUEST as $key => $value) { + $$key = $value; +} + +$fsd = new FSDirectory(); + +/* Uncomment and edit for debugging */ +/* +$section = "directory"; +$tag_name= "domain"; +$key_name ="name"; +$key_value="192.168.1.140"; +$user="1000"; +*/ +if ($section == "directory" && $tag_name == "domain" && $key_name == "name") { + $db_domain = $fsd->getDirDomainbyName($key_value); +} else { + printf("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<document type=\"freeswitch/xml\">\n<section name=\"result\">\n". + "<result status=\"not found\" />\n</section>\n</document>"); + die(); +} + +$db_user = $fsd->getDirUsersByDomainUidByUsername($db_domain['uid'], $user); + +$db_user_settings = $fsd->getDirUser($db_user['uid']); + +$db_groups = $fsd->getDirGroups($db_domain['uid']); + +printf(" <?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"); +printf(" <document type=\"freeswitch/xml\">\n"); +printf(" <section name=\"directory\" description=\"Codename: Shipment Directory\">\n"); +printf(" <domain name=\"%s\">\n", $db_domain['name']); +printf(" <groups>\n"); +printf(" <group name=\"default\">\n"); +printf(" <users>\n"); +printf(" <user id=\"%s\" mailbox=\"%s\">\n", $db_user['username'], $db_user['mailbox']); +printf(" <params>\n"); +foreach($db_user_settings['params'] as $db_params) { + printf(" <param name=\"%s\" value=\"%s\"/>\n", $db_params['name'], $db_params['value']); +} +printf(" </params>\n"); +printf(" <variables>\n"); +foreach($db_user_settings['variables'] as $db_variables) { + printf(" <variable name=\"%s\" value=\"%s\"/>\n", $db_variables['name'], $db_variables['value']); +} +printf(" </variables>\n"); +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(" <users>\n"); + foreach($db_members['members'] as $db_member){ + printf(" <user id=\"%s\" type=\"pointer\"/>\n", $db_member['usersUsername']); + } + printf(" </users>\n"); + printf(" </group>\n"); +} +*/ +printf(" </groups>\n"); +printf(" </domain>\n"); +printf(" </section>\n"); +printf(" </document>\n"); +?>

1 0

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

17 Mar '09

Author: silik0n Date: Tue Mar 17 16:09:12 2009 New Revision: 12653 Log: just a little something for an example of how to do CDRs from ESL with PHP Added: freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/ freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.postgres.sql Added: freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php Tue Mar 17 16:09:12 2009 @@ -0,0 +1,92 @@ +<? +require_once('ESL.php'); +require_once("MDB2.php"); + +$esl_host = '127.0.0.1'; +$esl_port = '8021'; +$esl_password = 'ClueCon'; + + +$db_url ="pgsql://root@localhost/esl_cdr"; + +$con = MDB2::factory($db_url); +if(PEAR::isError($con)) { + die("Error while connecting : " . $con->getMessage()); +} + +/* set up the ESL Connection */ +$esl = new eslConnection('204.8.45.218', '8021', 'disasterisk-sucks'); +$e = $esl->sendRecv("api status"); +print $e->getBody(); +$esl->events("plain", "channel_hangup"); +for(;;) { + print "foo - 1\n"; + $e = $esl->recvEvent(); + if ($e) { + $lines = explode("\n", $e->serialize()); + foreach ($lines as $line){ + $temp_data = explode(": ", $line); + + if ($temp_data[0]){ + if ($temp_data[0] == 'variable_easy_acctcode'){ + $data['acctcode'] = $temp_data[1]; + } elseif ($temp_data[0] == 'variable_acctcode'){ + $data['acctcode'] = $temp_data[1]; + } elseif ($temp_data[0] == 'variable_accountcode'){ + $data['acctcode'] = $temp_data[1]; + } elseif ($temp_data[0] == 'variable_account_code'){ + $data['acctcode'] = $temp_data[1]; + } else { + $data[$temp_data[0]] = $temp_data[1]; + } + } + } + + $insert = sprintf("INSERT into cdr (uuid, acctcode, ani, e164_ani, dnis, translated_dnis, e164_dnis, src_host, read_codec, write_codec, clid_name, ". + "clid_number, src_sdp, dest_sdp, originate_disposition, bridge_to_uuid, endpoint_disposition, sip_hangup_disposition, term_cause, ". + "hangup_cause, start_stamp, answer_stamp, progress_media_stamp, end_stamp, duration, billsec, progress_mediasec, billmin, ". + "carrier_id, cust_cost, carrier_cost)". + "VALUES". + "('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %s, '%s', '%s',". + "%s, %s, %s, %s, %s, %s, %s)", + $data['Unique-ID'], + $data['acctcode'], + $data['Caller-Caller-ID-Number'], + $data['Caller-Caller-ID-Number'], + urldecode($data['Caller-Destination-Number']), + urldecode($data['Caller-Destination-Number']), + urldecode($data['Caller-Destination-Number']), + $data['Caller-Network-Addr'], + $data['Channel-Read-Codec-Name']."-". $data['Channel-Read-Codec-Rate'], + $data['Channel-Write-Codec-Name']."-". $data['Channel-Write-Codec-Rate'], + urlencode($data['Caller-Caller-ID-Name']), + $data['Caller-Caller-ID-Number'], + $data['variable_switch_r_sdp'], + $data['variable_switch_m_sdp'], + $data['variable_originate_disposition'], + $data['variable_bridge_to'], + $data['variable_endpoint_disposition'], + $data['variable_sip_hangup_disposition'], + $data['variable_sip_term_cause'], + $data['variable_hangup_cause'], + urldecode($data['variable_start_stamp']) . '-05', + isset($data['variable_answer_stamp'])?'\''. urldecode($data['variable_answer_stamp']) . '-05\'':'null', + urldecode($data['variable_progress_media_stamp']) . '-05', + urldecode($data['variable_end_stamp']) . '-05', + $data['variable_duration'], + $data['variable_billsec'], + $data['variable_progress_mediasec'], + $data['variable_billsec'], + "0", + "0", + "0" + ); + + $result = $con->query($insert); + if(PEAR::isError($result)) { + echo "$insert\n"; + die(); + } + } +} +?> Added: freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.postgres.sql ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.postgres.sql Tue Mar 17 16:09:12 2009 @@ -0,0 +1,71 @@ +-- +-- PostgreSQL database dump +-- + +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = off; +SET check_function_bodies = false; +SET client_min_messages = warning; +SET escape_string_warning = off; + +SET search_path = public, pg_catalog; + +SET default_tablespace = ''; + +SET default_with_oids = false; + +-- +-- Name: cdr; Type: TABLE; Schema: public; Owner: root; Tablespace: +-- + +CREATE TABLE cdr ( + uuid character varying, + acctcode character varying, + ani character varying, + e164_ani character varying, + dnis character varying, + translated_dnis character varying, + e164_dnis character varying, + src_host character varying, + read_codec character varying, + write_codec character varying, + clid_name character varying, + clid_number character varying, + src_sdp character varying, + dest_sdp character varying, + originate_disposition character varying, + bridge_to_uuid character varying, + endpoint_disposition character varying, + sip_hangup_disposition character varying, + term_cause character varying, + hangup_cause character varying, + start_stamp timestamp with time zone, + answer_stamp timestamp with time zone, + progress_media_stamp timestamp with time zone, + end_stamp timestamp with time zone, + duration integer, + billsec integer, + progress_mediasec integer, + billmin numeric(8,2), + carrier_id integer, + cust_cost numeric(7,4), + carrier_cost numeric(7,4) +); + + +ALTER TABLE public.cdr OWNER TO root; + +-- +-- Name: public; Type: ACL; Schema: -; Owner: postgres +-- + +REVOKE ALL ON SCHEMA public FROM PUBLIC; +REVOKE ALL ON SCHEMA public FROM postgres; +GRANT ALL ON SCHEMA public TO postgres; +GRANT ALL ON SCHEMA public TO PUBLIC; + + +-- +-- PostgreSQL database dump complete +-- +

1 0

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

17 Mar '09

Author: anthm Date: Tue Mar 17 15:56:28 2009 New Revision: 12652 Log: fix from irc 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 Tue Mar 17 15:56:28 2009 @@ -2877,6 +2877,9 @@ if (r_sdp) { if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { + if (switch_channel_test_flag(channel, CF_PROXY_MEDIA) && !switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "PROXY MEDIA"); + } sofia_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_channel_mark_pre_answered(channel); sofia_set_flag(tech_pvt, TFLAG_SDP); @@ -2897,9 +2900,7 @@ } goto done; } else { - if (switch_channel_test_flag(channel, CF_PROXY_MEDIA) && !switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { - switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "PROXY MEDIA"); - } else if (sofia_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) && !switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { + if (sofia_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) && !switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "DELAYED NEGOTIATION"); } else { if (sofia_glue_tech_media(tech_pvt, (char *) r_sdp) != SWITCH_STATUS_SUCCESS) {

1 0