mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-02-08 08:51:50 +00:00
Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
This commit is contained in:
commit
635350dbff
@ -1664,7 +1664,7 @@ static void write_data(switch_stream_handle_t *stream, switch_bool_t as_xml, con
|
|||||||
|
|
||||||
SWITCH_STANDARD_API(dialplan_lcr_function)
|
SWITCH_STANDARD_API(dialplan_lcr_function)
|
||||||
{
|
{
|
||||||
char *argv[4] = { 0 };
|
char *argv[9] = { 0 };
|
||||||
int argc;
|
int argc;
|
||||||
char *mydata = NULL;
|
char *mydata = NULL;
|
||||||
//char *dialstring = NULL;
|
//char *dialstring = NULL;
|
||||||
@ -1825,7 +1825,7 @@ SWITCH_STANDARD_API(dialplan_lcr_function)
|
|||||||
if (as_xml) {
|
if (as_xml) {
|
||||||
event_xml = switch_event_xmlize(current->fields, SWITCH_VA_NONE);
|
event_xml = switch_event_xmlize(current->fields, SWITCH_VA_NONE);
|
||||||
event_str = switch_xml_toxml(event_xml, SWITCH_FALSE);
|
event_str = switch_xml_toxml(event_xml, SWITCH_FALSE);
|
||||||
stream->write_function(stream, event_str);
|
stream->write_function(stream, "%s", event_str);
|
||||||
switch_xml_free(event_xml);
|
switch_xml_free(event_xml);
|
||||||
switch_safe_free(event_str);
|
switch_safe_free(event_str);
|
||||||
}
|
}
|
||||||
|
@ -2171,6 +2171,15 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
|
|||||||
if (!strncasecmp(url_str, "sips:", 5)) {
|
if (!strncasecmp(url_str, "sips:", 5)) {
|
||||||
s = url_str + 5;
|
s = url_str + 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* tel: patch from jaybinks, added by MC
|
||||||
|
It compiles but I don't have a way to test it
|
||||||
|
*/
|
||||||
|
if (!strncasecmp(url_str, "tel:", 4)) {
|
||||||
|
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session),
|
||||||
|
SWITCH_LOG_ERROR, "URL Error! tel: uri's not supported at this time\n");
|
||||||
|
return SWITCH_STATUS_FALSE;
|
||||||
|
}
|
||||||
if (!s) {
|
if (!s) {
|
||||||
s = url_str;
|
s = url_str;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user