April 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8164 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 22 Apr '08

22 Apr '08

Author: brian Date: Mon Apr 21 23:16:14 2008 New Revision: 8164 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: fix stun lookup, Mike or Tony please review. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Apr 21 23:16:14 2008 @@ -1144,17 +1144,15 @@ profile->sipip = switch_core_strdup(profile->pool, ip); } else if (!strcasecmp(var, "ext-sip-ip")) { char *ip = mod_sofia_globals.guess_ip; - char stun_ip[50] = ""; - char *myip = stun_ip; - switch_copy_string(myip, ip, sizeof(myip)); - if (!strcasecmp(val, "0.0.0.0")) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invald IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip); - } else if (strcasecmp(val, "auto")) { + } else if (!strcasecmp(val, "auto")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Automatically using IP %s\n", mod_sofia_globals.guess_ip); + } else { switch_port_t port = 0; - if (sofia_glue_ext_address_lookup(&myip, &port, val, profile->pool) == SWITCH_STATUS_SUCCESS) { - ip = myip; + if (sofia_glue_ext_address_lookup(&ip, &port, val, profile->pool) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "STUN lookup sucessful using %s:%d\n", ip, port); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to get external ip.\n"); }

1 0

[commit] r8158 - freeswitch/trunk/scripts
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: anthm Date: Mon Apr 21 19:45:47 2008 New Revision: 8158 Added: freeswitch/trunk/scripts/extract_log_range.pl Log: update Added: freeswitch/trunk/scripts/extract_log_range.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/extract_log_range.pl Mon Apr 21 19:45:47 2008 @@ -0,0 +1,43 @@ +#!/usr/bin/perl +use Time::Local; + +my $file = shift; +my $start = shift; +my $stop = shift; + + +sub parse_date($) { + my $str = shift; + + if (my ($yr, $mo, $day, $hr, $min, $sec) = $str =~ /(\d{4})\-(\d{2})\-(\d{2}) (\d{2})\:(\d{2})\:(\d{2})/) { + return timelocal($sec, $min, $hr, $day - 1, $mo - 1, $yr); + } else { + die $str; + } +} + +if ($start =~ /\:/) { + $start = parse_date($start); +} + +if ($stop =~ /\:/) { + $stop = parse_date($stop); +} elsif ($stop =~ /^\+(\d+)/) { + $stop = $start + $1; +} + +open(I, $file); + +while (<I>) { + my $str = $_; + $epoch = parse_date($str); + + if ($epoch > $start) { + if ($stop && $epoch > $stop) { + last; + } + print; + } +} + +close(I);

1 0

[commit] r8149 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sip
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: mikej Date: Mon Apr 21 18:30:48 2008 New Revision: 8149 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c Log: Fri Apr 18 06:54:40 EDT 2008 Jerry Richards <jerryr at tonecommander dot com> * sip_util.c: fixed sip_header_as_string() Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Mon Apr 21 18:30:48 2008 @@ -1 +1 @@ -Mon Apr 7 15:44:29 EDT 2008 +Mon Apr 21 18:30:34 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c Mon Apr 21 18:30:48 2008 @@ -412,7 +412,7 @@ for (rv = su_alloc(home, len); rv; rv = su_realloc(home, rv, len)) { - ssize_t n = sip_header_field_e(s, sizeof(s), h, 0); + ssize_t n = sip_header_field_e(rv, len, h, 0); if (n > -1 && n + 1 <= len) break; if (n > -1) /* glibc >2.1 */

1 0

[commit] r8139 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: anthm Date: Mon Apr 21 17:00:18 2008 New Revision: 8139 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: outlaw 0.0.0.0 in sofia ip params Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Apr 21 17:00:18 2008 @@ -1116,23 +1116,50 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invald option %s for VAD\n", val); } } else if (!strcasecmp(var, "ext-rtp-ip")) { - profile->extrtpip = switch_core_strdup(profile->pool, strcasecmp(val, "auto") ? val : mod_sofia_globals.guess_ip); + char *ip = mod_sofia_globals.guess_ip; + + if (!strcmp(val, "0.0.0.0")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invald IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip); + } else { + ip = strcasecmp(val, "auto") ? val : mod_sofia_globals.guess_ip; + } + profile->extrtpip = switch_core_strdup(profile->pool, ip); } else if (!strcasecmp(var, "rtp-ip")) { - profile->rtpip = switch_core_strdup(profile->pool, strcasecmp(val, "auto") ? val : mod_sofia_globals.guess_ip); + char *ip = mod_sofia_globals.guess_ip; + + if (!strcmp(val, "0.0.0.0")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invald IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip); + } else { + ip = strcasecmp(val, "auto") ? val : mod_sofia_globals.guess_ip; + } + profile->rtpip = switch_core_strdup(profile->pool, ip); } else if (!strcasecmp(var, "sip-ip")) { - profile->sipip = switch_core_strdup(profile->pool, strcasecmp(val, "auto") ? val : mod_sofia_globals.guess_ip); - } else if (!strcasecmp(var, "ext-sip-ip")) { - if (!strcasecmp(val, "auto")) { - profile->extsipip = switch_core_strdup(profile->pool, mod_sofia_globals.guess_ip); + char *ip = mod_sofia_globals.guess_ip; + + if (!strcmp(val, "0.0.0.0")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invald IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip); } else { - char *ip = mod_sofia_globals.guess_ip; + ip = strcasecmp(val, "auto") ? val : mod_sofia_globals.guess_ip; + } + profile->sipip = switch_core_strdup(profile->pool, ip); + } else if (!strcasecmp(var, "ext-sip-ip")) { + char *ip = mod_sofia_globals.guess_ip; + char stun_ip[50] = ""; + char *myip = stun_ip; + + switch_copy_string(myip, ip, sizeof(myip)); + + if (!strcasecmp(val, "0.0.0.0")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invald IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip); + } else if (strcasecmp(val, "auto")) { switch_port_t port = 0; - if (sofia_glue_ext_address_lookup(&ip, &port, val, profile->pool) == SWITCH_STATUS_SUCCESS) { - profile->extsipip = switch_core_strdup(profile->pool, ip); + if (sofia_glue_ext_address_lookup(&myip, &port, val, profile->pool) == SWITCH_STATUS_SUCCESS) { + ip = myip; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to get external ip.\n"); } } + profile->extsipip = switch_core_strdup(profile->pool, ip); } else if (!strcasecmp(var, "force-register-domain")) { profile->reg_domain = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "bind-params")) {

1 0

[commit] r8138 - in freeswitch/trunk/src/mod: applications/mod_dptools languages/mod_spidermonkey
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: anthm Date: Mon Apr 21 16:15:50 2008 New Revision: 8138 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: add hold/unhold dialplan apps Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Apr 21 16:15:50 2008 @@ -1844,6 +1844,19 @@ return cause; } + +#define HOLD_SYNTAX "[<display message>]" +SWITCH_STANDARD_APP(hold_function) +{ + switch_ivr_hold_uuid(switch_core_session_get_uuid(session), data); +} + +#define UNHOLD_SYNTAX "" +SWITCH_STANDARD_APP(unhold_function) +{ + switch_ivr_unhold_uuid(switch_core_session_get_uuid(session)); +} + #define SPEAK_DESC "Speak text to a channel via the tts interface" #define DISPLACE_DESC "Displace audio from a file to the channels input" #define SESS_REC_DESC "Starts a background recording of the entire session" @@ -1876,6 +1889,9 @@ SWITCH_ADD_API(api_interface, "strftime", "strftime", strftime_api_function, "<format_string>"); SWITCH_ADD_API(api_interface, "presence", "presence", presence_api_function, "<user> <rpid> <message>"); SWITCH_ADD_APP(app_interface, "privacy", "Set privacy on calls", "Set caller privacy on calls.", privacy_function, "off|on|name|full|number", SAF_SUPPORT_NOMEDIA); + + SWITCH_ADD_APP(app_interface, "hold", "Send a hold message", "Send a hold message", hold_function, HOLD_SYNTAX, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "unhold", "Send a un-hold message", "Send a un-hold message", unhold_function, UNHOLD_SYNTAX, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "transfer", "Transfer a channel", TRANSFER_LONG_DESC, transfer_function, "<exten> [<dialplan> <context>]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "check_acl", "Check an ip against an ACL list", "Check an ip against an ACL list", check_acl_function, "<ip> <acl | cidr>", SAF_SUPPORT_NOMEDIA); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Apr 21 16:15:50 2008 @@ -2281,14 +2281,10 @@ CURL *curl_handle = NULL; struct config_data config_data; int saveDepth = 0; - int32 disable_wait = 0; if (argc > 1) { url = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); name = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); - if (argc > 2) { - JS_ValueToInt32(cx, argv[2], &disable_wait); - } curl_handle = curl_easy_init(); if (!strncasecmp(url, "https", 5)) { @@ -2305,13 +2301,9 @@ curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0"); - if (disable_wait) { - saveDepth = JS_SuspendRequest(cx); - curl_easy_perform(curl_handle); - JS_ResumeRequest(cx, saveDepth); - } else { - curl_easy_perform(curl_handle); - } + saveDepth = JS_SuspendRequest(cx); + curl_easy_perform(curl_handle); + JS_ResumeRequest(cx, saveDepth); curl_easy_cleanup(curl_handle); } else { @@ -2330,14 +2322,10 @@ CURL *curl_handle = NULL; struct config_data config_data; int saveDepth = 0; - int32 disable_wait = 0; if (argc > 1) { url = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); filename = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); - if (argc > 2) { - JS_ValueToInt32(cx, argv[2], &disable_wait); - } curl_global_init(CURL_GLOBAL_ALL); curl_handle = curl_easy_init(); @@ -2355,13 +2343,9 @@ curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0"); - if (disable_wait) { - saveDepth = JS_SuspendRequest(cx); - curl_easy_perform(curl_handle); - JS_ResumeRequest(cx, saveDepth); - } else { - curl_easy_perform(curl_handle); - } + saveDepth = JS_SuspendRequest(cx); + curl_easy_perform(curl_handle); + JS_ResumeRequest(cx, saveDepth); curl_easy_cleanup(curl_handle); close(config_data.fd); @@ -2383,15 +2367,11 @@ int32 buffer_size = 65535; CURLcode code = 0; int saveDepth = 0; - int32 disable_wait = 0; if (argc >= 1) { url = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); if (argc > 1) { JS_ValueToInt32(cx, argv[1], &buffer_size); - if (argc > 2) { - JS_ValueToInt32(cx, argv[2], &disable_wait); - } } curl_global_init(CURL_GLOBAL_ALL); @@ -2414,13 +2394,9 @@ curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0"); - if (disable_wait) { - saveDepth = JS_SuspendRequest(cx); - code = curl_easy_perform(curl_handle); - JS_ResumeRequest(cx, saveDepth); - } else { - code = curl_easy_perform(curl_handle); - } + saveDepth = JS_SuspendRequest(cx); + code = curl_easy_perform(curl_handle); + JS_ResumeRequest(cx, saveDepth); curl_easy_cleanup(curl_handle);

1 0

[commit] r8137 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: anthm Date: Mon Apr 21 15:26:32 2008 New Revision: 8137 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix MODLANG-56 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Apr 21 15:26:32 2008 @@ -2721,7 +2721,7 @@ if (JS_ValueToObject(cx, argv[0], &session_obj)) { struct js_session *old_jss = NULL; - if ((old_jss = JS_GetPrivate(cx, session_obj)) && old_jss->session) { + if (session_obj && (old_jss = JS_GetPrivate(cx, session_obj)) && old_jss->session) { session = old_jss->session; orig_caller_profile = switch_channel_get_caller_profile(switch_core_session_get_channel(session)); dialplan = orig_caller_profile->dialplan; @@ -2774,9 +2774,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot Create Outgoing Channel! [%s]\n", dest); goto done; } - + jss->session = peer_session; *rval = BOOLEAN_TO_JSVAL(JS_TRUE); + switch_channel_set_state(switch_core_session_get_channel(jss->session), CS_TRANSMIT); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Missing Args\n"); @@ -2803,8 +2804,8 @@ switch_channel_set_private(channel, "jss", NULL); switch_core_event_hook_remove_state_change(session, hanguphook); - - if (switch_test_flag(jss, S_HUP)) { + + if (switch_test_flag(jss, S_HUP) || switch_channel_get_state(channel) != CS_EXECUTE) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); }

1 0

[commit] r8136 - freeswitch/trunk
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: mikej Date: Mon Apr 21 15:07:18 2008 New Revision: 8136 Modified: freeswitch/trunk/bootstrap.sh Log: include the acutal files instead of symlinks when we bootstrap (FSBUILD-43) Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Mon Apr 21 15:07:18 2008 @@ -250,7 +250,7 @@ if [ ! -z "${AMTEST}" ] ; then if [ -f ${LIBDIR}/${i}/Makefile.am ] ; then echo "Creating Makefile.in" - ${AUTOMAKE:-automake} --no-force --add-missing ; + ${AUTOMAKE:-automake} --no-force --add-missing --copy ; fi fi rm -rf autom4te*.cache @@ -264,6 +264,6 @@ $libtoolize --copy --automake ${AUTOCONF:-autoconf} ${AUTOHEADER:-autoheader} -${AUTOMAKE:-automake} --no-force --add-missing +${AUTOMAKE:-automake} --no-force --add-missing --copy rm -rf autom4te*.cache

1 0

[commit] r8135 - freeswitch/trunk/src/mod/codecs/mod_amr
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: mikej Date: Mon Apr 21 15:02:51 2008 New Revision: 8135 Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Log: honor disable dtx in fmtp (MODCODEC-3) Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Mon Apr 21 15:02:51 2008 @@ -93,11 +93,17 @@ AMR_BITRATE_1220 } amr_bitrate_t; +typedef enum { + AMR_DTX_DISABLED = 0, + AMR_DTX_ENABLED +} amr_dtx_t; + struct amr_context { void *encoder_state; void *decoder_state; switch_byte_t enc_modes; switch_byte_t enc_mode; + switch_int_t dtx_mode; uint32_t change_period; switch_byte_t max_ptime; switch_byte_t ptime; @@ -133,8 +139,9 @@ if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct amr_context))))) { return SWITCH_STATUS_FALSE; - } else { - + } else { + + context->dtx_mode = AMR_DTX_ENABLED; if (codec->fmtp_in) { argc = switch_separate_string(codec->fmtp_in, ';', argv, (sizeof(argv) / sizeof(argv[0]))); for (x = 0; x < argc; x++) { @@ -180,6 +187,8 @@ for (y = 0; y < m_argc; y++) { context->enc_modes |= (1 << atoi(m_argv[y])); } + } else if (!strcasecmp(data, "dtx")) { + context->dtx_mode = if (atoi(arg)) ? AMR_DTX_ENABLED : AMR_DTX_DISABLED; } } } @@ -206,7 +215,7 @@ context->decoder_state = NULL; if (encoding) { - context->encoder_state = Encoder_Interface_init(1); + context->encoder_state = Encoder_Interface_init(context->dtx_mode); } if (decoding) {

1 0

[commit] r8134 - freeswitch/trunk/src
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: mikej Date: Mon Apr 21 12:48:34 2008 New Revision: 8134 Modified: freeswitch/trunk/src/inet_pton.c Log: tweak windows build for inet_pton Modified: freeswitch/trunk/src/inet_pton.c ============================================================================== --- freeswitch/trunk/src/inet_pton.c (original) +++ freeswitch/trunk/src/inet_pton.c Mon Apr 21 12:48:34 2008 @@ -36,8 +36,6 @@ #include <string.h> #include <errno.h> -#include "inet_pton.h" - #define IN6ADDRSZ 16 #define INADDRSZ 4 #define INT16SZ 2

1 0

[commit] r8133 - in freeswitch/trunk/src/mod: applications/mod_voicemail event_handlers/mod_event_socket
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: brian Date: Mon Apr 21 11:25:09 2008 New Revision: 8133 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: Add MODEVENT-21 and a small tweak to voicemail to not light up on saved message counts Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Mon Apr 21 11:25:09 2008 @@ -1429,7 +1429,7 @@ if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { char *mwi_id; const char *yn = "no"; - if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + if (total_new_messages || total_new_urgent_messages ) { yn = "yes"; } mwi_id = switch_mprintf("%s@%s", myid, domain_name); @@ -1940,7 +1940,7 @@ if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { const char *yn = "no"; - if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + if (total_new_messages || total_new_urgent_messages) { yn = "yes"; } mwi_id = switch_mprintf("%s@%s", id, domain_name); @@ -2187,7 +2187,7 @@ if (total_new_messages || total_saved_messages) { if (switch_event_create(&new_event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { const char *yn = "no"; - if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + if (total_new_messages || total_new_urgent_messages ) { yn = "yes"; } switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "%s", yn); Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Apr 21 11:25:09 2008 @@ -1334,7 +1334,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Socket up listening on %s:%u\n", prefs.ip, prefs.port); break; sock_fail: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error! Could not listen on %s:%u\n", prefs.ip, prefs.port); switch_yield(100000); }

1 0