Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d50ccc2d authored by Jon Maloy's avatar Jon Maloy Committed by David S. Miller
Browse files

tipc: add 128-bit node identifier 



We add a 128-bit node identity, as an alternative to the currently used
32-bit node address.

For the sake of compatibility and to minimize message header changes
we retain the existing 32-bit address field. When not set explicitly by
the user, this field will be filled with a hash value generated from the
much longer node identity, and be used as a shorthand value for the
latter.

We permit either the address or the identity to be set by configuration,
but not both, so when the address value is set by a legacy user the
corresponding 128-bit node identity is generated based on the that value.

Acked-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 23fd3eac

include/uapi/linux/tipc_netlink.h

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ enum { 
	TIPC_NLA_NET_UNSPEC,

	TIPC_NLA_NET_ID,		/* u32 */

	TIPC_NLA_NET_ADDR,		/* u32 */

	TIPC_NLA_NET_NODEID,		/* u64 */

	TIPC_NLA_NET_NODEID_W1,		/* u64 */



	__TIPC_NLA_NET_MAX,

	TIPC_NLA_NET_MAX = __TIPC_NLA_NET_MAX - 1

net/tipc/addr.c

+67 −14
Original line number Diff line number Diff line 
/*

 * net/tipc/addr.c: TIPC address utility routines

 *

 * Copyright (c) 2000-2006, Ericsson AB

 * Copyright (c) 2000-2006, 2018, Ericsson AB

 * Copyright (c) 2004-2005, 2010-2011, Wind River Systems

 * All rights reserved.

 *
@@ -34,18 +34,9 @@ 
 * POSSIBILITY OF SUCH DAMAGE.

 */



#include <linux/kernel.h>

#include "addr.h"

#include "core.h"



/**

 * in_own_node - test for node inclusion; <0.0.0> always matches

 */

int in_own_node(struct net *net, u32 addr)

{

	return addr == tipc_own_addr(net) || !addr;

}



bool tipc_in_scope(bool legacy_format, u32 domain, u32 addr)

{

	if (!domain || (domain == addr))
@@ -61,9 +52,71 @@ bool tipc_in_scope(bool legacy_format, u32 domain, u32 addr) 
	return false;

}



char *tipc_addr_string_fill(char *string, u32 addr)

void tipc_set_node_id(struct net *net, u8 *id)

{

	struct tipc_net *tn = tipc_net(net);

	u32 *tmp = (u32 *)id;



	memcpy(tn->node_id, id, NODE_ID_LEN);

	tipc_nodeid2string(tn->node_id_string, id);

	tn->node_addr = tmp[0] ^ tmp[1] ^ tmp[2] ^ tmp[3];

	pr_info("Own node identity %s, cluster identity %u\n",

		tipc_own_id_string(net), tn->net_id);

}



void tipc_set_node_addr(struct net *net, u32 addr)

{

	snprintf(string, 16, "<%u.%u.%u>",

		 tipc_zone(addr), tipc_cluster(addr), tipc_node(addr));

	return string;

	struct tipc_net *tn = tipc_net(net);

	u8 node_id[NODE_ID_LEN] = {0,};



	tn->node_addr = addr;

	if (!tipc_own_id(net)) {

		sprintf(node_id, "%x", addr);

		tipc_set_node_id(net, node_id);

	}

	pr_info("32-bit node address hash set to %x\n", addr);

}



char *tipc_nodeid2string(char *str, u8 *id)

{

	int i;

	u8 c;



	/* Already a string ? */

	for (i = 0; i < NODE_ID_LEN; i++) {

		c = id[i];

		if (c >= '0' && c <= '9')

			continue;

		if (c >= 'A' && c <= 'Z')

			continue;

		if (c >= 'a' && c <= 'z')

			continue;

		if (c == '.')

			continue;

		if (c == ':')

			continue;

		if (c == '_')

			continue;

		if (c == '-')

			continue;

		if (c == '@')

			continue;

		if (c != 0)

			break;

	}

	if (i == NODE_ID_LEN) {

		memcpy(str, id, NODE_ID_LEN);

		str[NODE_ID_LEN] = 0;

		return str;

	}



	/* Translate to hex string */

	for (i = 0; i < NODE_ID_LEN; i++)

		sprintf(&str[2 * i], "%02x", id[i]);



	/* Strip off trailing zeroes */

	for (i = NODE_ID_STR_LEN - 2; str[i] == '0'; i--)

		str[i] = 0;



	return str;

}

net/tipc/addr.h

+23 −5
Original line number Diff line number Diff line 
/*

 * net/tipc/addr.h: Include file for TIPC address utility routines

 *

 * Copyright (c) 2000-2006, Ericsson AB

 * Copyright (c) 2000-2006, 2018, Ericsson AB

 * Copyright (c) 2004-2005, Wind River Systems

 * All rights reserved.

 *
@@ -44,10 +44,22 @@ 
#include "core.h"



static inline u32 tipc_own_addr(struct net *net)

{

	return tipc_net(net)->node_addr;

}



static inline u8 *tipc_own_id(struct net *net)

{

	struct tipc_net *tn = tipc_net(net);



	return tn->own_addr;

	if (!strlen(tn->node_id_string))

		return NULL;

	return tn->node_id;

}



static inline char *tipc_own_id_string(struct net *net)

{

	return tipc_net(net)->node_id_string;

}



static inline u32 tipc_cluster_mask(u32 addr)
@@ -65,9 +77,15 @@ static inline int tipc_scope2node(struct net *net, int sc) 
	return sc != TIPC_NODE_SCOPE ? 0 : tipc_own_addr(net);

}



u32 tipc_own_addr(struct net *net);

int in_own_node(struct net *net, u32 addr);

static inline int in_own_node(struct net *net, u32 addr)

{

	return addr == tipc_own_addr(net) || !addr;

}



bool tipc_in_scope(bool legacy_format, u32 domain, u32 addr);

char *tipc_addr_string_fill(char *string, u32 addr);

void tipc_set_node_id(struct net *net, u8 *id);

void tipc_set_node_addr(struct net *net, u32 addr);

char *tipc_nodeid2string(char *str, u8 *id);

u32 tipc_node_id2hash(u8 *id128);



#endif

net/tipc/core.c

+3 −1
Original line number Diff line number Diff line
@@ -56,7 +56,9 @@ static int __net_init tipc_init_net(struct net *net) 
	int err;



	tn->net_id = 4711;

	tn->own_addr = 0;

	tn->node_addr = 0;

	memset(tn->node_id, 0, sizeof(tn->node_id));

	memset(tn->node_id_string, 0, sizeof(tn->node_id_string));

	tn->mon_threshold = TIPC_DEF_MON_THRESHOLD;

	get_random_bytes(&tn->random, sizeof(int));

	INIT_LIST_HEAD(&tn->node_list);

net/tipc/core.h

+5 −1
Original line number Diff line number Diff line
@@ -72,13 +72,17 @@ struct tipc_monitor; 
#define NODE_HTABLE_SIZE       512

#define MAX_BEARERS	         3

#define TIPC_DEF_MON_THRESHOLD  32

#define NODE_ID_LEN             16

#define NODE_ID_STR_LEN        (NODE_ID_LEN * 2 + 1)



extern unsigned int tipc_net_id __read_mostly;

extern int sysctl_tipc_rmem[3] __read_mostly;

extern int sysctl_tipc_named_timeout __read_mostly;



struct tipc_net {

	u32 own_addr;

	u8  node_id[NODE_ID_LEN];

	u32 node_addr;

	char node_id_string[NODE_ID_STR_LEN];

	int net_id;

	int random;

	bool legacy_addr_format;