[TIPC]: Added duplicate node address detection capability

TIPC now rejects and logs link setup requests from node <Z.C.N> if the
receiving node already has a functional link to that node on the associated
interface, or if the requestor is using the same <Z.C.N> as the receiver.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Per Liden <per.liden@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 75a5968c2139b92640f58cb961fafe01660b1d3f..39744a33bd3693864997d6ec2d1d2339f2f2eb48 100644 (file)
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -2,7 +2,7 @@
  * net/tipc/bearer.c: TIPC bearer code
  * 
  * Copyright (c) 1996-2006, Ericsson AB
- * Copyright (c) 2004-2005, Wind River Systems
+ * Copyright (c) 2004-2006, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -191,14 +191,14 @@ void tipc_media_addr_printf(struct print_buf *pb, struct tipc_media_addr *a)
        if ((i < media_count) && (m_ptr->addr2str != NULL)) {
                char addr_str[MAX_ADDR_STR];
 
-               tipc_printf(pb, "%s(%s) ", m_ptr->name, 
+               tipc_printf(pb, "%s(%s)", m_ptr->name,
                            m_ptr->addr2str(a, addr_str, sizeof(addr_str)));
        } else {
                unchar *addr = (unchar *)&a->dev_addr;
 
-               tipc_printf(pb, "UNKNOWN(%u):", media_type);
+               tipc_printf(pb, "UNKNOWN(%u)", media_type);
                for (i = 0; i < (sizeof(*a) - sizeof(a->type)); i++) {
-                       tipc_printf(pb, "%02x ", addr[i]);
+                       tipc_printf(pb, "-%02x", addr[i]);
                }
        }
 }

diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index ee94de92ae9916f9c53f3fcd7b46cb917005eba5..cc748d4d47425d3d40ebad5c7363cc069d6018ae 100644 (file)
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -131,6 +131,28 @@ static struct sk_buff *tipc_disc_init_msg(u32 type,
        return buf;
 }
 
+/**
+ * disc_dupl_alert - issue node address duplication alert
+ * @b_ptr: pointer to bearer detecting duplication
+ * @node_addr: duplicated node address
+ * @media_addr: media address advertised by duplicated node
+ */
+
+static void disc_dupl_alert(struct bearer *b_ptr, u32 node_addr,
+                           struct tipc_media_addr *media_addr)
+{
+       char node_addr_str[16];
+       char media_addr_str[64];
+       struct print_buf pb;
+
+       addr_string_fill(node_addr_str, node_addr);
+       tipc_printbuf_init(&pb, media_addr_str, sizeof(media_addr_str));
+       tipc_media_addr_printf(&pb, media_addr);
+       tipc_printbuf_validate(&pb);
+       warn("Duplicate %s using %s seen on <%s>\n",
+            node_addr_str, media_addr_str, b_ptr->publ.name);
+}
+
 /**
  * tipc_disc_recv_msg - handle incoming link setup message (request or response)
  * @buf: buffer containing message
@@ -157,8 +179,11 @@ void tipc_disc_recv_msg(struct sk_buff *buf)
                return;
        if (!tipc_addr_node_valid(orig))
                return;
-       if (orig == tipc_own_addr)
+       if (orig == tipc_own_addr) {
+               if (memcmp(&media_addr, &b_ptr->publ.addr, sizeof(media_addr)))
+                       disc_dupl_alert(b_ptr, tipc_own_addr, &media_addr);
                return;
+       }
        if (!in_scope(dest, tipc_own_addr))
                return;
        if (is_slave(tipc_own_addr) && is_slave(orig))
@@ -190,6 +215,11 @@ void tipc_disc_recv_msg(struct sk_buff *buf)
                }
                addr = &link->media_addr;
                if (memcmp(addr, &media_addr, sizeof(*addr))) {
+                       if (tipc_link_is_up(link) || (!link->started)) {
+                               disc_dupl_alert(b_ptr, orig, &media_addr);
+                               spin_unlock_bh(&n_ptr->lock);
+                               return;
+                       }
                        warn("Resetting link <%s>, peer interface address changed\n",
                             link->name);
                        memcpy(addr, &media_addr, sizeof(*addr));