From 0624f61d48162d1c38b37119294d654a686e9859 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 21 Aug 2013 22:24:20 +0500 Subject: [PATCH] revert --- src/mod/applications/mod_conference/mod_conference.c | 3 +-- src/mod/endpoints/mod_sofia/sofia_glue.c | 10 ++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 3c31e2b990..698b2079bd 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -8911,8 +8911,7 @@ static void call_setup_event_handler(switch_event_t *event) switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "conference_track_status", "true"); switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "conference_track_call_id", call_id); - switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "sip_invite_domain", domain); - switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "sip_invite_contact_params", "~isfocus"); + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "sip_invite_domain", domain); if (!strncasecmp(ostr, "url+", 4)) { ostr += 4; diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c index f569a12dd2..620d4e5d0b 100644 --- a/src/mod/endpoints/mod_sofia/sofia_glue.c +++ b/src/mod/endpoints/mod_sofia/sofia_glue.c @@ -497,12 +497,7 @@ char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char char *stripped = switch_core_session_strdup(session, uri); char *new_uri = NULL; char *p; - const char *url_params = NULL; - if (!zstr(params) && *params == '~') { - url_params = params + 1; - params = NULL; - } stripped = sofia_glue_get_url_from_contact(stripped, 0); @@ -547,9 +542,7 @@ char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char } } - if (url_params && !uri_only) { - new_uri = switch_core_session_sprintf(session, "%s;%s", new_uri, url_params); - } + if (!zstr(invite_tel_params)) { char *lhs, *rhs = strchr(new_uri, '@'); @@ -920,6 +913,7 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session) switch_channel_set_variable(channel, "sip_outgoing_contact_uri", invite_contact); + /* Does the "genius" who wanted SIP to be "text-based" so it was "easier to read" even use it now, or did he just suggest it to make our lives miserable?