interface: suppress unnecessary device config overrides

[project/netifd.git] / proto-shell.c

diff --git a/proto-shell.c b/proto-shell.c
index f32a32f..977cdbc 100644 (file)
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -156,10 +156,22 @@ proto_shell_handler(struct interface_proto_state *proto,
        proc = &state->script_task;
 
        if (cmd == PROTO_CMD_SETUP) {
-               action = "setup";
-               state->last_error = -1;
-               proto_shell_clear_host_dep(state);
-               state->sm = S_SETUP;
+               switch (state->sm) {
+               case S_IDLE:
+                       action = "setup";
+                       state->last_error = -1;
+                       proto_shell_clear_host_dep(state);
+                       state->sm = S_SETUP;
+                       break;
+
+               case S_SETUP_ABORT:
+               case S_TEARDOWN:
+               case S_SETUP:
+                       return 0;
+
+               default:
+                       return -1;
+               }
        } else if (cmd == PROTO_CMD_RENEW) {
                if (!(handler->proto.flags & PROTO_FLAG_RENEW_AVAILABLE))
                        return 0;
@@ -172,28 +184,35 @@ proto_shell_handler(struct interface_proto_state *proto,
                state->renew_pending = false;
                action = "renew";
        } else {
-               if (state->sm == S_TEARDOWN)
-                       return 0;
-
-               state->renew_pending = false;
-               if (state->script_task.uloop.pending) {
-                       if (state->sm != S_SETUP_ABORT) {
+               switch (state->sm) {
+               case S_SETUP:
+                       if (state->script_task.uloop.pending) {
                                uloop_timeout_set(&state->teardown_timeout, 1000);
                                kill(state->script_task.uloop.pid, SIGTERM);
                                if (state->proto_task.uloop.pending)
                                        kill(state->proto_task.uloop.pid, SIGTERM);
+                               state->renew_pending = false;
                                state->sm = S_SETUP_ABORT;
+                               return 0;
+                       }
+               /* fall through if no script task is running */
+               case S_IDLE:
+                       action = "teardown";
+                       state->renew_pending = false;
+                       state->sm = S_TEARDOWN;
+                       if (state->last_error >= 0) {
+                               snprintf(error_buf, sizeof(error_buf), "ERROR=%d", state->last_error);
+                               envp[j++] = error_buf;
                        }
+                       uloop_timeout_set(&state->teardown_timeout, 5000);
+                       break;
+
+               case S_TEARDOWN:
                        return 0;
-               }
 
-               action = "teardown";
-               state->sm = S_TEARDOWN;
-               if (state->last_error >= 0) {
-                       snprintf(error_buf, sizeof(error_buf), "ERROR=%d", state->last_error);
-                       envp[j++] = error_buf;
+               default:
+                       return -1;
                }
-               uloop_timeout_set(&state->teardown_timeout, 5000);
        }
 
        D(INTERFACE, "run %s for interface '%s'\n", action, proto->iface->name);
@@ -506,9 +525,11 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
 
        interface_update_complete(state->proto.iface);
 
-       if (!keep)
-               state->proto.proto_event(&state->proto, IFPEV_UP);
-       state->sm = S_IDLE;
+       if ((state->sm != S_SETUP_ABORT) && (state->sm != S_TEARDOWN)) {
+               if (!keep)
+                       state->proto.proto_event(&state->proto, IFPEV_UP);
+               state->sm = S_IDLE;
+       }
 
        return 0;
 }
@@ -578,7 +599,7 @@ proto_shell_kill_command(struct proto_shell_state *state, struct blob_attr **tb)
                signal = SIGTERM;
 
        if (state->proto_task.uloop.pending) {
-               if (signal == SIGTERM)
+               if (signal == SIGTERM || signal == SIGKILL)
                        state->proto_task_killed = true;
                kill(state->proto_task.uloop.pid, signal);
        }