reapply

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 86fa14004653e2a8f2284b19e48c30391fa9a5e5..b06eacb36d9fb1ed3c898501badf016f10266b28 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -4889,6 +4889,8 @@ static void general_event_handler(switch_event_t *event)
                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "EVENT_TRAP: IP change detected\n");
                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "IP change detected [%s]->[%s] [%s]->[%s]\n", old_ip4, new_ip4, old_ip6, new_ip6);
 
+                               strncpy(mod_sofia_globals.guess_ip, new_ip4, sizeof(mod_sofia_globals.guess_ip));
+
                                switch_mutex_lock(mod_sofia_globals.hash_mutex);
                                if (mod_sofia_globals.profile_hash) {
                                        for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) {

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 5b130850b2d98cc8de17cf7ba5d4aebe61185d62..dcb4235bc33431d189821856a9a7421cee86f037 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -4723,7 +4723,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
        const char *uuid;
        switch_core_session_t *other_session = NULL;
        switch_channel_t *other_channel = NULL;
-       private_object_t *other_tech_pvt = NULL;
+       //private_object_t *other_tech_pvt = NULL;
        char st[80] = "";
        int is_dup_sdp = 0;
        switch_event_t *s_event = NULL;
@@ -4930,7 +4930,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
                                if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))
                                        && (other_session = switch_core_session_locate(uuid))) {
                                        other_channel = switch_core_session_get_channel(other_session);
-                                       other_tech_pvt = switch_core_session_get_private(other_session);
+                                       //other_tech_pvt = switch_core_session_get_private(other_session);
 
                                        if (!switch_channel_get_variable(other_channel, SWITCH_B_SDP_VARIABLE)) {
                                                switch_channel_set_variable(other_channel, SWITCH_B_SDP_VARIABLE, r_sdp);