bridge: fdb: add support for src_vni option

[mirror_iproute2.git] / tipc / node.c

diff --git a/tipc/node.c b/tipc/node.c
index b73b644cebbfe96e0a7d6735635e7d07a5e8176e..2fec6753c974d7bc937e41bb1a732e07a098848d 100644 (file)
--- a/tipc/node.c
+++ b/tipc/node.c
@@ -26,12 +26,12 @@
 
 static int node_list_cb(const struct nlmsghdr *nlh, void *data)
 {
-       uint32_t addr;
-       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
        struct nlattr *info[TIPC_NLA_MAX + 1] = {};
        struct nlattr *attrs[TIPC_NLA_NODE_MAX + 1] = {};
+       char str[33] = {};
+       uint32_t addr;
 
-       mnl_attr_parse(nlh, sizeof(*genl), parse_attrs, info);
+       mnl_attr_parse(nlh, sizeof(struct genlmsghdr), parse_attrs, info);
        if (!info[TIPC_NLA_NODE])
                return MNL_CB_ERROR;
 
@@ -40,13 +40,12 @@ static int node_list_cb(const struct nlmsghdr *nlh, void *data)
                return MNL_CB_ERROR;
 
        addr = mnl_attr_get_u32(attrs[TIPC_NLA_NODE_ADDR]);
-       printf("%x: ", addr);
-
+       hash2nodestr(addr, str);
+       printf("%-32s %08x ", str, addr);
        if (attrs[TIPC_NLA_NODE_UP])
                printf("up\n");
        else
                printf("down\n");
-
        return MNL_CB_OK;
 }
 
@@ -64,7 +63,7 @@ static int cmd_node_list(struct nlmsghdr *nlh, const struct cmd *cmd,
                fprintf(stderr, "error, message initialisation failed\n");
                return -1;
        }
-
+       printf("Node Identity                    Hash     State\n");
        return msg_dumpit(nlh, node_list_cb, NULL);
 }
 
@@ -120,7 +119,7 @@ static int cmd_node_get_addr(struct nlmsghdr *nlh, const struct cmd *cmd,
        }
        close(sk);
 
-       printf("%x\n", addr.addr.id.node);
+       printf("%08x\n", addr.addr.id.node);
        return 0;
 }
 
@@ -160,16 +159,14 @@ static int cmd_node_set_nodeid(struct nlmsghdr *nlh, const struct cmd *cmd,
 
 static int nodeid_get_cb(const struct nlmsghdr *nlh, void *data)
 {
-       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
        struct nlattr *info[TIPC_NLA_MAX + 1] = {};
        struct nlattr *attrs[TIPC_NLA_NET_MAX + 1] = {};
        char str[33] = {0,};
        uint8_t id[16] = {0,};
        uint64_t *w0 = (uint64_t *) &id[0];
        uint64_t *w1 = (uint64_t *) &id[8];
-       int i;
 
-       mnl_attr_parse(nlh, sizeof(*genl), parse_attrs, info);
+       mnl_attr_parse(nlh, sizeof(struct genlmsghdr), parse_attrs, info);
        if (!info[TIPC_NLA_NET])
                return MNL_CB_ERROR;
 
@@ -180,10 +177,8 @@ static int nodeid_get_cb(const struct nlmsghdr *nlh, void *data)
        *w0 = mnl_attr_get_u64(attrs[TIPC_NLA_NET_NODEID]);
        *w1 = mnl_attr_get_u64(attrs[TIPC_NLA_NET_NODEID_W1]);
        nodeid2str(id, str);
-       printf("Node Identity                     Hash\n");
-       printf("%s", str);
-       for (i = strlen(str); i <= 33; i++)
-               printf(" ");
+       printf("Node Identity                    Hash\n");
+       printf("%-33s", str);
        cmd_node_get_addr(NULL, NULL, NULL, NULL);
        return MNL_CB_OK;
 }
@@ -210,11 +205,10 @@ static int cmd_node_get_nodeid(struct nlmsghdr *nlh, const struct cmd *cmd,
 
 static int netid_get_cb(const struct nlmsghdr *nlh, void *data)
 {
-       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
        struct nlattr *info[TIPC_NLA_MAX + 1] = {};
        struct nlattr *attrs[TIPC_NLA_NET_MAX + 1] = {};
 
-       mnl_attr_parse(nlh, sizeof(*genl), parse_attrs, info);
+       mnl_attr_parse(nlh, sizeof(struct genlmsghdr), parse_attrs, info);
        if (!info[TIPC_NLA_NET])
                return MNL_CB_ERROR;