January 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7147 - in freeswitch/trunk/scripts/contrib/intralanman/PHP: . fs_sock
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: intralanman Date: Tue Jan 8 16:55:23 2008 New Revision: 7147 Added: freeswitch/trunk/scripts/contrib/intralanman/PHP/ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/fs_sock.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/socktest.php Log: adding PHP class for event socket Added: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/fs_sock.php ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/fs_sock.php Tue Jan 8 16:55:23 2008 @@ -0,0 +1,420 @@ +<?php +/** + * Class for FreeSWITCH event socket + * + */ + +/** + * Class for FreeSWITCH event socket + * + */ +class fs_sock { + /** + * file handler for FreeSWITCH socket connection + * + * @var file pointer + */ + public $sock; + + /** + * Sets Whether auth was successful or not + * Used to not send further commands until auth is successful + * + * @var boolean + */ + public $auth; + + /** + * Variable to hold current command + * + * @var string + */ + private $command = 'initial_read'; + + private $input_buffer; + private $output_buffer; + + /** + * Class instantiation + * This method will connect to the socket and authenticate + * + * @param array $vars + * @return fs_sock + */ + function fs_sock($vars=null) { + if (!defined('BUFFER_SIZE')) { + /** + * This is the buffer size for fread/fgets operations (default 4096) + * Define BUFFER_SIZE before instantiation to use a different size + */ + define('BUFFER_SIZE', 4096); + } + $vars_array = is_array($vars) ? $vars : array(); + $initial_vars = $this -> set_initial_vars($vars_array); + //$this -> debug($initial_vars); + $this -> sock_connect($initial_vars); + $initial_output = $this -> sock_get(); + if ($initial_output['Content-Type'] == 'auth/request') { + $this -> debug('---- authentication requested ----'); + $this -> sock_auth($initial_vars['pass']); + } + } + + /** + * Close the connection to the event socket + * + */ + function sock_close() { + $this -> send_command('exit'); + fclose($this -> sock); + } + + /** + * Sets connection info from array passed, or used a set of defaults if nothing is passed + * + * @param array $var_array array of connection settings to use (host|port|pass|timeout) + * @return array + */ + function set_initial_vars($var_array) { + $defaults = array( + 'host' => '127.0.0.1', + 'port' => '8021', + 'pass' => 'ClueCon', + 'timeout' => 30, + 'stream_timeout' => 5 + ); + if (array_key_exists('host', $var_array) + && $var_array['host'] == 'localhost') { + //$this -> debug('Replacing localhost with 127.0.0.1'); + $var_array['host'] = '127.0.0.1'; + } + foreach ($defaults as $key => $val) { + if (array_key_exists($key, $var_array)) { + //$this -> debug("$key found in vars"); + $connection_settings[$key] = $var_array[$key]; + } else { + //$this -> debug("$key not found in vars"); + $connection_settings[$key] = $val; + } + } + //$this -> debug($connection_settings); + return $connection_settings; + } + + /** + * Connect to the event socket using the array determined by set_initial_vars + * + * @param array $sock_array array of connection parameters + * @return boolean + */ + function sock_connect($sock_array) { + //$this -> debug($sock_array); + $host = $sock_array['host']; + $port = $sock_array['port']; + $timeout = $sock_array['timeout']; + $this -> sock = fsockopen($host, $port, $errno, $errstr, $timeout); + if (!$this -> sock) { + $error = sprintf('Unable to connect to %s:%s Error #%s: %s' + , $host, $port, $errno, $errstr + ); + trigger_error($error, E_USER_ERROR); + return false; + } else { + //$this -> debug(stream_get_meta_data($this -> sock)); + $this -> set_stream_opts($sock_array); + return true; + } + } + + /** + * Set the stream timeout to not block for long periods of time + * + * @param array $opts initial options passed to class instantiation + * @return void + */ + function set_stream_opts($opts) { + //$this -> debug($opts); + if (ereg('^[0-9]*\.[0-9]+$', $opts['stream_timeout'])) { + //$this -> debug($opts['stream_timeout'] . ' seems to be a float'); + $time_opts = split('\.', $opts['stream_timeout']); + //$this -> debug($time_opts); + $secs = sprintf('%d', $time_opts[0]); + $ms = ($time_opts[1] * 100000); + } else { + $secs = $opts['stream_timeout']; + $ms = 0; + } + if (!stream_set_timeout($this -> sock, $secs, $ms)) { + $this -> debug( + "Failed to set timeout to $secs seconds and $ms microseconds" + ); + } + } + + /** + * Authenticate to the FreeSWITCH event socket + * + * @param string $pass FreeSWITCH event socket password + * @return void + */ + function sock_auth($pass) { + $reply = $this -> send_command("auth $pass"); + if (is_array($reply) && array_key_exists('Reply-Text', $reply) + && ereg('^\+?OK', $reply['Reply-Text'])) { + $this -> debug('Successfully authenticated'); + $this -> debug($reply); + $this -> auth = true; + } else { + $this -> debug('Failed to authenticate'); + $this -> debug($reply); + $this -> auth = false; + } + } + + /** + * write raw data to the FreeSWITCH socket + * + * @param string $input command to write to the socket + */ + private function sock_put($input) { + fputs($this -> sock, $input); + } + + /** + * Read an event from the FreeSWITCH event socket + * + * @return array multi-dimentional array of the event + */ + private function sock_get() { + $this -> debug('---- Event Start ----'); + while ($orig_line = fgets($this -> sock, BUFFER_SIZE)) { + $trim_line = trim($orig_line); + $this -> debug($trim_line); + if (strlen($trim_line) > 0) { + if (strstr($trim_line, ":")) { + $split = split(":", $trim_line); + $header = trim($split[0]); + $value = trim($split[1]); + $event[$header] = $value; + } + } elseif (is_array($event) + && array_key_exists('Content-Length', $event)) { + $this -> debug("line is empty: " . (empty($trim_line) ? 'true' : 'false')); + $event['Body'] = $this -> sock_get_length($event['Content-Length']); + break; + } else { + break; + } + } + $this -> debug('---- Event Finish ----'); + $this -> debug($event); + return $event; + } + + /** + * Read $content_len bytes from the socket + * + * @param integer $content_len + * @return array + */ + private function sock_get_length($content_len) { + $this -> debug("calling sock_get_length with length of $content_len"); + //for ($i=0; $i<$content_len; $i+=strlen($orig_line)) { + while ($orig_line = fgets($this -> sock, BUFFER_SIZE)) { + $len += strlen($orig_line); + $trim_line = trim($orig_line); + $this -> debug("$trim_line - $len"); + if (strstr($orig_line, ":")) { + $split = split(":", $orig_line); + $attribute = trim($split[0]); + $value = trim($split[1]); + $content[$attribute] = urldecode($value); + } elseif (empty($trim_line) && is_array($content) + && array_key_exists('Content-Length', $content)) { + $content['Body'] = $this -> sock_get_length($content['Content-Length']); + $len += $content['Content-Length']; + break; + } elseif (!empty($trim_line)) { + $content .= $trim_line; + } + if ($len >= $content_len) { + break; + } + } + $this -> debug("leaving after $len bytes"); + //$this -> debug($content); + return $content; + } + + /** + * Send a command to the FreeSWITCH event socket + * This method sends a command string to the FreeSWITCH event socket and + * returns true upon success and false upon failure + * @param string $cmd command string to send to socket excluding any \r or \n + * @return boolean + */ + public function send_command($cmd) { + $this -> debug('command is ' . $cmd); + $cmd_split = split(' ', $cmd); + //$this -> debug($cmd_split); + $this -> command = $cmd_split[0]; + if ($this -> auth != true && $this -> command != 'auth') { + unset($this -> command); + return false; + } + $this -> debug("sending command: '$cmd'"); + $this -> sock_put("$cmd\r\n\r\n"); + if ($this -> command != 'exit') { + $reply = $this -> sock_get(); + //$this -> debug($reply); + } else { + unset($this -> command); + return; + } + if (is_array($reply)) { + unset($this -> command); + return $reply; + } else { + unset($this -> command); + $this -> debug("Didn't get an array as a reply"); + return false; + } + } + + /** + * Execute an api command + * + * @param string $cmd_str + * @return array of the response or false + */ + function api_command($cmd_str) { + $reply = $this -> send_command("api $cmd_str"); + while ($reply['Content-Type'] != 'api/response') { + if (count($reply) > 0) { + $debug_text = sprintf( + "%s - (%s) != (api/response) adding an event to the output buffer" + , count($reply), $reply['Content-Type'] + ); + $this -> debug($debug_text); + $this -> output_buffer[] = $reply; + } + $reply = $this -> sock_get(); + } + return $reply; + } + + /** + * Execute a backgrounded api command + * + * @param string $cmd_str + * @return array of the response or false + */ + function bgapi_command($cmd_str) { + $reply = $this -> send_command("bgapi $cmd_str"); + while ($reply['Content-Type'] != 'command/reply') { + if (count($reply) > 0) { + $debug_text = sprintf( + "%s - (%s) != (command/reply) adding an event to the output buffer" + , count($reply), $reply['Content-Type'] + ); + $this -> debug($debug_text); + $this -> output_buffer[] = $reply; + } + $reply = $this -> sock_get(); + } + if (array_key_exists('Reply-Text', $reply)) { + $split = split(':', $reply['Reply-Text']); + $uuid = trim($split[1]); + $reply['Job-UUID'] = $uuid; + } + return $reply; + } + + /** + * Pop an event off of the buffer or try to get one from the socket + * + * @return array + */ + function read_event() { + if (count($this -> output_buffer) > 0) { + return array_shift($this -> output_buffer); + } else { + $reply = $this -> sock_get(); + return $reply; + } + } + + /** + * Keep trying read_event until we actually get one + * + * @return array + */ + function wait_for_event() { + $event = array(); + while (count($event) < 1) { + $event = $this -> read_event(); + } + return $event; + } + + /** + * Subscribe to event notifications + * + * @param mixed $events comma-separated or array of events + * @return boolean + */ + function subscribe_events($events) { + if (is_array($events)) { + if (count($events) > 1) { + $events_str = implode(',', $events); + } else { + $events_str = $events[0]; + } + } else { + $events_str = $events; + } + $reply = $this -> send_command("event plain $events_str"); + $this -> debug($reply); + if (ereg('^\+?OK', $reply['Reply-Text'])) { + return true; + } else { + return false; + } + } + + /** + * Function to print out debugging info + * This method will recieve arbitrary data and print it to the screen + * enable/disable by defining FS_SOCK_DEBUG to true/false + * @param mixed $input what to debug, arrays and strings tested, objects MAY work + * @param integer $spaces + */ + function debug($input, $spaces=0) { + if (defined('FS_SOCK_DEBUG') && FS_SOCK_DEBUG == true) { + if (is_array($input)) { + foreach ($input as $key=>$val) { + if (is_array($val) || is_object($val)) { + $this -> debug("[$key] => $val", $spaces+4); + $this -> debug('(', $spaces + 8); + $this -> debug($val, $spaces + 8); + } else { + $this -> debug("[$key] => '$val'", $spaces + 4); + } + } + $this -> debug(")", $spaces); + } else { + if (is_array($_SERVER) + && array_key_exists('HTTP_HOST', $_SERVER)) { + printf("<pre>%s%s</pre>\r\n" + , str_repeat(' ', $spaces) + , htmlentities($input) + ); + } else { + $input = trim($input); + printf("%s%s\r\n", str_repeat(' ', $spaces), $input); + } + } + } + } +} +?> \ No newline at end of file Added: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/socktest.php ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/socktest.php Tue Jan 8 16:55:23 2008 @@ -0,0 +1,62 @@ +<?php +require_once('fs_sock.php'); + +// uncommenting this will produce LARGE amounts of output +// define('FS_SOCK_DEBUG', true); + +// different connection settings, all of these should work with a fresh install +$array[] = array('host'=>'127.0.0.1'); +$array[] = array('host'=>'127.0.0.1', 'port'=>'8021'); +$array[] = array('pass'=>'ClueCon', 'timeout'=>7); +$array[] = array( +'host'=>'localhost', +'port'=>'8021', +'pass'=>'ClueCon', +'timeout'=>3, +'stream_timeout'=>0.5 +); + +// commands to run, initially this was how i caught a few of my bugs +$cmds[] = 'status'; +$cmds[] = 'originate'; +$cmds[] = 'reloadxml'; +$cmds[] = 'invalidapp'; +$cmds[] = 'craptest'; + +$obj = new fs_sock($array[3]); +if ($obj -> auth != true) { + die(printf("Unable to authenticate\r\n")); +} + +if (!$obj -> subscribe_events('ALL')) { + die(printf("Unable to subscribe to events")); +} + +for ($x=0; $x<count($cmds); $x++) { + $debug_string = sprintf("Return ouput from (%s) is:", $cmds[$x]); + $return = $obj -> api_command($cmds[$x]); + $bg_return = $obj -> bgapi_command($cmds[$x]); + + $obj -> debug("$debug_string\r\n"); + $obj -> debug($return); + $obj -> debug($bg_return); +} + + + +//get $items number of items from the event buffer +$output = array(); +$items = 25; +for ($i=0; count($output)<$items; $i++) { + $count = count($output); + printf("%s - %s\r\n", $i+1, $count); + //$output[] = $obj -> read_event(); + $output[] = $obj -> wait_for_event(); +} +$obj -> debug($output); + + + + +$obj -> sock_close(); +?> \ No newline at end of file

1 0

[commit] r7146 - freeswitch/trunk/src
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: anthm Date: Tue Jan 8 16:43:09 2008 New Revision: 7146 Modified: freeswitch/trunk/src/switch_rtp.c Log: dtmf nightmare continues Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Jan 8 16:43:09 2008 @@ -798,6 +798,11 @@ int x, loops = 1, duration; rtp_session->dtmf_data.out_digit_sofar += samples; + if (rtp_session->dtmf_data.out_digit_sofar > 0xFFFF) { + rtp_session->dtmf_data.out_digit_sofar = samples; + rtp_session->dtmf_data.timestamp_dtmf += 0xFFFF; + } + if (rtp_session->dtmf_data.out_digit_sofar >= rtp_session->dtmf_data.out_digit_dur) { duration = rtp_session->dtmf_data.out_digit_dur; rtp_session->dtmf_data.out_digit_packet[1] |= 0x80; @@ -809,11 +814,11 @@ rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (duration >> 8); rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration; - rtp_session->dtmf_data.timestamp_dtmf += samples; + for (x = 0; x < loops; x++) { rtp_session->seq++; - + switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, 4, @@ -835,11 +840,10 @@ void *pop; if (switch_queue_trypop(rtp_session->dtmf_data.dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) { - int x; switch_dtmf_t *rdigit = pop; memset(rtp_session->dtmf_data.out_digit_packet, 0, 4); - rtp_session->dtmf_data.out_digit_sofar = 0; + rtp_session->dtmf_data.out_digit_sofar = samples; rtp_session->dtmf_data.out_digit_dur = rdigit->duration; rtp_session->dtmf_data.out_digit = rdigit->digit; rtp_session->dtmf_data.out_digit_packet[0] = (unsigned char) switch_char_to_rfc2833(rdigit->digit); @@ -853,22 +857,26 @@ rtp_session->sending_dtmf = 1; - for (x = 0; x < 3; x++) { - rtp_session->seq++; - switch_rtp_write_manual(rtp_session, - rtp_session->dtmf_data.out_digit_packet, - 4, - switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BUGGY_2833) ? 0 : 1, - rtp_session->te, - rtp_session->dtmf_data.timestamp_dtmf, - rtp_session->seq, - rtp_session->dtmf_data.out_digit_ssrc, &flags); - switch_log_printf(SWITCH_CHANNEL_LOG, - SWITCH_LOG_DEBUG, - "Send start packet for [%c] ts=%d sofar=%u dur=%d seq=%d\n", - rtp_session->dtmf_data.out_digit, - rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, 0, rtp_session->seq); - } + + rtp_session->seq++; + switch_rtp_write_manual(rtp_session, + rtp_session->dtmf_data.out_digit_packet, + 4, + switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BUGGY_2833) ? 0 : 1, + rtp_session->te, + rtp_session->dtmf_data.timestamp_dtmf, + rtp_session->seq, + rtp_session->dtmf_data.out_digit_ssrc, &flags); + + switch_log_printf(SWITCH_CHANNEL_LOG, + SWITCH_LOG_DEBUG, + "Send start packet for [%c] ts=%d sofar=%u dur=%d seq=%d\n", + rtp_session->dtmf_data.out_digit, + rtp_session->dtmf_data.timestamp_dtmf, + rtp_session->dtmf_data.out_digit_sofar, + 0, + rtp_session->seq); + free(rdigit); } }

1 0

[commit] r7145 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: brian Date: Tue Jan 8 16:10:07 2008 New Revision: 7145 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: continue is an extension flag ONLY dont do anything on conditions Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Jan 8 16:10:07 2008 @@ -55,7 +55,7 @@  <!-- <extension name="refer"> - <condition field="${sip_refer_to}" expression="<sip:${destination_number}@$${domain}>" continue="on_false"/> + <condition field="${sip_refer_to}" expression="<sip:${destination_number}@$${domain}>"/> <condition field="${sip_refer_to}" expression="<sip:(.*)@(.*)>"> <action application="set" data="refer_user=$1"/> <action application="set" data="refer_domain=$2"/>

1 0

[commit] r7144 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: brian Date: Tue Jan 8 16:08:31 2008 New Revision: 7144 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: continue is an extension flag ONLY dont do anything on conditions Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Jan 8 16:08:31 2008 @@ -4,7 +4,7 @@ <context name="default"> <extension name="unloop"> - <condition field="${unroll_loops}" expression="^true$" continue="on-true"/> + <condition field="${unroll_loops}" expression="^true$"/> <condition field="${sip_looped_call}" expression="^true$"> <action application="deflect" data="${destination_number}"/> </condition> @@ -108,7 +108,7 @@ </extension> <extension name="extension-intercom"> - <condition field="${sip_to_params}" expression="intercom\=true" continue="on-true"/> + <condition field="${sip_to_params}" expression="intercom\=true"/> <condition field="destination_number" expression="^8(10[01][0-9])$"> <action application="set" data="dialed_ext=$1"/> <action application="export" data="sip_h_Call-Info=<sip:$${domain}>;answer-after=0"/> @@ -125,7 +125,7 @@ successful bridge (hangup_after-bridge=true) --> <extension name="Local_Extension"> - <condition field="destination_number" expression="^(10[01][0-9])$" continue="on-true"> + <condition field="destination_number" expression="^(10[01][0-9])$"> <action application="set" data="dialed_ext=$1"/> </condition> <condition field="destination_number" expression="^${caller_id_number}$"> @@ -209,8 +209,8 @@ the softkey on the phone. Should work with other phones. --> <extension name="park"> - <condition field="source" expression="mod_sofia" continue="on-true"/> - <condition field="destination_number" expression="park\+(\d+)" continue="on-true"> + <condition field="source" expression="mod_sofia"/> + <condition field="destination_number" expression="park\+(\d+)"> <action application="fifo" data="$1@$${domain} in undef $${moh_uri}"/> </condition> </extension> @@ -219,8 +219,8 @@ Some phones send things like orbit= and you can extract that info. --> <extension name="unpark"> - <condition field="source" expression="mod_sofia" continue="on-true"/> - <condition field="destination_number" expression="^parking$" continue="on-true"/> + <condition field="source" expression="mod_sofia"/> + <condition field="destination_number" expression="^parking$"/> <condition field="${sip_to_params}" expression="fifo\=(\d+)"> <action application="answer"/> <action application="fifo" data="$1@$${domain} out nowait"/>

1 0

[commit] r7143 - freeswitch/trunk/src
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: anthm Date: Tue Jan 8 14:38:57 2008 New Revision: 7143 Modified: freeswitch/trunk/src/switch_core_state_machine.c Log: why not Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Tue Jan 8 14:38:57 2008 @@ -60,6 +60,8 @@ switch_dialplan_interface_t *dialplan_interface = NULL; switch_caller_profile_t *caller_profile; switch_caller_extension_t *extension = NULL; + char *expanded = NULL; + char *dpstr = NULL; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard RING %s\n", switch_channel_get_name(session->channel)); @@ -69,16 +71,16 @@ return; } else { char *dp[25]; - char *dpstr; int argc, x, count = 0; - + if (!switch_strlen_zero(caller_profile->dialplan)) { if ((dpstr = switch_core_session_strdup(session, caller_profile->dialplan))) { - argc = switch_separate_string(dpstr, ',', dp, (sizeof(dp) / sizeof(dp[0]))); + expanded = switch_channel_expand_variables(session->channel, dpstr); + argc = switch_separate_string(expanded, ',', dp, (sizeof(dp) / sizeof(dp[0]))); for (x = 0; x < argc; x++) { char *dpname = dp[x]; char *dparg = NULL; - + if (dpname) { if ((dparg = strchr(dpname, ':'))) { *dparg++ = '\0'; @@ -87,12 +89,12 @@ if (!(dialplan_interface = switch_loadable_module_get_dialplan_interface(dpname))) { continue; } - + count++; if ((extension = dialplan_interface->hunt_function(session, dparg, NULL)) != 0) { switch_channel_set_caller_extension(session->channel, extension); - return; + goto end; } } } @@ -102,7 +104,7 @@ if (switch_channel_test_flag(session->channel, CF_OUTBOUND)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No Dialplan, changing state to HOLD\n"); switch_channel_set_state(session->channel, CS_HOLD); - return; + goto end; } } } @@ -111,6 +113,13 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No Route, Aborting\n"); switch_channel_hangup(session->channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); } + + end: + + if (expanded && dpstr && expanded != dpstr) { + free(expanded); + } + } static void switch_core_standard_on_execute(switch_core_session_t *session)

1 0

[commit] r7142 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: anthm Date: Tue Jan 8 14:03:47 2008 New Revision: 7142 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix typo Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Jan 8 14:03:47 2008 @@ -749,7 +749,7 @@ switch_size_t file_data_len = samples * 2; int has_file_data = 0; - if (conference->perpetual_sound && !conference->fnode) { + if (conference->perpetual_sound && !conference->async_fnode) { conference_play_file(conference, conference->perpetual_sound, CONF_DEFAULT_LEADIN, NULL, 1); } else if (conference->moh_sound && conference->count == 1 && !conference->async_fnode) { conference_play_file(conference, conference->moh_sound, CONF_DEFAULT_LEADIN, NULL, 1);

1 0

[commit] r7141 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/formats/mod_local_stream
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: anthm Date: Tue Jan 8 13:35:51 2008 New Revision: 7141 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/switch_core_file.c Log: leak protection, better than mighty putty Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Jan 8 13:35:51 2008 @@ -1135,12 +1135,16 @@ \return SWITCH_STATUS_SUCCESS if the file is opened \note the loadable module used is chosen based on the file extension */ -SWITCH_DECLARE(switch_status_t) switch_core_file_open(_In_ switch_file_handle_t *fh, - _In_z_ const char *file_path, - _In_ uint8_t channels, - _In_ uint32_t rate, - _In_ unsigned int flags, - _In_opt_ switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_status_t) switch_core_perform_file_open(const char *file, const char *func, int line, + _In_ switch_file_handle_t *fh, + _In_z_ const char *file_path, + _In_ uint8_t channels, + _In_ uint32_t rate, + _In_ unsigned int flags, + _In_opt_ switch_memory_pool_t *pool); +#define switch_core_file_open(_fh, _file_path, _channels, _rate, _flags, _pool) \ + switch_core_perform_file_open(__FILE__, __SWITCH_FUNC__, __LINE__, _fh, _file_path, _channels, _rate, _flags, _pool) + /*! \brief Read media from a file handle \param fh the file handle to read from (must be initilized by you memset all 0 for read, fill in channels and rate for write) Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Tue Jan 8 13:35:51 2008 @@ -301,6 +301,9 @@ switch_buffer_t *buffer; switch_byte_t *dbuf; switch_size_t dbuflen; + const char *file; + const char *func; + int line; }; /*! \brief Abstract interface to an asr module */ Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Jan 8 13:35:51 2008 @@ -979,64 +979,63 @@ switch_event_fire(&event); } - switch_core_timer_destroy(&timer); - - if (switch_test_flag(conference, CFLAG_DESTRUCT)) { - - switch_mutex_lock(conference->mutex); - conference_stop_file(conference, FILE_STOP_ASYNC); - conference_stop_file(conference, FILE_STOP_ALL); - /* Close Unused Handles */ - if (conference->fnode) { - conference_file_node_t *fnode, *cur; - switch_memory_pool_t *pool; + - fnode = conference->fnode; - while (fnode) { - cur = fnode; - fnode = fnode->next; + switch_mutex_lock(conference->mutex); + conference_stop_file(conference, FILE_STOP_ASYNC); + conference_stop_file(conference, FILE_STOP_ALL); + /* Close Unused Handles */ + if (conference->fnode) { + conference_file_node_t *fnode, *cur; + switch_memory_pool_t *pool; - if (cur->type != NODE_TYPE_SPEECH) { - switch_core_file_close(&cur->fh); - } + fnode = conference->fnode; + while (fnode) { + cur = fnode; + fnode = fnode->next; - pool = cur->pool; - switch_core_destroy_memory_pool(&pool); + if (cur->type != NODE_TYPE_SPEECH) { + switch_core_file_close(&cur->fh); } - conference->fnode = NULL; - } - if (conference->async_fnode) { - switch_memory_pool_t *pool; - switch_core_file_close(&conference->async_fnode->fh); - pool = conference->async_fnode->pool; - conference->async_fnode = NULL; - switch_core_destroy_memory_pool(&pool); + pool = cur->pool; + switch_core_destroy_memory_pool(&pool); } + conference->fnode = NULL; + } - switch_mutex_lock(conference->member_mutex); - for (imember = conference->members; imember; imember = imember->next) { - switch_channel_t *channel; + if (conference->async_fnode) { + switch_memory_pool_t *pool; + switch_core_file_close(&conference->async_fnode->fh); + pool = conference->async_fnode->pool; + conference->async_fnode = NULL; + switch_core_destroy_memory_pool(&pool); + } - if (!switch_test_flag(imember, MFLAG_NOCHANNEL)) { - channel = switch_core_session_get_channel(imember->session); + switch_mutex_lock(conference->member_mutex); + for (imember = conference->members; imember; imember = imember->next) { + switch_channel_t *channel; - /* add this little bit to preserve the bridge cause code in case of an early media call that */ - /* never answers */ - if (switch_test_flag(conference, CFLAG_ANSWERED)) { - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - } else { - /* put actual cause code from outbound channel hangup here */ - switch_channel_hangup(channel, conference->bridge_hangup_cause); - } - } + if (!switch_test_flag(imember, MFLAG_NOCHANNEL)) { + channel = switch_core_session_get_channel(imember->session); - switch_clear_flag_locked(imember, MFLAG_RUNNING); + /* add this little bit to preserve the bridge cause code in case of an early media call that */ + /* never answers */ + if (switch_test_flag(conference, CFLAG_ANSWERED)) { + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + } else { + /* put actual cause code from outbound channel hangup here */ + switch_channel_hangup(channel, conference->bridge_hangup_cause); + } } - switch_mutex_unlock(conference->member_mutex); - switch_mutex_unlock(conference->mutex); + switch_clear_flag_locked(imember, MFLAG_RUNNING); + } + switch_mutex_unlock(conference->member_mutex); + switch_mutex_unlock(conference->mutex); + if (switch_test_flag(conference, CFLAG_DESTRUCT)) { + switch_core_timer_destroy(&timer); switch_mutex_lock(globals.hash_mutex); switch_core_hash_delete(globals.conference_hash, conference->name); switch_mutex_unlock(globals.hash_mutex); Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Tue Jan 8 13:35:51 2008 @@ -51,6 +51,9 @@ switch_mutex_t *audio_mutex; switch_buffer_t *audio_buffer; int err; + const char *file; + const char *func; + int line; struct local_stream_context *next; }; typedef struct local_stream_context local_stream_context_t; @@ -191,14 +194,20 @@ switch_buffer_write(audio_buffer, abuf, olen * 2); used = switch_buffer_inuse(audio_buffer); - + if (used >= source->prebuf || (source->total && used > source->samples * 2)) { used = switch_buffer_read(audio_buffer, dist_buf, source->samples * 2); if (source->total) { + switch_mutex_lock(source->mutex); for (cp = source->context_list; cp; cp = cp->next) { switch_mutex_lock(cp->audio_mutex); - switch_buffer_write(cp->audio_buffer, dist_buf, used); + if (switch_buffer_inuse(cp->audio_buffer) > source->samples * 128) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Leaking stream handle! [%s() %s:%d]\n", cp->func, cp->file, cp->line); + switch_buffer_zero(cp->audio_buffer); + } else { + switch_buffer_write(cp->audio_buffer, dist_buf, used); + } switch_mutex_unlock(cp->audio_mutex); } switch_mutex_unlock(source->mutex); @@ -277,6 +286,9 @@ } context->source = source; + context->file = handle->file; + context->func = handle->func; + context->line = handle->line; switch_mutex_lock(source->mutex); context->next = source->context_list; Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Tue Jan 8 13:35:51 2008 @@ -34,8 +34,13 @@ #include <switch.h> #include "private/switch_core_pvt.h" -SWITCH_DECLARE(switch_status_t) switch_core_file_open(switch_file_handle_t *fh, - const char *file_path, uint8_t channels, uint32_t rate, unsigned int flags, switch_memory_pool_t *pool) +SWITCH_DECLARE(switch_status_t) switch_core_perform_file_open(const char *file, const char *func, int line, + switch_file_handle_t *fh, + const char *file_path, + uint8_t channels, + uint32_t rate, + unsigned int flags, + switch_memory_pool_t *pool) { char *ext; switch_status_t status; @@ -63,6 +68,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid file format [%s] for [%s]!\n", ext, file_path); return SWITCH_STATUS_GENERR; } + + fh->file = file; + fh->func = func; + fh->line = line; fh->flags = flags; if (pool) {

1 0

[commit] r7140 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: anthm Date: Tue Jan 8 12:18:04 2008 New Revision: 7140 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: there are no small problems only small fixes 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 Jan 8 12:18:04 2008 @@ -1496,6 +1496,7 @@ switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOMEDIA"); switch_set_flag_locked(tech_pvt, TFLAG_READY); switch_channel_set_state(channel, CS_INIT); + switch_set_flag(tech_pvt, TFLAG_SDP); goto done; } else { sdp_parser_t *parser;

1 0

[commit] r7139 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: anthm Date: Tue Jan 8 11:35:20 2008 New Revision: 7139 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix shutdown issues Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Jan 8 11:35:20 2008 @@ -546,6 +546,11 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); + if (!(tech_pvt->profile->pflags & PFLAG_RUNNING)) { + switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_NORMAL_CLEARING); + return SWITCH_STATUS_FALSE; + } + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } 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 Jan 8 11:35:20 2008 @@ -535,13 +535,23 @@ switch_thread_rwlock_wrlock(profile->rwlock); sofia_reg_unregister(profile); nua_shutdown(profile->nua); - su_root_run(profile->s_root); + + while(profile->inuse) { + switch_yield(100000); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "waiting for %d session(s)\n", profile->inuse); + } nua_destroy(profile->nua); switch_mutex_lock(profile->ireg_mutex); switch_mutex_unlock(profile->ireg_mutex); + switch_mutex_lock(profile->flag_mutex); + switch_mutex_unlock(profile->flag_mutex); + + + + if (switch_event_create(&s_event, SWITCH_EVENT_UNPUBLISH) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp,_sip._tcp,_sip._sctp%s", (sofia_test_pflag(profile, PFLAG_TLS)) ? ",_sips._tcp" : ""); @@ -2250,7 +2260,7 @@ int is_auth = 0, calling_myself = 0; su_addrinfo_t *my_addrinfo = msg_addrinfo(nua_current_request(nua)); - if (sess_count >= sess_max) { + if (sess_count >= sess_max || !(profile->pflags & PFLAG_RUNNING)) { nua_respond(nh, 480, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); return; } 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 Tue Jan 8 11:35:20 2008 @@ -1801,6 +1801,9 @@ switch_mutex_lock(mod_sofia_globals.hash_mutex); if ((profile = (sofia_profile_t *) switch_core_hash_find(mod_sofia_globals.profile_hash, key))) { + if (!(profile->pflags & PFLAG_RUNNING)) { + return NULL; + } if (switch_thread_rwlock_tryrdlock(profile->rwlock) != SWITCH_STATUS_SUCCESS) { #ifdef SOFIA_DEBUG_RWLOCKS switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_ERROR, "Profile %s is locked\n", profile->name); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Tue Jan 8 11:35:20 2008 @@ -1052,6 +1052,9 @@ switch_mutex_lock(mod_sofia_globals.hash_mutex); if ((gateway = (sofia_gateway_t *) switch_core_hash_find(mod_sofia_globals.gateway_hash, key))) { + if (!(gateway->profile->pflags & PFLAG_RUNNING)) { + return NULL; + } if (switch_thread_rwlock_tryrdlock(gateway->profile->rwlock) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "Profile %s is locked\n", gateway->profile->name); gateway = NULL;

1 0

[commit] r7138 - freeswitch/trunk/src
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: mikej Date: Tue Jan 8 11:20:00 2008 New Revision: 7138 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c Log: don't set blank vars, and handle them in error cases. Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Jan 8 11:20:00 2008 @@ -454,7 +454,7 @@ if (!switch_strlen_zero(varname)) { switch_mutex_lock(channel->profile_mutex); switch_event_del_header(channel->variables, varname); - if (value) { + if (!switch_strlen_zero(value)) { switch_event_add_header(channel->variables, SWITCH_STACK_BOTTOM, varname, "%s", value); } switch_mutex_unlock(channel->profile_mutex); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Jan 8 11:20:00 2008 @@ -1323,7 +1323,7 @@ if (!hi) return off; for (; hi; hi = hi->next) { - if (hi->name && hi->value && ((variable = switch_xml_add_child_d(xml, hi->name, off++)))) { + if (!switch_strlen_zero(hi->name) && !switch_strlen_zero(hi->value) && ((variable = switch_xml_add_child_d(xml, hi->name, off++)))) { char *data; switch_size_t dlen = strlen(hi->value) * 3;

1 0