kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-24 07:59:19 +00:00
Code Issues Projects Releases Wiki Activity

git fail, b4792e7 won't cherry pick but the patch manually applied fine

Browse Source
This commit is contained in:
Anthony Minessale 2013-08-21 22:27:56 +05:00
parent 706aa0903c
commit c73179c6ad
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mod/applications/mod_conference/mod_conference.c
View File

@ -8816,6 +8816,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_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, "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_domain", domain);
switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "sip_invite_contact_params", "~isfocus");
if (!strncasecmp(ostr, "url+", 4)) { if (!strncasecmp(ostr, "url+", 4)) {
ostr += 4; ostr += 4;

10
src/mod/endpoints/mod_sofia/sofia_glue.c
View File

@ -1459,7 +1459,12 @@ char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char
char *stripped = switch_core_session_strdup(session, uri); char *stripped = switch_core_session_strdup(session, uri);
char *new_uri = NULL; char *new_uri = NULL;
char *p; 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); stripped = sofia_glue_get_url_from_contact(stripped, 0);
@ -1504,7 +1509,9 @@ 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)) { if (!zstr(invite_tel_params)) {
char *lhs, *rhs = strchr(new_uri, '@'); char *lhs, *rhs = strchr(new_uri, '@');
@ -2388,7 +2395,6 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
switch_channel_set_variable(channel, "sip_outgoing_contact_uri", invite_contact); 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, 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? or did he just suggest it to make our lives miserable?