1 files changed, 4 insertions, 186 deletions

diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 18a3d44238bc..105ba7adf06f 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -36,11 +36,13 @@
 
 #include <net/sock.h>
 #include "core.h"
-#include "config.h"
+#include "netlink.h"
 #include "name_table.h"
 #include "name_distr.h"
 #include "subscr.h"
 #include "bcast.h"
+#include "addr.h"
+#include <net/genetlink.h>
 
 #define TIPC_NAMETBL_SIZE 1024          /* must be a power of 2 */
 
@@ -773,190 +775,6 @@ void tipc_nametbl_unsubscribe(struct tipc_subscription *s)
         spin_unlock_bh(&tn->nametbl_lock);
 }
 
-/**
- * subseq_list - print specified sub-sequence contents into the given buffer
- */
-static int subseq_list(struct sub_seq *sseq, char *buf, int len, u32 depth,
-                       u32 index)
-{
-        char portIdStr[27];
-        const char *scope_str[] = {"", " zone", " cluster", " node"};
-        struct publication *publ;
-        struct name_info *info;
-        int ret;
-
-        ret = tipc_snprintf(buf, len, "%-10u %-10u ", sseq->lower, sseq->upper);
-
-        if (depth == 2) {
-                ret += tipc_snprintf(buf - ret, len + ret, "\n");
-                return ret;
-        }
-
-        info = sseq->info;
-
-        list_for_each_entry(publ, &info->zone_list, zone_list) {
-                sprintf(portIdStr, "<%u.%u.%u:%u>",
-                         tipc_zone(publ->node), tipc_cluster(publ->node),
-                         tipc_node(publ->node), publ->ref);
-                ret += tipc_snprintf(buf + ret, len - ret, "%-26s ", portIdStr);
-                if (depth > 3) {
-                        ret += tipc_snprintf(buf + ret, len - ret, "%-10u %s",
-                                             publ->key, scope_str[publ->scope]);
-                }
-                if (!list_is_last(&publ->zone_list, &info->zone_list))
-                        ret += tipc_snprintf(buf + ret, len - ret,
-                                             "\n%33s", " ");
-        }
-
-        ret += tipc_snprintf(buf + ret, len - ret, "\n");
-        return ret;
-}
-
-/**
- * nameseq_list - print specified name sequence contents into the given buffer
- */
-static int nameseq_list(struct name_seq *seq, char *buf, int len, u32 depth,
-                        u32 type, u32 lowbound, u32 upbound, u32 index)
-{
-        struct sub_seq *sseq;
-        char typearea[11];
-        int ret = 0;
-
-        if (seq->first_free == 0)
-                return 0;
-
-        sprintf(typearea, "%-10u", seq->type);
-
-        if (depth == 1) {
-                ret += tipc_snprintf(buf, len, "%s\n", typearea);
-                return ret;
-        }
-
-        for (sseq = seq->sseqs; sseq != &seq->sseqs[seq->first_free]; sseq++) {
-                if ((lowbound <= sseq->upper) && (upbound >= sseq->lower)) {
-                        ret += tipc_snprintf(buf + ret, len - ret, "%s ",
-                                            typearea);
-                        spin_lock_bh(&seq->lock);
-                        ret += subseq_list(sseq, buf + ret, len - ret,
-                                          depth, index);
-                        spin_unlock_bh(&seq->lock);
-                        sprintf(typearea, "%10s", " ");
-                }
-        }
-        return ret;
-}
-
-/**
- * nametbl_header - print name table header into the given buffer
- */
-static int nametbl_header(char *buf, int len, u32 depth)
-{
-        const char *header[] = {
-                "Type       ",
-                "Lower      Upper      ",
-                "Port Identity              ",
-                "Publication Scope"
-        };
-
-        int i;
-        int ret = 0;
-
-        if (depth > 4)
-                depth = 4;
-        for (i = 0; i < depth; i++)
-                ret += tipc_snprintf(buf + ret, len - ret, header[i]);
-        ret += tipc_snprintf(buf + ret, len - ret, "\n");
-        return ret;
-}
-
-/**
- * nametbl_list - print specified name table contents into the given buffer
- */
-static int nametbl_list(struct net *net, char *buf, int len, u32 depth_info,
-                        u32 type, u32 lowbound, u32 upbound)
-{
-        struct tipc_net *tn = net_generic(net, tipc_net_id);
-        struct hlist_head *seq_head;
-        struct name_seq *seq;
-        int all_types;
-        int ret = 0;
-        u32 depth;
-        u32 i;
-
-        all_types = (depth_info & TIPC_NTQ_ALLTYPES);
-        depth = (depth_info & ~TIPC_NTQ_ALLTYPES);
-
-        if (depth == 0)
-                return 0;
-
-        if (all_types) {
-                /* display all entries in name table to specified depth */
-                ret += nametbl_header(buf, len, depth);
-                lowbound = 0;
-                upbound = ~0;
-                for (i = 0; i < TIPC_NAMETBL_SIZE; i++) {
-                        seq_head = &tn->nametbl->seq_hlist[i];
-                        hlist_for_each_entry_rcu(seq, seq_head, ns_list) {
-                                ret += nameseq_list(seq, buf + ret, len - ret,
-                                                   depth, seq->type,
-                                                   lowbound, upbound, i);
-                        }
-                }
-        } else {
-                /* display only the sequence that matches the specified type */
-                if (upbound < lowbound) {
-                        ret += tipc_snprintf(buf + ret, len - ret,
-                                        "invalid name sequence specified\n");
-                        return ret;
-                }
-                ret += nametbl_header(buf + ret, len - ret, depth);
-                i = hash(type);
-                seq_head = &tn->nametbl->seq_hlist[i];
-                hlist_for_each_entry_rcu(seq, seq_head, ns_list) {
-                        if (seq->type == type) {
-                                ret += nameseq_list(seq, buf + ret, len - ret,
-                                                   depth, type,
-                                                   lowbound, upbound, i);
-                                break;
-                        }
-                }
-        }
-        return ret;
-}
-
-struct sk_buff *tipc_nametbl_get(struct net *net, const void *req_tlv_area,
-                                 int req_tlv_space)
-{
-        struct sk_buff *buf;
-        struct tipc_name_table_query *argv;
-        struct tlv_desc *rep_tlv;
-        char *pb;
-        int pb_len;
-        int str_len;
-
-        if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NAME_TBL_QUERY))
-                return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
-
-        buf = tipc_cfg_reply_alloc(TLV_SPACE(ULTRA_STRING_MAX_LEN));
-        if (!buf)
-                return NULL;
-
-        rep_tlv = (struct tlv_desc *)buf->data;
-        pb = TLV_DATA(rep_tlv);
-        pb_len = ULTRA_STRING_MAX_LEN;
-        argv = (struct tipc_name_table_query *)TLV_DATA(req_tlv_area);
-        rcu_read_lock();
-        str_len = nametbl_list(net, pb, pb_len, ntohl(argv->depth),
-                               ntohl(argv->type),
-                               ntohl(argv->lowbound), ntohl(argv->upbound));
-        rcu_read_unlock();
-        str_len += 1;   /* for "\0" */
-        skb_put(buf, TLV_SPACE(str_len));
-        TLV_SET(rep_tlv, TIPC_TLV_ULTRA_STRING, NULL, str_len);
-
-        return buf;
-}
-
 int tipc_nametbl_init(struct net *net)
 {
         struct tipc_net *tn = net_generic(net, tipc_net_id);
@@ -1055,7 +873,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;