1 files changed, 132 insertions, 1 deletions

diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index ad844d365340..b891e3905bc4 100644
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -1,7 +1,7 @@
 /*
  * net/tipc/netlink.c: TIPC configuration handling
  *
- * Copyright (c) 2005-2006, Ericsson AB
+ * Copyright (c) 2005-2006, 2014, Ericsson AB
  * Copyright (c) 2005-2007, Wind River Systems
  * All rights reserved.
  *
@@ -36,6 +36,12 @@
 
 #include "core.h"
 #include "config.h"
+#include "socket.h"
+#include "name_table.h"
+#include "bearer.h"
+#include "link.h"
+#include "node.h"
+#include "net.h"
 #include <net/genetlink.h>
 
 static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
@@ -68,6 +74,19 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
         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, },
+        [TIPC_NLA_SOCK]         = { .type = NLA_NESTED, },
+        [TIPC_NLA_PUBL]         = { .type = NLA_NESTED, },
+        [TIPC_NLA_LINK]         = { .type = NLA_NESTED, },
+        [TIPC_NLA_MEDIA]        = { .type = NLA_NESTED, },
+        [TIPC_NLA_NODE]         = { .type = NLA_NESTED, },
+        [TIPC_NLA_NET]          = { .type = NLA_NESTED, },
+        [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,
@@ -76,6 +95,7 @@ static struct genl_family tipc_genl_family = {
         .maxattr        = 0,
 };
 
+/* Legacy ASCII API */
 static struct genl_ops tipc_genl_ops[] = {
         {
                 .cmd            = TIPC_GENL_CMD,
@@ -83,12 +103,122 @@ static struct genl_ops tipc_genl_ops[] = {
         },
 };
 
+/* 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 = {
+        .id             = GENL_ID_GENERATE,
+        .name           = TIPC_GENL_V2_NAME,
+        .version        = TIPC_GENL_V2_VERSION,
+        .hdrsize        = 0,
+        .maxattr        = TIPC_NLA_MAX,
+};
+
+static const struct genl_ops tipc_genl_v2_ops[] = {
+        {
+                .cmd    = TIPC_NL_BEARER_DISABLE,
+                .doit   = tipc_nl_bearer_disable,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_BEARER_ENABLE,
+                .doit   = tipc_nl_bearer_enable,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_BEARER_GET,
+                .doit   = tipc_nl_bearer_get,
+                .dumpit = tipc_nl_bearer_dump,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_BEARER_SET,
+                .doit   = tipc_nl_bearer_set,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_SOCK_GET,
+                .dumpit = tipc_nl_sk_dump,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_PUBL_GET,
+                .dumpit = tipc_nl_publ_dump,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_LINK_GET,
+                .doit   = tipc_nl_link_get,
+                .dumpit = tipc_nl_link_dump,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_LINK_SET,
+                .doit   = tipc_nl_link_set,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_LINK_RESET_STATS,
+                .doit   = tipc_nl_link_reset_stats,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_MEDIA_GET,
+                .doit   = tipc_nl_media_get,
+                .dumpit = tipc_nl_media_dump,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_MEDIA_SET,
+                .doit   = tipc_nl_media_set,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_NODE_GET,
+                .dumpit = tipc_nl_node_dump,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_NET_GET,
+                .dumpit = tipc_nl_net_dump,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_NET_SET,
+                .doit   = tipc_nl_net_set,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_NAME_TABLE_GET,
+                .dumpit = tipc_nl_name_table_dump,
+                .policy = tipc_nl_policy,
+        }
+};
+
+int tipc_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr ***attr)
+{
+        u32 maxattr = tipc_genl_v2_family.maxattr;
+
+        *attr = tipc_genl_v2_family.attrbuf;
+        if (!*attr)
+                return -EOPNOTSUPP;
+
+        return nlmsg_parse(nlh, GENL_HDRLEN, *attr, maxattr, tipc_nl_policy);
+}
+
 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,
+                                            tipc_genl_v2_ops);
+        if (res) {
                 pr_err("Failed to register netlink interface\n");
                 return res;
         }
@@ -98,4 +228,5 @@ int tipc_netlink_start(void)
 void tipc_netlink_stop(void)
 {
         genl_unregister_family(&tipc_genl_family);
+        genl_unregister_family(&tipc_genl_v2_family);
 }