kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-5652 --resolve 

Conflicts:
	src/mod/endpoints/mod_sofia/sofia.c
This commit is contained in:
Anthony Minessale 2013-07-29 16:55:16 -05:00
parent e765748288
commit c0477f966f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -7934,6 +7934,8 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
calling_myself++; calling_myself++;
} else { } else {
switch_event_create(&v_event, SWITCH_EVENT_REQUEST_PARAMS);
if (sofia_reg_handle_register(nua, profile, nh, sip, de, REG_INVITE, key, sizeof(key), &v_event, NULL, &x_user)) { if (sofia_reg_handle_register(nua, profile, nh, sip, de, REG_INVITE, key, sizeof(key), &v_event, NULL, &x_user)) {
if (v_event) { if (v_event) {
@ -7953,9 +7955,6 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
is_auth++; is_auth++;
} }
tech_pvt->remote_ip = switch_core_session_strdup(session, network_ip); tech_pvt->remote_ip = switch_core_session_strdup(session, network_ip);
tech_pvt->remote_port = network_port; tech_pvt->remote_port = network_port;
@ -8027,6 +8026,12 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
const char *ruser = NULL, *rdomain = NULL, *user = switch_xml_attr(x_user, "id"), *domain = switch_xml_attr(x_user, "domain-name"); const char *ruser = NULL, *rdomain = NULL, *user = switch_xml_attr(x_user, "id"), *domain = switch_xml_attr(x_user, "domain-name");
if (v_event) { if (v_event) {
switch_event_header_t *hp;
for (hp = v_event->headers; hp; hp = hp->next) {
switch_channel_set_variable(channel, hp->name, hp->value);
}
ruser = switch_event_get_header(v_event, "username"); ruser = switch_event_get_header(v_event, "username");
rdomain = switch_event_get_header(v_event, "domain_name"); rdomain = switch_event_get_header(v_event, "domain_name");