proto: Display proto flags when dumping the protocol handlers in ubus

[project/netifd.git] / proto.c

diff --git a/proto.c b/proto.c
index eaec913..3b973d9 100644 (file)
--- a/proto.c
+++ b/proto.c
@@ -101,6 +101,9 @@ alloc_device_addr(bool v6, bool ext)
        struct device_addr *addr;
 
        addr = calloc(1, sizeof(*addr));
+       if (!addr)
+               return NULL;
+
        addr->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4;
        if (ext)
                addr->flags |= DEVADDR_EXTERNAL;
@@ -262,6 +265,9 @@ parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
        int af = v6 ? AF_INET6 : AF_INET;
 
        route = calloc(1, sizeof(*route));
+       if (!route)
+               return NULL;
+
        if (!inet_pton(af, str, &route->nexthop)) {
                interface_add_error(iface, "proto", "INVALID_GATEWAY", &str, 1);
                free(route);
@@ -287,7 +293,7 @@ static bool
 parse_prefix_option(struct interface *iface, const char *str, size_t len)
 {
        char buf[128] = {0}, *saveptr;
-       if (len > sizeof(buf))
+       if (len >= sizeof(buf))
                return false;
 
        memcpy(buf, str, len);
@@ -514,6 +520,9 @@ default_proto_attach(const struct proto_handler *h,
        struct interface_proto_state *proto;
 
        proto = calloc(1, sizeof(*proto));
+       if (!proto)
+               return NULL;
+
        proto->free = default_proto_free;
        proto->cb = no_proto_handler;
 
@@ -558,7 +567,14 @@ proto_dump_handlers(struct blob_buf *b)
                                blobmsg_add_string(b, p->config_params->params[i].name, uci_get_validate_string(p->config_params, i));
                        blobmsg_close_table(b, v);
                }
+               blobmsg_add_u8(b, "immediate", !!(p->flags & PROTO_FLAG_IMMEDIATE));
                blobmsg_add_u8(b, "no_device", !!(p->flags & PROTO_FLAG_NODEV));
+               blobmsg_add_u8(b, "init_available", !!(p->flags & PROTO_FLAG_INIT_AVAILABLE));
+               blobmsg_add_u8(b, "renew_available", !!(p->flags & PROTO_FLAG_RENEW_AVAILABLE));
+               blobmsg_add_u8(b, "force_link_default", !!(p->flags & PROTO_FLAG_FORCE_LINK_DEFAULT));
+               blobmsg_add_u8(b, "last_error", !!(p->flags & PROTO_FLAG_LASTERROR));
+               blobmsg_add_u8(b, "teardown_on_l3_link_down", !!(p->flags & PROTO_FLAG_TEARDOWN_ON_L3_LINK_DOWN));
+               blobmsg_add_u8(b, "no_task", !!(p->flags & PROTO_FLAG_NO_TASK));
                blobmsg_close_table(b, c);
        }
 }