From c0477f966fb3e6536bb81378b15e18ea373aef84 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 29 Jul 2013 16:55:16 -0500 Subject: [PATCH] FS-5652 --resolve Conflicts: src/mod/endpoints/mod_sofia/sofia.c --- src/mod/endpoints/mod_sofia/sofia.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c index 46b8dcc0bf..087ad7bed4 100644 --- a/src/mod/endpoints/mod_sofia/sofia.c +++ b/src/mod/endpoints/mod_sofia/sofia.c @@ -7934,6 +7934,8 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia calling_myself++; } 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 (v_event) { @@ -7953,9 +7955,6 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia is_auth++; } - - - tech_pvt->remote_ip = switch_core_session_strdup(session, network_ip); 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"); 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"); rdomain = switch_event_get_header(v_event, "domain_name");