<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][17416] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=17416">17416</a></dd>
<dt>Author</dt> <dd>dyatsin</dd>
<dt>Date</dt> <dd>2010-04-27 13:32:55 -0500 (Tue, 27 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge branch 'master' of git@git.freeswitch.org:freeswitch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkMakefileam">freeswitch/trunk/Makefile.am</a></li>
<li><a href="#freeswitchtrunkconfigurein">freeswitch/trunk/configure.in</a></li>
<li><a href="#freeswitchtrunklibseslsrceslc">freeswitch/trunk/libs/esl/src/esl.c</a></li>
<li><a href="#freeswitchtrunklibslibdingalingsrclibdingalingc">freeswitch/trunk/libs/libdingaling/src/libdingaling.c</a></li>
<li><a href="#freeswitchtrunksrcincludeg711h">freeswitch/trunk/src/include/g711.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_dsoh">freeswitch/trunk/src/include/switch_dso.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_nath">freeswitch/trunk/src/include/switch_nat.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_stunh">freeswitch/trunk/src/include/switch_stun.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_xmlh">freeswitch/trunk/src/include/switch_xml.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_conferencemod_conferencec">freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_exprconioh">freeswitch/trunk/src/mod/applications/mod_expr/conio.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_fifomod_fifoc">freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_spymod_spyc">freeswitch/trunk/src/mod/applications/mod_spy/mod_spy.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_t38gatewayudptlh">freeswitch/trunk/src/mod/applications/mod_t38gateway/udptl.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc">freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c</a></li>
<li><a href="#freeswitchtrunksrcmoddialplansmod_dialplan_xmlmod_dialplan_xmlc">freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_portaudiopablioh">freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_presencec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_regc">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c</a></li>
<li><a href="#freeswitchtrunksrcmodevent_handlersmod_json_cdrmod_json_cdrc">freeswitch/trunk/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c</a></li>
<li><a href="#freeswitchtrunksrcmodxml_intmod_xml_cdrmod_xml_cdrc">freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c</a></li>
<li><a href="#freeswitchtrunksrcmodxml_intmod_xml_ldaplutil_ldaph">freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/lutil_ldap.h</a></li>
<li><a href="#freeswitchtrunksrcswitch_channelc">freeswitch/trunk/src/switch_channel.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_sqldbc">freeswitch/trunk/src/switch_core_sqldb.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_state_machinec">freeswitch/trunk/src/switch_core_state_machine.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_dsoc">freeswitch/trunk/src/switch_dso.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_asyncc">freeswitch/trunk/src/switch_ivr_async.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_originatec">freeswitch/trunk/src/switch_ivr_originate.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_loadable_modulec">freeswitch/trunk/src/switch_loadable_module.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_rtpc">freeswitch/trunk/src/switch_rtp.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_xmlc">freeswitch/trunk/src/switch_xml.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/Makefile.am (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/Makefile.am 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/Makefile.am 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> touch .version ; \
</span><span class="cx"> else \
</span><span class="cx"> if [ -d .git ] ; then \
</span><del>- version=`git log --format="%h %ci" -1 HEAD | head -1 || echo hacked` ; \
</del><ins>+ version=`git log --format="%h %ci" -1 HEAD | head -1 | sed -e 's|:|-|g' || echo hacked` ; \
</ins><span class="cx"> if [ "x$$version" == "xhacked" ] ; then \
</span><span class="cx"> version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \
</span><span class="cx"> else \
</span></span></pre></div>
<a id="freeswitchtrunkconfigurein"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/configure.in (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/configure.in 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/configure.in 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -353,7 +353,6 @@
</span><span class="cx">
</span><span class="cx"> AM_CONDITIONAL([ENABLE_ZRTP],[test "x$enable_zrtp" != "xno"])
</span><span class="cx">
</span><del>-
</del><span class="cx"> AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"])
</span><span class="cx">
</span><span class="cx"> AC_ARG_ENABLE(core-odbc-support,
</span><span class="lines">@@ -363,6 +362,11 @@
</span><span class="cx"> enable_core_odbc_support="yes"
</span><span class="cx"> fi
</span><span class="cx">
</span><ins>+AC_CHECK_LIB(z, inflateReset, have_libz=yes, have_libz=no)
+if test "x$have_libz" = "xyes" ; then
+APR_ADDTO(SWITCH_AM_LDFLAGS, -lz)
+fi
+
</ins><span class="cx"> ESL_LDFLAGS=
</span><span class="cx"> PLATFORM_CORE_DEPLIBS=
</span><span class="cx"> # tweak platform specific flags
</span></span></pre></div>
<a id="freeswitchtrunklibseslsrceslc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/src/esl.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/src/esl.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/libs/esl/src/esl.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -786,7 +786,7 @@
</span><span class="cx"> return ESL_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (esl_mutex_trylock(handle->mutex) != ESL_SUCCESS) {
</del><ins>+ if (activity == 0 || !FD_ISSET(handle->sock, &rfds) || (esl_mutex_trylock(handle->mutex) != ESL_SUCCESS)) {
</ins><span class="cx"> return ESL_BREAK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibslibdingalingsrclibdingalingc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/libdingaling/src/libdingaling.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -2179,7 +2179,11 @@
</span><span class="cx">
</span><span class="cx"> ldl_status ldl_global_terminate(void)
</span><span class="cx"> {
</span><del>- ldl_clear_flag_locked((&globals), LDL_FLAG_READY);
</del><ins>+ if (globals.flag_mutex) {
+ ldl_clear_flag_locked((&globals), LDL_FLAG_READY);
+ } else {
+ ldl_clear_flag((&globals), LDL_FLAG_READY);
+ }
</ins><span class="cx"> return LDL_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeg711h"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/g711.h (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/g711.h 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/include/g711.h 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx"> specification by other means.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if !defined(_G711_H_)
-#define _G711_H_
</del><ins>+#if !defined(FREESWITCH_G711_H)
+#define FREESWITCH_G711_H
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_dsoh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_dso.h (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_dso.h 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/include/switch_dso.h 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx">
</span><del>-#ifndef _SWITCH_DSO_H
-#define _SWITCH_DSO_H
</del><ins>+#ifndef FREESWITCH_DSO_H
+#define FREESWITCH_DSO_H
</ins><span class="cx">
</span><span class="cx"> typedef int (*switch_dso_func_t) (void);
</span><span class="cx"> #ifdef WIN32
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_nath"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_nat.h (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_nat.h 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/include/switch_nat.h 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> \ingroup core1
</span><span class="cx"> \{
</span><span class="cx"> */
</span><del>-#ifndef _SWITCH_NAT_H
-#define _SWITCH_NAT_H
</del><ins>+#ifndef FREESWITCH_NAT_H
+#define FREESWITCH_NAT_H
</ins><span class="cx">
</span><span class="cx"> SWITCH_BEGIN_EXTERN_C typedef enum {
</span><span class="cx"> SWITCH_NAT_TYPE_NONE,
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_stunh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_stun.h (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_stun.h 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/include/switch_stun.h 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> \ingroup core1
</span><span class="cx"> \{
</span><span class="cx"> */
</span><del>-#ifndef _SWITCH_STUN_PARSER_H
-#define _SWITCH_STUN_PARSER_H
</del><ins>+#ifndef FREESWITCH_STUN_PARSER_H
+#define FREESWITCH_STUN_PARSER_H
</ins><span class="cx">
</span><span class="cx"> SWITCH_BEGIN_EXTERN_C
</span><span class="cx"> #define SWITCH_STUN_DEFAULT_PORT 3478
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/include/switch_types.h 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -141,6 +141,7 @@
</span><span class="cx"> #define SWITCH_API_HANGUP_HOOK_VARIABLE "api_hangup_hook"
</span><span class="cx"> #define SWITCH_SESSION_IN_HANGUP_HOOK_VARIABLE "session_in_hangup_hook"
</span><span class="cx"> #define SWITCH_PROCESS_CDR_VARIABLE "process_cdr"
</span><ins>+#define SWITCH_FORCE_PROCESS_CDR_VARIABLE "force_process_cdr"
</ins><span class="cx"> #define SWITCH_BRIDGE_CHANNEL_VARIABLE "bridge_channel"
</span><span class="cx"> #define SWITCH_CHANNEL_NAME_VARIABLE "channel_name"
</span><span class="cx"> #define SWITCH_BRIDGE_UUID_VARIABLE "bridge_uuid"
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_xmlh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_xml.h (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_xml.h 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/include/switch_xml.h 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef _SWITCH_XML_H
-#define _SWITCH_XML_H
</del><ins>+#ifndef FREESWITCH_XML_H
+#define FREESWITCH_XML_H
</ins><span class="cx"> #include <switch.h>
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -413,6 +413,8 @@
</span><span class="cx"> ///\return the section mask
</span><span class="cx"> SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(_In_opt_z_ const char *str);
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(int) switch_xml_std_datetime_check(switch_xml_t xcond);
+
</ins><span class="cx"> SWITCH_END_EXTERN_C
</span><span class="cx"> ///\}
</span><span class="cx"> #endif // _SWITCH_XML_H
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_conferencemod_conferencec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -262,6 +262,7 @@
</span><span class="cx"> char *sound_prefix;
</span><span class="cx"> char *special_announce;
</span><span class="cx"> char *auto_record;
</span><ins>+ uint32_t terminate_on_silence;
</ins><span class="cx"> uint32_t max_members;
</span><span class="cx"> char *maxmember_sound;
</span><span class="cx"> uint32_t announce_count;
</span><span class="lines">@@ -336,6 +337,8 @@
</span><span class="cx"> int32_t energy_level;
</span><span class="cx"> int32_t volume_in_level;
</span><span class="cx"> int32_t volume_out_level;
</span><ins>+ switch_time_t join_time;
+ switch_time_t last_talking;
</ins><span class="cx"> uint32_t native_rate;
</span><span class="cx"> switch_audio_resampler_t *read_resampler;
</span><span class="cx"> int16_t *resample_out;
</span><span class="lines">@@ -638,6 +641,7 @@
</span><span class="cx"> switch_mutex_lock(conference->member_mutex);
</span><span class="cx">
</span><span class="cx"> switch_clear_flag(conference, CFLAG_DESTRUCT);
</span><ins>+ member->join_time = switch_epoch_time_now(NULL);
</ins><span class="cx"> member->conference = conference;
</span><span class="cx"> member->next = conference->members;
</span><span class="cx"> member->energy_level = conference->energy_level;
</span><span class="lines">@@ -1045,6 +1049,23 @@
</span><span class="cx"> switch_mutex_unlock(imember->audio_in_mutex);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* Find if no one talked for more than x number of second */
+ if (conference->terminate_on_silence && conference->count > 1) {
+ int is_talking = 0;
+
+ for (imember = conference->members; imember; imember = imember->next) {
+ if (switch_epoch_time_now(NULL) - imember->join_time <= conference->terminate_on_silence) {
+ is_talking++;
+ } else if (imember->last_talking != 0 && switch_epoch_time_now(NULL) - imember->last_talking <= conference->terminate_on_silence) {
+ is_talking++;
+ }
+ }
+ if (is_talking == 0) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Conference has been idle for over %d seconds, terminating\n", conference->terminate_on_silence);
+ switch_set_flag(conference, CFLAG_DESTRUCT);
+ }
+ }
+
</ins><span class="cx"> /* Start recording if there's more than one participant. */
</span><span class="cx"> if (conference->auto_record && !conference->is_recording && conference->count > 1) {
</span><span class="cx"> conference->is_recording = 1;
</span><span class="lines">@@ -1912,6 +1933,7 @@
</span><span class="cx">
</span><span class="cx"> if (diff >= diff_level || ++hangunder_hits >= hangunder) {
</span><span class="cx"> hangover_hits = hangunder_hits = 0;
</span><ins>+ member->last_talking = switch_epoch_time_now(NULL);
</ins><span class="cx">
</span><span class="cx"> if (!switch_test_flag(member, MFLAG_TALKING)) {
</span><span class="cx"> switch_event_t *event;
</span><span class="lines">@@ -3616,6 +3638,12 @@
</span><span class="cx"> add_x_tag(x_member, "caller_id_number", profile->caller_id_number, toff++);
</span><span class="cx">
</span><span class="cx">
</span><ins>+ switch_snprintf(i, sizeof(i), "%d", switch_epoch_time_now(NULL) - member->join_time);
+ add_x_tag(x_member, "join_time", i, toff++);
+
+ switch_snprintf(i, sizeof(i), "%d", switch_epoch_time_now(NULL) - member->last_talking);
+ add_x_tag(x_member, "last_talking", member->last_talking ? i : "N/A", toff++);
+
</ins><span class="cx"> x_flags = switch_xml_add_child_d(x_member, "flags", count++);
</span><span class="cx"> switch_assert(x_flags);
</span><span class="cx">
</span><span class="lines">@@ -5793,6 +5821,7 @@
</span><span class="cx"> char *suppress_events = NULL;
</span><span class="cx"> char *verbose_events = NULL;
</span><span class="cx"> char *auto_record = NULL;
</span><ins>+ char *terminate_on_silence = NULL;
</ins><span class="cx">
</span><span class="cx"> /* Validate the conference name */
</span><span class="cx"> if (zstr(name)) {
</span><span class="lines">@@ -5922,6 +5951,8 @@
</span><span class="cx"> verbose_events = val;
</span><span class="cx"> } else if (!strcasecmp(var, "auto-record") && !zstr(val)) {
</span><span class="cx"> auto_record = val;
</span><ins>+ } else if (!strcasecmp(var, "terminate-on-silence") && !zstr(val)) {
+ terminate_on_silence = val;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6093,6 +6124,9 @@
</span><span class="cx"> if (!zstr(auto_record)) {
</span><span class="cx"> conference->auto_record = switch_core_strdup(conference->pool, auto_record);
</span><span class="cx"> }
</span><ins>+ if (!zstr(terminate_on_silence)) {
+ conference->terminate_on_silence = atoi(terminate_on_silence);
+ }
</ins><span class="cx">
</span><span class="cx"> if (!zstr(verbose_events) && switch_true(verbose_events)) {
</span><span class="cx"> conference->verbose_events = 1;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_exprconioh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_expr/conio.h (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_expr/conio.h 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/applications/mod_expr/conio.h 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -8,8 +8,8 @@
</span><span class="cx"> * Offered for use in the public domain without any warranty.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef _CONIO_H_
-#define _CONIO_H_
</del><ins>+#ifndef CONIO_H
+#define CONIO_H
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> #include <stdio.h>
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_fifomod_fifoc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -75,6 +75,15 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static switch_bool_t match_key(const char *caller_exit_key, char key)
+{
+ while (caller_exit_key && *caller_exit_key) {
+ if (*caller_exit_key++ == key) {
+ return SWITCH_TRUE;
+ }
+ }
+ return SWITCH_FALSE;
+}
</ins><span class="cx">
</span><span class="cx"> static switch_status_t on_dtmf(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)
</span><span class="cx"> {
</span><span class="lines">@@ -131,7 +140,7 @@
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx"> const char *caller_exit_key = switch_channel_get_variable(channel, "fifo_caller_exit_key");
</span><span class="cx">
</span><del>- if (caller_exit_key && dtmf->digit == *caller_exit_key) {
</del><ins>+ if (match_key(caller_exit_key, dtmf->digit)) {
</ins><span class="cx"> char *bp = buf;
</span><span class="cx"> *bp = dtmf->digit;
</span><span class="cx"> return SWITCH_STATUS_BREAK;
</span><span class="lines">@@ -230,9 +239,10 @@
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (caller_exit_key && *buf == *caller_exit_key) {
</del><ins>+ if (match_key(caller_exit_key, *buf)) {
</ins><span class="cx"> cd->abort = 1;
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><ins>+ switch_channel_set_variable(channel, "fifo_caller_exit_key", (char *)buf);
</ins><span class="cx"> }
</span><span class="cx"> cd->next = switch_epoch_time_now(NULL) + cd->freq;
</span><span class="cx"> cd->index++;
</span><span class="lines">@@ -1051,7 +1061,8 @@
</span><span class="cx"> switch_ivr_collect_digits_callback(session, &args, 0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (caller_exit_key && *buf == *caller_exit_key) {
</del><ins>+ if (match_key(caller_exit_key, *buf)) {
+ switch_channel_set_variable(channel, "fifo_caller_exit_key", (char *)buf);
</ins><span class="cx"> aborted = 1;
</span><span class="cx"> goto abort;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_spymod_spyc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_spy/mod_spy.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_spy/mod_spy.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/applications/mod_spy/mod_spy.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -128,16 +128,17 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void event_handler(switch_event_t *event)
</del><ins>+static switch_status_t process_event(switch_event_t *event)
</ins><span class="cx"> {
</span><span class="cx"> switch_core_session_t *session = NULL;
</span><span class="cx"> switch_channel_t *channel;
</span><del>- char *username[2] = { 0 };
- char *domain[2] = { 0 };
</del><ins>+ char *username[3] = { 0 };
+ char *domain[3] = { 0 };
</ins><span class="cx"> char key[512];
</span><span class="cx"> char *uuid = NULL, *my_uuid = NULL;
</span><span class="cx"> int i;
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> switch_thread_rwlock_rdlock(globals.spy_hash_lock);
</span><span class="cx">
</span><span class="cx"> if (!globals.spy_count) {
</span><span class="lines">@@ -146,10 +147,15 @@
</span><span class="cx">
</span><span class="cx"> username[0] = switch_event_get_header(event, "Caller-Username");
</span><span class="cx"> domain[0] = switch_event_get_header(event, "variable_domain_name");
</span><ins>+
</ins><span class="cx"> domain[1] = switch_event_get_header(event, "variable_dialed_domain");
</span><span class="cx"> username[1] = switch_event_get_header(event, "variable_dialed_user");
</span><span class="cx">
</span><del>- for (i = 0; i < 2; i++) {
</del><ins>+ username[2] = switch_event_get_header(event, "variable_user_name");
+ domain[2] = switch_event_get_header(event, "variable_domain_name");
+
+ for (i = 0; i < 3; i++) {
+
</ins><span class="cx"> if (username[i] && domain[i]) {
</span><span class="cx"> switch_snprintf(key, sizeof(key), "%s@%s", username[i], domain[i]);
</span><span class="cx">
</span><span class="lines">@@ -159,11 +165,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- done:
</del><ins>+ done:
</ins><span class="cx"> switch_thread_rwlock_unlock(globals.spy_hash_lock);
</span><span class="cx">
</span><span class="cx"> if (!uuid) {
</span><del>- return;
</del><ins>+ return SWITCH_STATUS_FALSE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> session = switch_core_session_locate(uuid);
</span><span class="lines">@@ -178,9 +184,46 @@
</span><span class="cx"> switch_channel_set_flag(channel, CF_BREAK);
</span><span class="cx">
</span><span class="cx"> switch_core_session_rwunlock(session);
</span><ins>+ return SWITCH_STATUS_SUCCESS;
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void event_handler(switch_event_t *event)
+{
+ if (process_event(event) != SWITCH_STATUS_SUCCESS) {
+ const char *peer_uuid = switch_event_get_header(event, "variable_signal_bond");
+ switch_core_session_t *peer_session = NULL;
+ switch_channel_t *peer_channel = NULL;
+ switch_event_t *peer_event = NULL;
+
+ if (!peer_uuid) {
+ return;
+ }
+
+ if (!(peer_session = switch_core_session_locate(peer_uuid))) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cant locate peer session for uuid %s\n", peer_uuid);
+ return;
+ }
+
+ peer_channel = switch_core_session_get_channel(peer_session);
+
+ if (switch_event_create(&peer_event, SWITCH_EVENT_CHANNEL_BRIDGE) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cant create bridge event for peer channel %s\n", peer_uuid);
+ goto end;
+ }
+
+ switch_channel_event_set_data(peer_channel, peer_event);
+
+ end:
+ switch_core_session_rwunlock(peer_session);
+
+ if (peer_event) {
+ process_event(peer_event);
+ switch_event_destroy(&peer_event);
+ }
+ }
+}
+
</ins><span class="cx"> #define USERSPY_SYNTAX "<user@domain> [uuid]"
</span><span class="cx"> SWITCH_STANDARD_APP(userspy_function)
</span><span class="cx"> {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_t38gatewayudptlh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_t38gateway/udptl.h (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_t38gateway/udptl.h 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/applications/mod_t38gateway/udptl.h 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -22,8 +22,8 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if !defined(_UDPTL_H_)
-#define _UDPTL_H_
</del><ins>+#if !defined(FREESWITCH_UDPTL_H)
+#define FREESWITCH_UDPTL_H
</ins><span class="cx">
</span><span class="cx"> #define LOCAL_FAX_MAX_DATAGRAM 400
</span><span class="cx"> #define LOCAL_FAX_MAX_FEC_PACKETS 5
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -1524,7 +1524,7 @@
</span><span class="cx"> TRY_CODE(switch_ivr_phrase_macro(session, VM_INVALID_EXTENSION_MACRO, vm_cc, NULL, NULL));
</span><span class="cx"> goto get_exten;
</span><span class="cx"> }
</span><del>- } else if (!strcmp(input, profile->delete_file_key) || !strcmp(input, profile->email_key)) {
</del><ins>+ } else if (!strcmp(input, profile->delete_file_key) || (!strcmp(input, profile->email_key) && !zstr(cbt->email))) {
</ins><span class="cx"> char *sql = switch_mprintf("update voicemail_msgs set flags='delete' where uuid='%s'", cbt->uuid);
</span><span class="cx"> vm_execute_sql(profile, sql, profile->mutex);
</span><span class="cx"> switch_safe_free(sql);
</span><span class="lines">@@ -1681,7 +1681,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-#define FREE_DOMAIN_ROOT() if (x_domain_root) switch_xml_free(x_domain_root); x_user = x_domain = x_domain_root = NULL
</del><ins>+#define FREE_DOMAIN_ROOT() if (x_user) switch_xml_free(x_user); x_user = NULL
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> static void voicemail_check_main(switch_core_session_t *session, vm_profile_t *profile, const char *domain_name, const char *id, int auth)
</span><span class="lines">@@ -1689,7 +1689,7 @@
</span><span class="cx"> vm_check_state_t vm_check_state = VM_CHECK_START;
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx"> switch_caller_profile_t *caller_profile = switch_channel_get_caller_profile(channel);
</span><del>- switch_xml_t x_domain = NULL, x_domain_root = NULL, x_user = NULL, x_params, x_param;
</del><ins>+ switch_xml_t x_user = NULL, x_params, x_param;
</ins><span class="cx"> switch_status_t status;
</span><span class="cx"> char pass_buf[80] = "", *mypass = NULL, id_buf[80] = "", *myfolder = NULL;
</span><span class="cx"> const char *thepass = NULL, *myid = id, *thehash = NULL, *vmhash = NULL;
</span><span class="lines">@@ -2083,18 +2083,37 @@
</span><span class="cx"> switch_event_t *params;
</span><span class="cx"> int ok = 1;
</span><span class="cx">
</span><del>-
</del><span class="cx"> switch_event_create(&params, SWITCH_EVENT_GENERAL);
</span><span class="cx"> switch_assert(params);
</span><span class="cx"> switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "destination_number", caller_profile->destination_number);
</span><span class="cx"> switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "caller_id_number", caller_id_number);
</span><span class="cx">
</span><del>-
- if (switch_xml_locate_user("id", myid, domain_name, switch_channel_get_variable(channel, "network_addr"),
- &x_domain_root, &x_domain, &x_user, NULL, params) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_xml_locate_user_merged("id", myid, domain_name, switch_channel_get_variable(channel, "network_addr"),
+ &x_user, params) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Can't find user [%s@%s]\n", myid, domain_name);
</span><span class="cx"> ok = 0;
</span><span class="cx"> } else {
</span><ins>+ switch_bool_t vm_enabled = SWITCH_TRUE;
+
+ x_params = switch_xml_child(x_user, "params");
+
+ for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) {
+ const char *var = switch_xml_attr_soft(x_param, "name");
+ const char *val = switch_xml_attr_soft(x_param, "value");
+
+ if (zstr(var) || zstr(val)) {
+ continue; /* Ignore empty entires */
+ }
+
+ if (!strcasecmp(var, "vm-enabled")) {
+ vm_enabled = !switch_false(val);
+ }
+ }
+
+ if (!vm_enabled) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "User [%s@%s] have voicemail disabled\n", myid, domain_name);
+ ok = 0;
+ }
</ins><span class="cx"> myid = switch_core_session_strdup(session, switch_xml_attr(x_user, "id"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2261,9 +2280,9 @@
</span><span class="cx"> status = switch_ivr_phrase_macro(session, VM_GOODBYE_MACRO, NULL, NULL, NULL);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (x_domain_root) {
- switch_xml_free(x_domain_root);
- x_domain_root = NULL;
</del><ins>+ if (x_user) {
+ switch_xml_free(x_user);
+ x_user = NULL;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2836,6 +2855,7 @@
</span><span class="cx"> int disk_quota = 0;
</span><span class="cx"> switch_bool_t skip_greeting = switch_true(switch_channel_get_variable(channel, "skip_greeting"));
</span><span class="cx"> switch_bool_t skip_instructions = switch_true(switch_channel_get_variable(channel, "skip_instructions"));
</span><ins>+ switch_bool_t vm_enabled = SWITCH_TRUE;
</ins><span class="cx">
</span><span class="cx"> switch_channel_set_variable(channel, "skip_greeting", NULL);
</span><span class="cx"> switch_channel_set_variable(channel, "skip_instructions", NULL);
</span><span class="lines">@@ -2888,12 +2908,19 @@
</span><span class="cx"> disk_quota = atoi(val);
</span><span class="cx"> } else if (!strcasecmp(var, "vm-alternate-greet-id")) {
</span><span class="cx"> read_id = switch_core_session_strdup(session, val);
</span><ins>+ } else if (!strcasecmp(var, "vm-enabled")) {
+ vm_enabled = !switch_false(val);
</ins><span class="cx"> } else if (!strcasecmp(var, "vm-message-ext")) {
</span><span class="cx"> vm_ext = switch_core_session_strdup(session, val);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!vm_enabled) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "User [%s@%s] have voicemail disabled\n", id, domain_name);
+ ok = 0;
+ }
+
</ins><span class="cx"> if (send_main && zstr(vm_email) && !zstr(email_addr)) {
</span><span class="cx"> vm_email = switch_core_session_strdup(session, email_addr);
</span><span class="cx"> if (zstr(vm_email)) {
</span></span></pre></div>
<a id="freeswitchtrunksrcmoddialplansmod_dialplan_xmlmod_dialplan_xmlc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -101,19 +101,7 @@
</span><span class="cx"> switch_bool_t anti_action = SWITCH_TRUE;
</span><span class="cx"> break_t do_break_i = BREAK_ON_FALSE;
</span><span class="cx">
</span><del>- const char *xyear = switch_xml_attr(xcond, "year");
- const char *xyday = switch_xml_attr(xcond, "yday");
- const char *xmon = switch_xml_attr(xcond, "mon");
- const char *xmday = switch_xml_attr(xcond, "mday");
- const char *xweek = switch_xml_attr(xcond, "week");
- const char *xmweek = switch_xml_attr(xcond, "mweek");
- const char *xwday = switch_xml_attr(xcond, "wday");
- const char *xhour = switch_xml_attr(xcond, "hour");
- const char *xminute = switch_xml_attr(xcond, "minute");
- const char *xminday = switch_xml_attr(xcond, "minute-of-day");
- switch_time_t ts = switch_micro_time_now();
- int time_match = -1;
- switch_time_exp_t tm;
</del><ins>+ int time_match = switch_xml_std_datetime_check(xcond);
</ins><span class="cx">
</span><span class="cx"> switch_safe_free(field_expanded);
</span><span class="cx"> switch_safe_free(expression_expanded);
</span><span class="lines">@@ -124,81 +112,6 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_time_exp_lt(&tm, ts);
-
- if (time_match && xyear) {
- int test = tm.tm_year + 1900;
- time_match = switch_number_cmp(xyear, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: year[%d] =~ %s (%s)\n", test, xyear, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xyday) {
- int test = tm.tm_yday + 1;
- time_match = switch_number_cmp(xyday, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: day of year[%d] =~ %s (%s)\n", test, xyday, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xmon) {
- int test = tm.tm_mon + 1;
- time_match = switch_number_cmp(xmon, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: month[%d] =~ %s (%s)\n", test, xmon, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xmday) {
- int test = tm.tm_mday;
- time_match = switch_number_cmp(xmday, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: day of month[%d] =~ %s (%s)\n", test, xmday, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xweek) {
- int test = (int) (tm.tm_yday / 7 + 1);
- time_match = switch_number_cmp(xweek, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: week of year[%d] =~ %s (%s)\n", test, xweek, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xmweek) {
- /* calculate the day of the week of the first of the month (0-6) */
- int firstdow = (int) (7 - (tm.tm_mday - (tm.tm_wday + 1)) % 7) % 7;
- /* calculate the week of the month (1-6) */
- int test = (int) ceil((tm.tm_mday + firstdow) / 7.0);
- time_match = switch_number_cmp(xmweek, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: week of month[%d] =~ %s (%s)\n", test, xmweek, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xwday) {
- int test = tm.tm_wday + 1;
- time_match = switch_number_cmp(xwday, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: day of week[%d] =~ %s (%s)\n", test, xwday, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xhour) {
- int test = tm.tm_hour;
- time_match = switch_number_cmp(xhour, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: hour[%d] =~ %s (%s)\n", test, xhour, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xminute) {
- int test = tm.tm_min;
- time_match = switch_number_cmp(xminute, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: minute[%d] =~ %s (%s)\n", test, xminute, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xminday) {
- int test = (tm.tm_hour * 60) + (tm.tm_min + 1);
- time_match = switch_number_cmp(xminday, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: minute of day[%d] =~ %s (%s)\n", test, xminday, time_match ? "PASS" : "FAIL");
- }
-
</del><span class="cx"> field = (char *) switch_xml_attr(xcond, "field");
</span><span class="cx">
</span><span class="cx"> if ((xexpression = switch_xml_child(xcond, "expression"))) {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_portaudiopablioh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.h (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.h 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.h 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>-#ifndef _PABLIO_H
-#define _PABLIO_H
</del><ins>+#ifndef PORTAUDIO_PABLIO_H
+#define PORTAUDIO_PABLIO_H
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -392,7 +392,13 @@
</span><span class="cx"> switch_call_cause_t cause = switch_channel_get_cause(channel);
</span><span class="cx"> int sip_cause = hangup_cause_to_sip(cause);
</span><span class="cx"> const char *ps_cause = NULL, *use_my_cause;
</span><ins>+ const char *gateway_name = NULL;
+ sofia_gateway_t *gateway_ptr = NULL;
</ins><span class="cx">
</span><ins>+ if ((gateway_name = switch_channel_get_variable(channel, "sip_gateway_name"))) {
+ gateway_ptr = sofia_reg_find_gateway(gateway_name);
+ }
+
</ins><span class="cx"> switch_mutex_lock(tech_pvt->sofia_mutex);
</span><span class="cx">
</span><span class="cx"> sofia_clear_flag(tech_pvt, TFLAG_RECOVERING);
</span><span class="lines">@@ -405,7 +411,19 @@
</span><span class="cx"> } else {
</span><span class="cx"> tech_pvt->profile->ib_failed_calls++;
</span><span class="cx"> }
</span><ins>+
+ if (gateway_ptr) {
+ if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
+ gateway_ptr->ob_failed_calls++;
+ } else {
+ gateway_ptr->ib_failed_calls++;
+ }
+ }
</ins><span class="cx"> }
</span><ins>+
+ if (gateway_ptr) {
+ sofia_reg_release_gateway(gateway_ptr);
+ }
</ins><span class="cx">
</span><span class="cx"> if (!((use_my_cause = switch_channel_get_variable(channel, "sip_ignore_remote_cause")) && switch_true(use_my_cause))) {
</span><span class="cx"> ps_cause = switch_channel_get_variable(channel, SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE);
</span><span class="lines">@@ -2086,7 +2104,14 @@
</span><span class="cx"> return sofia_state_names[state];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+struct cb_helper_sql2str {
+ char *buf;
+ size_t len;
+ int matches;
+};
+
</ins><span class="cx"> struct cb_helper {
</span><ins>+ uint32_t row_process;
</ins><span class="cx"> sofia_profile_t *profile;
</span><span class="cx"> switch_stream_handle_t *stream;
</span><span class="cx"> };
</span><span class="lines">@@ -2097,12 +2122,17 @@
</span><span class="cx"> {
</span><span class="cx"> struct cb_helper *cb = (struct cb_helper *) pArg;
</span><span class="cx"> char exp_buf[128] = "";
</span><ins>+ int exp_secs = 0;
</ins><span class="cx"> switch_time_exp_t tm;
</span><span class="cx">
</span><ins>+ cb->row_process++;
+
</ins><span class="cx"> if (argv[6]) {
</span><ins>+ time_t now = switch_epoch_time_now(NULL);
</ins><span class="cx"> switch_time_t etime = atoi(argv[6]);
</span><span class="cx"> switch_size_t retsize;
</span><del>-
</del><ins>+
+ exp_secs = etime - now;
</ins><span class="cx"> switch_time_exp_lt(&tm, switch_time_from_sec(etime));
</span><span class="cx"> switch_strftime_nocheck(exp_buf, &retsize, sizeof(exp_buf), "%Y-%m-%d %T", &tm);
</span><span class="cx"> }
</span><span class="lines">@@ -2112,7 +2142,7 @@
</span><span class="cx"> "User: \t%s@%s\n"
</span><span class="cx"> "Contact: \t%s\n"
</span><span class="cx"> "Agent: \t%s\n"
</span><del>- "Status: \t%s(%s) EXP(%s)\n"
</del><ins>+ "Status: \t%s(%s) EXP(%s) EXPSECS(%d)\n"
</ins><span class="cx"> "Host: \t%s\n"
</span><span class="cx"> "IP: \t%s\n"
</span><span class="cx"> "Port: \t%s\n"
</span><span class="lines">@@ -2120,7 +2150,7 @@
</span><span class="cx"> "Auth-Realm: \t%s\n"
</span><span class="cx"> "MWI-Account:\t%s@%s\n\n",
</span><span class="cx"> switch_str_nil(argv[0]), switch_str_nil(argv[1]), switch_str_nil(argv[2]), switch_str_nil(argv[3]),
</span><del>- switch_str_nil(argv[7]), switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf, switch_str_nil(argv[11]),
</del><ins>+ switch_str_nil(argv[7]), switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf, exp_secs, switch_str_nil(argv[11]),
</ins><span class="cx"> switch_str_nil(argv[12]), switch_str_nil(argv[13]), switch_str_nil(argv[14]), switch_str_nil(argv[15]),
</span><span class="cx"> switch_str_nil(argv[16]), switch_str_nil(argv[17]));
</span><span class="cx"> return 0;
</span><span class="lines">@@ -2133,11 +2163,16 @@
</span><span class="cx"> switch_time_exp_t tm;
</span><span class="cx"> const int buflen = 2048;
</span><span class="cx"> char xmlbuf[2048];
</span><ins>+ int exp_secs = 0;
</ins><span class="cx">
</span><ins>+ cb->row_process++;
+
</ins><span class="cx"> if (argv[6]) {
</span><ins>+ time_t now = switch_epoch_time_now(NULL);
</ins><span class="cx"> switch_time_t etime = atoi(argv[6]);
</span><span class="cx"> switch_size_t retsize;
</span><span class="cx">
</span><ins>+ exp_secs = etime - now;
</ins><span class="cx"> switch_time_exp_lt(&tm, switch_time_from_sec(etime));
</span><span class="cx"> switch_strftime_nocheck(exp_buf, &retsize, sizeof(exp_buf), "%Y-%m-%d %T", &tm);
</span><span class="cx"> }
</span><span class="lines">@@ -2147,7 +2182,7 @@
</span><span class="cx"> cb->stream->write_function(cb->stream," <user>%s@%s</user>\n", switch_str_nil(argv[1]), switch_str_nil(argv[2]));
</span><span class="cx"> cb->stream->write_function(cb->stream," <contact>%s</contact>\n", switch_amp_encode(switch_str_nil(argv[3]), xmlbuf, buflen));
</span><span class="cx"> cb->stream->write_function(cb->stream," <agent>%s</agent>\n", switch_str_nil(argv[7]));
</span><del>- cb->stream->write_function(cb->stream," <status>%s(%s) exp(%s)</status>\n", switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf);
</del><ins>+ cb->stream->write_function(cb->stream," <status>%s(%s) exp(%s) expsecs(%d)</status>\n", switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf, exp_secs);
</ins><span class="cx"> cb->stream->write_function(cb->stream," <host>%s</host>\n", switch_str_nil(argv[11]));
</span><span class="cx"> cb->stream->write_function(cb->stream," <network-ip>%s</network-ip>\n", switch_str_nil(argv[12]));
</span><span class="cx"> cb->stream->write_function(cb->stream," <network-port>%s</network-port>\n", switch_str_nil(argv[13]));
</span><span class="lines">@@ -2175,7 +2210,56 @@
</span><span class="cx">
</span><span class="cx"> if (argc > 0) {
</span><span class="cx"> if (argc == 1) {
</span><del>- stream->write_function(stream, "Invalid Syntax!\n");
</del><ins>+ /* show summary of all gateways*/
+
+ uint32_t ib_failed = 0;
+ uint32_t ib = 0;
+ uint32_t ob_failed = 0;
+ uint32_t ob = 0;
+
+ stream->write_function(stream, "%25s\t%32s\t%s\t%s\t%s\n", "Profile::Gateway-Name", " Data ", "State", "IB Calls(F/T)", "OB Calls(F/T)");
+ stream->write_function(stream, "%s\n", line);
+ switch_mutex_lock(mod_sofia_globals.hash_mutex);
+ for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) {
+ switch_hash_this(hi, &vvar, NULL, &val);
+ profile = (sofia_profile_t *) val;
+ if (sofia_test_pflag(profile, PFLAG_RUNNING)) {
+
+ if (!strcmp(vvar, profile->name)) { /* not an alias */
+ for (gp = profile->gateways; gp; gp = gp->next) {
+ char *pkey = switch_mprintf("%s::%s", profile->name, gp->name);
+
+ switch_assert(gp->state < REG_STATE_LAST);
+
+ c++;
+ ib_failed += gp->ib_failed_calls;
+ ib += gp->ib_calls;
+ ob_failed += gp->ob_failed_calls;
+ ob += gp->ob_calls;
+
+ stream->write_function(stream, "%25s\t%32s\t%s\t%ld/%ld\t%ld/%ld",
+ pkey, gp->register_to, sofia_state_names[gp->state],
+ gp->ib_failed_calls, gp->ib_calls, gp->ob_failed_calls, gp->ob_calls);
+
+ if (gp->state == REG_STATE_FAILED || gp->state == REG_STATE_TRYING) {
+ time_t now = switch_epoch_time_now(NULL);
+ if (gp->retry > now) {
+ stream->write_function(stream, " (retry: %ds)", gp->retry - now);
+ } else {
+ stream->write_function(stream, " (retry: NEVER)");
+ }
+ }
+ stream->write_function(stream, "\n");
+ }
+ }
+ }
+ }
+ switch_mutex_unlock(mod_sofia_globals.hash_mutex);
+ stream->write_function(stream, "%s\n", line);
+ stream->write_function(stream, "%d gateway%s: Inound(Failed/Total): %ld/%ld,"
+ "Outbound(Failed/Total):%ld/%ld\n", c, c == 1 ? "" : "s",
+ ib_failed, ib, ob_failed, ob);
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2205,6 +2289,8 @@
</span><span class="cx"> stream->write_function(stream, "Status \t%s%s\n", status_names[gp->status], gp->pinging ? " (ping)" : "");
</span><span class="cx"> stream->write_function(stream, "CallsIN \t%d\n", gp->ib_calls);
</span><span class="cx"> stream->write_function(stream, "CallsOUT\t%d\n", gp->ob_calls);
</span><ins>+ stream->write_function(stream, "FailedCallsIN\t%d\n", gp->ib_failed_calls);
+ stream->write_function(stream, "FailedCallsOUT\t%d\n", gp->ob_failed_calls);
</ins><span class="cx"> stream->write_function(stream, "%s\n", line);
</span><span class="cx"> sofia_reg_release_gateway(gp);
</span><span class="cx"> } else {
</span><span class="lines">@@ -2213,7 +2299,7 @@
</span><span class="cx"> } else if (!strcasecmp(argv[0], "profile")) {
</span><span class="cx"> struct cb_helper cb;
</span><span class="cx"> char *sql = NULL;
</span><del>-
</del><ins>+ cb.row_process = 0;
</ins><span class="cx"> if ((argv[1]) && (profile = sofia_glue_find_profile(argv[1]))) {
</span><span class="cx"> if (!argv[2] || (strcasecmp(argv[2], "reg") && strcasecmp(argv[2], "user"))) {
</span><span class="cx"> stream->write_function(stream, "%s\n", line);
</span><span class="lines">@@ -2334,6 +2420,7 @@
</span><span class="cx"> sofia_glue_execute_sql_callback(profile, profile->ireg_mutex, sql, show_reg_callback, &cb);
</span><span class="cx"> switch_safe_free(sql);
</span><span class="cx">
</span><ins>+ stream->write_function(stream, "Total items returned: %d\n", cb.row_process);
</ins><span class="cx"> stream->write_function(stream, "%s\n", line);
</span><span class="cx">
</span><span class="cx"> sofia_glue_release_profile(profile);
</span><span class="lines">@@ -2412,7 +2499,46 @@
</span><span class="cx">
</span><span class="cx"> if (argc > 0) {
</span><span class="cx"> if (argc == 1) {
</span><del>- stream->write_function(stream, "Invalid Syntax!\n");
</del><ins>+ /* show summary of all gateways */
+
+ stream->write_function(stream, "%s\n", header);
+ stream->write_function(stream, "<gateways>\n", header);
+
+ switch_mutex_lock(mod_sofia_globals.hash_mutex);
+ for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) {
+ switch_hash_this(hi, &vvar, NULL, &val);
+ profile = (sofia_profile_t *) val;
+ if (sofia_test_pflag(profile, PFLAG_RUNNING)) {
+
+ if (!strcmp(vvar, profile->name)) { /* not an alias */
+ for (gp = profile->gateways; gp; gp = gp->next) {
+ switch_assert(gp->state < REG_STATE_LAST);
+
+ stream->write_function(stream, "\t<gateway>\n");
+ stream->write_function(stream, "\t\t<profile>%s</profile>\n", profile->name);
+ stream->write_function(stream, "\t\t<to>%s</to>\n", gp->register_to);
+ stream->write_function(stream, "\t\t<state>%s</state>\n", sofia_state_names[gp->state]);
+ stream->write_function(stream, "\t\t<calls-in>%ld</calls-in>\n", gp->ib_calls);
+ stream->write_function(stream, "\t\t<calls-out>%ld</calls-out>\n", gp->ob_calls);
+ stream->write_function(stream, "\t\t<failed-calls-in>%ld</failed-calls-in>\n", gp->ib_failed_calls);
+ stream->write_function(stream, "\t\t<failed-calls-out>%ld</failed-calls-out>\n", gp->ob_failed_calls);
+
+ if (gp->state == REG_STATE_FAILED || gp->state == REG_STATE_TRYING) {
+ time_t now = switch_epoch_time_now(NULL);
+ if (gp->retry > now) {
+ stream->write_function(stream, "\t\t<retry>%ds</retry>\n", gp->retry - now);
+ } else {
+ stream->write_function(stream, "\t\t<retry>NEVER</retry>\n");
+ }
+ }
+ stream->write_function(stream, "\t</gateway>\n");
+ }
+ }
+ }
+ }
+ switch_mutex_unlock(mod_sofia_globals.hash_mutex);
+ stream->write_function(stream, "</gateways>\n");
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(argv[0], "gateway")) {
</span><span class="lines">@@ -2440,7 +2566,8 @@
</span><span class="cx"> stream->write_function(stream, " <status>%s%s</status>\n", status_names[gp->status], gp->pinging ? " (ping)" : "");
</span><span class="cx"> stream->write_function(stream, " <calls-in>%d</calls-in>\n", gp->ib_calls);
</span><span class="cx"> stream->write_function(stream, " <calls-out>%d</calls-out>\n", gp->ob_calls);
</span><del>-
</del><ins>+ stream->write_function(stream, " <failed-calls-in>%d</calls-in>\n", gp->ib_failed_calls);
+ stream->write_function(stream, " <failed-calls-out>%d</calls-out>\n", gp->ob_failed_calls);
</ins><span class="cx"> stream->write_function(stream, " </gateway>\n");
</span><span class="cx"> sofia_reg_release_gateway(gp);
</span><span class="cx"> } else {
</span><span class="lines">@@ -2449,6 +2576,7 @@
</span><span class="cx"> } else if (!strcasecmp(argv[0], "profile")) {
</span><span class="cx"> struct cb_helper cb;
</span><span class="cx"> char *sql = NULL;
</span><ins>+ cb.row_process = 0;
</ins><span class="cx">
</span><span class="cx"> if ((argv[1]) && (profile = sofia_glue_find_profile(argv[1]))) {
</span><span class="cx"> stream->write_function(stream, "%s\n", header);
</span><span class="lines">@@ -2867,6 +2995,8 @@
</span><span class="cx"> struct cb_helper *cb = (struct cb_helper *) pArg;
</span><span class="cx"> char *contact;
</span><span class="cx">
</span><ins>+ cb->row_process++;
+
</ins><span class="cx"> if (!zstr(argv[0]) && (contact = sofia_glue_get_url_from_contact(argv[0], 1))) {
</span><span class="cx"> cb->stream->write_function(cb->stream, "%ssofia/%s/sip:%s,", argv[2], argv[1], sofia_glue_strip_proto(contact));
</span><span class="cx"> free(contact);
</span><span class="lines">@@ -2874,7 +3004,115 @@
</span><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><ins>+static int sql2str_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+ struct cb_helper_sql2str *cbt = (struct cb_helper_sql2str *) pArg;
</ins><span class="cx">
</span><ins>+ switch_copy_string(cbt->buf, argv[0], cbt->len);
+ cbt->matches++;
+ return 0;
+}
+
+SWITCH_STANDARD_API(sofia_count_reg_function) {
+ char *data;
+ char *user = NULL;
+ char *domain = NULL;
+ char *concat = NULL;
+ char *profile_name = NULL;
+ char *p;
+ char *reply = "-1";
+ sofia_profile_t *profile = NULL;
+
+ if (!cmd) {
+ stream->write_function(stream, "%s", "");
+ return SWITCH_STATUS_SUCCESS;
+ }
+
+ data = strdup(cmd);
+ switch_assert(data);
+
+ if ((p = strchr(data, '/'))) {
+ profile_name = data;
+ *p++ = '\0';
+ user = p;
+ } else {
+ user = data;
+ }
+
+ if ((domain = strchr(user, '@'))) {
+ *domain++ = '\0';
+ if ( (concat = strchr( domain, '/')) ) {
+ *concat++ = '\0';
+ }
+ }
+ else {
+ if ( (concat = strchr( user, '/')) ) {
+ *concat++ = '\0';
+ }
+ }
+
+ if (!profile_name && domain) {
+ profile_name = domain;
+ }
+
+ if (user && profile_name) {
+ char *sql;
+
+ if (!(profile = sofia_glue_find_profile(profile_name))) {
+ profile_name = domain;
+ domain = NULL;
+ }
+
+ if (!profile && profile_name) {
+ profile = sofia_glue_find_profile(profile_name);
+ }
+
+ if (profile) {
+ struct cb_helper_sql2str cb;
+ char reg_count[80] = "";
+
+ cb.buf = reg_count;
+ cb.len = sizeof(reg_count);
+
+ if (!domain || !strchr(domain, '.')) {
+ domain = profile->name;
+ }
+
+ if (zstr(user)) {
+ sql = switch_mprintf("select count(*) "
+ "from sip_registrations where (sip_host='%q' or presence_hosts like '%%%q%%')",
+ ( concat != NULL ) ? concat : "", domain, domain);
+
+ } else {
+ sql = switch_mprintf("select count(*) "
+ "from sip_registrations where (sip_user='%q' or dir_user='%q') and (sip_host='%q' or presence_hosts like '%%%q%%')",
+ ( concat != NULL ) ? concat : "", user, user, domain, domain);
+ }
+ switch_assert(sql);
+ sofia_glue_execute_sql_callback(profile, profile->ireg_mutex, sql, sql2str_callback, &cb);
+ switch_safe_free(sql);
+ if (!zstr(reg_count)) {
+ stream->write_function(stream, "%s", reg_count);
+ } else {
+ stream->write_function(stream, "0");
+ }
+ reply = NULL;
+
+ }
+ }
+
+ if (reply) {
+ stream->write_function(stream, "%s", reply);
+ }
+
+ switch_safe_free(data);
+
+ if (profile) {
+ sofia_glue_release_profile(profile);
+ }
+
+ return SWITCH_STATUS_SUCCESS;
+}
</ins><span class="cx"> SWITCH_STANDARD_API(sofia_contact_function)
</span><span class="cx"> {
</span><span class="cx"> char *data;
</span><span class="lines">@@ -2940,6 +3178,8 @@
</span><span class="cx"> struct cb_helper cb;
</span><span class="cx"> switch_stream_handle_t mystream = { 0 };
</span><span class="cx">
</span><ins>+ cb.row_process = 0;
+
</ins><span class="cx"> if (!domain || (!strchr(domain, '.') && strcmp(profile_name, domain))) {
</span><span class="cx"> domain = profile->name;
</span><span class="cx"> }
</span><span class="lines">@@ -3255,6 +3495,7 @@
</span><span class="cx"> if (gateway_ptr->status != SOFIA_GATEWAY_UP) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Gateway is down!\n");
</span><span class="cx"> cause = SWITCH_CAUSE_NETWORK_OUT_OF_ORDER;
</span><ins>+ gateway_ptr->ob_failed_calls++;
</ins><span class="cx"> sofia_reg_release_gateway(gateway_ptr);
</span><span class="cx"> gateway_ptr = NULL;
</span><span class="cx"> goto error;
</span><span class="lines">@@ -3280,6 +3521,7 @@
</span><span class="cx"> tech_pvt->transport = sofia_glue_str2transport(tp_param);
</span><span class="cx"> if (tech_pvt->transport == SOFIA_TRANSPORT_UNKNOWN) {
</span><span class="cx"> cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><ins>+ gateway_ptr->ob_failed_calls++;
</ins><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -4161,6 +4403,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> SWITCH_ADD_API(api_interface, "sofia_contact", "Sofia Contacts", sofia_contact_function, "[profile/]<user>@<domain>");
</span><ins>+ SWITCH_ADD_API(api_interface, "sofia_count_reg", "Count Sofia registration", sofia_count_reg_function, "[profile/]<user>@<domain>");
</ins><span class="cx"> SWITCH_ADD_API(api_interface, "sofia_dig", "SIP DIG", sip_dig_function, "<url>");
</span><span class="cx"> SWITCH_ADD_CHAT(chat_interface, SOFIA_CHAT_PROTO, sofia_presence_chat_send);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -402,6 +402,8 @@
</span><span class="cx"> switch_event_t *ob_vars;
</span><span class="cx"> uint32_t ib_calls;
</span><span class="cx"> uint32_t ob_calls;
</span><ins>+ uint32_t ib_failed_calls;
+ uint32_t ob_failed_calls;
</ins><span class="cx"> char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
</span><span class="cx"> int failures;
</span><span class="cx"> struct sofia_gateway *next;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -1758,6 +1758,10 @@
</span><span class="cx"> gateway->ping_max = 0;
</span><span class="cx"> gateway->ping_min = 0;
</span><span class="cx"> gateway->ping_count = 0;
</span><ins>+ gateway->ib_calls = 0;
+ gateway->ob_calls = 0;
+ gateway->ib_failed_calls = 0;
+ gateway->ob_failed_calls = 0;
</ins><span class="cx">
</span><span class="cx"> if ((x_params = switch_xml_child(gateway_tag, "variables"))) {
</span><span class="cx"> param = switch_xml_child(x_params, "variable");
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -2189,6 +2189,7 @@
</span><span class="cx">
</span><span class="cx"> if (tech_pvt->local_sdp_video_port > 0 && !zstr(tech_pvt->remote_ip) && sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) {
</span><span class="cx"> switch_nat_del_mapping((switch_port_t) tech_pvt->local_sdp_video_port, SWITCH_NAT_UDP);
</span><ins>+ switch_nat_del_mapping((switch_port_t) tech_pvt->local_sdp_video_port + 1, SWITCH_NAT_UDP);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -2200,6 +2201,7 @@
</span><span class="cx">
</span><span class="cx"> if (tech_pvt->local_sdp_audio_port > 0 && !zstr(tech_pvt->remote_ip) && sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) {
</span><span class="cx"> switch_nat_del_mapping((switch_port_t) tech_pvt->local_sdp_audio_port, SWITCH_NAT_UDP);
</span><ins>+ switch_nat_del_mapping((switch_port_t) tech_pvt->local_sdp_audio_port + 1, SWITCH_NAT_UDP);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_presencec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -1901,7 +1901,7 @@
</span><span class="cx"> full_from = sip_header_as_string(profile->home, (void *) sip->sip_from);
</span><span class="cx"> full_via = sip_header_as_string(profile->home, (void *) sip->sip_via);
</span><span class="cx">
</span><del>- if (sip->sip_expires->ex_delta > 31536000) {
</del><ins>+ if (sip && sip->sip_expires && sip->sip_expires->ex_delta > 31536000) {
</ins><span class="cx"> sip->sip_expires->ex_delta = 31536000;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_regc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -1688,6 +1688,7 @@
</span><span class="cx"> const char *passwd = NULL;
</span><span class="cx"> const char *a1_hash = NULL;
</span><span class="cx"> const char *mwi_account = NULL;
</span><ins>+ switch_bool_t allow_empty_password = SWITCH_TRUE;
</ins><span class="cx"> const char *call_id = NULL;
</span><span class="cx"> char *sql;
</span><span class="cx"> char *number_alias = NULL;
</span><span class="lines">@@ -1924,7 +1925,9 @@
</span><span class="cx"> if (!strcasecmp(var, "mwi-account")) {
</span><span class="cx"> mwi_account = val;
</span><span class="cx"> }
</span><del>-
</del><ins>+ if (!strcasecmp(var, "allow-empty-password")) {
+ allow_empty_password = switch_true(val);
+ }
</ins><span class="cx"> if (!strcasecmp(var, "user-agent-filter")) {
</span><span class="cx"> user_agent_filter = val;
</span><span class="cx"> }
</span><span class="lines">@@ -1958,7 +1961,9 @@
</span><span class="cx"> if (!strcasecmp(var, "mwi-account")) {
</span><span class="cx"> mwi_account = val;
</span><span class="cx"> }
</span><del>-
</del><ins>+ if (!strcasecmp(var, "allow-empty-password")) {
+ allow_empty_password = switch_true(val);
+ }
</ins><span class="cx"> if (!strcasecmp(var, "user-agent-filter")) {
</span><span class="cx"> user_agent_filter = val;
</span><span class="cx"> }
</span><span class="lines">@@ -1992,6 +1997,9 @@
</span><span class="cx"> if (!strcasecmp(var, "mwi-account")) {
</span><span class="cx"> mwi_account = val;
</span><span class="cx"> }
</span><ins>+ if (!strcasecmp(var, "allow-empty-password")) {
+ allow_empty_password = switch_true(val);
+ }
</ins><span class="cx"> if (!strcasecmp(var, "user-agent-filter")) {
</span><span class="cx"> user_agent_filter = val;
</span><span class="cx"> }
</span><span class="lines">@@ -2058,6 +2066,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!allow_empty_password && zstr(passwd) && zstr(a1_hash)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Empty password denied for user %s@%s\n", username, domain_name);
+ ret = AUTH_FORBIDDEN;
+ goto end;
+ }
+
</ins><span class="cx"> if (zstr(passwd) && zstr(a1_hash)) {
</span><span class="cx"> ret = AUTH_OK;
</span><span class="cx"> goto skip_auth;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodevent_handlersmod_json_cdrmod_json_cdrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -620,7 +620,10 @@
</span><span class="cx">
</span><span class="cx"> is_b = channel && switch_channel_get_originator_caller_profile(channel);
</span><span class="cx"> if (!globals.log_b && is_b) {
</span><del>- return SWITCH_STATUS_SUCCESS;
</del><ins>+ const char *force_cdr = switch_channel_get_variable(channel, SWITCH_FORCE_PROCESS_CDR_VARIABLE);
+ if (!switch_true(force_cdr)) {
+ return SWITCH_STATUS_SUCCESS;
+ }
</ins><span class="cx"> }
</span><span class="cx"> if (!is_b && globals.prefix_a)
</span><span class="cx"> a_prefix = "a_";
</span></span></pre></div>
<a id="freeswitchtrunksrcmodxml_intmod_xml_cdrmod_xml_cdrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -200,7 +200,10 @@
</span><span class="cx">
</span><span class="cx"> is_b = channel && switch_channel_get_originator_caller_profile(channel);
</span><span class="cx"> if (!globals.log_b && is_b) {
</span><del>- return SWITCH_STATUS_SUCCESS;
</del><ins>+ const char *force_cdr = switch_channel_get_variable(channel, SWITCH_FORCE_PROCESS_CDR_VARIABLE);
+ if (!switch_true(force_cdr)) {
+ return SWITCH_STATUS_SUCCESS;
+ }
</ins><span class="cx"> }
</span><span class="cx"> if (!is_b && globals.prefix_a)
</span><span class="cx"> a_prefix = "a_";
</span><span class="lines">@@ -334,7 +337,8 @@
</span><span class="cx"> switch_yield(globals.delay * 1000000);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- destUrl = switch_mprintf("%s?uuid=%s", globals.urls[globals.url_index], switch_core_session_get_uuid(session));
</del><ins>+ destUrl = switch_mprintf("%s?uuid=%s&leg=%c", globals.urls[globals.url_index], switch_core_session_get_uuid(session),
+ is_b ? 'b' : 'a');
</ins><span class="cx"> curl_easy_setopt(curl_handle, CURLOPT_URL, destUrl);
</span><span class="cx">
</span><span class="cx"> if (!strncasecmp(destUrl, "https", 5)) {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodxml_intmod_xml_ldaplutil_ldaph"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/lutil_ldap.h (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/lutil_ldap.h 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/lutil_ldap.h 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -13,8 +13,8 @@
</span><span class="cx"> * <http://www.OpenLDAP.org/license.html>.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef _LUTIL_LDAP_H
-#define _LUTIL_LDAP_H 1
</del><ins>+#ifndef LUTIL_LDAP_H
+#define LUTIL_LDAP_H
</ins><span class="cx">
</span><span class="cx"> #include <ldap_cdefs.h>
</span><span class="cx"> #include <lber_types.h>
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_channelc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_channel.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_channel.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/switch_channel.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -241,6 +241,7 @@
</span><span class="cx"> (*channel)->hangup_cause = SWITCH_CAUSE_NONE;
</span><span class="cx"> (*channel)->name = "";
</span><span class="cx"> (*channel)->direction = direction;
</span><ins>+ switch_channel_set_variable(*channel, "direction", switch_channel_direction(*channel) == SWITCH_CALL_DIRECTION_OUTBOUND ? "outbound" : "inbound");
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_sqldbc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_sqldb.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_sqldb.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/switch_core_sqldb.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -958,6 +958,7 @@
</span><span class="cx"> case SWITCH_EVENT_CHANNEL_DESTROY:
</span><span class="cx"> sql = switch_mprintf("delete from channels where uuid='%q' and hostname='%q'",
</span><span class="cx"> switch_event_get_header_nil(event, "unique-id"), switch_core_get_variable("hostname"));
</span><ins>+ printf("%s\n", sql);
</ins><span class="cx"> break;
</span><span class="cx"> case SWITCH_EVENT_CHANNEL_UUID:
</span><span class="cx"> {
</span><span class="lines">@@ -1143,7 +1144,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (sql) {
</span><del>- if (switch_stristr("update channels", sql)) {
</del><ins>+ if (switch_stristr("update channels", sql) || switch_stristr("delete from channels", sql)) {
</ins><span class="cx"> switch_queue_push(sql_manager.sql_queue[1], sql);
</span><span class="cx"> } else {
</span><span class="cx"> switch_queue_push(sql_manager.sql_queue[0], sql);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_state_machinec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_state_machine.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_state_machine.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/switch_core_state_machine.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -526,8 +526,9 @@
</span><span class="cx">
</span><span class="cx"> switch_api_execute(cmd, expanded, use_session, &stream);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Hangup Command %s(%s):\n%s\n", cmd, switch_str_nil(expanded),
- switch_str_nil((char *) stream.data));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Hangup Command %s %s(%s):\n%s\n",
+ use_session ? "with Session" : "with no Session", cmd, switch_str_nil(expanded),
+ switch_str_nil((char *) stream.data) );
</ins><span class="cx">
</span><span class="cx"> if (expanded != arg) {
</span><span class="cx"> switch_safe_free(expanded);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_dsoc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_dso.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_dso.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/switch_dso.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> dlerror();
</span><span class="cx">
</span><span class="cx"> if (!(addr = dlsym(lib, sym))) {
</span><del>- err_str = dlerror();
</del><ins>+ err_str = (char *)dlerror();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (err_str) {
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_asyncc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_async.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_async.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/switch_ivr_async.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -353,10 +353,15 @@
</span><span class="cx"> switch_media_bug_t *bug;
</span><span class="cx"> switch_status_t status;
</span><span class="cx"> time_t to = 0;
</span><ins>+ char *ext;
+ const char *prefix;
</ins><span class="cx"> displace_helper_t *dh;
</span><span class="cx"> switch_codec_implementation_t read_impl = { 0 };
</span><span class="cx"> switch_core_session_get_read_impl(session, &read_impl);
</span><span class="cx">
</span><ins>+ if (zstr(file)) {
+ return SWITCH_STATUS_FALSE;
+ }
</ins><span class="cx">
</span><span class="cx"> if ((status = switch_channel_pre_answer(channel)) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -376,7 +381,35 @@
</span><span class="cx"> return SWITCH_STATUS_MEMERR;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!(prefix = switch_channel_get_variable(channel, "sound_prefix"))) {
+ prefix = SWITCH_GLOBAL_dirs.base_dir;
+ }
</ins><span class="cx">
</span><ins>+ if (!strstr(file, SWITCH_URL_SEPARATOR)) {
+ if (!switch_is_file_path(file)) {
+ char *tfile = NULL;
+ char *e;
+
+ if (*file == '[') {
+ tfile = switch_core_session_strdup(session, file);
+ if ((e = switch_find_end_paren(tfile, '[', ']'))) {
+ *e = '\0';
+ file = e + 1;
+ } else {
+ tfile = NULL;
+ }
+ }
+
+ file = switch_core_session_sprintf(session, "%s%s%s%s%s", switch_str_nil(tfile), tfile ? "]" : "", prefix, SWITCH_PATH_SEPARATOR, file);
+ }
+ if ((ext = strrchr(file, '.'))) {
+ ext++;
+ } else {
+ ext = read_impl.iananame;
+ file = switch_core_session_sprintf(session, "%s.%s", file, ext);
+ }
+ }
+
</ins><span class="cx"> dh->fh.channels = read_impl.number_of_channels;
</span><span class="cx"> dh->fh.samplerate = read_impl.actual_samples_per_second;
</span><span class="cx"> dh->file = switch_core_session_strdup(session, file);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_originatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_originate.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -372,6 +372,38 @@
</span><span class="cx"> return SWITCH_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void inherit_codec(switch_channel_t *caller_channel, switch_core_session_t *session)
+{
+ const char *var = switch_channel_get_variable(caller_channel, "inherit_codec");
+ switch_channel_t *channel = switch_core_session_get_channel(session);
+
+ if (switch_true(var)) {
+ switch_codec_implementation_t impl = { 0 };
+ switch_codec_implementation_t video_impl = { 0 };
+ char tmp[128] = "";
+
+
+ if (switch_core_session_get_read_impl(session, &impl) == SWITCH_STATUS_SUCCESS) {
+ if (switch_core_session_get_video_read_impl(session, &impl) == SWITCH_STATUS_SUCCESS) {
+ switch_snprintf(tmp, sizeof(tmp), "%s@%uh@%ui,%s",
+ impl.iananame, impl.samples_per_second, impl.microseconds_per_packet / 1000,
+ video_impl.iananame);
+ } else {
+ switch_snprintf(tmp, sizeof(tmp), "%s@%uh@%ui",
+ impl.iananame, impl.samples_per_second, impl.microseconds_per_packet / 1000);
+ }
+ switch_channel_set_variable(caller_channel, "absolute_codec_string", tmp);
+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(caller_channel), SWITCH_LOG_DEBUG, "Setting codec string on %s to %s\n",
+ switch_channel_get_name(caller_channel), tmp);
+ } else {
+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(caller_channel), SWITCH_LOG_WARNING,
+ "Error inheriting codec. Channel %s has no read codec yet.\n",
+ switch_channel_get_name(channel));
+ }
+
+ }
+}
+
</ins><span class="cx"> static uint8_t check_channel_status(originate_global_t *oglobals, originate_status_t *originate_status, uint32_t len)
</span><span class="cx"> {
</span><span class="cx">
</span><span class="lines">@@ -671,32 +703,7 @@
</span><span class="cx"> end:
</span><span class="cx">
</span><span class="cx"> if (pindex > -1 && caller_channel && switch_channel_ready(caller_channel) && !switch_channel_media_ready(caller_channel)) {
</span><del>- const char *var = switch_channel_get_variable(caller_channel, "inherit_codec");
- if (switch_true(var)) {
- switch_codec_implementation_t impl = { 0 };
- switch_codec_implementation_t video_impl = { 0 };
- char tmp[128] = "";
-
-
- if (switch_core_session_get_read_impl(originate_status[pindex].peer_session, &impl) == SWITCH_STATUS_SUCCESS) {
- if (switch_core_session_get_video_read_impl(originate_status[pindex].peer_session, &impl) == SWITCH_STATUS_SUCCESS) {
- switch_snprintf(tmp, sizeof(tmp), "%s@%uh@%ui,%s",
- impl.iananame, impl.samples_per_second, impl.microseconds_per_packet / 1000,
- video_impl.iananame);
- } else {
- switch_snprintf(tmp, sizeof(tmp), "%s@%uh@%ui",
- impl.iananame, impl.samples_per_second, impl.microseconds_per_packet / 1000);
- }
- switch_channel_set_variable(caller_channel, "absolute_codec_string", tmp);
- switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(caller_channel), SWITCH_LOG_DEBUG, "Setting codec string on %s to %s\n",
- switch_channel_get_name(caller_channel), tmp);
- } else {
- switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(originate_status[pindex].peer_channel), SWITCH_LOG_WARNING,
- "Error inheriting codec. Channel %s has no read codec yet.\n",
- switch_channel_get_name(originate_status[pindex].peer_channel));
- }
-
- }
</del><ins>+ inherit_codec(caller_channel, originate_status[pindex].peer_session);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (send_ringback) {
</span><span class="lines">@@ -1051,7 +1058,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-static switch_status_t setup_ringback(originate_global_t *oglobals,
</del><ins>+static switch_status_t setup_ringback(originate_global_t *oglobals, originate_status_t *originate_status, int len,
</ins><span class="cx"> const char *ringback_data, ringback_t *ringback, switch_frame_t *write_frame, switch_codec_t *write_codec)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1061,6 +1068,10 @@
</span><span class="cx">
</span><span class="cx"> if (!switch_channel_test_flag(caller_channel, CF_ANSWERED)
</span><span class="cx"> && !switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) {
</span><ins>+ if (oglobals->bridge_early_media > -1 && len == 1 && originate_status[0].peer_session &&
+ switch_channel_media_ready(originate_status[0].peer_channel)) {
+ inherit_codec(caller_channel, originate_status[0].peer_session);
+ }
</ins><span class="cx"> if ((status = switch_channel_pre_answer(caller_channel)) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(caller_channel), SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n",
</span><span class="cx"> switch_channel_get_name(caller_channel));
</span><span class="lines">@@ -1073,6 +1084,25 @@
</span><span class="cx"> if (!(strrchr(ringback_data, '.') || strstr(ringback_data, SWITCH_URL_SEPARATOR))) {
</span><span class="cx"> ringback->asis++;
</span><span class="cx"> }
</span><ins>+ } else if (oglobals->bridge_early_media > -1 && zstr(ringback_data) && len == 1 && originate_status[0].peer_session) {
+ switch_codec_implementation_t read_impl = { 0 }, write_impl = { 0 };
+
+ if (switch_channel_ready(originate_status[0].peer_channel)
+ && switch_core_session_get_read_impl(originate_status[0].peer_session, &read_impl) == SWITCH_STATUS_SUCCESS
+ && switch_core_session_get_write_impl(oglobals->session, &write_impl) == SWITCH_STATUS_SUCCESS) {
+ if (read_impl.impl_id == write_impl.impl_id &&
+ read_impl.microseconds_per_packet == write_impl.microseconds_per_packet &&
+ read_impl.actual_samples_per_second == write_impl.actual_samples_per_second) {
+ ringback->asis++;
+ write_frame->codec = switch_core_session_get_write_codec(originate_status[0].peer_session);
+ write_frame->datalen = write_frame->codec->implementation->decoded_bytes_per_packet;
+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(caller_channel), SWITCH_LOG_DEBUG, "bridge_early_media: passthrough enabled\n");
+ } else {
+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(caller_channel), SWITCH_LOG_DEBUG, "bridge_early_media: codecs don't match (%s@%uh@%di / %s@%uh@%di)\n",
+ read_impl.iananame, read_impl.actual_samples_per_second, read_impl.microseconds_per_packet / 1000,
+ write_impl.iananame, write_impl.actual_samples_per_second, write_impl.microseconds_per_packet / 1000);
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!ringback->asis) {
</span><span class="lines">@@ -1553,6 +1583,7 @@
</span><span class="cx"> switch_mutex_t *mutex;
</span><span class="cx"> switch_buffer_t *buffer;
</span><span class="cx"> int ready;
</span><ins>+ ringback_t *ringback;
</ins><span class="cx"> };
</span><span class="cx"> typedef struct early_state early_state_t;
</span><span class="cx">
</span><span class="lines">@@ -1591,38 +1622,52 @@
</span><span class="cx"> answered++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!switch_core_codec_ready((&read_codecs[i]))) {
- read_codec = switch_core_session_get_read_codec(session);
</del><ins>+ if (!state->ringback->asis) {
+ if (!switch_core_codec_ready((&read_codecs[i]))) {
+ read_codec = switch_core_session_get_read_codec(session);
</ins><span class="cx">
</span><del>- if (switch_core_codec_init(&read_codecs[i],
- "L16",
- NULL,
- read_codec->implementation->actual_samples_per_second,
- read_codec->implementation->microseconds_per_packet / 1000,
- 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
- switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec Error!\n");
- } else {
- switch_core_session_set_read_codec(session, &read_codecs[i]);
</del><ins>+ if (switch_core_codec_init(&read_codecs[i],
+ "L16",
+ NULL,
+ read_codec->implementation->actual_samples_per_second,
+ read_codec->implementation->microseconds_per_packet / 1000,
+ 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
+ switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec Error!\n");
+ } else {
+ switch_core_session_set_read_codec(session, &read_codecs[i]);
+ }
</ins><span class="cx"> }
</span><del>- }
- status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
- if (SWITCH_READ_ACCEPTABLE(status)) {
- data = (int16_t *) read_frame->data;
- if (datalen < read_frame->datalen) {
</del><ins>+ status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
+ if (SWITCH_READ_ACCEPTABLE(status)) {
+ data = (int16_t *) read_frame->data;
+ if (datalen < read_frame->datalen) {
+ datalen = read_frame->datalen;
+ }
+ for (x = 0; x < (int) read_frame->datalen / 2; x++) {
+ sample = data[x] + mux_data[x];
+ switch_normalize_to_16bit(sample);
+ mux_data[x] = (int16_t) sample;
+ }
+ }
+ } else {
+ status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
+ if (SWITCH_READ_ACCEPTABLE(status)) {
</ins><span class="cx"> datalen = read_frame->datalen;
</span><span class="cx"> }
</span><del>- for (x = 0; x < (int) read_frame->datalen / 2; x++) {
- sample = data[x] + mux_data[x];
- switch_normalize_to_16bit(sample);
- mux_data[x] = (int16_t) sample;
- }
-
</del><ins>+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (datalen) {
</del><ins>+
+ if (state->ringback->asis && datalen) {
+ uint16_t flen = (uint16_t)datalen;
</ins><span class="cx"> switch_mutex_lock(state->mutex);
</span><ins>+ switch_buffer_write(state->buffer, &flen, sizeof(uint16_t));
+ switch_buffer_write(state->buffer, read_frame->data, datalen);
+ switch_mutex_unlock(state->mutex);
+ } else if (datalen) {
+ switch_mutex_lock(state->mutex);
</ins><span class="cx"> switch_buffer_write(state->buffer, mux_data, datalen);
</span><span class="cx"> switch_mutex_unlock(state->mutex);
</span><span class="cx"> }
</span><span class="lines">@@ -2758,9 +2803,10 @@
</span><span class="cx"> if (oglobals.ringback_ok && (oglobals.ring_ready || oglobals.instant_ringback ||
</span><span class="cx"> oglobals.sending_ringback > 1 || oglobals.bridge_early_media > -1)) {
</span><span class="cx"> if (oglobals.ringback_ok == 1) {
</span><del>- switch_status_t rst = setup_ringback(&oglobals, ringback_data, &ringback, &write_frame, &write_codec);
-
-
</del><ins>+ switch_status_t rst;
+
+ rst = setup_ringback(&oglobals, originate_status, and_argc, ringback_data, &ringback, &write_frame, &write_codec);
+
</ins><span class="cx"> if (oglobals.bridge_early_media > -1) {
</span><span class="cx"> switch_threadattr_t *thd_attr = NULL;
</span><span class="cx"> switch_threadattr_create(&thd_attr, switch_core_session_get_pool(session));
</span><span class="lines">@@ -2768,6 +2814,7 @@
</span><span class="cx"> early_state.oglobals = &oglobals;
</span><span class="cx"> early_state.originate_status = originate_status;
</span><span class="cx"> early_state.ready = 1;
</span><ins>+ early_state.ringback = &ringback;
</ins><span class="cx"> switch_mutex_init(&early_state.mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
</span><span class="cx"> switch_buffer_create_dynamic(&early_state.buffer, 1024, 1024, 0);
</span><span class="cx"> switch_thread_create(&oglobals.ethread, thd_attr, early_thread_run, &early_state, switch_core_session_get_pool(session));
</span><span class="lines">@@ -2794,12 +2841,24 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (oglobals.bridge_early_media > -1) {
</del><ins>+ if (oglobals.bridge_early_media > -1) {
</ins><span class="cx"> write_frame.datalen = 0;
</span><span class="cx"> switch_mutex_lock(early_state.mutex);
</span><del>- if (switch_buffer_inuse(early_state.buffer) >= write_frame.codec->implementation->decoded_bytes_per_packet) {
- write_frame.datalen = switch_buffer_read(early_state.buffer, write_frame.data,
- write_frame.codec->implementation->decoded_bytes_per_packet);
</del><ins>+ if (ringback.asis) {
+ uint16_t mlen;
+ switch_size_t buflen = switch_buffer_inuse(early_state.buffer);
+ if (buflen > sizeof(uint16_t)) {
+ switch_buffer_peek(early_state.buffer, &mlen, sizeof(uint16_t));
+ if (buflen >= (mlen + sizeof(uint16_t))) {
+ switch_buffer_toss(early_state.buffer, sizeof(uint16_t));
+ write_frame.datalen = switch_buffer_read(early_state.buffer, write_frame.data, mlen);
+ }
+ }
+ } else {
+ if (switch_buffer_inuse(early_state.buffer) >= write_frame.codec->implementation->decoded_bytes_per_packet) {
+ write_frame.datalen = switch_buffer_read(early_state.buffer, write_frame.data,
+ write_frame.codec->implementation->decoded_bytes_per_packet);
+ }
</ins><span class="cx"> }
</span><span class="cx"> switch_mutex_unlock(early_state.mutex);
</span><span class="cx"> } else if (ringback.fh) {
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_loadable_modulec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_loadable_module.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_loadable_module.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/switch_loadable_module.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -1176,13 +1176,20 @@
</span><span class="cx"> for (ld = switch_xml_child(mods, "load"); ld; ld = ld->next) {
</span><span class="cx"> switch_bool_t global = SWITCH_FALSE;
</span><span class="cx"> const char *val = switch_xml_attr_soft(ld, "module");
</span><ins>+ const char *critical = switch_xml_attr_soft(ld, "critical");
</ins><span class="cx"> const char *sglobal = switch_xml_attr_soft(ld, "global");
</span><span class="cx"> if (zstr(val) || (strchr(val, '.') && !strstr(val, ext) && !strstr(val, EXT))) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Invalid extension for %s\n", val);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> global = switch_true(sglobal);
</span><del>- switch_loadable_module_load_module_ex((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) val, SWITCH_FALSE, global, &err);
</del><ins>+
+ if (switch_loadable_module_load_module_ex((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) val, SWITCH_FALSE, global, &err) == SWITCH_STATUS_FALSE) {
+ if (critical && switch_true(critical)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to load critical module '%s', abort()\n", val);
+ abort();
+ }
+ }
</ins><span class="cx"> count++;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_rtpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_rtp.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_rtp.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/switch_rtp.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -2130,7 +2130,7 @@
</span><span class="cx"> "Sender Packet Count = %u, " \
</span><span class="cx"> "Sender Octet Count = %u\n",
</span><span class="cx"> rtp_session->rtcp_recv_msg.header.count,
</span><del>- ntohs(rtp_session->rtcp_recv_msg.header.length),
</del><ins>+ ntohs((uint16_t)rtp_session->rtcp_recv_msg.header.length),
</ins><span class="cx"> ntohl(sr->ssrc),
</span><span class="cx"> ntohl(sr->ntp_msw),
</span><span class="cx"> ntohl(sr->ntp_lsw),
</span><span class="lines">@@ -2907,7 +2907,7 @@
</span><span class="cx"> rtp_session->rtcp_fresh_frame = 0;
</span><span class="cx">
</span><span class="cx"> frame->ssrc = ntohl(sr->ssrc);
</span><del>- frame->packet_type = rtp_session->rtcp_recv_msg.header.type;
</del><ins>+ frame->packet_type = (uint16_t)rtp_session->rtcp_recv_msg.header.type;
</ins><span class="cx"> frame->ntp_msw = ntohl(sr->ntp_msw);
</span><span class="cx"> frame->ntp_lsw = ntohl(sr->ntp_lsw);
</span><span class="cx"> frame->timestamp = ntohl(sr->ts);
</span><span class="lines">@@ -3337,8 +3337,8 @@
</span><span class="cx"> struct switch_rtcp_senderinfo* sr = (struct switch_rtcp_senderinfo*)rtp_session->rtcp_send_msg.body;
</span><span class="cx">
</span><span class="cx"> sr->ssrc = send_msg->header.ssrc;
</span><del>- sr->ntp_msw = htonl(rtp_session->send_time / 1000000 + 2208988800UL);
- sr->ntp_lsw = htonl(rtp_session->send_time % 1000000 * ((UINT_MAX * 1.0)/ 1000000.0));
</del><ins>+ sr->ntp_msw = htonl((u_long)rtp_session->send_time / 1000000 + 2208988800UL);
+ sr->ntp_lsw = htonl((u_long)(rtp_session->send_time % 1000000 * ((UINT_MAX * 1.0)/ 1000000.0)));
</ins><span class="cx"> sr->ts = send_msg->header.ts;
</span><span class="cx"> sr->pc = htonl(rtp_session->stats.outbound.packet_count);
</span><span class="cx"> sr->oc = htonl((rtp_session->stats.outbound.raw_bytes - rtp_session->stats.outbound.packet_count * sizeof(srtp_hdr_t)));
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_xmlc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_xml.c (17415 => 17416)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_xml.c 2010-04-27 18:32:36 UTC (rev 17415)
+++ freeswitch/trunk/src/switch_xml.c 2010-04-27 18:32:55 UTC (rev 17416)
</span><span class="lines">@@ -403,6 +403,10 @@
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!root->attr) {
+ return NULL;
+ }
+
</ins><span class="cx"> for (i = 0; root->attr[i] && xml->name && strcmp(xml->name, root->attr[i][0]); i++);
</span><span class="cx"> if (!root->attr[i])
</span><span class="cx"> return NULL; /* no matching default attributes */
</span><span class="lines">@@ -451,6 +455,9 @@
</span><span class="cx"> return (const char **) SWITCH_XML_NIL;
</span><span class="cx"> while (root->xml.parent)
</span><span class="cx"> root = (switch_xml_root_t) root->xml.parent; /* root tag */
</span><ins>+ if (!root || !root->pi) {
+ return (const char **) SWITCH_XML_NIL;
+ }
</ins><span class="cx"> while (root->pi[i] && strcmp(target, root->pi[i][0]))
</span><span class="cx"> i++; /* find target */
</span><span class="cx"> return (const char **) ((root->pi[i]) ? root->pi[i] + 1 : SWITCH_XML_NIL);
</span><span class="lines">@@ -463,6 +470,10 @@
</span><span class="cx"> int line = 1;
</span><span class="cx"> char *t, fmt[SWITCH_XML_ERRL];
</span><span class="cx">
</span><ins>+ if (!root || !root->s) {
+ return NULL;
+ }
+
</ins><span class="cx"> for (t = root->s; t && t < s; t++)
</span><span class="cx"> if (*t == '\n')
</span><span class="cx"> line++;
</span><span class="lines">@@ -578,8 +589,14 @@
</span><span class="cx"> /* called when parser finds start of new tag */
</span><span class="cx"> static void switch_xml_open_tag(switch_xml_root_t root, char *name, char **attr)
</span><span class="cx"> {
</span><del>- switch_xml_t xml = root->cur;
</del><ins>+ switch_xml_t xml;
</ins><span class="cx">
</span><ins>+ if (!root || !root->cur) {
+ return;
+ }
+
+ xml = root->cur;
+
</ins><span class="cx"> if (xml->name)
</span><span class="cx"> xml = switch_xml_add_child(xml, name, strlen(xml->txt));
</span><span class="cx"> else
</span><span class="lines">@@ -592,10 +609,16 @@
</span><span class="cx"> /* called when parser finds character content between open and closing tag */
</span><span class="cx"> static void switch_xml_char_content(switch_xml_root_t root, char *s, switch_size_t len, char t)
</span><span class="cx"> {
</span><del>- switch_xml_t xml = root->cur;
</del><ins>+ switch_xml_t xml;
</ins><span class="cx"> char *m = s;
</span><span class="cx"> switch_size_t l;
</span><span class="cx">
</span><ins>+ if (!root || !root->cur) {
+ return;
+ }
+
+ xml = root->cur;
+
</ins><span class="cx"> if (!xml || !xml->name || !len)
</span><span class="cx"> return; /* sanity check */
</span><span class="cx">
</span><span class="lines">@@ -632,7 +655,7 @@
</span><span class="cx"> /* called when parser finds closing tag */
</span><span class="cx"> static switch_xml_t switch_xml_close_tag(switch_xml_root_t root, char *name, char *s)
</span><span class="cx"> {
</span><del>- if (!root->cur || !root->cur->name || strcmp(name, root->cur->name))
</del><ins>+ if (!root || !root->cur || !root->cur->name || strcmp(name, root->cur->name))
</ins><span class="cx"> return switch_xml_err(root, s, "unexpected closing tag </%s>", name);
</span><span class="cx">
</span><span class="cx"> root->cur = root->cur->parent;
</span><span class="lines">@@ -681,7 +704,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!root->pi[0]) {
</del><ins>+ if (!root->pi || !root->pi[0]) {
</ins><span class="cx"> root->pi = (char ***) malloc(sizeof(char **));
</span><span class="cx"> if (!root->pi)
</span><span class="cx"> return;
</span><span class="lines">@@ -2601,6 +2624,107 @@
</span><span class="cx"> return xml;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(int) switch_xml_std_datetime_check(switch_xml_t xcond) {
+
+ const char *xyear = switch_xml_attr(xcond, "year");
+ const char *xyday = switch_xml_attr(xcond, "yday");
+ const char *xmon = switch_xml_attr(xcond, "mon");
+ const char *xmday = switch_xml_attr(xcond, "mday");
+ const char *xweek = switch_xml_attr(xcond, "week");
+ const char *xmweek = switch_xml_attr(xcond, "mweek");
+ const char *xwday = switch_xml_attr(xcond, "wday");
+ const char *xhour = switch_xml_attr(xcond, "hour");
+ const char *xminute = switch_xml_attr(xcond, "minute");
+ const char *xminday = switch_xml_attr(xcond, "minute-of-day");
+
+ switch_time_t ts = switch_micro_time_now();
+ int time_match = -1;
+ switch_time_exp_t tm;
+
+ switch_time_exp_lt(&tm, ts);
+
+ if (time_match && xyear) {
+ int test = tm.tm_year + 1900;
+ time_match = switch_number_cmp(xyear, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: year[%d] =~ %s (%s)\n", test, xyear, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xyday) {
+ int test = tm.tm_yday + 1;
+ time_match = switch_number_cmp(xyday, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: day of year[%d] =~ %s (%s)\n", test, xyday, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xmon) {
+ int test = tm.tm_mon + 1;
+ time_match = switch_number_cmp(xmon, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: month[%d] =~ %s (%s)\n", test, xmon, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xmday) {
+ int test = tm.tm_mday;
+ time_match = switch_number_cmp(xmday, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: day of month[%d] =~ %s (%s)\n", test, xmday, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xweek) {
+ int test = (int) (tm.tm_yday / 7 + 1);
+ time_match = switch_number_cmp(xweek, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: week of year[%d] =~ %s (%s)\n", test, xweek, time_match ? "PASS" : "FAIL");
+ }
+ if (time_match && xweek) {
+ int test = (int) (tm.tm_yday / 7 + 1);
+ time_match = switch_number_cmp(xweek, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: week of year[%d] =~ %s (%s)\n", test, xweek, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xmweek) {
+ /* calculate the day of the week of the first of the month (0-6) */
+ int firstdow = (int) (7 - (tm.tm_mday - (tm.tm_wday + 1)) % 7) % 7;
+ /* calculate the week of the month (1-6)*/
+ int test = (int) ceil((tm.tm_mday + firstdow) / 7.0);
+ time_match = switch_number_cmp(xmweek, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime: week of month[%d] =~ %s (%s)\n", test, xmweek, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xwday) {
+ int test = tm.tm_wday + 1;
+ time_match = switch_number_cmp(xwday, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: day of week[%d] =~ %s (%s)\n", test, xwday, time_match ? "PASS" : "FAIL");
+ }
+ if (time_match && xhour) {
+ int test = tm.tm_hour;
+ time_match = switch_number_cmp(xhour, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: hour[%d] =~ %s (%s)\n", test, xhour, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xminute) {
+ int test = tm.tm_min;
+ time_match = switch_number_cmp(xminute, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: minute[%d] =~ %s (%s)\n", test, xminute, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xminday) {
+ int test = (tm.tm_hour * 60) + (tm.tm_min + 1);
+ time_match = switch_number_cmp(xminday, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: minute of day[%d] =~ %s (%s)\n", test, xminday, time_match ? "PASS" : "FAIL");
+ }
+
+ return time_match;
+}
+
+
</ins><span class="cx"> #ifdef WIN32
</span><span class="cx"> /*
</span><span class="cx"> * globbing functions for windows, part of libc on unix, this code was cut and paste from
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>