Merge pull request #1058 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-9735 to master

* commit '498ce4fc':
  FS-9735 - send unknown headers to switch_ivr_set_user

src/include/switch_ivr.h

@@ -961,6 +961,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_say_ip(switch_core_session_t *session
 												  switch_input_args_t *args);
 
 SWITCH_DECLARE(switch_status_t) switch_ivr_set_user(switch_core_session_t *session, const char *data);
+SWITCH_DECLARE(switch_status_t) switch_ivr_set_user_extended(switch_core_session_t *session, const char *data, switch_event_t *params);
 SWITCH_DECLARE(switch_status_t) switch_ivr_set_user_xml(switch_core_session_t *session, const char *prefix,
 														const char *user, const char *domain, switch_xml_t x_user);
 

src/mod/endpoints/mod_sofia/sofia.c

@@ -10032,7 +10032,12 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
 
 		if (sip && sip->sip_from) {
 			user = switch_core_session_sprintf(session, "%s@%s", sip->sip_from->a_url->url_user, sip->sip_from->a_url->url_host);
-			blind_result = switch_ivr_set_user(session, user);
+			switch_event_create(&v_event, SWITCH_EVENT_REQUEST_PARAMS);
+			for (un = sip->sip_unknown; un; un = un->un_next) {
+				switch_event_add_header_string(v_event, SWITCH_STACK_BOTTOM, un->un_name, un->un_value);
+			};
+			blind_result = switch_ivr_set_user_extended(session, user, v_event);
+			switch_event_destroy(&v_event);
 		}
 		if(!sofia_test_pflag(profile, PFLAG_BLIND_AUTH_ENFORCE_RESULT) || blind_result == SWITCH_STATUS_SUCCESS) {
 			is_auth++;

src/switch_ivr.c

@@ -3862,6 +3862,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_set_user_xml(switch_core_session_t *s
 }
 
 SWITCH_DECLARE(switch_status_t) switch_ivr_set_user(switch_core_session_t *session, const char *data)
+{
+	return switch_ivr_set_user_extended(session, data, NULL);
+}
+
+SWITCH_DECLARE(switch_status_t) switch_ivr_set_user_extended(switch_core_session_t *session, const char *data, switch_event_t *params)
 {
 	switch_xml_t x_user = 0;
 	char *user, *domain;
@@ -3885,8 +3890,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_set_user(switch_core_session_t *sessi
 
 	*domain++ = '\0';
 
-
-	if (switch_xml_locate_user_merged("id", user, domain, NULL, &x_user, NULL) != SWITCH_STATUS_SUCCESS) {
+	if (switch_xml_locate_user_merged("id", user, domain, NULL, &x_user, params) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", user, domain);
 		goto done;
 	}