aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/node.c
diff options
context:
space:
mode:
authorJon Maloy <jon.maloy@ericsson.com>2018-03-22 15:42:50 -0400
committerDavid S. Miller <davem@davemloft.net>2018-03-23 13:12:18 -0400
commitd50ccc2d3909fc1b4d40e4af16b026f05dc68707 (patch)
tree09ef046f87dc8eb6d4611b26a355477293a01bbd /net/tipc/node.c
parent23fd3eace088ab1872ee59c19191a119ec779ac9 (diff)
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: Ying Xue <ying.xue@windriver.com> Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/node.c')
-rw-r--r--net/tipc/node.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c
index 8a4b04933ecc..7b0c99347406 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -883,11 +883,9 @@ void tipc_node_delete_links(struct net *net, int bearer_id)
883 883
884static void tipc_node_reset_links(struct tipc_node *n) 884static void tipc_node_reset_links(struct tipc_node *n)
885{ 885{
886 char addr_string[16];
887 int i; 886 int i;
888 887
889 pr_warn("Resetting all links to %s\n", 888 pr_warn("Resetting all links to %x\n", n->addr);
890 tipc_addr_string_fill(addr_string, n->addr));
891 889
892 for (i = 0; i < MAX_BEARERS; i++) { 890 for (i = 0; i < MAX_BEARERS; i++) {
893 tipc_node_link_down(n, i, false); 891 tipc_node_link_down(n, i, false);
@@ -1074,15 +1072,13 @@ illegal_evt:
1074static void node_lost_contact(struct tipc_node *n, 1072static void node_lost_contact(struct tipc_node *n,
1075 struct sk_buff_head *inputq) 1073 struct sk_buff_head *inputq)
1076{ 1074{
1077 char addr_string[16];
1078 struct tipc_sock_conn *conn, *safe; 1075 struct tipc_sock_conn *conn, *safe;
1079 struct tipc_link *l; 1076 struct tipc_link *l;
1080 struct list_head *conns = &n->conn_sks; 1077 struct list_head *conns = &n->conn_sks;
1081 struct sk_buff *skb; 1078 struct sk_buff *skb;
1082 uint i; 1079 uint i;
1083 1080
1084 pr_debug("Lost contact with %s\n", 1081 pr_debug("Lost contact with %x\n", n->addr);
1085 tipc_addr_string_fill(addr_string, n->addr));
1086 1082
1087 /* Clean up broadcast state */ 1083 /* Clean up broadcast state */
1088 tipc_bcast_remove_peer(n->net, n->bc_entry.link); 1084 tipc_bcast_remove_peer(n->net, n->bc_entry.link);