tipc: move and rename the legacy nl api to "nl compat"
authorRichard Alpe <richard.alpe@ericsson.com>
Mon, 9 Feb 2015 08:50:03 +0000 (09:50 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Feb 2015 21:20:47 +0000 (13:20 -0800)
The new netlink API is no longer "v2" but rather the standard API and
the legacy API is now "nl compat". We split them into separate
start/stop and put them in different files in order to further
distinguish them.

Signed-off-by: Richard Alpe <richard.alpe@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 files changed:
net/tipc/Makefile
net/tipc/bcast.c
net/tipc/bearer.c
net/tipc/core.c
net/tipc/core.h
net/tipc/link.c
net/tipc/name_table.c
net/tipc/net.c
net/tipc/netlink.c
net/tipc/netlink.h
net/tipc/netlink_compat.c [new file with mode: 0644]
net/tipc/node.c
net/tipc/socket.c

index 333e4592772ced97b3a636c0b7a854f795a140cd..69b82bbc60d3a01570aea2f049b4623aa2a41886 100644 (file)
@@ -7,8 +7,8 @@ obj-$(CONFIG_TIPC) := tipc.o
 tipc-y += addr.o bcast.o bearer.o config.o \
           core.o link.o discover.o msg.o  \
           name_distr.o  subscr.o name_table.o net.o  \
-          netlink.o node.o socket.o log.o eth_media.o \
-          server.o
+          netlink.o netlink_compat.o node.o socket.o log.o eth_media.o \
+          server.o socket.o
 
 tipc-$(CONFIG_TIPC_MEDIA_IB)   += ib_media.o
 tipc-$(CONFIG_SYSCTL)          += sysctl.o
index 81b1fef1f5e014882b3bb07569a532583c82b14d..e96fd6a6d5c2787e2be47a50009c090b3dbfb981 100644 (file)
@@ -810,7 +810,7 @@ int tipc_nl_add_bc_link(struct net *net, struct tipc_nl_msg *msg)
 
        tipc_bclink_lock(net);
 
-       hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_v2_family,
+       hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_family,
                          NLM_F_MULTI, TIPC_NL_LINK_GET);
        if (!hdr)
                return -EMSGSIZE;
index 33dc3486d16c4014ffaff7c0d49e01089db5ca46..35d400e8c2e547bf941d729edbe35aef2ae81ebf 100644 (file)
@@ -658,7 +658,7 @@ static int __tipc_nl_add_bearer(struct tipc_nl_msg *msg,
        struct nlattr *attrs;
        struct nlattr *prop;
 
-       hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_v2_family,
+       hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_family,
                          NLM_F_MULTI, TIPC_NL_BEARER_GET);
        if (!hdr)
                return -EMSGSIZE;
@@ -924,7 +924,7 @@ static int __tipc_nl_add_media(struct tipc_nl_msg *msg,
        struct nlattr *attrs;
        struct nlattr *prop;
 
-       hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_v2_family,
+       hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_family,
                          NLM_F_MULTI, TIPC_NL_MEDIA_GET);
        if (!hdr)
                return -EMSGSIZE;
index 674bd26985289f5f5cda583a2244456bd520e5c3..2d06d1f8b6e63fb57aa6c4acbc570ba123a1eb6a 100644 (file)
@@ -111,6 +111,10 @@ static int __init tipc_init(void)
        if (err)
                goto out_netlink;
 
+       err = tipc_netlink_compat_start();
+       if (err)
+               goto out_netlink_compat;
+
        err = tipc_socket_init();
        if (err)
                goto out_socket;
@@ -136,6 +140,8 @@ out_pernet:
 out_sysctl:
        tipc_socket_stop();
 out_socket:
+       tipc_netlink_compat_stop();
+out_netlink_compat:
        tipc_netlink_stop();
 out_netlink:
        pr_err("Unable to start in single node mode\n");
@@ -146,6 +152,7 @@ static void __exit tipc_exit(void)
 {
        tipc_bearer_cleanup();
        tipc_netlink_stop();
+       tipc_netlink_compat_stop();
        tipc_socket_stop();
        tipc_unregister_sysctl();
        unregister_pernet_subsys(&tipc_net_ops);
index 817b2e9d42279185721300079ecb38228e478cd7..451c346fd3cf6e37c0f235863490c0e35436e5fa 100644 (file)
@@ -115,5 +115,4 @@ void tipc_unregister_sysctl(void);
 #define tipc_register_sysctl() 0
 #define tipc_unregister_sysctl()
 #endif
-
 #endif
index 942491234099ae6947916f1c6c24a2cbfc3360dc..466f28fcf2151806907b71f03582b42e2fa3bc8d 100644 (file)
@@ -2498,7 +2498,7 @@ static int __tipc_nl_add_link(struct net *net, struct tipc_nl_msg *msg,
        struct nlattr *prop;
        struct tipc_net *tn = net_generic(net, tipc_net_id);
 
-       hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_v2_family,
+       hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_family,
                          NLM_F_MULTI, TIPC_NL_LINK_GET);
        if (!hdr)
                return -EMSGSIZE;
index 18a3d44238bcd6454569ccf287e9d9a13ee6bb6c..2251912264a23103081a72f271c953d9ea1f3906 100644 (file)
@@ -1055,7 +1055,7 @@ static int __tipc_nl_add_nametable_publ(struct tipc_nl_msg *msg,
                *last_publ = p->key;
 
                hdr = genlmsg_put(msg->skb, msg->portid, msg->seq,
-                                 &tipc_genl_v2_family, NLM_F_MULTI,
+                                 &tipc_genl_family, NLM_F_MULTI,
                                  TIPC_NL_NAME_TABLE_GET);
                if (!hdr)
                        return -EMSGSIZE;
index 263267e0e7fe463370f5c6d7e092419df0e922b0..8b0fb0966628924241b1588a3b5a2dc69980b3fa 100644 (file)
@@ -156,7 +156,7 @@ static int __tipc_nl_add_net(struct net *net, struct tipc_nl_msg *msg)
        void *hdr;
        struct nlattr *attrs;
 
-       hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_v2_family,
+       hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_family,
                          NLM_F_MULTI, TIPC_NL_NET_GET);
        if (!hdr)
                return -EMSGSIZE;
index fe0f5134ce155fadbfe3c90f97d5f8533fff4bc2..7f6475efc984d0a385aae7ebc2c7145f7e313826 100644 (file)
@@ -35,7 +35,6 @@
  */
 
 #include "core.h"
-#include "config.h"
 #include "socket.h"
 #include "name_table.h"
 #include "bearer.h"
 #include "net.h"
 #include <net/genetlink.h>
 
-static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
-{
-       struct net *net = genl_info_net(info);
-       struct sk_buff *rep_buf;
-       struct nlmsghdr *rep_nlh;
-       struct nlmsghdr *req_nlh = info->nlhdr;
-       struct tipc_genlmsghdr *req_userhdr = info->userhdr;
-       int hdr_space = nlmsg_total_size(GENL_HDRLEN + TIPC_GENL_HDRLEN);
-       u16 cmd;
-
-       if ((req_userhdr->cmd & 0xC000) &&
-           (!netlink_net_capable(skb, CAP_NET_ADMIN)))
-               cmd = TIPC_CMD_NOT_NET_ADMIN;
-       else
-               cmd = req_userhdr->cmd;
-
-       rep_buf = tipc_cfg_do_cmd(net, req_userhdr->dest, cmd,
-                                 nlmsg_data(req_nlh) + GENL_HDRLEN +
-                                 TIPC_GENL_HDRLEN,
-                                 nlmsg_attrlen(req_nlh, GENL_HDRLEN +
-                                 TIPC_GENL_HDRLEN), hdr_space);
-
-       if (rep_buf) {
-               skb_push(rep_buf, hdr_space);
-               rep_nlh = nlmsg_hdr(rep_buf);
-               memcpy(rep_nlh, req_nlh, hdr_space);
-               rep_nlh->nlmsg_len = rep_buf->len;
-               genlmsg_unicast(net, rep_buf, NETLINK_CB(skb).portid);
-       }
-
-       return 0;
-}
-
 static const struct nla_policy tipc_nl_policy[TIPC_NLA_MAX + 1] = {
        [TIPC_NLA_UNSPEC]       = { .type = NLA_UNSPEC, },
        [TIPC_NLA_BEARER]       = { .type = NLA_NESTED, },
@@ -89,28 +55,10 @@ static const struct nla_policy tipc_nl_policy[TIPC_NLA_MAX + 1] = {
        [TIPC_NLA_NAME_TABLE]   = { .type = NLA_NESTED, }
 };
 
-/* Legacy ASCII API */
-static struct genl_family tipc_genl_family = {
-       .id             = GENL_ID_GENERATE,
-       .name           = TIPC_GENL_NAME,
-       .version        = TIPC_GENL_VERSION,
-       .hdrsize        = TIPC_GENL_HDRLEN,
-       .maxattr        = 0,
-       .netnsok        = true,
-};
-
-/* Legacy ASCII API */
-static struct genl_ops tipc_genl_ops[] = {
-       {
-               .cmd            = TIPC_GENL_CMD,
-               .doit           = handle_cmd,
-       },
-};
-
 /* Users of the legacy API (tipc-config) can't handle that we add operations,
  * so we have a separate genl handling for the new API.
  */
-struct genl_family tipc_genl_v2_family = {
+struct genl_family tipc_genl_family = {
        .id             = GENL_ID_GENERATE,
        .name           = TIPC_GENL_V2_NAME,
        .version        = TIPC_GENL_V2_VERSION,
@@ -202,9 +150,9 @@ static const struct genl_ops tipc_genl_v2_ops[] = {
 
 int tipc_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr ***attr)
 {
-       u32 maxattr = tipc_genl_v2_family.maxattr;
+       u32 maxattr = tipc_genl_family.maxattr;
 
-       *attr = tipc_genl_v2_family.attrbuf;
+       *attr = tipc_genl_family.attrbuf;
        if (!*attr)
                return -EOPNOTSUPP;
 
@@ -215,13 +163,7 @@ int tipc_netlink_start(void)
 {
        int res;
 
-       res = genl_register_family_with_ops(&tipc_genl_family, tipc_genl_ops);
-       if (res) {
-               pr_err("Failed to register legacy interface\n");
-               return res;
-       }
-
-       res = genl_register_family_with_ops(&tipc_genl_v2_family,
+       res = genl_register_family_with_ops(&tipc_genl_family,
                                            tipc_genl_v2_ops);
        if (res) {
                pr_err("Failed to register netlink interface\n");
@@ -233,5 +175,4 @@ int tipc_netlink_start(void)
 void tipc_netlink_stop(void)
 {
        genl_unregister_family(&tipc_genl_family);
-       genl_unregister_family(&tipc_genl_v2_family);
 }
index ae2f2d923a15d107606f5604c80926831238275a..08a1db67b9272df1f5dc23c96c31847a0b84ed59 100644 (file)
@@ -36,7 +36,7 @@
 #ifndef _TIPC_NETLINK_H
 #define _TIPC_NETLINK_H
 
-extern struct genl_family tipc_genl_v2_family;
+extern struct genl_family tipc_genl_family;
 int tipc_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr ***buf);
 
 struct tipc_nl_msg {
@@ -46,6 +46,8 @@ struct tipc_nl_msg {
 };
 
 int tipc_netlink_start(void);
+int tipc_netlink_compat_start(void);
 void tipc_netlink_stop(void);
+void tipc_netlink_compat_stop(void);
 
 #endif
diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
new file mode 100644 (file)
index 0000000..f752854
--- /dev/null
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2014, Ericsson AB
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "core.h"
+#include "config.h"
+#include <net/genetlink.h>
+#include <linux/tipc_config.h>
+
+static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
+{
+       struct net *net = genl_info_net(info);
+       struct sk_buff *rep_buf;
+       struct nlmsghdr *rep_nlh;
+       struct nlmsghdr *req_nlh = info->nlhdr;
+       struct tipc_genlmsghdr *req_userhdr = info->userhdr;
+       int hdr_space = nlmsg_total_size(GENL_HDRLEN + TIPC_GENL_HDRLEN);
+       u16 cmd;
+
+       if ((req_userhdr->cmd & 0xC000) &&
+           (!netlink_net_capable(skb, CAP_NET_ADMIN)))
+               cmd = TIPC_CMD_NOT_NET_ADMIN;
+       else
+               cmd = req_userhdr->cmd;
+
+       rep_buf = tipc_cfg_do_cmd(net, req_userhdr->dest, cmd,
+                                 nlmsg_data(req_nlh) + GENL_HDRLEN +
+                                 TIPC_GENL_HDRLEN,
+                                 nlmsg_attrlen(req_nlh, GENL_HDRLEN +
+                                 TIPC_GENL_HDRLEN), hdr_space);
+
+       if (rep_buf) {
+               skb_push(rep_buf, hdr_space);
+               rep_nlh = nlmsg_hdr(rep_buf);
+               memcpy(rep_nlh, req_nlh, hdr_space);
+               rep_nlh->nlmsg_len = rep_buf->len;
+               genlmsg_unicast(net, rep_buf, NETLINK_CB(skb).portid);
+       }
+
+       return 0;
+}
+
+static struct genl_family tipc_genl_compat_family = {
+       .id             = GENL_ID_GENERATE,
+       .name           = TIPC_GENL_NAME,
+       .version        = TIPC_GENL_VERSION,
+       .hdrsize        = TIPC_GENL_HDRLEN,
+       .maxattr        = 0,
+       .netnsok        = true,
+};
+
+static struct genl_ops tipc_genl_compat_ops[] = {
+       {
+               .cmd            = TIPC_GENL_CMD,
+               .doit           = handle_cmd,
+       },
+};
+
+int tipc_netlink_compat_start(void)
+{
+       int res;
+
+       res = genl_register_family_with_ops(&tipc_genl_compat_family,
+                                           tipc_genl_compat_ops);
+       if (res) {
+               pr_err("Failed to register legacy compat interface\n");
+               return res;
+       }
+
+       return 0;
+}
+
+void tipc_netlink_compat_stop(void)
+{
+       genl_unregister_family(&tipc_genl_compat_family);
+}
index 52308498f2088ec4c1a017a33d70523a6b87c258..995618d6da9d74986755c57939fc53d6ababe19b 100644 (file)
@@ -623,7 +623,7 @@ static int __tipc_nl_add_node(struct tipc_nl_msg *msg, struct tipc_node *node)
        void *hdr;
        struct nlattr *attrs;
 
-       hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_v2_family,
+       hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_family,
                          NLM_F_MULTI, TIPC_NL_NODE_GET);
        if (!hdr)
                return -EMSGSIZE;
index 4a98d15a13239ff514e14d67e4ae39745f410c15..d76c171f7b7e414b44a6143d5e8aad627cdee56d 100644 (file)
@@ -2783,7 +2783,7 @@ static int __tipc_nl_add_sk(struct sk_buff *skb, struct netlink_callback *cb,
        struct tipc_net *tn = net_generic(net, tipc_net_id);
 
        hdr = genlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq,
-                         &tipc_genl_v2_family, NLM_F_MULTI, TIPC_NL_SOCK_GET);
+                         &tipc_genl_family, NLM_F_MULTI, TIPC_NL_SOCK_GET);
        if (!hdr)
                goto msg_cancel;
 
@@ -2864,7 +2864,7 @@ static int __tipc_nl_add_sk_publ(struct sk_buff *skb,
        struct nlattr *attrs;
 
        hdr = genlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq,
-                         &tipc_genl_v2_family, NLM_F_MULTI, TIPC_NL_PUBL_GET);
+                         &tipc_genl_family, NLM_F_MULTI, TIPC_NL_PUBL_GET);
        if (!hdr)
                goto msg_cancel;