From b3a3ae9c430a4ce77b4665db6136994baa59206d Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 1 May 2007 01:04:07 +0000
Subject: [PATCH] update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5049 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 src/mod/endpoints/mod_alsa/mod_alsa.c         | 20 +++++++++----------
 .../endpoints/mod_portaudio/mod_portaudio.c   |  6 ++++++
 src/mod/endpoints/mod_sofia/sofia_presence.c  |  6 +++++-
 src/mod/xml_int/mod_xml_curl/mod_xml_curl.c   |  2 +-
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/mod/endpoints/mod_alsa/mod_alsa.c b/src/mod/endpoints/mod_alsa/mod_alsa.c
index 9f4a2754d8..630f81e4db 100644
--- a/src/mod/endpoints/mod_alsa/mod_alsa.c
+++ b/src/mod/endpoints/mod_alsa/mod_alsa.c
@@ -1520,7 +1520,7 @@ static switch_status_t pa_cmd(char *cmd, switch_core_session_t *isession, switch
 {
 	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 @@ static switch_status_t pa_cmd(char *cmd, switch_core_session_t *isession, switch
 	}
 
 	if (func) {
-		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, "<pre>");
 		}
+		status = func(&argv[lead], argc - lead, stream);
+		if (stream->event) {
+			stream->write_function(stream, "\n\n</pre>");
+		}
+	} else {
+		stream->write_function(stream, "Unknown Command [%s]\n", argv[0]);
 	}
 
  done:
diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
index d5f3de9990..d2b040db51 100644
--- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
@@ -1851,7 +1851,13 @@ static switch_status_t pa_cmd(char *cmd, switch_core_session_t *isession, switch
 	}
 
 	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) {
diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index e89cd3c8b9..2c2113e721 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -770,7 +770,11 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 
 		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());
 
 
 
diff --git a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
index 29b7d25f9d..b10ff2ccc4 100644
--- a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
+++ b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
@@ -119,7 +119,7 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con
 		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);