提交 2a57f182 编写于 作者: J Jon Maloy 提交者: David S. Miller

tipc: fix wrong return value from function tipc_node_try_addr()

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: 25b0b9c4 ("tipc: handle collisions of 32-bit node address hash values")
Signed-off-by: NJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 0f62aeec
...@@ -797,6 +797,7 @@ static u32 tipc_node_suggest_addr(struct net *net, u32 addr) ...@@ -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 /* 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) 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) ...@@ -819,12 +820,14 @@ u32 tipc_node_try_addr(struct net *net, u8 *id, u32 addr)
if (n) { if (n) {
addr = n->addr; addr = n->addr;
tipc_node_put(n); tipc_node_put(n);
return addr;
} }
/* Even this node may be in trial phase */
/* Even this node may be in conflict */
if (tn->trial_addr == addr) if (tn->trial_addr == addr)
return tipc_node_suggest_addr(net, addr); return tipc_node_suggest_addr(net, addr);
return addr; return 0;
} }
void tipc_node_check_dest(struct net *net, u32 addr, void tipc_node_check_dest(struct net *net, u32 addr,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册