tipc: split up function tipc_msg_eval()

The function tipc_msg_eval() is in reality doing two related, but
different tasks. First it tries to find a new destination for named
messages, in case there was no first lookup, or if the first lookup
failed. Second, it does what its name suggests, evaluating the validity
of the message and its destination, and returning an appropriate error
code depending on the result.

This is confusing, and in this commit we choose to break it up into two
functions. A new function, tipc_msg_lookup_dest(), first attempts to find
a new destination, if the message is of the right type. If this lookup
fails, or if the message should not be subject to a second lookup, the
already existing tipc_msg_reverse() is called. This function performs
prepares the message for rejection, if applicable.

Reviewed-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>

1 files changed, 21 insertions, 21 deletions

diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 940d74197b8c..697223a21240 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -411,43 +411,43 @@ bool tipc_msg_reverse(u32 own_addr,  struct sk_buff *buf, u32 *dnode,
         return true;
 exit:
         kfree_skb(buf);
+        *dnode = 0;
         return false;
 }
 
 /**
- * tipc_msg_eval: determine fate of message that found no destination
- * @buf: the buffer containing the message.
- * @dnode: return value: next-hop node, if message to be forwarded
- * @err: error code to use, if message to be rejected
- *
+ * tipc_msg_lookup_dest(): try to find new destination for named message
+ * @skb: the buffer containing the message.
+ * @dnode: return value: next-hop node, if destination found
+ * @err: return value: error code to use, if message to be rejected
  * Does not consume buffer
- * Returns 0 (TIPC_OK) if message ok and we can try again, -TIPC error
- * code if message to be rejected
+ * Returns true if a destination is found, false otherwise
  */
-int tipc_msg_eval(struct net *net, struct sk_buff *buf, u32 *dnode)
+bool tipc_msg_lookup_dest(struct net *net, struct sk_buff *skb,
+                          u32 *dnode, int *err)
 {
-        struct tipc_msg *msg = buf_msg(buf);
+        struct tipc_msg *msg = buf_msg(skb);
         u32 dport;
 
-        if (msg_type(msg) != TIPC_NAMED_MSG)
-                return -TIPC_ERR_NO_PORT;
-        if (skb_linearize(buf))
-                return -TIPC_ERR_NO_NAME;
-        if (msg_data_sz(msg) > MAX_FORWARD_SIZE)
-                return -TIPC_ERR_NO_NAME;
+        if (!msg_isdata(msg))
+                return false;
+        if (!msg_named(msg))
+                return false;
+        *err = -TIPC_ERR_NO_NAME;
+        if (skb_linearize(skb))
+                return false;
         if (msg_reroute_cnt(msg) > 0)
-                return -TIPC_ERR_NO_NAME;
-
+                return false;
         *dnode = addr_domain(net, msg_lookup_scope(msg));
         dport = tipc_nametbl_translate(net, msg_nametype(msg),
-                                       msg_nameinst(msg),
-                                       dnode);
+                                       msg_nameinst(msg), dnode);
         if (!dport)
-                return -TIPC_ERR_NO_NAME;
+                return false;
         msg_incr_reroute_cnt(msg);
         msg_set_destnode(msg, *dnode);
         msg_set_destport(msg, dport);
-        return TIPC_OK;
+        *err = TIPC_OK;
+        return true;
 }
 
 /* tipc_msg_reassemble() - clone a buffer chain of fragments and