tipc: introduce command for handling a new 128-bit node identity

We add the possibility to set and get a 128 bit node identifier, as
an alternative to the legacy 32-bit node address we are using now.

We also add an option to set and get 'clusterid' in the node. This
is the same as what we have so far called 'netid' and performs the
same operations. For compatibility the old 'netid' commands are
retained, -we just remove them from the help texts.

Acked-by: GhantaKrishnamurthy MohanKrishna <mohan.krishna.ghanta.krishnamurthy@ericsson.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/tipc/misc.c b/tipc/misc.c
index 80912228b03c27ef23fb06273a603fa1f170c106..16849f18cd5cbe89a97d149e9256e0ca2a2500ba 100644 (file)
--- a/tipc/misc.c
+++ b/tipc/misc.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <linux/tipc.h>
-
+#include <string.h>
 #include "misc.h"
 
 #define IN_RANGE(val, low, high) ((val) <= (high) && (val) >= (low))
@@ -33,3 +33,79 @@ uint32_t str2addr(char *str)
        fprintf(stderr, "invalid network address \"%s\"\n", str);
        return 0;
 }
+
+static int is_hex(char *arr, int last)
+{
+       int i;
+
+       while (!arr[last])
+               last--;
+
+       for (i = 0; i <= last; i++) {
+               if (!IN_RANGE(arr[i], '0', '9') &&
+                   !IN_RANGE(arr[i], 'a', 'f') &&
+                   !IN_RANGE(arr[i], 'A', 'F'))
+                       return 0;
+       }
+       return 1;
+}
+
+static int is_name(char *arr, int last)
+{
+       int i;
+       char c;
+
+       while (!arr[last])
+               last--;
+
+       if (last > 15)
+               return 0;
+
+       for (i = 0; i <= last; i++) {
+               c = arr[i];
+               if (!IN_RANGE(c, '0', '9') && !IN_RANGE(c, 'a', 'z') &&
+                   !IN_RANGE(c, 'A', 'Z') && c != '-' && c != '_' &&
+                   c != '.' && c != ':' && c != '@')
+                       return 0;
+       }
+       return 1;
+}
+
+int str2nodeid(char *str, uint8_t *id)
+{
+       int len = strlen(str);
+       int i;
+
+       if (len > 32)
+               return -1;
+
+       if (is_name(str, len - 1)) {
+               memcpy(id, str, len);
+               return 0;
+       }
+       if (!is_hex(str, len - 1))
+               return -1;
+
+       str[len] = '0';
+       for (i = 0; i < 16; i++) {
+               if (sscanf(&str[2 * i], "%2hhx", &id[i]) != 1)
+                       break;
+       }
+       return 0;
+}
+
+void nodeid2str(uint8_t *id, char *str)
+{
+       int i;
+
+       if (is_name((char *)id, 15)) {
+               memcpy(str, id, 16);
+               return;
+       }
+
+       for (i = 0; i < 16; i++)
+               sprintf(&str[2 * i], "%02x", id[i]);
+
+       for (i = 31; str[i] == '0'; i--)
+               str[i] = 0;
+}

diff --git a/tipc/misc.h b/tipc/misc.h
index 585df745eb2f11e0bab74b71f5e2bc2cc977979b..6e8afddff031918ac64c586dd7a88bfe23056b2d 100644 (file)
--- a/tipc/misc.h
+++ b/tipc/misc.h
@@ -15,5 +15,7 @@
 #include <stdint.h>
 
 uint32_t str2addr(char *str);
+int str2nodeid(char *str, uint8_t *id);
+void nodeid2str(uint8_t *id, char *str);
 
 #endif

diff --git a/tipc/node.c b/tipc/node.c
index fe085aec9b4acae5be327649c90f8465f83111e4..3ebbe0b87313e006cfda4af46ece6997d9164223 100644 (file)
--- a/tipc/node.c
+++ b/tipc/node.c
@@ -131,6 +131,90 @@ static int cmd_node_get_addr(struct nlmsghdr *nlh, const struct cmd *cmd,
        return 0;
 }
 
+static int cmd_node_set_nodeid(struct nlmsghdr *nlh, const struct cmd *cmd,
+                              struct cmdl *cmdl, void *data)
+{
+       char buf[MNL_SOCKET_BUFFER_SIZE];
+       uint8_t id[16] = {0,};
+       uint64_t *w0 = (uint64_t *) &id[0];
+       uint64_t *w1 = (uint64_t *) &id[8];
+       struct nlattr *nest;
+       char *str;
+
+       if (cmdl->argc != cmdl->optind + 1) {
+               fprintf(stderr, "Usage: %s node set nodeid NODE_ID\n",
+                       cmdl->argv[0]);
+               return -EINVAL;
+       }
+
+       str = shift_cmdl(cmdl);
+       if (str2nodeid(str, id)) {
+               fprintf(stderr, "Invalid node identity\n");
+               return -EINVAL;
+       }
+
+       nlh = msg_init(buf, TIPC_NL_NET_SET);
+       if (!nlh) {
+               fprintf(stderr, "error, message initialisation failed\n");
+               return -1;
+       }
+       nest = mnl_attr_nest_start(nlh, TIPC_NLA_NET);
+       mnl_attr_put_u64(nlh, TIPC_NLA_NET_NODEID, *w0);
+       mnl_attr_put_u64(nlh, TIPC_NLA_NET_NODEID_W1, *w1);
+       mnl_attr_nest_end(nlh, nest);
+       return msg_doit(nlh, NULL, NULL);
+}
+
+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);
+       if (!info[TIPC_NLA_NET])
+               return MNL_CB_ERROR;
+
+       mnl_attr_parse_nested(info[TIPC_NLA_NET], parse_attrs, attrs);
+       if (!attrs[TIPC_NLA_NET_ID])
+               return MNL_CB_ERROR;
+
+       *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(" ");
+       cmd_node_get_addr(NULL, NULL, NULL, NULL);
+       return MNL_CB_OK;
+}
+
+static int cmd_node_get_nodeid(struct nlmsghdr *nlh, const struct cmd *cmd,
+                              struct cmdl *cmdl, void *data)
+{
+       char buf[MNL_SOCKET_BUFFER_SIZE];
+
+       if (help_flag) {
+               (cmd->help)(cmdl);
+               return -EINVAL;
+       }
+
+       nlh = msg_init(buf, TIPC_NL_NET_GET);
+       if (!nlh) {
+               fprintf(stderr, "error, message initialisation failed\n");
+               return -1;
+       }
+
+       return msg_dumpit(nlh, nodeid_get_cb, NULL);
+}
+
+
 static int netid_get_cb(const struct nlmsghdr *nlh, void *data)
 {
        struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
@@ -204,8 +288,8 @@ static void cmd_node_set_help(struct cmdl *cmdl)
        fprintf(stderr,
                "Usage: %s node set PROPERTY\n\n"
                "PROPERTIES\n"
-               " address ADDRESS       - Set local address\n"
-               " netid NETID           - Set local netid\n",
+               " identity NODEID       - Set node identity\n"
+               " clusterid CLUSTERID   - Set local cluster id\n",
                cmdl->argv[0]);
 }
 
@@ -213,8 +297,10 @@ static int cmd_node_set(struct nlmsghdr *nlh, const struct cmd *cmd,
                        struct cmdl *cmdl, void *data)
 {
        const struct cmd cmds[] = {
-               { "address",    cmd_node_set_addr,      NULL },
+               { "address",    cmd_node_set_addr,      NULL },
+               { "identity",   cmd_node_set_nodeid,    NULL },
                { "netid",      cmd_node_set_netid,     NULL },
+               { "clusterid",  cmd_node_set_netid,     NULL },
                { NULL }
        };
 
@@ -226,8 +312,8 @@ static void cmd_node_get_help(struct cmdl *cmdl)
        fprintf(stderr,
                "Usage: %s node get PROPERTY\n\n"
                "PROPERTIES\n"
-               " address               - Get local address\n"
-               " netid                 - Get local netid\n",
+               " identity              - Get node identity\n"
+               " clusterid             - Get local clusterid\n",
                cmdl->argv[0]);
 }
 
@@ -236,7 +322,9 @@ static int cmd_node_get(struct nlmsghdr *nlh, const struct cmd *cmd,
 {
        const struct cmd cmds[] = {
                { "address",    cmd_node_get_addr,      NULL },
+               { "identity",   cmd_node_get_nodeid,    NULL },
                { "netid",      cmd_node_get_netid,     NULL },
+               { "clusterid",  cmd_node_get_netid,     NULL },
                { NULL }
        };