netfilter: ipset: move ip_set_get_ip_port() to ip_set_bitmap_port.c. (f8615bf8) · Commits · 戴 / test

include/linux/netfilter/ipset/ip_set_getport.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -20,9 +20,6 @@ static inline bool ip_set_get_ip6_port(const struct sk_buff *skb, bool src,
		}
		#endif

		extern bool ip_set_get_ip_port(const struct sk_buff *skb, u8 pf, bool src,
		__be16 *port);

		static inline bool ip_set_proto_with_ports(u8 proto)
		{
		switch (proto) {

+27 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,33 @@ bitmap_port_do_head(struct sk_buff skb, const struct bitmap_port map)
		nla_put_net16(skb, IPSET_ATTR_PORT_TO, htons(map->last_port));
		}

		static bool
		ip_set_get_ip_port(const struct sk_buff skb, u8 pf, bool src, __be16 port)
		{
		bool ret;
		u8 proto;

		switch (pf) {
		case NFPROTO_IPV4:
		ret = ip_set_get_ip4_port(skb, src, port, &proto);
		break;
		case NFPROTO_IPV6:
		ret = ip_set_get_ip6_port(skb, src, port, &proto);
		break;
		default:
		return false;
		}
		if (!ret)
		return ret;
		switch (proto) {
		case IPPROTO_TCP:
		case IPPROTO_UDP:
		return true;
		default:
		return false;
		}
		}

		static int
		bitmap_port_kadt(struct ip_set set, const struct sk_buff skb,
		const struct xt_action_param *par,

+0 −28

Original line number	Diff line number	Diff line
		@@ -148,31 +148,3 @@ ip_set_get_ip6_port(const struct sk_buff *skb, bool src,
		}
		EXPORT_SYMBOL_GPL(ip_set_get_ip6_port);
		#endif

		bool
		ip_set_get_ip_port(const struct sk_buff skb, u8 pf, bool src, __be16 port)
		{
		bool ret;
		u8 proto;

		switch (pf) {
		case NFPROTO_IPV4:
		ret = ip_set_get_ip4_port(skb, src, port, &proto);
		break;
		case NFPROTO_IPV6:
		ret = ip_set_get_ip6_port(skb, src, port, &proto);
		break;
		default:
		return false;
		}
		if (!ret)
		return ret;
		switch (proto) {
		case IPPROTO_TCP:
		case IPPROTO_UDP:
		return true;
		default:
		return false;
		}
		}
		EXPORT_SYMBOL_GPL(ip_set_get_ip_port);