FS-6540 This should proxy all refers now, the param has changed to proxy-refer

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index fbe5bad740dfc0ccdc9bda47f00d5098f53145e5..3e8e98fafca2a5ee0224f4487dab0b48a7fb0c86 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -277,7 +277,7 @@ typedef enum {
        PFLAG_TCP_ALWAYS_NAT,
        PFLAG_ENABLE_CHAT,
        PFLAG_AUTH_SUBSCRIPTIONS,
-       PFLAG_PROXY_REFER_REPLACES,
+       PFLAG_PROXY_REFER,
        /* No new flags below this line */
        PFLAG_MAX
 } PFLAGS;

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index f53149f3fd22633ed86ada046e85547e41800fea..65ca08c3bb875fc571223e50db96adf574b88d00 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -4101,11 +4101,11 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
                                        } else if (!strcasecmp(var, "tcp-ping2pong") && !zstr(val)) {
                                                profile->tcp_ping2pong = atoi(val);
                                                sofia_set_pflag(profile, PFLAG_TCP_PING2PONG);
-                                       } else if (!strcasecmp(var, "proxy-refer-replaces") && !zstr(val)) {
+                                       } else if ((!strcasecmp(var, "proxy-refer-replaces") || !strcasecmp(var, "proxy-refer")) && !zstr(val)) {
                                                if (switch_true(val)) {
-                                                       sofia_set_pflag(profile, PFLAG_PROXY_REFER_REPLACES);
+                                                       sofia_set_pflag(profile, PFLAG_PROXY_REFER);
                                                } else {
-                                                       sofia_clear_pflag(profile, PFLAG_PROXY_REFER_REPLACES);
+                                                       sofia_clear_pflag(profile, PFLAG_PROXY_REFER);
                                                }
                                        } else if (!strcasecmp(var, "sip-messages-respond-200-ok") && !zstr(val)) {
                                                if (switch_true(val)) {
@@ -7450,10 +7450,10 @@ void sofia_handle_sip_i_refer(nua_t *nua, sofia_profile_t *profile, nua_handle_t
        }
 
        
-       if (sofia_test_pflag(profile, PFLAG_PROXY_REFER_REPLACES)) {
+       if (sofia_test_pflag(profile, PFLAG_PROXY_REFER)) {
                switch_core_session_t *other_session;
 
-               if (switch_stristr("replaces=", full_ref_to) && switch_core_session_get_partner(session, &other_session) == SWITCH_STATUS_SUCCESS) {
+               if (switch_core_session_get_partner(session, &other_session) == SWITCH_STATUS_SUCCESS) {
                        switch_core_session_message_t *msg;
                        
                        msg = switch_core_session_alloc(other_session, sizeof(*msg));