tipc: nl compat add noop and remove legacy nl framework (22ae7cff) · Commits · 戴 / test

net/tipc/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@

		obj-$(CONFIG_TIPC) := tipc.o

		tipc-y += addr.o bcast.o bearer.o config.o \
		tipc-y += addr.o bcast.o bearer.o \
		core.o link.o discover.o msg.o \
		name_distr.o subscr.o name_table.o net.o \
		netlink.o netlink_compat.o node.o socket.o log.o eth_media.o \

net/tipc/bearer.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@

		#include <net/sock.h>
		#include "core.h"
		#include "config.h"
		#include "bearer.h"
		#include "link.h"
		#include "discover.h"

net/tipc/config.c

deleted100644 → 0

+0 −157

Original line number	Diff line number	Diff line
		/*
		* net/tipc/config.c: TIPC configuration management code
		*
		* Copyright (c) 2002-2006, Ericsson AB
		* Copyright (c) 2004-2007, 2010-2013, Wind River Systems
		* 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 "socket.h"
		#include "name_table.h"
		#include "config.h"
		#include "server.h"

		#define REPLY_TRUNCATED "<truncated>\n"

		static const void req_tlv_area; / request message TLV area */
		static int req_tlv_space; /* request message TLV area size */
		static int rep_headroom; /* reply message headroom to use */

		struct sk_buff *tipc_cfg_reply_alloc(int payload_size)
		{
		struct sk_buff *buf;

		buf = alloc_skb(rep_headroom + payload_size, GFP_ATOMIC);
		if (buf)
		skb_reserve(buf, rep_headroom);
		return buf;
		}

		int tipc_cfg_append_tlv(struct sk_buff *buf, int tlv_type,
		void *tlv_data, int tlv_data_size)
		{
		struct tlv_desc tlv = (struct tlv_desc )skb_tail_pointer(buf);
		int new_tlv_space = TLV_SPACE(tlv_data_size);

		if (skb_tailroom(buf) < new_tlv_space)
		return 0;
		skb_put(buf, new_tlv_space);
		tlv->tlv_type = htons(tlv_type);
		tlv->tlv_len = htons(TLV_LENGTH(tlv_data_size));
		if (tlv_data_size && tlv_data)
		memcpy(TLV_DATA(tlv), tlv_data, tlv_data_size);
		return 1;
		}

		struct sk_buff tipc_cfg_reply_string_type(u16 tlv_type, char string)
		{
		struct sk_buff *buf;
		int string_len = strlen(string) + 1;

		buf = tipc_cfg_reply_alloc(TLV_SPACE(string_len));
		if (buf)
		tipc_cfg_append_tlv(buf, tlv_type, string, string_len);
		return buf;
		}

		struct sk_buff tipc_cfg_do_cmd(struct net net, u32 orig_node, u16 cmd,
		const void *request_area, int request_space,
		int reply_headroom)
		{
		struct sk_buff *rep_tlv_buf;

		rtnl_lock();

		/* Save request and reply details in a well-known location */
		req_tlv_area = request_area;
		req_tlv_space = request_space;
		rep_headroom = reply_headroom;

		/* Check command authorization */
		if (likely(in_own_node(net, orig_node))) {
		/* command is permitted */
		} else {
		rep_tlv_buf = tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
		" (cannot be done remotely)");
		goto exit;
		}

		/* Call appropriate processing routine */
		switch (cmd) {
		case TIPC_CMD_NOOP:
		rep_tlv_buf = tipc_cfg_reply_none();
		break;
		case TIPC_CMD_NOT_NET_ADMIN:
		rep_tlv_buf =
		tipc_cfg_reply_error_string(TIPC_CFG_NOT_NET_ADMIN);
		break;
		case TIPC_CMD_SET_MAX_ZONES:
		case TIPC_CMD_GET_MAX_ZONES:
		case TIPC_CMD_SET_MAX_SLAVES:
		case TIPC_CMD_GET_MAX_SLAVES:
		case TIPC_CMD_SET_MAX_CLUSTERS:
		case TIPC_CMD_GET_MAX_CLUSTERS:
		case TIPC_CMD_SET_MAX_NODES:
		case TIPC_CMD_GET_MAX_NODES:
		case TIPC_CMD_SET_MAX_SUBSCR:
		case TIPC_CMD_GET_MAX_SUBSCR:
		case TIPC_CMD_SET_MAX_PUBL:
		case TIPC_CMD_GET_MAX_PUBL:
		case TIPC_CMD_SET_LOG_SIZE:
		case TIPC_CMD_SET_REMOTE_MNG:
		case TIPC_CMD_GET_REMOTE_MNG:
		case TIPC_CMD_DUMP_LOG:
		case TIPC_CMD_SET_MAX_PORTS:
		case TIPC_CMD_GET_MAX_PORTS:
		rep_tlv_buf = tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
		" (obsolete command)");
		break;
		default:
		rep_tlv_buf = tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
		" (unknown command)");
		break;
		}

		WARN_ON(rep_tlv_buf->len > TLV_SPACE(ULTRA_STRING_MAX_LEN));

		/* Append an error message if we cannot return all requested data */
		if (rep_tlv_buf->len == TLV_SPACE(ULTRA_STRING_MAX_LEN)) {
		if (*(rep_tlv_buf->data + ULTRA_STRING_MAX_LEN) != '\0')
		sprintf(rep_tlv_buf->data + rep_tlv_buf->len -
		sizeof(REPLY_TRUNCATED) - 1, REPLY_TRUNCATED);
		}

		/* Return reply buffer */
		exit:
		rtnl_unlock();
		return rep_tlv_buf;
		}

net/tipc/config.h

deleted100644 → 0

+0 −67

Original line number	Diff line number	Diff line
		/*
		* net/tipc/config.h: Include file for TIPC configuration service code
		*
		* Copyright (c) 2003-2006, Ericsson AB
		* Copyright (c) 2005, Wind River Systems
		* 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.
		*/

		#ifndef _TIPC_CONFIG_H
		#define _TIPC_CONFIG_H

		#include "link.h"

		#define ULTRA_STRING_MAX_LEN 32768

		struct sk_buff *tipc_cfg_reply_alloc(int payload_size);
		int tipc_cfg_append_tlv(struct sk_buff *buf, int tlv_type,
		void *tlv_data, int tlv_data_size);
		struct sk_buff tipc_cfg_reply_string_type(u16 tlv_type, char string);

		static inline struct sk_buff *tipc_cfg_reply_none(void)
		{
		return tipc_cfg_reply_alloc(0);
		}

		static inline struct sk_buff tipc_cfg_reply_error_string(char string)
		{
		return tipc_cfg_reply_string_type(TIPC_TLV_ERROR_STRING, string);
		}

		static inline struct sk_buff tipc_cfg_reply_ultra_string(char string)
		{
		return tipc_cfg_reply_string_type(TIPC_TLV_ULTRA_STRING, string);
		}

		struct sk_buff tipc_cfg_do_cmd(struct net net, u32 orig_node, u16 cmd,
		const void *req_tlv_area, int req_tlv_space,
		int headroom);
		#endif

net/tipc/core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,8 @@
		#include "core.h"
		#include "name_table.h"
		#include "subscr.h"
		#include "config.h"
		#include "bearer.h"
		#include "net.h"
		#include "socket.h"

		#include <linux/module.h>

Admin message