[net,1/4] tipc: fix wrong return value from function tipc_node_try_addr()

Message ID 1530900606-24429-2-git-send-email-jon.maloy@ericsson.com
State Accepted
Delegated to: David Miller
Headers show
  • tipc: fixes in duplicate address discovery function
Related show

Commit Message

Jon Maloy July 6, 2018, 6:10 p.m.
The function for checking if there is an node address conflict is
supposed to return a suggestion for a new address if it finds a
conflict, and zero otherwise. But in case the peer being checked
is previously unknown it does instead return a "suggestion" for
the checked address itself. This results in a DSC_TRIAL_FAIL_MSG
being sent unecessarily to the peer, and sometimes makes the trial
period starting over again.

Fixes: 25b0b9c4e835 ("tipc: handle collisions of 32-bit node address hash values")
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
 net/tipc/node.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


diff --git a/net/tipc/node.c b/net/tipc/node.c
index 6a44eb8..0453bd4 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -797,6 +797,7 @@  static u32 tipc_node_suggest_addr(struct net *net, u32 addr)
 /* tipc_node_try_addr(): Check if addr can be used by peer, suggest other if not
+ * Returns suggested address if any, otherwise 0
 u32 tipc_node_try_addr(struct net *net, u8 *id, u32 addr)
@@ -819,12 +820,14 @@  u32 tipc_node_try_addr(struct net *net, u8 *id, u32 addr)
 	if (n) {
 		addr = n->addr;
+		return addr;
-	/* Even this node may be in trial phase */
+	/* Even this node may be in conflict */
 	if (tn->trial_addr == addr)
 		return tipc_node_suggest_addr(net, addr);
-	return addr;
+	return 0;
 void tipc_node_check_dest(struct net *net, u32 addr,