cache auth_gateway_name in sofia for challenged bye

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10222 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index 39a37d78a162e4198b209e3b8d7dfa5955c16131..80bc933aa39e09dfc0754eef3812e7dc78256914 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -109,7 +109,8 @@ typedef enum {
 struct sofia_private {
        char uuid[SWITCH_UUID_FORMATTED_LENGTH + 1];
        sofia_gateway_t *gateway;
-       char gateway_name[512];
+       char gateway_name[256];
+       char auth_gateway_name[256];
        int destroy_nh;
        int destroy_me;
        int is_call;
@@ -586,8 +587,9 @@ auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t co
 
 void sofia_reg_handle_sip_r_challenge(int status,
                                                                          char const *phrase,
-                                                                         nua_t *nua, sofia_profile_t *profile, 
-                                                                         nua_handle_t *nh, switch_core_session_t *session, sofia_gateway_t *gateway, sip_t const *sip, tagi_t tags[]);
+                                                                         nua_t *nua, sofia_profile_t *profile,
+                                                                         nua_handle_t *nh, sofia_private_t *sofia_private,
+                                                                         switch_core_session_t *session, sofia_gateway_t *gateway, sip_t const *sip, tagi_t tags[]);
 void sofia_reg_handle_sip_r_register(int status,
                                        char const *phrase,
                                        nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]);

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index dd8b037faa2ce9fe09f55a57217a46afc3fd1950..58ce022c2b9ba5a17d7591ef2cec9f994043b3f0 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -182,6 +182,12 @@ void sofia_event_callback(nua_event_t event,
                                tech_pvt = switch_core_session_get_private(session);
                                switch_assert(tech_pvt);
                                channel = switch_core_session_get_channel(tech_pvt->session);
+                               if (status >= 180 && !*sofia_private->auth_gateway_name) {
+                                       const char *gwname = switch_channel_get_variable(channel, "sip_use_gateway");
+                                       if (!switch_strlen_zero(gwname)) {
+                                               switch_set_string(sofia_private->auth_gateway_name, gwname);
+                                       }
+                               }
                                if (!tech_pvt->call_id && sip && sip->sip_call_id && sip->sip_call_id->i_id) {
                                        tech_pvt->call_id = switch_core_session_strdup(session, sip->sip_call_id->i_id);
                                        switch_channel_set_variable(channel, "sip_call_id", tech_pvt->call_id);
@@ -237,7 +243,7 @@ void sofia_event_callback(nua_event_t event,
        }
 
        if (sip && (status == 401 || status == 407)) {
-               sofia_reg_handle_sip_r_challenge(status, phrase, nua, profile, nh, session, gateway, sip, tags);
+               sofia_reg_handle_sip_r_challenge(status, phrase, nua, profile, nh, sofia_private, session, gateway, sip, tags);
                goto done;
        }
 
@@ -3899,7 +3905,7 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
        memset(sofia_private, 0, sizeof(*sofia_private));
        sofia_private->is_call++;
        tech_pvt->sofia_private = sofia_private;
-
+       
        if ((profile->pres_type)) {
                sofia_presence_set_chat_hash(tech_pvt, sip);
        }

diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c
index f635ddcbb675327e74b464c278aad715cf37ff6b..f963b9d7912f0c22852d41d0180f81734a48de35 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_reg.c
+++ b/src/mod/endpoints/mod_sofia/sofia_reg.c
@@ -1097,7 +1097,7 @@ void sofia_reg_handle_sip_r_register(int status,
 
 void sofia_reg_handle_sip_r_challenge(int status,
                                                                          char const *phrase,
-                                                                         nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh,
+                                                                         nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private,
                                                                          switch_core_session_t *session, sofia_gateway_t *gateway, sip_t const *sip, tagi_t tags[])
 {
        sip_www_authenticate_t const *authenticate = NULL;
@@ -1110,6 +1110,10 @@ void sofia_reg_handle_sip_r_challenge(int status,
        sofia_gateway_t *var_gateway = NULL;
        const char *gw_name = NULL;
 
+       if (sofia_private && *sofia_private->auth_gateway_name) {
+               gw_name = sofia_private->auth_gateway_name;
+       }
+
        if (session) {
                private_object_t *tech_pvt;
                switch_channel_t *channel = switch_core_session_get_channel(session);