mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-03-14 04:54:49 +00:00
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5049 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
c222c58542
commit
b3a3ae9c43
@ -1520,7 +1520,7 @@ static switch_status_t pa_cmd(char *cmd, switch_core_session_t *isession, switch
|
|||||||
{
|
{
|
||||||
char *argv[1024] = { 0 };
|
char *argv[1024] = { 0 };
|
||||||
int argc = 0;
|
int argc = 0;
|
||||||
char *mycmd = NULL, *devname = NULL;
|
char *mycmd = NULL;
|
||||||
switch_status_t status = SWITCH_STATUS_SUCCESS;
|
switch_status_t status = SWITCH_STATUS_SUCCESS;
|
||||||
pa_command_t func = NULL;
|
pa_command_t func = NULL;
|
||||||
int lead = 1, devval = 0;
|
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 (func) {
|
||||||
status = func(&argv[lead], argc - lead, stream);
|
if (stream->event) {
|
||||||
} else {
|
stream->write_function(stream, "<pre>");
|
||||||
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]);
|
|
||||||
}
|
}
|
||||||
|
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:
|
done:
|
||||||
|
@ -1851,7 +1851,13 @@ static switch_status_t pa_cmd(char *cmd, switch_core_session_t *isession, switch
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (func) {
|
if (func) {
|
||||||
|
if (stream->event) {
|
||||||
|
stream->write_function(stream, "<pre>");
|
||||||
|
}
|
||||||
status = func(&argv[lead], argc - lead, stream);
|
status = func(&argv[lead], argc - lead, stream);
|
||||||
|
if (stream->event) {
|
||||||
|
stream->write_function(stream, "\n\n</pre>");
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
if (devname) {
|
if (devname) {
|
||||||
if (devval > 0) {
|
if (devval > 0) {
|
||||||
|
@ -770,7 +770,11 @@ void sofia_presence_handle_sip_i_subscribe(int status,
|
|||||||
|
|
||||||
nua_respond(nh, SIP_202_ACCEPTED,
|
nua_respond(nh, SIP_202_ACCEPTED,
|
||||||
NUTAG_WITH_THIS(nua),
|
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());
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -119,7 +119,7 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con
|
|||||||
curl_easy_cleanup(curl_handle);
|
curl_easy_cleanup(curl_handle);
|
||||||
close(config_data.fd);
|
close(config_data.fd);
|
||||||
} else {
|
} 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);
|
switch_safe_free(data);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user