update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5049 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_alsa/mod_alsa.c b/src/mod/endpoints/mod_alsa/mod_alsa.c
index 9f4a2754d8255fd34d0c937a94d6c3f524fedbeb..630f81e4db2777a732ffbdece8b9fdb4ca60ca6c 100644 (file)
--- 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) {
+               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:

diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
index d5f3de999040f07b2a25ba19e1cdd5b9e21a4ebe..d2b040db5164cb3d72011df814807d03580a2556 100644 (file)
--- 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 e89cd3c8b9ddf6f48decb969218bf78fd934d69f..2c2113e7216cfc978d634da41dbe7eae1b10ff67 100644 (file)
--- 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 29b7d25f9da0da3ac5dfa9e29030744eeb642129..b10ff2ccc44779b9dd328aa93a4444a232f90d07 100644 (file)
--- 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);