tipc: obsolete TIPC_ZONE_SCOPE

Publications for TIPC_CLUSTER_SCOPE and TIPC_ZONE_SCOPE are in all
aspects handled the same way, both on the publishing node and on the
receiving nodes.

Despite previous ambitions to the contrary, this is never going to change,
so we take the conseqeunce of this and obsolete TIPC_ZONE_SCOPE and related
macros/functions. Whenever a user is doing a bind() or a sendmsg() attempt
using ZONE_SCOPE we translate this internally to CLUSTER_SCOPE, while we
remain compatible with users and remote nodes still using ZONE_SCOPE.

Furthermore, the non-formalized scope value 0 has always been permitted
for use during lookup, with the same meaning as ZONE_SCOPE/CLUSTER_SCOPE.
We now permit it even as binding scope, but for compatibility reasons we
choose to not change the value of TIPC_CLUSTER_SCOPE.

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>

6 files changed, 23 insertions, 40 deletions

diff --git a/net/tipc/addr.c b/net/tipc/addr.c
index 48fd3b5a73fb..97cd857d7f43 100644
--- a/net/tipc/addr.c
+++ b/net/tipc/addr.c
@@ -64,23 +64,6 @@ int in_own_node(struct net *net, u32 addr)
 }
 
 /**
- * addr_domain - convert 2-bit scope value to equivalent message lookup domain
- *
- * Needed when address of a named message must be looked up a second time
- * after a network hop.
- */
-u32 addr_domain(struct net *net, u32 sc)
-{
-        struct tipc_net *tn = net_generic(net, tipc_net_id);
-
-        if (likely(sc == TIPC_NODE_SCOPE))
-                return tn->own_addr;
-        if (sc == TIPC_CLUSTER_SCOPE)
-                return tipc_cluster_mask(tn->own_addr);
-        return tipc_zone_mask(tn->own_addr);
-}
-
-/**
  * tipc_addr_domain_valid - validates a network domain address
  *
  * Accepts <Z.C.N>, <Z.C.0>, <Z.0.0>, and <0.0.0>,
@@ -124,20 +107,6 @@ int tipc_in_scope(u32 domain, u32 addr)
         return 0;
 }
 
-/**
- * tipc_addr_scope - convert message lookup domain to a 2-bit scope value
- */
-int tipc_addr_scope(u32 domain)
-{
-        if (likely(!domain))
-                return TIPC_ZONE_SCOPE;
-        if (tipc_node(domain))
-                return TIPC_NODE_SCOPE;
-        if (tipc_cluster(domain))
-                return TIPC_CLUSTER_SCOPE;
-        return TIPC_ZONE_SCOPE;
-}
-
 char *tipc_addr_string_fill(char *string, u32 addr)
 {
         snprintf(string, 16, "<%u.%u.%u>",
diff --git a/net/tipc/addr.h b/net/tipc/addr.h
index bebb347803ce..2ecf5a5d40dd 100644
--- a/net/tipc/addr.h
+++ b/net/tipc/addr.h
@@ -60,6 +60,16 @@ static inline u32 tipc_cluster_mask(u32 addr)
         return addr & TIPC_ZONE_CLUSTER_MASK;
 }
 
+static inline int tipc_node2scope(u32 node)
+{
+        return node ? TIPC_NODE_SCOPE : TIPC_CLUSTER_SCOPE;
+}
+
+static inline int tipc_scope2node(struct net *net, int sc)
+{
+        return sc != TIPC_NODE_SCOPE ? 0 : tipc_own_addr(net);
+}
+
 u32 tipc_own_addr(struct net *net);
 int in_own_cluster(struct net *net, u32 addr);
 int in_own_cluster_exact(struct net *net, u32 addr);
diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 4e1c6f6450bb..b6c45dccba3d 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -580,7 +580,7 @@ bool tipc_msg_lookup_dest(struct net *net, struct sk_buff *skb, int *err)
         msg = buf_msg(skb);
         if (msg_reroute_cnt(msg))
                 return false;
-        dnode = addr_domain(net, msg_lookup_scope(msg));
+        dnode = tipc_scope2node(net, msg_lookup_scope(msg));
         dport = tipc_nametbl_translate(net, msg_nametype(msg),
                                        msg_nameinst(msg), &dnode);
         if (!dport)
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index e01c9c691ba2..6772390fcb00 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -473,8 +473,7 @@ struct publication *tipc_nametbl_insert_publ(struct net *net, u32 type,
         struct name_seq *seq = nametbl_find_seq(net, type);
         int index = hash(type);
 
-        if ((scope < TIPC_ZONE_SCOPE) || (scope > TIPC_NODE_SCOPE) ||
-            (lower > upper)) {
+        if (scope > TIPC_NODE_SCOPE || lower > upper) {
                 pr_debug("Failed to publish illegal {%u,%u,%u} with scope %u\n",
                          type, lower, upper, scope);
                 return NULL;
diff --git a/net/tipc/net.c b/net/tipc/net.c
index 1a2fde0d6f61..5c4c4405b78e 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -118,7 +118,7 @@ int tipc_net_start(struct net *net, u32 addr)
         tipc_sk_reinit(net);
 
         tipc_nametbl_publish(net, TIPC_CFG_SRV, tn->own_addr, tn->own_addr,
-                             TIPC_ZONE_SCOPE, 0, tn->own_addr);
+                             TIPC_CLUSTER_SCOPE, 0, tn->own_addr);
 
         pr_info("Started in network mode\n");
         pr_info("Own node address %s, network identity %u\n",
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 8b04e601311c..910d3827f499 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -644,7 +644,7 @@ static int tipc_bind(struct socket *sock, struct sockaddr *uaddr,
                 goto exit;
         }
 
-        res = (addr->scope > 0) ?
+        res = (addr->scope >= 0) ?
                 tipc_sk_publish(tsk, addr->scope, &addr->addr.nameseq) :
                 tipc_sk_withdraw(tsk, -addr->scope, &addr->addr.nameseq);
 exit:
@@ -1280,8 +1280,8 @@ static int __tipc_sendmsg(struct socket *sock, struct msghdr *m, size_t dlen)
         struct tipc_msg *hdr = &tsk->phdr;
         struct tipc_name_seq *seq;
         struct sk_buff_head pkts;
-        u32 type, inst, domain;
         u32 dnode, dport;
+        u32 type, inst;
         int mtu, rc;
 
         if (unlikely(dlen > TIPC_MAX_USER_MSG_SIZE))
@@ -1332,13 +1332,12 @@ static int __tipc_sendmsg(struct socket *sock, struct msghdr *m, size_t dlen)
         if (dest->addrtype == TIPC_ADDR_NAME) {
                 type = dest->addr.name.name.type;
                 inst = dest->addr.name.name.instance;
-                domain = dest->addr.name.domain;
-                dnode = domain;
+                dnode = dest->addr.name.domain;
                 msg_set_type(hdr, TIPC_NAMED_MSG);
                 msg_set_hdr_sz(hdr, NAMED_H_SIZE);
                 msg_set_nametype(hdr, type);
                 msg_set_nameinst(hdr, inst);
-                msg_set_lookup_scope(hdr, tipc_addr_scope(domain));
+                msg_set_lookup_scope(hdr, tipc_node2scope(dnode));
                 dport = tipc_nametbl_translate(net, type, inst, &dnode);
                 msg_set_destnode(hdr, dnode);
                 msg_set_destport(hdr, dport);
@@ -2592,6 +2591,9 @@ static int tipc_sk_publish(struct tipc_sock *tsk, uint scope,
         struct publication *publ;
         u32 key;
 
+        if (scope != TIPC_NODE_SCOPE)
+                scope = TIPC_CLUSTER_SCOPE;
+
         if (tipc_sk_connected(sk))
                 return -EINVAL;
         key = tsk->portid + tsk->pub_count + 1;
@@ -2617,6 +2619,9 @@ static int tipc_sk_withdraw(struct tipc_sock *tsk, uint scope,
         struct publication *safe;
         int rc = -EINVAL;
 
+        if (scope != TIPC_NODE_SCOPE)
+                scope = TIPC_CLUSTER_SCOPE;
+
         list_for_each_entry_safe(publ, safe, &tsk->publications, pport_list) {
                 if (seq) {
                         if (publ->scope != scope)