netifd: add netlink udebug ring

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

diff --git a/proto-shell.c b/proto-shell.c
index 07ec21ac440eac137eb764ff0fcdb06854bd1988..2139806b6a6b84e5626edc4dd4a4d980dfba7148 100644 (file)
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -129,7 +129,7 @@ proto_shell_update_host_dep(struct proto_shell_dependency *dep)
        }
 
        if (!dep->any)
-               iface = interface_ip_add_target_route(&dep->host, dep->v6, iface);
+               iface = interface_ip_add_target_route(&dep->host, dep->v6, iface, false);
 
        if (!iface)
                goto out;
@@ -208,7 +208,7 @@ proto_shell_handler(struct interface_proto_state *proto,
                                return 0;
                        }
                /* if no script task is running */
-               /* fall through */
+               fallthrough;
                case S_IDLE:
                        action = "teardown";
                        state->renew_pending = false;
@@ -292,7 +292,7 @@ proto_shell_task_finish(struct proto_shell_state *state,
        case S_IDLE:
                if (task == &state->proto_task)
                        state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
-               /* fall through */
+               fallthrough;
        case S_SETUP:
                if (task == &state->proto_task)
                        proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN,
@@ -401,11 +401,11 @@ proto_shell_parse_route_list(struct interface *iface, struct blob_attr *attr,
                             bool v6)
 {
        struct blob_attr *cur;
-       int rem;
+       size_t rem;
 
        blobmsg_for_each_attr(cur, attr, rem) {
                if (blobmsg_type(cur) != BLOBMSG_TYPE_TABLE) {
-                       DPRINTF("Ignore wrong route type: %d\n", blobmsg_type(cur));
+                       D(INTERFACE, "Ignore wrong route type: %d\n", blobmsg_type(cur));
                        continue;
                }
 
@@ -418,11 +418,11 @@ proto_shell_parse_neighbor_list(struct interface *iface, struct blob_attr *attr,
                                bool v6)
 {
        struct blob_attr *cur;
-       int rem;
+       size_t rem;
 
        blobmsg_for_each_attr(cur, attr, rem) {
                if (blobmsg_type(cur) != BLOBMSG_TYPE_TABLE) {
-                       DPRINTF("Ignore wrong neighbor type: %d\n", blobmsg_type(cur));
+                       D(INTERFACE, "Ignore wrong neighbor type: %d\n", blobmsg_type(cur));
                        continue;
                }
 
@@ -434,7 +434,7 @@ static void
 proto_shell_parse_data(struct interface *iface, struct blob_attr *attr)
 {
        struct blob_attr *cur;
-       int rem;
+       size_t rem;
 
        blobmsg_for_each_attr(cur, attr, rem)
                interface_add_data(iface, cur);
@@ -597,7 +597,7 @@ fill_string_list(struct blob_attr *attr, char **argv, int max)
 {
        struct blob_attr *cur;
        int argc = 0;
-       int rem;
+       size_t rem;
 
        if (!attr)
                goto out;
@@ -606,7 +606,7 @@ fill_string_list(struct blob_attr *attr, char **argv, int max)
                if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
                        return false;
 
-               if (!blobmsg_check_attr(cur, NULL))
+               if (!blobmsg_check_attr(cur, false))
                        return false;
 
                argv[argc++] = blobmsg_data(cur);
@@ -671,7 +671,7 @@ proto_shell_notify_error(struct proto_shell_state *state, struct blob_attr **tb)
        struct blob_attr *cur;
        char *data[16];
        int n_data = 0;
-       int rem;
+       size_t rem;
 
        if (!tb[NOTIFY_ERROR])
                return UBUS_STATUS_INVALID_ARGUMENT;
@@ -683,7 +683,7 @@ proto_shell_notify_error(struct proto_shell_state *state, struct blob_attr **tb)
                if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
                        goto error;
 
-               if (!blobmsg_check_attr(cur, NULL))
+               if (!blobmsg_check_attr(cur, false))
                        goto error;
 
                data[n_data++] = blobmsg_data(cur);
@@ -764,7 +764,7 @@ proto_shell_setup_failed(struct proto_shell_state *state)
        switch (state->sm) {
        case S_IDLE:
                state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
-               /* fall through */
+               fallthrough;
        case S_SETUP:
                proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
                break;
@@ -936,7 +936,7 @@ proto_shell_add_handler(const char *script, const char *name, json_object *obj)
        if (config)
                handler->config_buf = netifd_handler_parse_config(&handler->config, config);
 
-       DPRINTF("Add handler for script %s: %s\n", script, proto->name);
+       D(INTERFACE, "Add handler for script %s: %s\n", script, proto->name);
        add_proto_handler(proto);
 }