Author: brian Date: Mon Apr 30 21:04:07 2007 New Revision: 5049 Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Mon Apr 30 21:04:07 2007 @@ -1520,7 +1520,7 @@ { char *argv[1024] = { 0 }; int argc = 0; - char *mycmd = NULL, *devname = NULL; + char *mycmd = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; pa_command_t func = NULL; int lead = 1, devval = 0; @@ -1616,17 +1616,15 @@ } if (func) { + if (stream->event) { + stream->write_function(stream, "<pre>"); + } status = func(&argv[lead], argc - lead, stream); - } else { - if (devname) { - if (devval > 0) { - stream->write_function(stream, "%s set to %d\n", devname, devval); - } else { - stream->write_function(stream, "%s not set (invalid value)\n", devname); - } - } else { - stream->write_function(stream, "Unknown Command [%s]\n", argv[0]); + if (stream->event) { + stream->write_function(stream, "\n\n</pre>"); } + } else { + stream->write_function(stream, "Unknown Command [%s]\n", argv[0]); } done: Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Mon Apr 30 21:04:07 2007 @@ -1851,7 +1851,13 @@ } if (func) { + if (stream->event) { + stream->write_function(stream, "<pre>"); + } status = func(&argv[lead], argc - lead, stream); + if (stream->event) { + stream->write_function(stream, "\n\n</pre>"); + } } else { if (devname) { if (devval > 0) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Apr 30 21:04:07 2007 @@ -770,7 +770,11 @@ nua_respond(nh, SIP_202_ACCEPTED, NUTAG_WITH_THIS(nua), - SIPTAG_SUBSCRIPTION_STATE_STR(sstr), SIPTAG_FROM(sip->sip_to), SIPTAG_TO(sip->sip_from), SIPTAG_CONTACT_STR(to_str), TAG_END()); + SIPTAG_SUBSCRIPTION_STATE_STR(sstr), + SIPTAG_FROM(sip->sip_to), + SIPTAG_TO(sip->sip_from), + SIPTAG_CONTACT_STR(contact_str), + TAG_END()); Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Mon Apr 30 21:04:07 2007 @@ -119,7 +119,7 @@ curl_easy_cleanup(curl_handle); close(config_data.fd); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening temp file!\n"); } switch_safe_free(data);