Skinny: Better IP change handling

- Respawn only if ip or port is changed
- Properly handle timeout

diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c
index cbeae6cf5afadce27d298d3347ea517fbaccc9c4..0f7b370a99b00da1b505b00e46ea24ce3b0d2ecd 100644 (file)
--- a/src/mod/endpoints/mod_skinny/mod_skinny.c
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.c
@@ -1233,7 +1233,6 @@ static void walk_listeners(skinny_listener_callback_func_t callback, void *pvt)
        switch_hash_index_t *hi;
        void *val;
        skinny_profile_t *profile;
-       listener_t *l;
 
        /* walk listeners */
        switch_mutex_lock(globals.mutex);
@@ -1241,11 +1240,7 @@ static void walk_listeners(skinny_listener_callback_func_t callback, void *pvt)
                switch_hash_this(hi, NULL, NULL, &val);
                profile = (skinny_profile_t *) val;
 
-               switch_mutex_lock(profile->listener_mutex);
-               for (l = profile->listeners; l; l = l->next) {
-                       callback(l, pvt);
-               }
-               switch_mutex_unlock(profile->listener_mutex);
+               profile_walk_listeners(profile, callback, pvt);
        }
        switch_mutex_unlock(globals.mutex);
 }
@@ -1509,6 +1504,7 @@ static void *SWITCH_THREAD_FUNC skinny_profile_run(switch_thread_t *thread, void
 
 new_socket:
        while(globals.running) {
+               switch_clear_flag_locked(profile, PFLAG_RESPAWN);
                rv = switch_sockaddr_info_get(&sa, profile->ip, SWITCH_INET, profile->port, 0, tmp_pool);
                if (rv)
                        goto fail;
@@ -1546,8 +1542,10 @@ new_socket:
                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Shutting Down\n");
                                goto end;
                        } else if (switch_test_flag(profile, PFLAG_RESPAWN)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Creating a new socket\n");
-                               switch_clear_flag_locked(profile, PFLAG_RESPAWN);
+                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Respawn in progress. Waiting for socket to close.\n");
+                               while (profile->sock) {
+                                       switch_cond_next();
+                               }
                                goto new_socket;
                        } else {
                                /* I wish we could use strerror_r here but its not defined everywhere =/ */
@@ -1619,6 +1617,18 @@ switch_endpoint_interface_t *skinny_get_endpoint_interface()
        return skinny_endpoint_interface;
 }
 
+switch_status_t skinny_profile_respawn(skinny_profile_t *profile, int force)
+{
+       if (force || switch_test_flag(profile, PFLAG_SHOULD_RESPAWN)) {
+               switch_clear_flag_locked(profile, PFLAG_SHOULD_RESPAWN);
+               switch_set_flag_locked(profile, PFLAG_RESPAWN);
+               switch_clear_flag_locked(profile, PFLAG_LISTENER_READY);
+               profile_walk_listeners(profile, kill_listener, NULL);
+               close_socket(&profile->sock, profile);
+       }
+       return SWITCH_STATUS_SUCCESS;
+}
+
 switch_status_t skinny_profile_set(skinny_profile_t *profile, const char *var, const char *val)
 {
        if (!var)
@@ -1633,9 +1643,15 @@ switch_status_t skinny_profile_set(skinny_profile_t *profile, const char *var, c
        if (!strcasecmp(var, "domain")) {
                profile->domain = switch_core_strdup(profile->pool, val);
        } else if (!strcasecmp(var, "ip")) {
-               profile->ip = switch_core_strdup(profile->pool, val);
+               if (!profile->ip || strcmp(val, profile->ip)) {
+                       profile->ip = switch_core_strdup(profile->pool, val);
+                       switch_set_flag_locked(profile, PFLAG_SHOULD_RESPAWN);
+               }
        } else if (!strcasecmp(var, "port")) {
-               profile->port = atoi(val);
+               if (atoi(val) != profile->port) {
+                       profile->port = atoi(val);
+                       switch_set_flag_locked(profile, PFLAG_SHOULD_RESPAWN);
+               }
        } else if (!strcasecmp(var, "patterns-dialplan")) {
                profile->patterns_dialplan = switch_core_strdup(profile->pool, val);
        } else if (!strcasecmp(var, "patterns-context")) {
@@ -1669,15 +1685,21 @@ switch_status_t skinny_profile_set(skinny_profile_t *profile, const char *var, c
        } else {
                return SWITCH_STATUS_FALSE;
        }
-       if (profile->sock && (!strcasecmp(var, "ip") || !strcasecmp(var, "port"))) {
-               switch_set_flag_locked(profile, PFLAG_RESPAWN);
-               switch_clear_flag_locked(profile, PFLAG_LISTENER_READY);
-               close_socket(&profile->sock, profile);
-       }
 
        return SWITCH_STATUS_SUCCESS;
 }
 
+void profile_walk_listeners(skinny_profile_t *profile, skinny_listener_callback_func_t callback, void *pvt)
+{
+       listener_t *l;
+
+       switch_mutex_lock(profile->listener_mutex);
+       for (l = profile->listeners; l; l = l->next) {
+               callback(l, pvt);
+       }
+       switch_mutex_unlock(profile->listener_mutex);
+}
+
 static switch_status_t load_skinny_config(void)
 {
        char *cf = "skinny.conf";
@@ -1811,6 +1833,7 @@ static switch_status_t load_skinny_config(void)
                                                }
                                        }
                                }
+                               skinny_profile_respawn(profile, 0);
 
                                /* Register profile */
                            switch_mutex_lock(globals.mutex);
@@ -2009,6 +2032,7 @@ static void skinny_trap_event_handler(switch_event_t *event)
                                        } else if (!strcmp(profile->ip, old_ip6)) {
                                                skinny_profile_set(profile, "ip", new_ip6);
                                        }
+                                       skinny_profile_respawn(profile, 0);
                                }
                        }
                }

diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.h b/src/mod/endpoints/mod_skinny/mod_skinny.h
index f52f171fdc2c5d70d2a843e716d5f7642702c820..accb7e6c6937d66c004de3e45c410e64e947f588 100644 (file)
--- a/src/mod/endpoints/mod_skinny/mod_skinny.h
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.h
@@ -61,7 +61,8 @@ extern skinny_globals_t globals;
 
 typedef enum {
     PFLAG_LISTENER_READY = (1 << 0),
-    PFLAG_RESPAWN = (1 << 1),
+    PFLAG_SHOULD_RESPAWN = (1 << 1),
+    PFLAG_RESPAWN = (1 << 2),
 } profile_flag_t;
 
 struct skinny_profile {
@@ -220,6 +221,9 @@ switch_core_session_t * skinny_profile_perform_find_session(skinny_profile_t *pr
 switch_core_session_t * skinny_profile_find_session(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id);
 #endif
 switch_status_t dump_device(skinny_profile_t *profile, const char *device_name, switch_stream_handle_t *stream);
+switch_status_t skinny_profile_respawn(skinny_profile_t *profile, int force);
+switch_status_t skinny_profile_set(skinny_profile_t *profile, const char *var, const char *val);
+void profile_walk_listeners(skinny_profile_t *profile, skinny_listener_callback_func_t callback, void *pvt);
 
 /*****************************************************************************/
 /* SQL FUNCTIONS */
@@ -262,7 +266,6 @@ switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
 /* MODULE FUNCTIONS */
 /*****************************************************************************/
 switch_endpoint_interface_t *skinny_get_endpoint_interface();
-switch_status_t skinny_profile_set(skinny_profile_t *profile, const char *var, const char *val);
 
 #endif /* _MOD_SKINNY_H */
 

diff --git a/src/mod/endpoints/mod_skinny/skinny_api.c b/src/mod/endpoints/mod_skinny/skinny_api.c
index 86eea74fc832012827dcde45a91cfd9b266196dc..99373538afbef2371a54391401f524d6a9779edf 100644 (file)
--- a/src/mod/endpoints/mod_skinny/skinny_api.c
+++ b/src/mod/endpoints/mod_skinny/skinny_api.c
@@ -366,7 +366,9 @@ static switch_status_t skinny_api_cmd_profile_set(const char *profile_name, cons
     skinny_profile_t *profile;
 
     if ((profile = skinny_find_profile(profile_name))) {
-           if (skinny_profile_set(profile, name, value) != SWITCH_STATUS_SUCCESS) {
+           if (skinny_profile_set(profile, name, value) == SWITCH_STATUS_SUCCESS) {
+                       skinny_profile_respawn(profile, 0);
+           } else {
                    stream->write_function(stream, "Unable to set skinny setting '%s'. Does it exists?\n", name);
            }
     } else {

diff --git a/src/mod/endpoints/mod_skinny/skinny_protocol.c b/src/mod/endpoints/mod_skinny/skinny_protocol.c
index c519dc4bf539486e92fb77dd7ff84459140039d8..1aea8125745f9449d083cf24581c4643614b8e22 100644 (file)
--- a/src/mod/endpoints/mod_skinny/skinny_protocol.c
+++ b/src/mod/endpoints/mod_skinny/skinny_protocol.c
@@ -122,6 +122,9 @@ switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req)
 
        while (listener_is_ready(listener)) {
                uint8_t do_sleep = 1;
+               if (listener->expire_time && listener->expire_time < switch_epoch_time_now(NULL)) {
+                       return SWITCH_STATUS_TIMEOUT;
+               }
                if(bytes < SKINNY_MESSAGE_FIELD_SIZE) {
                        /* We have nothing yet, get length header field */
                        mlen = SKINNY_MESSAGE_FIELD_SIZE - bytes;
@@ -171,9 +174,6 @@ switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req)
                                }
                        }
                }
-               if (listener->expire_time && listener->expire_time < switch_epoch_time_now(NULL)) {
-                       return SWITCH_STATUS_TIMEOUT;
-               }
                if (do_sleep) {
                        switch_cond_next();
                }