fix

fast-classifier/Makefile

@@ -1,92 +0,0 @@
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=fast-classifier
-PKG_RELEASE:=1
-PKG_CONFIG_DEPENDS := CONFIG_IPV6
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/$(PKG_NAME)/Default
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Support
-  DEPENDS:=+kmod-ipt-conntrack +kmod-shortcut-fe
-  TITLE:=Kernel driver for FAST Classifier
-  FILES:=$(PKG_BUILD_DIR)/fast-classifier.ko
-  KCONFIG:=CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y CONFIG_NF_CONNTRACK_MARK=y
-  PROVIDES:=$(PKG_NAME)
-endef
-
-define KernelPackage/$(PKG_NAME)
-  $(call KernelPackage/$(PKG_NAME)/Default)
-endef
-
-define KernelPackage/$(PKG_NAME)-noload
-  $(call KernelPackage/$(PKG_NAME)/Default)
-endef
-
-define KernelPackage/$(PKG_NAME)/Default/description
-FAST Classifier talks to SFE to make decisions about offloading connections
-endef
-
-define KernelPackage/$(PKG_NAME)/description
-$(call KernelPackage/$(PKG_NAME)/Default/description)
-endef
-
-define KernelPackage/$(PKG_NAME)-noload/description
-$(call KernelPackage/$(PKG_NAME)/Default/description)
-
-This package does not load $(PKG_NAME) at boot by default
-endef
-
-define Package/fast-classifier-example
-  TITLE:=Example user space program for fast-classifier
-  DEPENDS:=+libnl +kmod-fast-classifier
-endef
-
-define Package/fast-classifier-example/description
-Example user space program that communicates with fast
-classifier kernel module
-endef
-
-SFE_MAKE_OPTS:=SFE_SUPPORT_IPV6=$(if $(CONFIG_IPV6),y,n)
-
-define Build/Compile/kmod
-	+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" $(SFE_MAKE_OPTS) \
-		$(KERNEL_MAKE_FLAGS) \
-		$(PKG_MAKE_FLAGS) \
-		M="$(PKG_BUILD_DIR)" \
-		CONFIG_FAST_CLASSIFIER=m \
-		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
-		modules
-endef
-
-define Build/Compile/example
-	$(TARGET_CC) -o $(PKG_BUILD_DIR)/userspace_fast_classifier \
-		-I $(PKG_BUILD_DIR) \
-		-I$(STAGING_DIR)/usr/include/libnl \
-		-I$(STAGING_DIR)/usr/include/libnl3 \
-		-lnl-genl-3 -lnl-3 \
-		$(PKG_BUILD_DIR)/nl_classifier_test.c
-endef
-
-define Build/Compile
-	$(Build/Compile/kmod)
-	$(if $(CONFIG_PACKAGE_fast-classifier-example),$(Build/Compile/example))
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/fast-classifier.h $(1)/usr/include/
-endef
-
-
-define Package/fast-classifier-example/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) $(PKG_BUILD_DIR)/userspace_fast_classifier $(1)/sbin/
-endef
-
-$(eval $(call KernelPackage,$(PKG_NAME)))
-$(eval $(call KernelPackage,$(PKG_NAME)-noload))
-#$(eval $(call BuildPackage,fast-classifier-example))

fast-classifier/src/Makefile

@@ -1,10 +0,0 @@
-obj-$(CONFIG_FAST_CLASSIFIER) += fast-classifier.o
-
-ifeq ($(SFE_SUPPORT_IPV6),)
-SFE_SUPPORT_IPV6=y
-endif
-ccflags-$(SFE_SUPPORT_IPV6) += -DSFE_SUPPORT_IPV6
-
-ccflags-y += -I$(obj)/../shortcut-fe
-
-obj ?= .

fast-classifier/src/fast-classifier.h

@@ -1,57 +0,0 @@
-/*
- * User space header to send message to the fast classifier
- *
- * Copyright (c) 2013,2016 The Linux Foundation. All rights reserved.
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <linux/if_ether.h>
-
-#define FAST_CLASSIFIER_GENL_VERSION	(1)
-#define FAST_CLASSIFIER_GENL_NAME	"FC"
-#define FAST_CLASSIFIER_GENL_MCGRP	"FC_MCGRP"
-#define FAST_CLASSIFIER_GENL_HDRSIZE	(0)
-
-enum {
-	FAST_CLASSIFIER_A_UNSPEC,
-	FAST_CLASSIFIER_A_TUPLE,
-	__FAST_CLASSIFIER_A_MAX,
-};
-
-#define FAST_CLASSIFIER_A_MAX (__FAST_CLASSIFIER_A_MAX - 1)
-
-enum {
-	FAST_CLASSIFIER_C_UNSPEC,
-	FAST_CLASSIFIER_C_OFFLOAD,
-	FAST_CLASSIFIER_C_OFFLOADED,
-	FAST_CLASSIFIER_C_DONE,
-	__FAST_CLASSIFIER_C_MAX,
-};
-
-#define FAST_CLASSIFIER_C_MAX (__FAST_CLASSIFIER_C_MAX - 1)
-
-struct fast_classifier_tuple {
-	unsigned short ethertype;
-	unsigned char proto;
-	union {
-		struct in_addr in;
-		struct in6_addr in6;
-	} src_saddr;
-	union {
-		struct in_addr in;
-		struct in6_addr in6;
-	} dst_saddr;
-	unsigned short sport;
-	unsigned short dport;
-	unsigned char smac[ETH_ALEN];
-	unsigned char dmac[ETH_ALEN];
-};

fast-classifier/src/nl_classifier_test.c

@@ -1,281 +0,0 @@
-/*
- * Copyright (c) 2016 The Linux Foundation. All rights reserved.
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <netlink/genl/genl.h>
-#include <netlink/genl/ctrl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <signal.h>
-#include <arpa/inet.h>
-
-#define NL_CLASSIFIER_GENL_VERSION	1
-#define NL_CLASSIFIER_GENL_FAMILY	"FC"
-#define NL_CLASSIFIER_GENL_GROUP	"FC_MCGRP"
-#define NL_CLASSIFIER_GENL_HDRSIZE	0
-
-enum NL_CLASSIFIER_CMD {
-	NL_CLASSIFIER_CMD_UNSPEC,
-	NL_CLASSIFIER_CMD_ACCEL,
-	NL_CLASSIFIER_CMD_ACCEL_OK,
-	NL_CLASSIFIER_CMD_CONNECTION_CLOSED,
-	NL_CLASSIFIER_CMD_MAX,
-};
-
-enum NL_CLASSIFIER_ATTR {
-	NL_CLASSIFIER_ATTR_UNSPEC,
-	NL_CLASSIFIER_ATTR_TUPLE,
-	NL_CLASSIFIER_ATTR_MAX,
-};
-
-union nl_classifier_tuple_ip {
-	struct in_addr in;
-	struct in6_addr in6;
-};
-
-struct nl_classifier_tuple {
-	unsigned short af;
-	unsigned char proto;
-	union nl_classifier_tuple_ip src_ip;
-	union nl_classifier_tuple_ip dst_ip;
-	unsigned short sport;
-	unsigned short dport;
-	unsigned char smac[6];
-	unsigned char dmac[6];
-};
-
-struct nl_classifier_instance {
-	struct nl_sock *sock;
-	int family_id;
-	int group_id;
-	int stop;
-};
-
-struct nl_classifier_instance nl_cls_inst;
-
-static struct nla_policy nl_classifier_genl_policy[(NL_CLASSIFIER_ATTR_MAX+1)] = {
-	[NL_CLASSIFIER_ATTR_TUPLE] = { .type = NLA_UNSPEC },
-};
-
-void nl_classifier_dump_nl_tuple(struct nl_classifier_tuple *tuple)
-{
-	char ip_str[64];
-
-	printf("protocol = %s\n", (tuple->proto == IPPROTO_UDP) ? "udp" : ((tuple->proto == IPPROTO_TCP) ? "tcp" : "unknown"));
-	printf("source ip = %s\n", inet_ntop(tuple->af, &tuple->src_ip, ip_str, sizeof(ip_str)));
-	printf("destination ip = %s\n", inet_ntop(tuple->af, &tuple->dst_ip, ip_str, sizeof(ip_str)));
-	printf("source port = %d\n", ntohs(tuple->sport));
-	printf("destination port = %d\n", ntohs(tuple->dport));
-}
-
-int nl_classifier_msg_recv(struct nl_msg *msg, void *arg)
-{
-	struct nlmsghdr *nlh = nlmsg_hdr(msg);
-	struct genlmsghdr *gnlh = nlmsg_data(nlh);
-	struct nlattr *attrs[(NL_CLASSIFIER_ATTR_MAX+1)];
-
-	genlmsg_parse(nlh, NL_CLASSIFIER_GENL_HDRSIZE, attrs, NL_CLASSIFIER_ATTR_MAX, nl_classifier_genl_policy);
-
-	switch (gnlh->cmd) {
-	case NL_CLASSIFIER_CMD_ACCEL_OK:
-		printf("Acceleration successful:\n");
-		nl_classifier_dump_nl_tuple(nla_data(attrs[NL_CLASSIFIER_ATTR_TUPLE]));
-		return NL_OK;
-	case NL_CLASSIFIER_CMD_CONNECTION_CLOSED:
-		printf("Connection is closed:\n");
-		nl_classifier_dump_nl_tuple(nla_data(attrs[NL_CLASSIFIER_ATTR_TUPLE]));
-		return NL_OK;
-	default:
-		printf("nl classifier received unknow message %d\n", gnlh->cmd);
-	}
-
-	return NL_SKIP;
-}
-
-void nl_classifier_offload(struct nl_classifier_instance *inst,
-			   unsigned char proto, unsigned long *src_saddr,
-			   unsigned long *dst_saddr, unsigned short sport,
-			   unsigned short dport, int af)
-{
-	struct nl_msg *msg;
-	int ret;
-	struct nl_classifier_tuple classifier_msg;
-
-	memset(&classifier_msg, 0, sizeof(classifier_msg));
-	classifier_msg.af = af;
-	classifier_msg.proto = proto;
-	memcpy(&classifier_msg.src_ip, src_saddr, (af == AF_INET ? 4 : 16));
-	memcpy(&classifier_msg.dst_ip, dst_saddr, (af == AF_INET ? 4 : 16));
-	classifier_msg.sport = sport;
-	classifier_msg.dport = dport;
-
-	msg = nlmsg_alloc();
-	if (!msg) {
-		printf("Unable to allocate message\n");
-		return;
-	}
-
-	genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, inst->family_id,
-		    NL_CLASSIFIER_GENL_HDRSIZE, NLM_F_REQUEST,
-		    NL_CLASSIFIER_CMD_ACCEL, NL_CLASSIFIER_GENL_VERSION);
-	nla_put(msg, NL_CLASSIFIER_ATTR_TUPLE, sizeof(classifier_msg), &classifier_msg);
-
-	ret = nl_send_auto(inst->sock, msg);
-	if (ret < 0) {
-		printf("send netlink message failed.\n");
-		nlmsg_free(msg);
-		return;
-	}
-
-	nlmsg_free(msg);
-	printf("nl classifier offload connection successful\n");
-}
-
-int nl_classifier_init(struct nl_classifier_instance *inst)
-{
-	int ret;
-
-	inst->sock = nl_socket_alloc();
-	if (!inst->sock) {
-		printf("Unable to allocation socket.\n");
-		return -1;
-	}
-	genl_connect(inst->sock);
-
-	inst->family_id = genl_ctrl_resolve(inst->sock, NL_CLASSIFIER_GENL_FAMILY);
-	if (inst->family_id < 0) {
-		printf("Unable to resolve family %s\n", NL_CLASSIFIER_GENL_FAMILY);
-		goto init_failed;
-	}
-
-	inst->group_id = genl_ctrl_resolve_grp(inst->sock, NL_CLASSIFIER_GENL_FAMILY, NL_CLASSIFIER_GENL_GROUP);
-	if (inst->group_id < 0) {
-		printf("Unable to resolve mcast group %s\n", NL_CLASSIFIER_GENL_GROUP);
-		goto init_failed;
-	}
-
-	ret = nl_socket_add_membership(inst->sock, inst->group_id);
-	if (ret < 0) {
-		printf("Unable to add membership\n");
-		goto init_failed;
-	}
-
-	nl_socket_disable_seq_check(inst->sock);
-	nl_socket_modify_cb(inst->sock, NL_CB_VALID, NL_CB_CUSTOM, nl_classifier_msg_recv, NULL);
-
-	printf("nl classifier init successful\n");
-	return 0;
-
-init_failed:
-	if (inst->sock) {
-		nl_close(inst->sock);
-		nl_socket_free(inst->sock);
-		inst->sock = NULL;
-	}
-	return -1;
-}
-
-void nl_classifier_exit(struct nl_classifier_instance *inst)
-{
-	if (inst->sock) {
-		nl_close(inst->sock);
-		nl_socket_free(inst->sock);
-		inst->sock = NULL;
-	}
-	printf("nl classifier exit successful\n");
-}
-
-int nl_classifier_parse_arg(int argc, char *argv[], unsigned char *proto, unsigned long *src_saddr,
-			    unsigned long *dst_saddr, unsigned short *sport, unsigned short *dport, int *af)
-{
-	int ret;
-	unsigned short port;
-
-	if (argc < 7) {
-		printf("help: nl_classifier <v4|v6> <udp|tcp> <source ip> <destination ip> <source port> <destination port>\n");
-		return -1;
-	}
-
-	if (0 == strncmp(argv[1], "v4", 2)) {
-		*af = AF_INET;
-	} else if (0 == strncmp(argv[1], "v6", 2)) {
-		*af = AF_INET6;
-	} else {
-		printf("Address family is not supported");
-		return -1;
-	}
-
-	if (0 == strncmp(argv[2], "udp", 3)) {
-		*proto = IPPROTO_UDP;
-	} else if (0 == strncmp(argv[2], "tcp", 3)) {
-		*proto = IPPROTO_TCP;
-	} else {
-		printf("Protocol is not supported");
-		return -1;
-	}
-
-	ret = inet_pton(*af, argv[3], src_saddr);
-	if (ret <= 0) {
-		printf("source ip has wrong format\n");
-		return -1;
-	}
-
-	ret = inet_pton(*af, argv[4], dst_saddr);
-	if (ret <= 0) {
-		printf("destination ip has wrong format\n");
-		return -1;
-	}
-
-	port = strtol(argv[5], NULL, 0);
-	*sport = htons(port);
-	port = strtol(argv[6], NULL, 0);
-	*dport = htons(port);
-
-	printf("nl classifier parse arguments successful\n");
-	return 0;
-}
-
-int main(int argc, char *argv[])
-{
-	struct nl_classifier_instance *inst = &nl_cls_inst;
-	unsigned char proto;
-	unsigned long src_addr[4];
-	unsigned long dst_addr[4];
-	unsigned short sport;
-	unsigned short dport;
-	int af;
-	int ret;
-
-	ret = nl_classifier_parse_arg(argc, argv, &proto, src_addr, dst_addr, &sport, &dport, &af);
-	if (ret < 0) {
-		printf("Failed to parse arguments\n");
-		return ret;
-	}
-
-	ret = nl_classifier_init(inst);
-	if (ret < 0) {
-		printf("Unable to init generic netlink\n");
-		return ret;
-	}
-
-	nl_classifier_offload(inst, proto, src_addr, dst_addr, sport, dport, af);
-
-	/* main loop to listen on message */
-	while (!inst->stop) {
-		nl_recvmsgs_default(inst->sock);
-	}
-
-	nl_classifier_exit(inst);
-
-	return 0;
-}

fast-classifier/src/sfe.h

@@ -1,114 +0,0 @@
-/*
- * sfe.h
- *	Shortcut forwarding engine.
- *
- * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-
-/*
- * The following are debug macros used throughout the SFE.
- *
- * The DEBUG_LEVEL enables the followings based on its value,
- * when dynamic debug option is disabled.
- *
- * 0 = OFF
- * 1 = ASSERTS / ERRORS
- * 2 = 1 + WARN
- * 3 = 2 + INFO
- * 4 = 3 + TRACE
- */
-#define DEBUG_LEVEL 2
-
-#if (DEBUG_LEVEL < 1)
-#define DEBUG_ASSERT(s, ...)
-#define DEBUG_ERROR(s, ...)
-#else
-#define DEBUG_ASSERT(c, s, ...) if (!(c)) { pr_emerg("ASSERT: %s:%d:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__); BUG(); }
-#define DEBUG_ERROR(s, ...) pr_err("%s:%d:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#endif
-
-#if defined(CONFIG_DYNAMIC_DEBUG)
-/*
- * Compile messages for dynamic enable/disable
- */
-#define DEBUG_WARN(s, ...) pr_debug("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#define DEBUG_INFO(s, ...) pr_debug("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#define DEBUG_TRACE(s, ...) pr_debug("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#else
-
-/*
- * Statically compile messages at different levels
- */
-#if (DEBUG_LEVEL < 2)
-#define DEBUG_WARN(s, ...)
-#else
-#define DEBUG_WARN(s, ...) pr_warn("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#endif
-
-#if (DEBUG_LEVEL < 3)
-#define DEBUG_INFO(s, ...)
-#else
-#define DEBUG_INFO(s, ...) pr_notice("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#endif
-
-#if (DEBUG_LEVEL < 4)
-#define DEBUG_TRACE(s, ...)
-#else
-#define DEBUG_TRACE(s, ...) pr_info("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#endif
-#endif
-
-#ifdef CONFIG_NF_FLOW_COOKIE
-typedef int (*flow_cookie_set_func_t)(u32 protocol, __be32 src_ip, __be16 src_port,
-				      __be32 dst_ip, __be16 dst_port, u16 flow_cookie);
-/*
- * sfe_register_flow_cookie_cb
- *	register a function in SFE to let SFE use this function to configure flow cookie for a flow
- *
- * Hardware driver which support flow cookie should register a callback function in SFE. Then SFE
- * can use this function to configure flow cookie for a flow.
- * return: 0, success; !=0, fail
- */
-int sfe_register_flow_cookie_cb(flow_cookie_set_func_t cb);
-
-/*
- * sfe_unregister_flow_cookie_cb
- *	unregister function which is used to configure flow cookie for a flow
- *
- * return: 0, success; !=0, fail
- */
-int sfe_unregister_flow_cookie_cb(flow_cookie_set_func_t cb);
-
-typedef int (*sfe_ipv6_flow_cookie_set_func_t)(u32 protocol, __be32 src_ip[4], __be16 src_port,
-						__be32 dst_ip[4], __be16 dst_port, u16 flow_cookie);
-
-/*
- * sfe_ipv6_register_flow_cookie_cb
- *	register a function in SFE to let SFE use this function to configure flow cookie for a flow
- *
- * Hardware driver which support flow cookie should register a callback function in SFE. Then SFE
- * can use this function to configure flow cookie for a flow.
- * return: 0, success; !=0, fail
- */
-int sfe_ipv6_register_flow_cookie_cb(sfe_ipv6_flow_cookie_set_func_t cb);
-
-/*
- * sfe_ipv6_unregister_flow_cookie_cb
- *	unregister function which is used to configure flow cookie for a flow
- *
- * return: 0, success; !=0, fail
- */
-int sfe_ipv6_unregister_flow_cookie_cb(sfe_ipv6_flow_cookie_set_func_t cb);
-
-#endif /*CONFIG_NF_FLOW_COOKIE*/

fast-classifier/src/sfe_backport.h

@@ -1,195 +0,0 @@
-/*
- * sfe_backport.h
- *	Shortcut forwarding engine compatible header file.
- *
- * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <linux/version.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0))
-#include <net/netfilter/nf_conntrack_timeout.h>
-#else
-enum udp_conntrack {
-	UDP_CT_UNREPLIED,
-	UDP_CT_REPLIED,
-	UDP_CT_MAX
-};
-
-static inline unsigned int *
-nf_ct_timeout_lookup(struct net *net, struct nf_conn *ct,
-		     struct nf_conntrack_l4proto *l4proto)
-{
-#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
-	struct nf_conn_timeout *timeout_ext;
-	unsigned int *timeouts;
-
-	timeout_ext = nf_ct_timeout_find(ct);
-	if (timeout_ext)
-		timeouts = NF_CT_TIMEOUT_EXT_DATA(timeout_ext);
-	else
-		timeouts = l4proto->get_timeouts(net);
-
-	return timeouts;
-#else
-	return l4proto->get_timeouts(net);
-#endif /*CONFIG_NF_CONNTRACK_TIMEOUT*/
-}
-#endif /*KERNEL_VERSION(3, 7, 0)*/
-#endif /*KERNEL_VERSION(3, 4, 0)*/
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
-#define sfe_define_post_routing_hook(FN_NAME, HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN) \
-static unsigned int FN_NAME(void *priv, \
-			    struct sk_buff *SKB, \
-			    const struct nf_hook_state *state)
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0))
-#define sfe_define_post_routing_hook(FN_NAME, HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN) \
-static unsigned int FN_NAME(const struct nf_hook_ops *OPS, \
-			    struct sk_buff *SKB, \
-			    const struct net_device *UNUSED, \
-			    const struct net_device *OUT, \
-			    int (*OKFN)(struct sk_buff *))
-#else
-#define sfe_define_post_routing_hook(FN_NAME, HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN) \
-static unsigned int FN_NAME(unsigned int HOOKNUM, \
-			    struct sk_buff *SKB, \
-			    const struct net_device *UNUSED, \
-			    const struct net_device *OUT, \
-			    int (*OKFN)(struct sk_buff *))
-#endif
-
-#define sfe_cm_ipv4_post_routing_hook(HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN) \
-	sfe_define_post_routing_hook(__sfe_cm_ipv4_post_routing_hook, HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN)
-#define sfe_cm_ipv6_post_routing_hook(HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN) \
-	sfe_define_post_routing_hook(__sfe_cm_ipv6_post_routing_hook, HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN)
-#define fast_classifier_ipv4_post_routing_hook(HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN) \
-	sfe_define_post_routing_hook(__fast_classifier_ipv4_post_routing_hook, HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN)
-#define fast_classifier_ipv6_post_routing_hook(HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN) \
-	sfe_define_post_routing_hook(__fast_classifier_ipv6_post_routing_hook, HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN)
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
-#define SFE_IPV4_NF_POST_ROUTING_HOOK(fn) \
-	{						\
-		.hook = fn,				\
-		.pf = NFPROTO_IPV4,			\
-		.hooknum = NF_INET_POST_ROUTING,	\
-		.priority = NF_IP_PRI_NAT_SRC + 1,	\
-	}
-#else
-#define SFE_IPV4_NF_POST_ROUTING_HOOK(fn) \
-	{						\
-		.hook = fn,				\
-		.owner = THIS_MODULE,			\
-		.pf = NFPROTO_IPV4,			\
-		.hooknum = NF_INET_POST_ROUTING,	\
-		.priority = NF_IP_PRI_NAT_SRC + 1,	\
-	}
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
-#define SFE_IPV6_NF_POST_ROUTING_HOOK(fn) \
-	{						\
-		.hook = fn,				\
-		.pf = NFPROTO_IPV6,			\
-		.hooknum = NF_INET_POST_ROUTING,	\
-		.priority = NF_IP_PRI_NAT_SRC + 1,	\
-	}
-#else
-#define SFE_IPV6_NF_POST_ROUTING_HOOK(fn) \
-	{						\
-		.hook = fn,				\
-		.owner = THIS_MODULE,			\
-		.pf = NFPROTO_IPV6,			\
-		.hooknum = NF_INET_POST_ROUTING,	\
-		.priority = NF_IP6_PRI_NAT_SRC + 1,	\
-	}
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0))
-#define SFE_NF_CT_DEFAULT_ZONE (&nf_ct_zone_dflt)
-#else
-#define SFE_NF_CT_DEFAULT_ZONE NF_CT_DEFAULT_ZONE
-#endif
-
-/*
- * sfe_dev_get_master
- * 	get master of bridge port, and hold it
- */
-static inline struct net_device *sfe_dev_get_master(struct net_device *dev)
-{
-	struct net_device *master;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0))
-	rcu_read_lock();
-	master = netdev_master_upper_dev_get_rcu(dev);
-	if (master)
-		dev_hold(master);
-
-	rcu_read_unlock();
-#else
-	master = dev->master;
-	if (master)
-		dev_hold(master);
-#endif
-	return master;
-}
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
-#define SFE_DEV_EVENT_PTR(PTR) netdev_notifier_info_to_dev(PTR)
-#else
-#define SFE_DEV_EVENT_PTR(PTR) (struct net_device *)(PTR)
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0))
-#define SFE_NF_CONN_ACCT(NM) struct nf_conn_acct *NM
-#else
-#define SFE_NF_CONN_ACCT(NM) struct nf_conn_counter *NM
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0))
-#define SFE_ACCT_COUNTER(NM) ((NM)->counter)
-#else
-#define SFE_ACCT_COUNTER(NM) (NM)
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0))
-#define sfe_hash_for_each_possible(name, obj, node, member, key) \
-	hash_for_each_possible(name, obj, member, key)
-#else
-#define sfe_hash_for_each_possible(name, obj, node, member, key) \
-	hash_for_each_possible(name, obj, node, member, key)
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0))
-#define sfe_hash_for_each(name, bkt, node, obj, member) \
-	hash_for_each(name, bkt, obj, member)
-#else
-#define sfe_hash_for_each(name, bkt, node, obj, member) \
-	hash_for_each(name, bkt, node, obj, member)
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
-#define sfe_dst_get_neighbour(dst, daddr) dst_neigh_lookup(dst, daddr)
-#else
-static inline struct neighbour *
-sfe_dst_get_neighbour(struct dst_entry *dst, void *daddr)
-{
-	struct neighbour *neigh = dst_get_neighbour_noref(dst);
-
-	if (neigh)
-		neigh_hold(neigh);
-
-	return neigh;
-}
-#endif

fast-classifier/src/sfe_cm.h

@@ -1,259 +0,0 @@
-/*
- * sfe_cm.h
- *	Shortcut forwarding engine.
- *
- * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * connection flags.
- */
-#define SFE_CREATE_FLAG_NO_SEQ_CHECK BIT(0)
-					/* Indicates that we should not check sequence numbers */
-#define SFE_CREATE_FLAG_REMARK_PRIORITY BIT(1)
-					/* Indicates that we should remark priority of skb */
-#define SFE_CREATE_FLAG_REMARK_DSCP BIT(2)
-					/* Indicates that we should remark DSCP of packet */
-
-/*
- * IPv6 address structure
- */
-struct sfe_ipv6_addr {
-	__be32 addr[4];
-};
-
-typedef union {
-	__be32			ip;
-	struct sfe_ipv6_addr	ip6[1];
-} sfe_ip_addr_t;
-
-/*
- * connection creation structure.
- */
-struct sfe_connection_create {
-	int protocol;
-	struct net_device *src_dev;
-	struct net_device *dest_dev;
-	u32 flags;
-	u32 src_mtu;
-	u32 dest_mtu;
-	sfe_ip_addr_t src_ip;
-	sfe_ip_addr_t src_ip_xlate;
-	sfe_ip_addr_t dest_ip;
-	sfe_ip_addr_t dest_ip_xlate;
-	__be16 src_port;
-	__be16 src_port_xlate;
-	__be16 dest_port;
-	__be16 dest_port_xlate;
-	u8 src_mac[ETH_ALEN];
-	u8 src_mac_xlate[ETH_ALEN];
-	u8 dest_mac[ETH_ALEN];
-	u8 dest_mac_xlate[ETH_ALEN];
-	u8 src_td_window_scale;
-	u32 src_td_max_window;
-	u32 src_td_end;
-	u32 src_td_max_end;
-	u8 dest_td_window_scale;
-	u32 dest_td_max_window;
-	u32 dest_td_end;
-	u32 dest_td_max_end;
-	u32 mark;
-#ifdef CONFIG_XFRM
-	u32 original_accel;
-	u32 reply_accel;
-#endif
-	u32 src_priority;
-	u32 dest_priority;
-	u32 src_dscp;
-	u32 dest_dscp;
-};
-
-/*
- * connection destruction structure.
- */
-struct sfe_connection_destroy {
-	int protocol;
-	sfe_ip_addr_t src_ip;
-	sfe_ip_addr_t dest_ip;
-	__be16 src_port;
-	__be16 dest_port;
-};
-
-typedef enum sfe_sync_reason {
-	SFE_SYNC_REASON_STATS,	/* Sync is to synchronize stats */
-	SFE_SYNC_REASON_FLUSH,	/* Sync is to flush a entry */
-	SFE_SYNC_REASON_DESTROY	/* Sync is to destroy a entry(requested by connection manager) */
-} sfe_sync_reason_t;
-
-/*
- * Structure used to sync connection stats/state back within the system.
- *
- * NOTE: The addresses here are NON-NAT addresses, i.e. the true endpoint addressing.
- * 'src' is the creator of the connection.
- */
-struct sfe_connection_sync {
-	struct net_device *src_dev;
-	struct net_device *dest_dev;
-	int is_v6;			/* Is it for ipv6? */
-	int protocol;			/* IP protocol number (IPPROTO_...) */
-	sfe_ip_addr_t src_ip;		/* Non-NAT source address, i.e. the creator of the connection */
-	sfe_ip_addr_t src_ip_xlate;	/* NATed source address */
-	__be16 src_port;		/* Non-NAT source port */
-	__be16 src_port_xlate;		/* NATed source port */
-	sfe_ip_addr_t dest_ip;		/* Non-NAT destination address, i.e. to whom the connection was created */
-	sfe_ip_addr_t dest_ip_xlate;	/* NATed destination address */
-	__be16 dest_port;		/* Non-NAT destination port */
-	__be16 dest_port_xlate;		/* NATed destination port */
-	u32 src_td_max_window;
-	u32 src_td_end;
-	u32 src_td_max_end;
-	u64 src_packet_count;
-	u64 src_byte_count;
-	u32 src_new_packet_count;
-	u32 src_new_byte_count;
-	u32 dest_td_max_window;
-	u32 dest_td_end;
-	u32 dest_td_max_end;
-	u64 dest_packet_count;
-	u64 dest_byte_count;
-	u32 dest_new_packet_count;
-	u32 dest_new_byte_count;
-	u32 reason;		/* reason for stats sync message, i.e. destroy, flush, period sync */
-	u64 delta_jiffies;		/* Time to be added to the current timeout to keep the connection alive */
-};
-
-/*
- * connection mark structure
- */
-struct sfe_connection_mark {
-	int protocol;
-	sfe_ip_addr_t src_ip;
-	sfe_ip_addr_t dest_ip;
-	__be16 src_port;
-	__be16 dest_port;
-	u32 mark;
-};
-
-/*
- * Expose the hook for the receive processing.
- */
-extern int (*athrs_fast_nat_recv)(struct sk_buff *skb);
-
-/*
- * Expose what should be a static flag in the TCP connection tracker.
- */
-extern int nf_ct_tcp_no_window_check;
-
-/*
- * This callback will be called in a timer
- * at 100 times per second to sync stats back to
- * Linux connection track.
- *
- * A RCU lock is taken to prevent this callback
- * from unregistering.
- */
-typedef void (*sfe_sync_rule_callback_t)(struct sfe_connection_sync *);
-
-/*
- * IPv4 APIs used by connection manager
- */
-int sfe_ipv4_recv(struct net_device *dev, struct sk_buff *skb);
-int sfe_ipv4_create_rule(struct sfe_connection_create *sic);
-void sfe_ipv4_destroy_rule(struct sfe_connection_destroy *sid);
-void sfe_ipv4_destroy_all_rules_for_dev(struct net_device *dev);
-void sfe_ipv4_register_sync_rule_callback(sfe_sync_rule_callback_t callback);
-void sfe_ipv4_update_rule(struct sfe_connection_create *sic);
-void sfe_ipv4_mark_rule(struct sfe_connection_mark *mark);
-
-#ifdef SFE_SUPPORT_IPV6
-/*
- * IPv6 APIs used by connection manager
- */
-int sfe_ipv6_recv(struct net_device *dev, struct sk_buff *skb);
-int sfe_ipv6_create_rule(struct sfe_connection_create *sic);
-void sfe_ipv6_destroy_rule(struct sfe_connection_destroy *sid);
-void sfe_ipv6_destroy_all_rules_for_dev(struct net_device *dev);
-void sfe_ipv6_register_sync_rule_callback(sfe_sync_rule_callback_t callback);
-void sfe_ipv6_update_rule(struct sfe_connection_create *sic);
-void sfe_ipv6_mark_rule(struct sfe_connection_mark *mark);
-#else
-static inline int sfe_ipv6_recv(struct net_device *dev, struct sk_buff *skb)
-{
-	return 0;
-}
-
-static inline int sfe_ipv6_create_rule(struct sfe_connection_create *sic)
-{
-	return 0;
-}
-
-static inline void sfe_ipv6_destroy_rule(struct sfe_connection_destroy *sid)
-{
-	return;
-}
-
-static inline void sfe_ipv6_destroy_all_rules_for_dev(struct net_device *dev)
-{
-	return;
-}
-
-static inline void sfe_ipv6_register_sync_rule_callback(sfe_sync_rule_callback_t callback)
-{
-	return;
-}
-
-static inline void sfe_ipv6_update_rule(struct sfe_connection_create *sic)
-{
-	return;
-}
-
-static inline void sfe_ipv6_mark_rule(struct sfe_connection_mark *mark)
-{
-	return;
-}
-#endif
-
-/*
- * sfe_ipv6_addr_equal()
- *	compare ipv6 address
- *
- * return: 1, equal; 0, no equal
- */
-static inline int sfe_ipv6_addr_equal(struct sfe_ipv6_addr *a,
-				      struct sfe_ipv6_addr *b)
-{
-	return a->addr[0] == b->addr[0] &&
-	       a->addr[1] == b->addr[1] &&
-	       a->addr[2] == b->addr[2] &&
-	       a->addr[3] == b->addr[3];
-}
-
-/*
- * sfe_ipv4_addr_equal()
- *	compare ipv4 address
- *
- * return: 1, equal; 0, no equal
- */
-#define sfe_ipv4_addr_equal(a, b) ((u32)(a) == (u32)(b))
-
-/*
- * sfe_addr_equal()
- *	compare ipv4 or ipv6 address
- *
- * return: 1, equal; 0, no equal
- */
-static inline int sfe_addr_equal(sfe_ip_addr_t *a,
-				 sfe_ip_addr_t *b, int is_v4)
-{
-	return is_v4 ? sfe_ipv4_addr_equal(a->ip, b->ip) : sfe_ipv6_addr_equal(a->ip6, b->ip6);
-}

fast-classifier/src/userspace_example.c

@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 2013,2016 The Linux Foundation. All rights reserved.
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <netlink/genl/genl.h>
-#include <netlink/genl/ctrl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <arpa/inet.h>
-
-#include <fast-classifier.h>
-
-static struct nl_sock *sock;
-static struct nl_sock *sock_event;
-static int family;
-static int grp_id;
-
-static struct nla_policy fast_classifier_genl_policy[FAST_CLASSIFIER_A_MAX + 1] = {
-	[FAST_CLASSIFIER_A_TUPLE] = { .type = NLA_UNSPEC },
-};
-
-void dump_fc_tuple(struct fast_classifier_tuple *fc_msg)
-{
-	char src_str[INET_ADDRSTRLEN];
-	char dst_str[INET_ADDRSTRLEN];
-
-	printf("TUPLE: %d, %s, %s, %d, %d"
-			" SMAC=%02x:%02x:%02x:%02x:%02x:%02x",
-			" DMAC=%02x:%02x:%02x:%02x:%02x:%02x\n",
-				fc_msg->proto,
-				inet_ntop(AF_INET,
-					  &fc_msg->src_saddr.in.s_addr,
-					  src_str,
-					  INET_ADDRSTRLEN),
-				inet_ntop(AF_INET,
-					  &fc_msg->dst_saddr.in.s_addr,
-					  dst_str,
-					  INET_ADDRSTRLEN),
-				fc_msg->sport, fc_msg->dport,
-				fc_msg->smac[0], fc_msg->smac[1], fc_msg->smac[2],
-				fc_msg->smac[3], fc_msg->smac[4], fc_msg->smac[5],
-				fc_msg->dmac[0], fc_msg->dmac[1], fc_msg->dmac[2],
-				fc_msg->dmac[3], fc_msg->dmac[4], fc_msg->dmac[5]);
-}
-
-static int parse_cb(struct nl_msg *msg, void *arg)
-{
-	struct nlmsghdr *nlh = nlmsg_hdr(msg);
-	struct genlmsghdr *gnlh = nlmsg_data(nlh);
-	struct nlattr *attrs[FAST_CLASSIFIER_A_MAX];
-
-	genlmsg_parse(nlh, 0, attrs, FAST_CLASSIFIER_A_MAX, fast_classifier_genl_policy);
-
-	switch (gnlh->cmd) {
-	case FAST_CLASSIFIER_C_OFFLOADED:
-		printf("Got a offloaded message\n");
-		dump_fc_tuple(nla_data(attrs[FAST_CLASSIFIER_A_TUPLE]));
-		return NL_OK;
-	case FAST_CLASSIFIER_C_DONE:
-		printf("Got a done message\n");
-		dump_fc_tuple(nla_data(attrs[FAST_CLASSIFIER_A_TUPLE]));
-		return NL_OK;
-	}
-
-	return NL_SKIP;
-}
-
-int fast_classifier_init(void)
-{
-	int err;
-
-	sock = nl_socket_alloc();
-	if (!sock) {
-		printf("Unable to allocation socket.\n");
-		return -1;
-	}
-	genl_connect(sock);
-
-	sock_event = nl_socket_alloc();
-	if (!sock_event) {
-		nl_close(sock);
-		nl_socket_free(sock);
-		printf("Unable to allocation socket.\n");
-		return -1;
-	}
-	genl_connect(sock_event);
-
-	family = genl_ctrl_resolve(sock, FAST_CLASSIFIER_GENL_NAME);
-	if (family < 0) {
-		nl_close(sock_event);
-		nl_close(sock);
-		nl_socket_free(sock);
-		nl_socket_free(sock_event);
-		printf("Unable to resolve family\n");
-		return -1;
-	}
-
-	grp_id = genl_ctrl_resolve_grp(sock, FAST_CLASSIFIER_GENL_NAME,
-				       FAST_CLASSIFIER_GENL_MCGRP);
-	if (grp_id < 0) {
-		printf("Unable to resolve mcast group\n");
-		return -1;
-	}
-
-	err = nl_socket_add_membership(sock_event, grp_id);
-	if (err < 0) {
-		printf("Unable to add membership\n");
-		return -1;
-	}
-
-	nl_socket_disable_seq_check(sock_event);
-	nl_socket_modify_cb(sock_event, NL_CB_VALID, NL_CB_CUSTOM, parse_cb, NULL);
-
-	return 0;
-}
-
-void fast_classifier_close(void)
-{
-	nl_close(sock_event);
-	nl_close(sock);
-	nl_socket_free(sock_event);
-	nl_socket_free(sock);
-}
-
-void fast_classifier_ipv4_offload(unsigned char proto, unsigned long src_saddr,
-				  unsigned long dst_saddr, unsigned short sport,
-				  unsigned short dport)
-{
-	struct nl_msg *msg;
-	int ret;
-#ifdef DEBUG
-	char src_str[INET_ADDRSTRLEN];
-	char dst_str[INET_ADDRSTRLEN];
-#endif
-	struct fast_classifier_tuple fc_msg;
-
-#ifdef DEBUG
-	printf("DEBUG: would offload: %d, %s, %s, %d, %d\n", proto,
-	       inet_ntop(AF_INET, &src_saddr,  src_str, INET_ADDRSTRLEN),
-	       inet_ntop(AF_INET, &dst_saddr,  dst_str, INET_ADDRSTRLEN),
-	       sport, dport);
-#endif
-
-	fc_msg.proto = proto;
-	fc_msg.src_saddr.in.s_addr = src_saddr;
-	fc_msg.dst_saddr.in.s_addr = dst_saddr;
-	fc_msg.sport = sport;
-	fc_msg.dport = dport;
-	fc_msg.smac[0] = 'a';
-	fc_msg.smac[1] = 'b';
-	fc_msg.smac[2] = 'c';
-	fc_msg.smac[3] = 'd';
-	fc_msg.smac[4] = 'e';
-	fc_msg.smac[5] = 'f';
-	fc_msg.dmac[0] = 'f';
-	fc_msg.dmac[1] = 'e';
-	fc_msg.dmac[2] = 'd';
-	fc_msg.dmac[3] = 'c';
-	fc_msg.dmac[4] = 'b';
-	fc_msg.dmac[5] = 'a';
-
-	if (fast_classifier_init() < 0) {
-		printf("Unable to init generic netlink\n");
-		exit(1);
-	}
-
-	msg = nlmsg_alloc();
-	if (!msg) {
-		nl_socket_free(sock);
-		printf("Unable to allocate message\n");
-		return;
-	}
-
-	genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family,
-		    FAST_CLASSIFIER_GENL_HDRSIZE, NLM_F_REQUEST,
-		    FAST_CLASSIFIER_C_OFFLOAD, FAST_CLASSIFIER_GENL_VERSION);
-	nla_put(msg, 1, sizeof(fc_msg), &fc_msg);
-
-	ret = nl_send_auto_complete(sock, msg);
-
-	nlmsg_free(msg);
-	if (ret < 0) {
-		printf("nlmsg_free failed");
-		nl_close(sock);
-		nl_socket_free(sock);
-		return;
-	}
-
-	ret = nl_wait_for_ack(sock);
-	if (ret < 0) {
-		printf("wait for ack failed");
-		nl_close(sock);
-		nl_socket_free(sock);
-		return;
-	}
-}
-
-void fast_classifier_listen_for_messages(void)
-{
-	printf("waiting for netlink events\n");
-
-	while (1) {
-		nl_recvmsgs_default(sock_event);
-	}
-}
-
-int main(int argc, char *argv[])
-{
-	if (fast_classifier_init() < 0) {
-		printf("Unable to init generic netlink\n");
-		exit(1);
-	}
-
-	fast_classifier_ipv4_offload('a', 0, 0, 0, 0);
-
-	/* this never returns */
-	fast_classifier_listen_for_messages();
-
-	fast_classifier_close();
-
-	return 0;
-}

lcd4linux/Config.in

@@ -1,490 +0,0 @@
-if PACKAGE_lcd4linux-custom
-
-config LCD4LINUX_CUSTOM_NEEDS_libdbus
-	bool
-
-#config LCD4LINUX_CUSTOM_NEEDS_libftdi
-#	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libgd
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libiconv
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libjpeg
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libmpdclient
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libmysqlclient
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libncurses
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libnmeap
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libsqlite3
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libusb
-	bool
-
-#config LCD4LINUX_CUSTOM_NEEDS_libX11
-#	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_ppp
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_python
-	bool
-
-
-comment "Drivers ---"
-
-config LCD4LINUX_CUSTOM_DRIVER_ASTUSB
-	bool
-	prompt "ASTUSB"
-
-config LCD4LINUX_CUSTOM_DRIVER_BeckmannEgle
-	bool
-	prompt "BeckmannEgle"
-
-config LCD4LINUX_CUSTOM_DRIVER_BWCT
-	bool
-	prompt "BWCT"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_CrystalFontz
-	bool
-	prompt "CrystalFontz"
-
-config LCD4LINUX_CUSTOM_DRIVER_Curses
-	bool
-	prompt "Curses"
-	select LCD4LINUX_CUSTOM_NEEDS_libncurses
-
-config LCD4LINUX_CUSTOM_DRIVER_Cwlinux
-	bool
-	prompt "Cwlinux"
-
-config LCD4LINUX_CUSTOM_DRIVER_D4D
-	bool
-	prompt "D4D"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_dpf
-	bool
-	prompt "dpf"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_EA232graphic
-	bool
-	prompt "EA232graphic"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_EFN
-	bool
-	prompt "EFN"
-
-config LCD4LINUX_CUSTOM_DRIVER_FutabaVFD
-	bool
-	prompt "FutabaVFD"
-
-config LCD4LINUX_CUSTOM_DRIVER_FW8888
-	bool
-	prompt "FW8888"
-
-config LCD4LINUX_CUSTOM_DRIVER_G15
-	bool
-	prompt "G15"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_GLCD2USB
-	bool
-	prompt "GLCD2USB"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_HD44780
-	bool
-	prompt "HD44780"
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_DRIVER_HD44780-I2C
-	bool
-	prompt "HD44780-I2C"
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_DRIVER_IRLCD
-	bool
-	prompt "IRLCD"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_LCD2USB
-	bool
-	prompt "LCD2USB"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_LCDLinux
-	bool
-	prompt "LCDLinux"
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_DRIVER_LCDTerm
-	bool
-	prompt "LCDTerm"
-
-config LCD4LINUX_CUSTOM_DRIVER_LEDMatrix
-	bool
-	prompt "LEDMatrix"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_LPH7508
-	bool
-	prompt "LPH7508"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_LUIse
-	bool
-	prompt "LUIse"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	#select LCD4LINUX_CUSTOM_NEEDS_libluise
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_DRIVER_LW_ABP
-	bool
-	prompt "LW_ABP"
-
-config LCD4LINUX_CUSTOM_DRIVER_M50530
-	bool
-	prompt "M50530"
-
-config LCD4LINUX_CUSTOM_DRIVER_MatrixOrbital
-	bool
-	prompt "MatrixOrbital"
-
-config LCD4LINUX_CUSTOM_DRIVER_MatrixOrbitalGX
-	bool
-	prompt "MatrixOrbitalGX"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_mdm166a
-	bool
-	prompt "mdm166a"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_MilfordInstruments
-	bool
-	prompt "MilfordInstruments"
-
-config LCD4LINUX_CUSTOM_DRIVER_Newhaven
-	bool
-	prompt "Newhaven"
-
-config LCD4LINUX_CUSTOM_DRIVER_Noritake
-	bool
-	prompt "Noritake"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_NULL
-	bool
-	prompt "NULL"
-	default y
-
-config LCD4LINUX_CUSTOM_DRIVER_Pertelian
-	bool
-	prompt "Pertelian"
-
-config LCD4LINUX_CUSTOM_DRIVER_PHAnderson
-	bool
-	prompt "PHAnderson"
-
-config LCD4LINUX_CUSTOM_DRIVER_PICGraphic
-	bool
-	prompt "PICGraphic"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_picoLCD
-	bool
-	prompt "picoLCD"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_picoLCDGraphic
-	bool
-	prompt "picoLCDGraphic"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_PNG
-	bool
-	prompt "PNG"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_PPM
-	bool
-	prompt "PPM"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_RouterBoard
-	bool
-	prompt "RouterBoard"
-	depends on TARGET_rb532
-
-config LCD4LINUX_CUSTOM_DRIVER_SamsungSPF
-	bool
-	prompt "SamsungSPF"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libjpeg
-
-config LCD4LINUX_CUSTOM_DRIVER_serdisplib
-	bool
-	prompt "serdisplib"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_serdisplib
-
-config LCD4LINUX_CUSTOM_DRIVER_ShuttleVFD
-	bool
-	prompt "ShuttleVFD"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_SimpleLCD
-	bool
-	prompt "SimpleLCD"
-
-config LCD4LINUX_CUSTOM_DRIVER_st2205
-	bool
-	prompt "st2205"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_st2205tool
-
-config LCD4LINUX_CUSTOM_DRIVER_T6963
-	bool
-	prompt "T6963"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_TeakLCM
-	bool
-	prompt "TeakLCM"
-
-config LCD4LINUX_CUSTOM_DRIVER_TEW673GRU
-	bool
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	depends on TARGET_ar71xx
-	default TARGET_ar71xx
-
-config LCD4LINUX_CUSTOM_DRIVER_Trefon
-	bool
-	prompt "Trefon"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-#config LCD4LINUX_CUSTOM_DRIVER_ULA200
-#	bool
-#	prompt "ULA200"
-#	select LCD4LINUX_CUSTOM_NEEDS_libftdi
-#	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_USBHUB
-	bool
-	prompt "USBHUB"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_USBLCD
-	bool
-	prompt "USBLCD"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_VNC
-	bool
-	prompt "VNC"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libvncserver
-
-config LCD4LINUX_CUSTOM_DRIVER_WincorNixdorf
-	bool
-	prompt "WincorNixdorf"
-
-#config LCD4LINUX_CUSTOM_DRIVER_X11
-#	bool
-#	prompt "X11"
-#	select LCD4LINUX_CUSTOM_NEEDS_libgd
-#	select LCD4LINUX_CUSTOM_NEEDS_libX11
-
-
-comment "Plugins ---"
-
-config LCD4LINUX_CUSTOM_PLUGIN_apm
-	bool
-	prompt "apm"
-
-config LCD4LINUX_CUSTOM_PLUGIN_asterisk
-	bool
-	prompt "asterisk"
-
-config LCD4LINUX_CUSTOM_PLUGIN_button_exec
-	bool
-	prompt "button_exec"
-
-config LCD4LINUX_CUSTOM_PLUGIN_cpuinfo
-	bool
-	prompt "cpuinfo"
-	default y
-
-config LCD4LINUX_CUSTOM_PLUGIN_dbus
-	bool
-	prompt "dbus"
-	select LCD4LINUX_CUSTOM_NEEDS_libdbus
-
-config LCD4LINUX_CUSTOM_PLUGIN_diskstats
-	bool
-	prompt "diskstats"
-
-config LCD4LINUX_CUSTOM_PLUGIN_dvb
-	bool
-	prompt "dvb"
-
-config LCD4LINUX_CUSTOM_PLUGIN_event
-	bool
-	prompt "event"
-
-config LCD4LINUX_CUSTOM_PLUGIN_exec
-	bool
-	prompt "exec"
-
-config LCD4LINUX_CUSTOM_PLUGIN_fifo
-	bool
-	prompt "fifo"
-
-config LCD4LINUX_CUSTOM_PLUGIN_file
-	bool
-	prompt "file"
-
-config LCD4LINUX_CUSTOM_PLUGIN_gps
-	bool
-	prompt "gps"
-	select LCD4LINUX_CUSTOM_NEEDS_libnmeap
-
-config LCD4LINUX_CUSTOM_PLUGIN_hddtemp
-	bool
-	prompt "hddtemp"
-
-config LCD4LINUX_CUSTOM_PLUGIN_huawei
-	bool
-	prompt "huawei"
-
-config LCD4LINUX_CUSTOM_PLUGIN_i2c_sensors
-	bool
-	prompt "i2c_sensors"
-
-config LCD4LINUX_CUSTOM_PLUGIN_iconv
-	bool
-	prompt "iconv"
-	select LCD4LINUX_CUSTOM_NEEDS_libiconv
-
-config LCD4LINUX_CUSTOM_PLUGIN_imon
-	bool
-	prompt "imon"
-
-config LCD4LINUX_CUSTOM_PLUGIN_isdn
-	bool
-	prompt "isdn"
-
-config LCD4LINUX_CUSTOM_PLUGIN_kvv
-	bool
-	prompt "kvv"
-
-config LCD4LINUX_CUSTOM_PLUGIN_loadavg
-	bool
-	prompt "loadavg"
-	default y
-
-config LCD4LINUX_CUSTOM_PLUGIN_meminfo
-	bool
-	prompt "meminfo"
-	default y
-
-config LCD4LINUX_CUSTOM_PLUGIN_mpd
-	bool
-	prompt "mpd"
-	select LCD4LINUX_CUSTOM_NEEDS_libmpdclient
-
-config LCD4LINUX_CUSTOM_PLUGIN_mpris_dbus
-	bool
-	prompt "mpris_dbus"
-	select LCD4LINUX_CUSTOM_NEEDS_libdbus
-
-config LCD4LINUX_CUSTOM_PLUGIN_mysql
-	bool
-	prompt "mysql"
-	select LCD4LINUX_CUSTOM_NEEDS_libmysqlclient
-
-config LCD4LINUX_CUSTOM_PLUGIN_netdev
-	bool
-	prompt "netdev"
-
-config LCD4LINUX_CUSTOM_PLUGIN_netinfo
-	bool
-	prompt "netinfo"
-
-config LCD4LINUX_CUSTOM_PLUGIN_pop3
-	bool
-	prompt "pop3"
-
-config LCD4LINUX_CUSTOM_PLUGIN_ppp
-	bool
-	prompt "ppp"
-	select LCD4LINUX_CUSTOM_NEEDS_ppp
-
-config LCD4LINUX_CUSTOM_PLUGIN_proc_stat
-	bool
-	prompt "proc_stat"
-	default y
-
-#config LCD4LINUX_CUSTOM_PLUGIN_python
-#	bool
-#	prompt "python"
-#	select LCD4LINUX_CUSTOM_NEEDS_python
-
-config LCD4LINUX_CUSTOM_PLUGIN_qnaplog
-	bool
-	prompt "qnaplog"
-	select LCD4LINUX_CUSTOM_NEEDS_libsqlite3
-
-config LCD4LINUX_CUSTOM_PLUGIN_seti
-	bool
-	prompt "seti"
-
-config LCD4LINUX_CUSTOM_PLUGIN_statfs
-	bool
-	prompt "statfs"
-
-config LCD4LINUX_CUSTOM_PLUGIN_uname
-	bool
-	prompt "uname"
-
-config LCD4LINUX_CUSTOM_PLUGIN_uptime
-	bool
-	prompt "uptime"
-	default y
-
-config LCD4LINUX_CUSTOM_PLUGIN_w1retap
-	bool
-	prompt "w1retap"
-
-config LCD4LINUX_CUSTOM_PLUGIN_wireless
-	bool
-	prompt "wireless"
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_PLUGIN_xmms
-	bool
-	prompt "xmms"
-
-endif

lcd4linux/Makefile

@@ -1,306 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-# Copyright (C) 2019 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lcd4linux
-PKG_REV:=f13470faf00e52d1458f2a88d498716240edc272
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-#PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/
-PKG_SOURCE_URL:=https://github.com/redblue-pkt/lcd4linux.git
-#PKG_SOURCE_SUBDIR:=lcd4linux-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=git
-
-LCD4LINUX_DRIVERS:= \
-	ASTUSB \
-	BeckmannEgle \
-	BWCT \
-	CrystalFontz \
-	Curses \
-	Cwlinux \
-	D4D \
-	DPF \
-	EA232graphic \
-	EFN \
-	FutabaVFD \
-	FW8888 \
-	GLCD2USB \
-	IRLCD \
-	$(if $(CONFIG_BROKEN),HD44780) \
-	$(if $(CONFIG_BROKEN),HD44780-I2C) \
-	LCD2USB \
-	$(if $(CONFIG_BROKEN),LCDLinux) \
-	LCDTerm \
-	LEDMatrix \
-	LPH7508 \
-	$(if $(CONFIG_BROKEN),LUIse) \
-	LW_ABP \
-	M50530 \
-	MatrixOrbital \
-	MatrixOrbitalGX \
-	MilfordInstruments \
-	Newhaven \
-	Noritake \
-	NULL \
-	Pertelian \
-	PHAnderson \
-	PICGraphic \
-	picoLCD \
-	picoLCDGraphic \
-	PNG \
-	PPM \
-	$(if $(CONFIG_TARGET_rb532),RouterBoard) \
-	$(if $(CONFIG_BROKEN),SamsungSPF) \
-	ShuttleVFD \
-	SimpleLCD \
-	st2205 \
-	T6963 \
-	TeakLCM \
-	$(if $(CONFIG_TARGET_ar71xx),TEW673GRU) \
-	Trefon \
-	USBHUB \
-	USBLCD \
-	VNC \
-	WincorNixdorf \
-	serdisplib \
-#	G15 \
-#	ULA200 \
-#	X11 \
-
-LCD4LINUX_PLUGINS:= \
-	apm \
-	asterisk \
-	button_exec \
-	cpuinfo \
-	dbus \
-	diskstats \
-	dvb \
-	event \
-	exec \
-	fifo \
-	file \
-	gps \
-	hddtemp \
-	huawei \
-	i2c_sensors \
-	iconv \
-	imon \
-	isdn \
-	kvv \
-	loadavg \
-	netdev \
-	netinfo \
-	meminfo \
-	mpris_dbus \
-	netdev \
-	pop3 \
-	ppp \
-	proc_stat \
-	qnaplog \
-	seti \
-	statfs \
-	uname \
-	uptime \
-	w1retap \
-	$(if $(CONFIG_BROKEN),wireless) \
-	xmms \
-#	mpd \
-#	mysql \
-#	python \
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILD_DEPENDS:= \
-#	ppp \
-#	libftdi \
-#	libX11 \
-#	python \
-
-PKG_CONFIG_DEPENDS:= \
-	$(patsubst %,CONFIG_LCD4LINUX_CUSTOM_DRIVER_%,$(LCD4LINUX_DRIVERS)) \
-	$(patsubst %,CONFIG_LCD4LINUX_CUSTOM_PLUGIN_%,$(LCD4LINUX_PLUGINS)) \
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/lcd4linux/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
-  TITLE:=LCD display utility
-  URL:=http://lcd4linux.bulix.org/
-endef
-
-define Package/lcd4linux/Default/description
- LCD4Linux is a small program that grabs information from the kernel and
- some subsystems and displays it on an external liquid crystal display.
-endef
-
-
-define Package/lcd4linux-custom
-$(call Package/lcd4linux/Default)
-  DEPENDS:= \
-	+LCD4LINUX_CUSTOM_NEEDS_libdbus:libdbus \
-	+LCD4LINUX_CUSTOM_NEEDS_libgd:libgd \
-	$(if $(ICONV_FULL),+LCD4LINUX_CUSTOM_NEEDS_libiconv:libiconv-full) \
-	+LCD4LINUX_CUSTOM_NEEDS_libjpeg:libjpeg \
-	+LCD4LINUX_CUSTOM_NEEDS_libncurses:libncurses \
-	+LCD4LINUX_CUSTOM_NEEDS_libsqlite3:libsqlite3 \
-	+LCD4LINUX_CUSTOM_NEEDS_libusb:libusb-compat \
-#	+LCD4LINUX_CUSTOM_NEEDS_libmpdclient:libmpdclient \
-#	+LCD4LINUX_CUSTOM_NEEDS_libmysqlclient:libmysqlclient \
-#	+LCD4LINUX_CUSTOM_NEEDS_libftdi:libftdi \
-#	+LCD4LINUX_CUSTOM_NEEDS_libX11:libX11 \
-#	+LCD4LINUX_CUSTOM_NEEDS_python:python
-  MENU:=1
-  PROVIDES:=lcd4linux
-  VARIANT=custom
-endef
-
-define Package/lcd4linux-custom/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/lcd4linux-custom/description
-$(call Package/lcd4linux/Default/description)
- .
- This package contains a customized version of LCD4Linux.
-endef
-
-
-define Package/lcd4linux-full
-$(call Package/lcd4linux/Default)
-  DEPENDS:= \
-	+libdbus \
-	+libgd \
-	$(if $(ICONV_FULL),+libiconv-full) \
-	+libncurses \
-	+libsqlite3 \
-	+libusb-compat \
-	+serdisplib
-#	+libmpdclient \
-#	+libmysqlclient \
-#	+libftdi \
-#	+libX11 \
-#	+python
-  PROVIDES:=lcd4linux
-  VARIANT=full
-endef
-
-define Package/lcd4linux-full/description
-$(call Package/lcd4linux/Default/description)
- .
- This package contains a version of LCD4Linux built with all supported
- drivers and plugins.
-endef
-
-
-CONFIGURE_ARGS+= \
-	--disable-rpath \
-
-EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
-
-ifeq ($(BUILD_VARIANT),custom)
-
-  LCD4LINUX_CUSTOM_DRIVERS:= $(strip $(foreach c, $(LCD4LINUX_DRIVERS), \
-    $(if $(CONFIG_LCD4LINUX_CUSTOM_DRIVER_$(c)),$(c),) \
- ))
-  ifeq ($(LCD4LINUX_CUSTOM_DRIVERS),)
-    LCD4LINUX_CUSTOM_DRIVERS:=Sample
-  endif
-
-  LCD4LINUX_CUSTOM_PLUGINS:= $(strip $(foreach c, $(LCD4LINUX_PLUGINS), \
-    $(if $(CONFIG_LCD4LINUX_CUSTOM_PLUGIN_$(c)),$(c)) \
-  ))
-  ifeq ($(LCD4LINUX_CUSTOM_PLUGINS),)
-    LCD4LINUX_CUSTOM_PLUGINS:=sample
-  endif
-
-  CONFIGURE_ARGS+= \
-	--with-drivers="$(LCD4LINUX_CUSTOM_DRIVERS)" \
-	--with-plugins="$(LCD4LINUX_CUSTOM_PLUGINS)" \
-
-  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libiconv),)
-    CONFIGURE_ARGS+= --with-libiconv-prefix="$(ICONV_PREFIX)"
-  else
-    CONFIGURE_ARGS+= --without-libiconv-prefix
-  endif
-
-  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libmysqlclient),)
-    EXTRA_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql
-  endif
-
-#  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_python),)
-#    CONFIGURE_ARGS+= --with-python
-#  else
-    CONFIGURE_ARGS+= --without-python
-#  endif
-
-#  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libX11),)
-#    CONFIGURE_ARGS+= --with-x
-#  else
-    CONFIGURE_ARGS+= --without-x
-#  endif
-
-endif
-
-ifeq ($(BUILD_VARIANT),full)
-
-  LCD4LINUX_FULL_DRIVERS:= $(strip $(foreach c, $(LCD4LINUX_DRIVERS), \
-    $(c) \
-  ))
-
-  LCD4LINUX_FULL_PLUGINS:= $(strip $(foreach c, $(LCD4LINUX_PLUGINS), \
-    $(c) \
-  ))
-
-  CONFIGURE_ARGS+= \
-	--with-drivers="$(LCD4LINUX_FULL_DRIVERS)" \
-	--with-plugins="$(LCD4LINUX_FULL_PLUGINS)" \
-	--with-libiconv-prefix="$(ICONV_PREFIX)" \
-	--without-python \
-	--without-x \
-
-  EXTRA_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql
-
-endif
-
-
-define Package/lcd4linux/conffiles
-/etc/lcd4linux.conf
-endef
-
-define Package/lcd4linux/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/lcd4linux $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/lcd4linux.conf.sample $(1)/etc/lcd4linux.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/lcd4linux.init $(1)/etc/init.d/lcd4linux
-	$(SED) "s|^\(Display 'GLCD2USB'\)|#\1|g" \
-	    -e "s|^\(Layout 'TestLayer'\)|#\1|g" \
-	    -e "s|^#\(Display 'Image'\)|\1|g" \
-	    -e "s|^#\(Layout 'Default'\)|\1|g" \
-	     $(1)/etc/lcd4linux.conf
-endef
-
-Package/lcd4linux-custom/conffiles = $(Package/lcd4linux/conffiles)
-Package/lcd4linux-custom/install = $(Package/lcd4linux/install)
-
-Package/lcd4linux-full/conffiles = $(Package/lcd4linux/conffiles)
-Package/lcd4linux-full/install = $(Package/lcd4linux/install)
-
-$(eval $(call BuildPackage,lcd4linux-custom))
-$(eval $(call BuildPackage,lcd4linux-full))

lcd4linux/files/lcd4linux.init

@@ -1,15 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2007-2015 OpenWrt.org
-
-START=98
-
-SERVICE_USE_PID=1
-
-start() {
-	service_start /usr/bin/lcd4linux -o /tmp/lcd4linux.png -q
-}
-
-stop() {
-	service_stop /usr/bin/lcd4linux
-}
-

lcd4linux/patches/120-remove-as-needed-linker-option.patch

@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,7 +18,7 @@ ACLOCAL_AMFLAGS=-I m4
- # use this for lots of warnings
- #AM_CFLAGS = -D_GNU_SOURCE -std=c99 -m64 -Wall -W -pedantic -Wno-variadic-macros -fno-strict-aliasing
- 
--lcd4linux_LDFLAGS ="-Wl,--as-needed"
-+lcd4linux_LDFLAGS = 
- lcd4linux_LDADD   = @DRIVERS@ @PLUGINS@ @DRVLIBS@ @PLUGINLIBS@
- lcd4linux_DEPENDENCIES = @DRIVERS@ @PLUGINS@
- 

lcd4linux/patches/140-no_repnop_T6963.patch

@@ -1,22 +0,0 @@
---- a/drv_T6963.c
-+++ b/drv_T6963.c
-@@ -114,7 +114,9 @@ static void drv_T6_status1(void)
-     /* wait for STA0=1 and STA1=1 */
-     n = 0;
-     do {
-+#if 0
- 	rep_nop();
-+#endif
- 	if (++n > 1000) {
- 	    debug("hang in status1");
- 	    bug = 1;
-@@ -150,7 +152,9 @@ static void drv_T6_status2(void)
-     /* wait for STA3=1 */
-     n = 0;
-     do {
-+#if 0
- 	rep_nop();
-+#endif
- 	if (++n > 1000) {
- 	    debug("hang in status2");
- 	    bug = 1;

lcd4linux/patches/160-uinput_defs.patch

@@ -1,24 +0,0 @@
---- a/drv_G15.c
-+++ b/drv_G15.c
-@@ -42,6 +42,7 @@
- 
- #include <usb.h>
- #include <fcntl.h>
-+#include <linux/version.h>
- #include <linux/input.h>
- #include <linux/uinput.h>
- 
-@@ -269,8 +270,13 @@ void drv_G15_initKeyHandling(char *devic
-     }
-     memset(&device, 0, sizeof(device));
-     strncpy(device.name, "G15 Keys", UINPUT_MAX_NAME_SIZE);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-     device.id.bustype = BUS_USB;
-     device.id.version = 4;
-+#else
-+    device.idbus = BUS_USB;
-+    device.idversion = 4;
-+#endif
- 
-     ioctl(uinput_fd, UI_SET_EVBIT, EV_KEY);
- 

lcd4linux/patches/170-add-generic-spidev-driver.patch

@@ -1,195 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -71,6 +71,8 @@ drv_generic_i2c.c             \
- drv_generic_i2c.h             \
- drv_generic_keypad.c          \
- drv_generic_keypad.h          \
-+drv_generic_spidev.c          \
-+drv_generic_spidev.h          \
- drv_ASTUSB.c                  \
- drv_BeckmannEgle.c            \
- drv_BWCT.c                    \
---- /dev/null
-+++ b/drv_generic_spidev.c
-@@ -0,0 +1,89 @@
-+/* $Id$
-+ * $URL$
-+ *
-+ * generic driver helper for displays connected via SPI bus
-+ *
-+ * Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ * This file is part of LCD4Linux.
-+ *
-+ * LCD4Linux is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * LCD4Linux is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+#include "config.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+
-+#include "debug.h"
-+#include "qprintf.h"
-+#include "cfg.h"
-+#include "drv_generic_spidev.h"
-+
-+static char *generic_spidev_section = "";
-+static char *generic_spidev_driver = "";
-+static int generic_spidev_fd;
-+
-+int drv_generic_spidev_open(const char *section, const char *driver)
-+{
-+    char *spidev;
-+
-+    udelay_init();
-+
-+    generic_spidev_section = (char *) section;
-+    generic_spidev_driver = (char *) driver;
-+
-+    spidev = cfg_get(generic_spidev_section, "Port", NULL);
-+
-+    info("%s: initializing SPI device %s", generic_spidev_driver, spidev);
-+    generic_spidev_fd = open(spidev, O_WRONLY);
-+    if (generic_spidev_fd < 0) {
-+	error("%s: unable to open SPI device %s!\n", generic_spidev_driver, spidev);
-+	goto exit_error;
-+    }
-+
-+    return 0;
-+
-+  exit_error:
-+    free(spidev);
-+    return -1;
-+}
-+
-+int drv_generic_spidev_close(void)
-+{
-+    close(generic_spidev_fd);
-+    return 0;
-+}
-+
-+int drv_generic_spidev_transfer(const int count, struct spi_ioc_transfer *tr)
-+{
-+    int ret;
-+
-+    ret = ioctl(generic_spidev_fd, SPI_IOC_MESSAGE(count), tr);
-+    if (ret < count) {
-+	error("%s: can't send SPI message! (%s)\n",
-+		generic_spidev_driver, strerror(errno));
-+	return -1;
-+    }
-+
-+    return 0;
-+}
---- /dev/null
-+++ b/drv_generic_spidev.h
-@@ -0,0 +1,54 @@
-+/* $Id$
-+ * $URL$
-+ *
-+ * generic driver helper for displays connected via SPI bus
-+ *
-+ * Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2012 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
-+ *
-+ * This file is part of LCD4Linux.
-+ *
-+ * LCD4Linux is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * LCD4Linux is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+/*
-+ *
-+ * exported fuctions:
-+ *
-+ * int drv_generic_spidev_open (const char *section, const char *driver)
-+ *   reads 'Port' entry from config and opens
-+ *   the SPI device
-+ *   returns 0 if ok, -1 on failure
-+ *
-+ * int drv_generic_spidev_close (void)
-+ *   closes SPI device
-+ *   returns 0 if ok, -1 on failure
-+ *
-+ * void drv_generic_spidev_transfer (int count, struct spi_ioc_transfer *tr)
-+ *   transfer data to/from the SPI device
-+ *
-+ */
-+
-+#ifndef _DRV_GENERIC_SPIDEV_H_
-+#define _DRV_GENERIC_SPIDEV_H_
-+
-+#include <linux/spi/spidev.h>
-+
-+int drv_generic_spidev_open(const char *section, const char *driver);
-+int drv_generic_spidev_close(void);
-+int drv_generic_spidev_transfer(const int count, struct spi_ioc_transfer *tr);
-+
-+#endif /* _DRV_GENERIC_SPIDEV_H_ */
---- a/drivers.m4
-+++ b/drivers.m4
-@@ -301,6 +301,7 @@ PARPORT="no"
- SERIAL="no"
- I2C="no"
- KEYPAD="no"
-+SPIDEV="no"
- 
- # generic libraries
- LIBUSB="no"
-@@ -936,6 +937,12 @@ if test "$LIBJPEG" = "yes"; then
-    DRVLIBS="$DRVLIBS -ljpeg"
- fi
- 
-+# generic spidev driver
-+if test "$SPIDEV" = "yes"; then
-+   DRIVERS="$DRIVERS drv_generic_spidev.o"
-+   AC_DEFINE(WITH_SPIDEV, 1, [SPIDEV driver])
-+fi
-+
- # libusb
- if test "$LIBUSB" = "yes"; then
-    DRVLIBS="$DRVLIBS -lusb"
---- a/configure.ac
-+++ b/configure.ac
-@@ -115,6 +115,9 @@ AC_ARG_WITH(outb,
- 
- AC_CHECK_HEADERS([asm/io.h] [linux/parport.h linux/ppdev.h], [has_parport="true"], [has_parport="false"])
- 
-+# check for spidev
-+AC_CHECK_HEADERS([linux/spi/spidev.h], [has_spidev="true"], [has_spidev="false"])
-+
- # drivers
- sinclude(drivers.m4)
- 

lcd4linux/patches/173-glcd2usb-bigendian-fix.patch

@@ -1,20 +0,0 @@
---- a/drv_GLCD2USB.c
-+++ b/drv_GLCD2USB.c
-@@ -48,6 +48,7 @@
- #include <fcntl.h>
- #include <sys/time.h>
- #include <usb.h>
-+#include <endian.h>
- 
- #include "debug.h"
- #include "cfg.h"
-@@ -487,6 +488,9 @@ static int drv_GLCD2USB_start(const char
- 	return -1;
-     }
- 
-+    buffer.display_info.width = le16toh(buffer.display_info.width);
-+    buffer.display_info.height = le16toh(buffer.display_info.height);
-+
-     info("%s: display name = %s", Name, buffer.display_info.name);
-     info("%s: display resolution = %d * %d", Name, buffer.display_info.width, buffer.display_info.height);
-     info("%s: display flags: %x", Name, buffer.display_info.flags);

netifd/Makefile

@@ -1,52 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=netifd
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
-PKG_SOURCE_DATE:=2021-07-26
-PKG_SOURCE_VERSION:=440eb0647708274cc8d7d9e7c2bb0cfdfba90023
-PKG_MIRROR_HASH:=eed957036ab608fdc49bdf801fc5b4405fcd2a3a5e5d3343ec39898e156c10e9
-PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/netifd
-  SECTION:=base
-  CATEGORY:=Base system
-  DEPENDS:=+libuci +libnl-tiny +libubus +ubus +ubusd +jshn +libubox
-  TITLE:=OpenWrt Network Interface Configuration Daemon
-endef
-
-define Package/netifd/conffiles
-/etc/udhcpc.user
-/etc/udhcpc.user.d/
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include/libnl-tiny \
-	-I$(STAGING_DIR)/usr/include \
-	-flto
-
-TARGET_LDFLAGS += -flto -fuse-linker-plugin
-
-CMAKE_OPTIONS += \
-	-DLIBNL_LIBS=-lnl-tiny \
-	-DDEBUG=1
-
-define Package/netifd/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netifd $(1)/sbin/
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d/
-	$(CP) $(PKG_BUILD_DIR)/scripts/* $(1)/lib/netifd/
-endef
-
-$(eval $(call BuildPackage,netifd))

netifd/files/etc/hotplug.d/iface/00-netstate

@@ -1,6 +0,0 @@
-[ ifup = "$ACTION" ] && {
-	uci_toggle_state network "$INTERFACE" up 1
-	[ -n "$DEVICE" ] && {
-		uci_toggle_state network "$INTERFACE" ifname "$DEVICE"
-	}
-}

netifd/files/etc/hotplug.d/net/20-smp-packet-steering

@@ -1,67 +0,0 @@
-#!/bin/sh
-[ "$ACTION" = add ] || exit
-
-NPROCS="$(grep -c "^processor.*:" /proc/cpuinfo)"
-[ "$NPROCS" -gt 1 ] || exit
-
-PROC_MASK="$(( (1 << $NPROCS) - 1 ))"
-
-find_irq_cpu() {
-	local dev="$1"
-	local match="$(grep -m 1 "$dev\$" /proc/interrupts)"
-	local cpu=0
-
-	[ -n "$match" ] && {
-		set -- $match
-		shift
-		for cur in $(seq 1 $NPROCS); do
-			[ "$1" -gt 0 ] && {
-				cpu=$(($cur - 1))
-				break
-			}
-			shift
-		done
-	}
-
-	echo "$cpu"
-}
-
-set_hex_val() {
-	local file="$1"
-	local val="$2"
-	val="$(printf %x "$val")"
-	[ -n "$DEBUG" ] && echo "$file = $val"
-	echo "$val" > "$file"
-}
-
-packet_steering="$(uci get "network.@globals[0].packet_steering")"
-[ "$packet_steering" != 1 ] && exit 0
-
-exec 512>/var/lock/smp_tune.lock
-flock 512 || exit 1
-
-for dev in /sys/class/net/*; do
-	[ -d "$dev" ] || continue
-
-	# ignore virtual interfaces
-	[ -n "$(ls "${dev}/" | grep '^lower_')" ] && continue
-	[ -d "${dev}/device" ] || continue
-
-	device="$(readlink "${dev}/device")"
-	device="$(basename "$device")"
-	irq_cpu="$(find_irq_cpu "$device")"
-	irq_cpu_mask="$((1 << $irq_cpu))"
-
-	for q in ${dev}/queues/tx-*; do
-		set_hex_val "$q/xps_cpus" "$PROC_MASK"
-	done
-
-	# ignore dsa slave ports for RPS
-	subsys="$(readlink "${dev}/device/subsystem")"
-	subsys="$(basename "$subsys")"
-	[ "$subsys" = "mdio_bus" ] && continue
-
-	for q in ${dev}/queues/rx-*; do
-		set_hex_val "$q/rps_cpus" "$PROC_MASK"
-	done
-done

netifd/files/etc/init.d/network

@@ -1,144 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=20
-STOP=90
-
-USE_PROCD=1
-
-init_switch() {
-	setup_switch() { return 0; }
-
-	include /lib/network
-	setup_switch
-}
-
-start_service() {
-	init_switch
-
-	procd_open_instance
-	procd_set_param command /sbin/netifd
-	procd_set_param respawn
-	procd_set_param watch network.interface
-	[ -e /proc/sys/kernel/core_pattern ] && {
-		procd_set_param limits core="unlimited"
-	}
-	procd_close_instance
-}
-
-reload_service() {
-	local rv=0
-
-	init_switch
-	ubus call network reload || rv=1
-	/sbin/wifi reload_legacy
-	return $rv
-}
-
-stop_service() {
-	/sbin/wifi down
-	ifdown -a
-	sleep 1
-}
-
-validate_atm_bridge_section()
-{
-	uci_validate_section network "atm-bridge" "${1}" \
-		'unit:uinteger:0' \
-		'vci:range(32, 65535):35' \
-		'vpi:range(0, 255):8' \
-		'atmdev:uinteger:0' \
-		'encaps:or("llc", "vc"):llc' \
-		'payload:or("bridged", "routed"):bridged'
-}
-
-validate_route_section()
-{
-	uci_validate_section network route "${1}" \
-		'interface:string' \
-		'target:cidr4' \
-		'netmask:netmask4' \
-		'gateway:ip4addr' \
-		'metric:uinteger' \
-		'mtu:uinteger' \
-		'table:or(range(0,65535),string)'
-}
-
-validate_route6_section()
-{
-	uci_validate_section network route6 "${1}" \
-		'interface:string' \
-		'target:cidr6' \
-		'gateway:ip6addr' \
-		'metric:uinteger' \
-		'mtu:uinteger' \
-		'table:or(range(0,65535),string)'
-}
-
-validate_rule_section()
-{
-	uci_validate_section network rule "${1}" \
-		'in:string' \
-		'out:string' \
-		'src:cidr4' \
-		'dest:cidr4' \
-		'tos:range(0,31)' \
-		'mark:string' \
-		'invert:bool' \
-		'lookup:or(range(0,65535),string)' \
-		'goto:range(0,65535)' \
-		'action:or("prohibit", "unreachable", "blackhole", "throw")'
-}
-
-validate_rule6_section()
-{
-	uci_validate_section network rule6 "${1}" \
-		'in:string' \
-		'out:string' \
-		'src:cidr6' \
-		'dest:cidr6' \
-		'tos:range(0,31)' \
-		'mark:string' \
-		'invert:bool' \
-		'lookup:or(range(0,65535),string)' \
-		'goto:range(0,65535)' \
-		'action:or("prohibit", "unreachable", "blackhole", "throw")'
-}
-
-validate_switch_section()
-{
-	uci_validate_section network switch "${1}" \
-		'name:string' \
-		'enable:bool' \
-		'enable_vlan:bool' \
-		'reset:bool' \
-		'ar8xxx_mib_poll_interval:uinteger' \
-		'ar8xxx_mib_type:range(0,1)'
-}
-
-validate_switch_vlan()
-{
-	uci_validate_section network switch_vlan "${1}" \
-		'device:string' \
-		'vlan:uinteger' \
-		'ports:list(ports)'
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger network wireless
-
-	procd_open_validate
-	validate_atm_bridge_section
-	validate_route_section
-	[ -e /proc/sys/net/ipv6 ] && validate_route6_section
-	validate_rule_section
-	[ -e /proc/sys/net/ipv6 ] && validate_rule6_section
-	validate_switch_section
-	validate_switch_vlan
-	procd_close_validate
-}
-
-shutdown() {
-	ifdown -a
-	sleep 1
-}

netifd/files/etc/uci-defaults/14_migrate-dhcp-release

@@ -1,23 +0,0 @@
-. /lib/functions.sh
-
-migrate_release() {
-	local config="$1"
-	local proto
-	local release
-
-	config_get proto "$config" proto
-	config_get release "$config" release
-
-	[ "$proto" = "dhcp" ] && [ -n "$release" ] && {
-		norelease="$((!$release))"
-		uci_set network "$config" norelease "$norelease"
-		uci_remove network "$config" release
-	}
-
-}
-
-config_load network
-config_foreach migrate_release interface
-uci commit network
-
-exit 0

netifd/files/etc/udhcpc.user

@@ -1 +0,0 @@
-# This script is sourced by udhcpc's dhcp.script at every DHCP event.

netifd/files/lib/netifd/dhcp.script

@@ -1,120 +0,0 @@
-#!/bin/sh
-[ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
-
-. /lib/functions.sh
-. /lib/netifd/netifd-proto.sh
-
-set_classless_routes() {
-	local max=128
-	while [ -n "$1" -a -n "$2" -a $max -gt 0 ]; do
-		proto_add_ipv4_route "${1%%/*}" "${1##*/}" "$2" "$ip"
-		max=$(($max-1))
-		shift 2
-	done
-}
-
-setup_interface() {
-	proto_init_update "*" 1
-	proto_add_ipv4_address "$ip" "${subnet:-255.255.255.0}"
-	# TODO: apply $broadcast
-
-	local ip_net
-	eval "$(ipcalc.sh "$ip/$mask")";ip_net="$NETWORK"
-
-	local i
-	for i in $router; do
-		local gw_net
-		eval "$(ipcalc.sh "$i/$mask")";gw_net="$NETWORK"
-
-		[ "$ip_net" != "$gw_net" ] && proto_add_ipv4_route "$i" 32 "" "$ip"
-		#[ "$DEFAULTROUTE" = 0 ] || proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip"
-		proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip"
-
-		local r
-		for r in $CUSTOMROUTES; do
-			proto_add_ipv4_route "${r%%/*}" "${r##*/}" "$i" "$ip"
-		done
-	done
-
-	# CIDR STATIC ROUTES (rfc3442)
-	[ -n "$staticroutes" ] && set_classless_routes $staticroutes
-	[ -n "$msstaticroutes" ] && set_classless_routes $msstaticroutes
-
-	for i in $dns; do
-		proto_add_dns_server "$i"
-	done
-	for i in $domain; do
-		proto_add_dns_search "$i"
-	done
-
-	# TODO: Deprecate timesvr in favor of timesrv
-	if [ -n "$timesvr" -a -z "$timesrv" ]; then
-		timesrv="$timesvr"
-		echo "Environment variable 'timesvr' will be deprecated; use 'timesrv' instead."
-	fi
-
-	proto_add_data
-	[ -n "$ZONE" ]     && json_add_string zone "$ZONE"
-	[ -n "$ntpsrv" ]   && json_add_string ntpserver "$ntpsrv"
-	[ -n "$timesrv" ]  && json_add_string timeserver "$timesrv"
-	[ -n "$hostname" ] && json_add_string hostname "$hostname"
-	[ -n "$message" ]  && json_add_string message "$message"
-	[ -n "$timezone" ] && json_add_int timezone "$timezone"
-	[ -n "$lease" ]    && json_add_int leasetime "$lease"
-	proto_close_data
-
-	proto_send_update "$INTERFACE"
-
-
-	if [ "$IFACE6RD" != 0 -a -n "$ip6rd" ]; then
-		local v4mask="${ip6rd%% *}"
-		ip6rd="${ip6rd#* }"
-		local ip6rdprefixlen="${ip6rd%% *}"
-		ip6rd="${ip6rd#* }"
-		local ip6rdprefix="${ip6rd%% *}"
-		ip6rd="${ip6rd#* }"
-		local ip6rdbr="${ip6rd%% *}"
-
-		[ -n "$ZONE" ] || ZONE=$(fw3 -q network $INTERFACE 2>/dev/null)
-		[ -z "$IFACE6RD" -o "$IFACE6RD" = 1 ] && IFACE6RD=${INTERFACE}_6
-
-		json_init
-		json_add_string name "$IFACE6RD"
-		json_add_string ifname "@$INTERFACE"
-		json_add_string proto "6rd"
-		json_add_string peeraddr "$ip6rdbr"
-		json_add_int ip4prefixlen "$v4mask"
-		json_add_string ip6prefix "$ip6rdprefix"
-		json_add_int ip6prefixlen "$ip6rdprefixlen"
-		json_add_string tunlink "$INTERFACE"
-		[ -n "$IFACE6RD_DELEGATE" ] && json_add_boolean delegate "$IFACE6RD_DELEGATE"
-		[ -n "$ZONE6RD" ] || ZONE6RD=$ZONE
-		[ -n "$ZONE6RD" ] && json_add_string zone "$ZONE6RD"
-		[ -n "$MTU6RD" ] && json_add_string mtu "$MTU6RD"
-		json_close_object
-
-		ubus call network add_dynamic "$(json_dump)"
-	fi
-}
-
-deconfig_interface() {
-	proto_init_update "*" 0
-	proto_send_update "$INTERFACE"
-}
-
-case "$1" in
-	deconfig)
-		deconfig_interface
-	;;
-	renew|bound)
-		setup_interface
-	;;
-esac
-
-# user rules
-[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user "$@"
-for f in /etc/udhcpc.user.d/*; do
-	[ -f "$f" ] && (. "$f" "$@")
-done
-
-exit 0

netifd/files/lib/netifd/proto/dhcp.sh

@@ -1,89 +0,0 @@
-#!/bin/sh
-
-[ -L /sbin/udhcpc ] || exit 0
-
-. /lib/functions.sh
-. ../netifd-proto.sh
-init_proto "$@"
-
-proto_dhcp_init_config() {
-	renew_handler=1
-
-	proto_config_add_string 'ipaddr:ipaddr'
-	proto_config_add_string 'hostname:hostname'
-	proto_config_add_string clientid
-	proto_config_add_string vendorid
-	proto_config_add_boolean 'broadcast:bool'
-	proto_config_add_boolean 'norelease:bool'
-	proto_config_add_string 'reqopts:list(string)'
-	proto_config_add_boolean 'defaultreqopts:bool'
-	proto_config_add_string iface6rd
-	proto_config_add_array 'sendopts:list(string)'
-	proto_config_add_boolean delegate
-	proto_config_add_string zone6rd
-	proto_config_add_string zone
-	proto_config_add_string mtu6rd
-	proto_config_add_string customroutes
-	proto_config_add_boolean classlessroute
-}
-
-proto_dhcp_add_sendopts() {
-	[ -n "$1" ] && append "$3" "-x $1"
-}
-
-proto_dhcp_setup() {
-	local config="$1"
-	local iface="$2"
-
-	local ipaddr hostname clientid vendorid broadcast norelease reqopts defaultreqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes classlessroute defaultroute
-	json_get_vars ipaddr hostname clientid vendorid broadcast norelease reqopts defaultreqopts iface6rd delegate zone6rd zone mtu6rd customroutes classlessroute defaultroute
-
-	local opt dhcpopts
-	for opt in $reqopts; do
-		append dhcpopts "-O $opt"
-	done
-
-	json_for_each_item proto_dhcp_add_sendopts sendopts dhcpopts
-
-	[ -z "$hostname" ] && hostname="$(cat /proc/sys/kernel/hostname)"
-	[ "$hostname" = "*" ] && hostname=
-
-	[ "$defaultreqopts" = 0 ] && defaultreqopts="-o" || defaultreqopts=
-	[ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
-	[ "$norelease" = 1 ] && norelease="" || norelease="-R"
-	[ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
-	[ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd"
-	[ "$iface6rd" != 0 -a -f /lib/netifd/proto/6rd.sh ] && append dhcpopts "-O 212"
-	[ -n "$zone6rd" ] && proto_export "ZONE6RD=$zone6rd"
-	[ -n "$zone" ] && proto_export "ZONE=$zone"
-	[ -n "$mtu6rd" ] && proto_export "MTU6RD=$mtu6rd"
-	[ -n "$customroutes" ] && proto_export "CUSTOMROUTES=$customroutes"
-	[ -n "$defaultroute" ] && proto_export "DEFAULTROUTE=$defaultroute"
-	[ "$delegate" = "0" ] && proto_export "IFACE6RD_DELEGATE=0"
-	# Request classless route option (see RFC 3442) by default
-	[ "$classlessroute" = "0" ] || append dhcpopts "-O 121"
-
-	proto_export "INTERFACE=$config"
-	proto_run_command "$config" udhcpc \
-		-p /var/run/udhcpc-$iface.pid \
-		-s /lib/netifd/dhcp.script \
-		-f -t 0 -i "$iface" \
-		${ipaddr:+-r $ipaddr} \
-		${hostname:+-x "hostname:$hostname"} \
-		${vendorid:+-V "$vendorid"} \
-		$clientid $defaultreqopts $broadcast $norelease $dhcpopts
-}
-
-proto_dhcp_renew() {
-	local interface="$1"
-	# SIGUSR1 forces udhcpc to renew its lease
-	local sigusr1="$(kill -l SIGUSR1)"
-	[ -n "$sigusr1" ] && proto_kill_command "$interface" $sigusr1
-}
-
-proto_dhcp_teardown() {
-	local interface="$1"
-	proto_kill_command "$interface"
-}
-
-add_protocol dhcp

netifd/files/lib/network/config.sh

@@ -1,76 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2011 OpenWrt.org
-
-. /usr/share/libubox/jshn.sh
-
-find_config() {
-	local device="$1"
-	local ifdev ifl3dev ifobj
-	for ifobj in $(ubus list network.interface.\*); do
-		interface="${ifobj##network.interface.}"
-		(
-			json_load "$(ifstatus $interface)"
-			json_get_var ifdev device
-			json_get_var ifl3dev l3_device
-			if [ "$device" = "$ifdev" ] || [ "$device" = "$ifl3dev" ]; then
-				echo "$interface"
-				exit 0
-			else
-				exit 1
-			fi
-		) && return
-	done
-}
-
-unbridge() {
-	return
-}
-
-ubus_call() {
-	json_init
-	local _data="$(ubus -S call "$1" "$2")"
-	[ -z "$_data" ] && return 1
-	json_load "$_data"
-	return 0
-}
-
-
-fixup_interface() {
-	local config="$1"
-	local ifname type device l3dev
-
-	config_get type "$config" type
-	config_get ifname "$config" ifname
-	[ "bridge" = "$type" ] && ifname="br-$config"
-	ubus_call "network.interface.$config" status || return 0
-	json_get_var l3dev l3_device
-	[ -n "$l3dev" ] && ifname="$l3dev"
-	json_init
-	config_set "$config" ifname "$ifname"
-}
-
-scan_interfaces() {
-	config_load network
-	config_foreach fixup_interface interface
-}
-
-prepare_interface_bridge() {
-	local config="$1"
-
-	[ -n "$config" ] || return 0
-	ubus call network.interface."$config" prepare
-}
-
-setup_interface() {
-	local iface="$1"
-	local config="$2"
-
-	[ -n "$config" ] || return 0
-	ubus call network.interface."$config" add_device "{ \"name\": \"$iface\" }"
-}
-
-do_sysctl() {
-	[ -n "$2" ] && \
-		sysctl -n -e -w "$1=$2" >/dev/null || \
-		sysctl -n -e "$1"
-}

netifd/files/sbin/devstatus

@@ -1,12 +0,0 @@
-#!/bin/sh
-. /usr/share/libubox/jshn.sh
-DEVICE="$1"
-
-[ -n "$DEVICE" ] || {
-	echo "Usage: $0 <device>"
-	exit 1
-}
-
-json_init
-json_add_string name "$DEVICE"
-ubus call network.device status "$(json_dump)"

netifd/files/sbin/ifdown

@@ -1 +0,0 @@
-ifup

netifd/files/sbin/ifstatus

@@ -1,13 +0,0 @@
-#!/bin/sh
-INTERFACE="$1"
-
-[ -n "$INTERFACE" ] || {
-	echo "Usage: $0 <interface>"
-	exit 1
-}
-
-ubus -S list "network.interface.$INTERFACE" >/dev/null || {
-	echo "Interface $INTERFACE not found"
-	exit 1
-}
-ubus call network.interface status "{ \"interface\" : \"$INTERFACE\" }"

netifd/files/sbin/ifup

@@ -1,77 +0,0 @@
-#!/bin/sh
-
-ifup_all=
-setup_wifi=
-
-if_call() {
-	local interface="$1"
-	for mode in $modes; do
-		ubus call network.interface $mode "{ \"interface\" : \"$interface\" }"
-	done
-}
-
-case "$0" in
-	*ifdown) modes=down;;
-	*ifup)
-		modes="down up"
-		setup_wifi=1
-	;;
-	*) echo "Invalid command: $0";;
-esac
-
-while :; do
-	case "$1" in
-		-a)
-			ifup_all=1
-			shift
-		;;
-		-w)
-			setup_wifi=
-			shift
-		;;
-		*)
-			break
-		;;
-	esac
-done
-
-[ "$modes" = "down up" ] && ubus call network reload
-if [ -n "$ifup_all" ]; then
-	for interface in $(ubus -S list 'network.interface.*'); do
-		if_call "${interface##network.interface.}"
-	done
-	[ -n "$setup_wifi" ] && /sbin/wifi up
-	exit
-else
-	ubus -S list "network.interface.$1" > /dev/null || {
-		echo "Interface $1 not found"
-		exit
-	}
-	if_call "$1"
-fi
-
-if [ -n "$setup_wifi" ] && grep -sq config /etc/config/wireless; then
-	. /lib/functions.sh
-
-	find_related_radios() {
-		local wdev wnet
-		config_get wdev "$1" device
-		config_get wnet "$1" network
-
-		if [ -n "$wdev" ]; then
-			for wnet in $wnet; do
-				if [ "$wnet" = "$network" ]; then
-					append radio_devs "$wdev" "$N"
-				fi
-			done
-		fi
-	}
-
-	network="$1"
-	config_load wireless
-	config_foreach find_related_radios wifi-iface
-
-	for dev in $(echo "$radio_devs" | sort -u); do
-		/sbin/wifi up "$dev"
-	done
-fi

netifd/files/usr/share/udhcpc/default.script

@@ -1,57 +0,0 @@
-#!/bin/sh
-[ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
-
-set_classless_routes() {
-	local max=128
-	local type
-	while [ -n "$1" -a -n "$2" -a $max -gt 0 ]; do
-		[ ${1##*/} -eq 32 ] && type=host || type=net
-		echo "udhcpc: adding route for $type $1 via $2"
-		route add -$type "$1" gw "$2" dev "$interface"
-		max=$(($max-1))
-		shift 2
-	done
-}
-
-setup_interface() {
-	echo "udhcpc: ip addr add $ip/${subnet:-255.255.255.0} broadcast ${broadcast:-+} dev $interface"
-	ip addr add $ip/${subnet:-255.255.255.0} broadcast ${broadcast:-+} dev $interface
-
-	[ -n "$router" ] && [ "$router" != "0.0.0.0" ] && [ "$router" != "255.255.255.255" ] && {
-		echo "udhcpc: setting default routers: $router"
-
-		local valid_gw=""
-		for i in $router ; do
-			route add default gw $i dev $interface
-			valid_gw="${valid_gw:+$valid_gw|}$i"
-		done
-		
-		eval $(route -n | awk '
-			/^0.0.0.0\W{9}('$valid_gw')\W/ {next}
-			/^0.0.0.0/ {print "route del -net "$1" gw "$2";"}
-		')
-	}
-
-	# CIDR STATIC ROUTES (rfc3442)
-	[ -n "$staticroutes" ] && set_classless_routes $staticroutes
-	[ -n "$msstaticroutes" ] && set_classless_routes $msstaticroutes
-}
-
-
-applied=
-case "$1" in
-	deconfig)
-		ip -4 addr flush dev "$interface"
-	;;
-	renew)
-		setup_interface update
-	;;
-	bound)
-		setup_interface ifup
-	;;
-esac
-
-# user rules
-[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
-
-exit 0

shortcut-fe/Makefile

@@ -1,77 +0,0 @@
-#
-# Copyright (c) 2014 The Linux Foundation. All rights reserved.
-# Permission to use, copy, modify, and/or distribute this software for
-# any purpose with or without fee is hereby granted, provided that the
-# above copyright notice and this permission notice appear in all copies.
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=shortcut-fe
-PKG_RELEASE:=2
-PKG_CONFIG_DEPENDS := CONFIG_IPV6
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/shortcut-fe
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Support
-  DEPENDS:=
-  TITLE:=Kernel driver for SFE
-  FILES:=$(PKG_BUILD_DIR)/shortcut-fe.ko $(if $(CONFIG_IPV6),$(PKG_BUILD_DIR)/shortcut-fe-ipv6.ko,)
-  KCONFIG:=CONFIG_NF_CONNTRACK_EVENTS=y \
-	   CONFIG_NF_CONNTRACK_TIMEOUT=y \
-	   CONFIG_SHORTCUT_FE=y \
-	   CONFIG_XFRM=y
-  AUTOLOAD:=$(call AutoLoad,09,shortcut-fe shortcut-fe-ipv6)
-endef
-
-define KernelPackage/shortcut-fe/Description
-Shortcut is an in-Linux-kernel IP packet forwarding engine.
-endef
-
-define KernelPackage/shortcut-fe/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) ./files/usr/bin/sfe_dump $(1)/usr/bin
-endef
-
-define KernelPackage/shortcut-fe-cm
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Support
-  DEPENDS:=+kmod-ipt-conntrack +kmod-shortcut-fe
-  TITLE:=Kernel driver for SFE
-  FILES:=$(PKG_BUILD_DIR)/shortcut-fe-cm.ko
-  KCONFIG:=CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y
-endef
-
-define KernelPackage/shortcut-fe-cm/Description
-Simple connection manager for the Shortcut forwarding engine.
-endef
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-		$(KERNEL_MAKE_FLAGS) \
-		$(PKG_MAKE_FLAGS) \
-		M="$(PKG_BUILD_DIR)" \
-		modules \
-		$(if $(CONFIG_IPV6),EXTRA_CFLAGS="-DSFE_SUPPORT_IPV6" SFE_SUPPORT_IPV6=y,)
-endef
-
-#ifneq ($(CONFIG_PACKAGE_kmod-shortcut-fe)$(CONFIG_PACKAGE_kmod-shortcut-fe-cm),)
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/shortcut-fe
-	$(CP) -rf $(PKG_BUILD_DIR)/sfe.h $(1)/usr/include/shortcut-fe
-endef
-#endif
-
-$(eval $(call KernelPackage,shortcut-fe))
-$(eval $(call KernelPackage,shortcut-fe-cm))

shortcut-fe/files/usr/bin/sfe_dump

@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2015 The Linux Foundation. All rights reserved.
-# Permission to use, copy, modify, and/or distribute this software for
-# any purpose with or without fee is hereby granted, provided that the
-# above copyright notice and this permission notice appear in all copies.
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-#@sfe_dump
-#@example : sfe_dump (ipv4|ipv6)
-sfe_dump(){
-	[ -e "/dev/sfe_ipv4" ] || {
-		dev_num=$(cat /sys/sfe_ipv4/debug_dev)
-		mknod /dev/sfe_ipv4 c $dev_num 0
-	}
-	[ -e "/dev/sfe_ipv6" ] || {
-		dev_num=$(cat /sys/sfe_ipv6/debug_dev)
-		mknod /dev/sfe_ipv6 c $dev_num 0
-	}
-	cat /dev/sfe_$1
-}
-
-if [ -z "$1" ]; then
-	sfe_dump ipv4
-	sfe_dump ipv6
-else
-	sfe_dump $1
-fi

shortcut-fe/src/Kconfig

@@ -1,15 +0,0 @@
-#
-# Shortcut forwarding engine
-#
-
-config SHORTCUT_FE
-	tristate "Shortcut Forwarding Engine"
-	depends on NF_CONNTRACK
-	default n
-	help
-	  Shortcut is a fast in-kernel packet forwarding engine.
-
-	  To compile this code as a module, choose M here: the module will be
-	  called shortcut-fe.
-
-	  If unsure, say N.

shortcut-fe/src/Makefile

@@ -1,23 +0,0 @@
-#
-# Makefile for Shortcut FE.
-#
-
-obj-m += shortcut-fe.o
-
-ifdef SFE_SUPPORT_IPV6
-obj-m += shortcut-fe-ipv6.o
-endif
-
-obj-m += shortcut-fe-cm.o
-
-shortcut-fe-objs := \
-	sfe_ipv4.o
-
-ifdef SFE_SUPPORT_IPV6
-shortcut-fe-ipv6-objs := \
-	sfe_ipv6.o
-endif
-
-shortcut-fe-cm-objs := \
-	sfe_cm.o
-

shortcut-fe/src/sfe.h

@@ -1,114 +0,0 @@
-/*
- * sfe.h
- *	Shortcut forwarding engine.
- *
- * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-
-/*
- * The following are debug macros used throughout the SFE.
- *
- * The DEBUG_LEVEL enables the followings based on its value,
- * when dynamic debug option is disabled.
- *
- * 0 = OFF
- * 1 = ASSERTS / ERRORS
- * 2 = 1 + WARN
- * 3 = 2 + INFO
- * 4 = 3 + TRACE
- */
-#define DEBUG_LEVEL 2
-
-#if (DEBUG_LEVEL < 1)
-#define DEBUG_ASSERT(s, ...)
-#define DEBUG_ERROR(s, ...)
-#else
-#define DEBUG_ASSERT(c, s, ...) if (!(c)) { pr_emerg("ASSERT: %s:%d:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__); BUG(); }
-#define DEBUG_ERROR(s, ...) pr_err("%s:%d:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#endif
-
-#if defined(CONFIG_DYNAMIC_DEBUG)
-/*
- * Compile messages for dynamic enable/disable
- */
-#define DEBUG_WARN(s, ...) pr_debug("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#define DEBUG_INFO(s, ...) pr_debug("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#define DEBUG_TRACE(s, ...) pr_debug("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#else
-
-/*
- * Statically compile messages at different levels
- */
-#if (DEBUG_LEVEL < 2)
-#define DEBUG_WARN(s, ...)
-#else
-#define DEBUG_WARN(s, ...) pr_warn("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#endif
-
-#if (DEBUG_LEVEL < 3)
-#define DEBUG_INFO(s, ...)
-#else
-#define DEBUG_INFO(s, ...) pr_notice("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#endif
-
-#if (DEBUG_LEVEL < 4)
-#define DEBUG_TRACE(s, ...)
-#else
-#define DEBUG_TRACE(s, ...) pr_info("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#endif
-#endif
-
-#ifdef CONFIG_NF_FLOW_COOKIE
-typedef int (*flow_cookie_set_func_t)(u32 protocol, __be32 src_ip, __be16 src_port,
-				      __be32 dst_ip, __be16 dst_port, u16 flow_cookie);
-/*
- * sfe_register_flow_cookie_cb
- *	register a function in SFE to let SFE use this function to configure flow cookie for a flow
- *
- * Hardware driver which support flow cookie should register a callback function in SFE. Then SFE
- * can use this function to configure flow cookie for a flow.
- * return: 0, success; !=0, fail
- */
-int sfe_register_flow_cookie_cb(flow_cookie_set_func_t cb);
-
-/*
- * sfe_unregister_flow_cookie_cb
- *	unregister function which is used to configure flow cookie for a flow
- *
- * return: 0, success; !=0, fail
- */
-int sfe_unregister_flow_cookie_cb(flow_cookie_set_func_t cb);
-
-typedef int (*sfe_ipv6_flow_cookie_set_func_t)(u32 protocol, __be32 src_ip[4], __be16 src_port,
-						__be32 dst_ip[4], __be16 dst_port, u16 flow_cookie);
-
-/*
- * sfe_ipv6_register_flow_cookie_cb
- *	register a function in SFE to let SFE use this function to configure flow cookie for a flow
- *
- * Hardware driver which support flow cookie should register a callback function in SFE. Then SFE
- * can use this function to configure flow cookie for a flow.
- * return: 0, success; !=0, fail
- */
-int sfe_ipv6_register_flow_cookie_cb(sfe_ipv6_flow_cookie_set_func_t cb);
-
-/*
- * sfe_ipv6_unregister_flow_cookie_cb
- *	unregister function which is used to configure flow cookie for a flow
- *
- * return: 0, success; !=0, fail
- */
-int sfe_ipv6_unregister_flow_cookie_cb(sfe_ipv6_flow_cookie_set_func_t cb);
-
-#endif /*CONFIG_NF_FLOW_COOKIE*/

shortcut-fe/src/sfe_backport.h

@@ -1,195 +0,0 @@
-/*
- * sfe_backport.h
- *	Shortcut forwarding engine compatible header file.
- *
- * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <linux/version.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0))
-#include <net/netfilter/nf_conntrack_timeout.h>
-#else
-enum udp_conntrack {
-	UDP_CT_UNREPLIED,
-	UDP_CT_REPLIED,
-	UDP_CT_MAX
-};
-
-static inline unsigned int *
-nf_ct_timeout_lookup(struct net *net, struct nf_conn *ct,
-		     struct nf_conntrack_l4proto *l4proto)
-{
-#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
-	struct nf_conn_timeout *timeout_ext;
-	unsigned int *timeouts;
-
-	timeout_ext = nf_ct_timeout_find(ct);
-	if (timeout_ext)
-		timeouts = NF_CT_TIMEOUT_EXT_DATA(timeout_ext);
-	else
-		timeouts = l4proto->get_timeouts(net);
-
-	return timeouts;
-#else
-	return l4proto->get_timeouts(net);
-#endif /*CONFIG_NF_CONNTRACK_TIMEOUT*/
-}
-#endif /*KERNEL_VERSION(3, 7, 0)*/
-#endif /*KERNEL_VERSION(3, 4, 0)*/
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
-#define sfe_define_post_routing_hook(FN_NAME, HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN) \
-static unsigned int FN_NAME(void *priv, \
-			    struct sk_buff *SKB, \
-			    const struct nf_hook_state *state)
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0))
-#define sfe_define_post_routing_hook(FN_NAME, HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN) \
-static unsigned int FN_NAME(const struct nf_hook_ops *OPS, \
-			    struct sk_buff *SKB, \
-			    const struct net_device *UNUSED, \
-			    const struct net_device *OUT, \
-			    int (*OKFN)(struct sk_buff *))
-#else
-#define sfe_define_post_routing_hook(FN_NAME, HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN) \
-static unsigned int FN_NAME(unsigned int HOOKNUM, \
-			    struct sk_buff *SKB, \
-			    const struct net_device *UNUSED, \
-			    const struct net_device *OUT, \
-			    int (*OKFN)(struct sk_buff *))
-#endif
-
-#define sfe_cm_ipv4_post_routing_hook(HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN) \
-	sfe_define_post_routing_hook(__sfe_cm_ipv4_post_routing_hook, HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN)
-#define sfe_cm_ipv6_post_routing_hook(HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN) \
-	sfe_define_post_routing_hook(__sfe_cm_ipv6_post_routing_hook, HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN)
-#define fast_classifier_ipv4_post_routing_hook(HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN) \
-	sfe_define_post_routing_hook(__fast_classifier_ipv4_post_routing_hook, HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN)
-#define fast_classifier_ipv6_post_routing_hook(HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN) \
-	sfe_define_post_routing_hook(__fast_classifier_ipv6_post_routing_hook, HOOKNUM, OPS, SKB, UNUSED, OUT, OKFN)
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
-#define SFE_IPV4_NF_POST_ROUTING_HOOK(fn) \
-	{						\
-		.hook = fn,				\
-		.pf = NFPROTO_IPV4,			\
-		.hooknum = NF_INET_POST_ROUTING,	\
-		.priority = NF_IP_PRI_NAT_SRC + 1,	\
-	}
-#else
-#define SFE_IPV4_NF_POST_ROUTING_HOOK(fn) \
-	{						\
-		.hook = fn,				\
-		.owner = THIS_MODULE,			\
-		.pf = NFPROTO_IPV4,			\
-		.hooknum = NF_INET_POST_ROUTING,	\
-		.priority = NF_IP_PRI_NAT_SRC + 1,	\
-	}
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
-#define SFE_IPV6_NF_POST_ROUTING_HOOK(fn) \
-	{						\
-		.hook = fn,				\
-		.pf = NFPROTO_IPV6,			\
-		.hooknum = NF_INET_POST_ROUTING,	\
-		.priority = NF_IP_PRI_NAT_SRC + 1,	\
-	}
-#else
-#define SFE_IPV6_NF_POST_ROUTING_HOOK(fn) \
-	{						\
-		.hook = fn,				\
-		.owner = THIS_MODULE,			\
-		.pf = NFPROTO_IPV6,			\
-		.hooknum = NF_INET_POST_ROUTING,	\
-		.priority = NF_IP6_PRI_NAT_SRC + 1,	\
-	}
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0))
-#define SFE_NF_CT_DEFAULT_ZONE (&nf_ct_zone_dflt)
-#else
-#define SFE_NF_CT_DEFAULT_ZONE NF_CT_DEFAULT_ZONE
-#endif
-
-/*
- * sfe_dev_get_master
- * 	get master of bridge port, and hold it
- */
-static inline struct net_device *sfe_dev_get_master(struct net_device *dev)
-{
-	struct net_device *master;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0))
-	rcu_read_lock();
-	master = netdev_master_upper_dev_get_rcu(dev);
-	if (master)
-		dev_hold(master);
-
-	rcu_read_unlock();
-#else
-	master = dev->master;
-	if (master)
-		dev_hold(master);
-#endif
-	return master;
-}
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
-#define SFE_DEV_EVENT_PTR(PTR) netdev_notifier_info_to_dev(PTR)
-#else
-#define SFE_DEV_EVENT_PTR(PTR) (struct net_device *)(PTR)
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0))
-#define SFE_NF_CONN_ACCT(NM) struct nf_conn_acct *NM
-#else
-#define SFE_NF_CONN_ACCT(NM) struct nf_conn_counter *NM
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0))
-#define SFE_ACCT_COUNTER(NM) ((NM)->counter)
-#else
-#define SFE_ACCT_COUNTER(NM) (NM)
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0))
-#define sfe_hash_for_each_possible(name, obj, node, member, key) \
-	hash_for_each_possible(name, obj, member, key)
-#else
-#define sfe_hash_for_each_possible(name, obj, node, member, key) \
-	hash_for_each_possible(name, obj, node, member, key)
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0))
-#define sfe_hash_for_each(name, bkt, node, obj, member) \
-	hash_for_each(name, bkt, obj, member)
-#else
-#define sfe_hash_for_each(name, bkt, node, obj, member) \
-	hash_for_each(name, bkt, node, obj, member)
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
-#define sfe_dst_get_neighbour(dst, daddr) dst_neigh_lookup(dst, daddr)
-#else
-static inline struct neighbour *
-sfe_dst_get_neighbour(struct dst_entry *dst, void *daddr)
-{
-	struct neighbour *neigh = dst_get_neighbour_noref(dst);
-
-	if (neigh)
-		neigh_hold(neigh);
-
-	return neigh;
-}
-#endif

shortcut-fe/src/sfe_cm.h

@@ -1,259 +0,0 @@
-/*
- * sfe_cm.h
- *	Shortcut forwarding engine.
- *
- * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * connection flags.
- */
-#define SFE_CREATE_FLAG_NO_SEQ_CHECK BIT(0)
-					/* Indicates that we should not check sequence numbers */
-#define SFE_CREATE_FLAG_REMARK_PRIORITY BIT(1)
-					/* Indicates that we should remark priority of skb */
-#define SFE_CREATE_FLAG_REMARK_DSCP BIT(2)
-					/* Indicates that we should remark DSCP of packet */
-
-/*
- * IPv6 address structure
- */
-struct sfe_ipv6_addr {
-	__be32 addr[4];
-};
-
-typedef union {
-	__be32			ip;
-	struct sfe_ipv6_addr	ip6[1];
-} sfe_ip_addr_t;
-
-/*
- * connection creation structure.
- */
-struct sfe_connection_create {
-	int protocol;
-	struct net_device *src_dev;
-	struct net_device *dest_dev;
-	u32 flags;
-	u32 src_mtu;
-	u32 dest_mtu;
-	sfe_ip_addr_t src_ip;
-	sfe_ip_addr_t src_ip_xlate;
-	sfe_ip_addr_t dest_ip;
-	sfe_ip_addr_t dest_ip_xlate;
-	__be16 src_port;
-	__be16 src_port_xlate;
-	__be16 dest_port;
-	__be16 dest_port_xlate;
-	u8 src_mac[ETH_ALEN];
-	u8 src_mac_xlate[ETH_ALEN];
-	u8 dest_mac[ETH_ALEN];
-	u8 dest_mac_xlate[ETH_ALEN];
-	u8 src_td_window_scale;
-	u32 src_td_max_window;
-	u32 src_td_end;
-	u32 src_td_max_end;
-	u8 dest_td_window_scale;
-	u32 dest_td_max_window;
-	u32 dest_td_end;
-	u32 dest_td_max_end;
-	u32 mark;
-#ifdef CONFIG_XFRM
-	u32 original_accel;
-	u32 reply_accel;
-#endif
-	u32 src_priority;
-	u32 dest_priority;
-	u32 src_dscp;
-	u32 dest_dscp;
-};
-
-/*
- * connection destruction structure.
- */
-struct sfe_connection_destroy {
-	int protocol;
-	sfe_ip_addr_t src_ip;
-	sfe_ip_addr_t dest_ip;
-	__be16 src_port;
-	__be16 dest_port;
-};
-
-typedef enum sfe_sync_reason {
-	SFE_SYNC_REASON_STATS,	/* Sync is to synchronize stats */
-	SFE_SYNC_REASON_FLUSH,	/* Sync is to flush a entry */
-	SFE_SYNC_REASON_DESTROY	/* Sync is to destroy a entry(requested by connection manager) */
-} sfe_sync_reason_t;
-
-/*
- * Structure used to sync connection stats/state back within the system.
- *
- * NOTE: The addresses here are NON-NAT addresses, i.e. the true endpoint addressing.
- * 'src' is the creator of the connection.
- */
-struct sfe_connection_sync {
-	struct net_device *src_dev;
-	struct net_device *dest_dev;
-	int is_v6;			/* Is it for ipv6? */
-	int protocol;			/* IP protocol number (IPPROTO_...) */
-	sfe_ip_addr_t src_ip;		/* Non-NAT source address, i.e. the creator of the connection */
-	sfe_ip_addr_t src_ip_xlate;	/* NATed source address */
-	__be16 src_port;		/* Non-NAT source port */
-	__be16 src_port_xlate;		/* NATed source port */
-	sfe_ip_addr_t dest_ip;		/* Non-NAT destination address, i.e. to whom the connection was created */
-	sfe_ip_addr_t dest_ip_xlate;	/* NATed destination address */
-	__be16 dest_port;		/* Non-NAT destination port */
-	__be16 dest_port_xlate;		/* NATed destination port */
-	u32 src_td_max_window;
-	u32 src_td_end;
-	u32 src_td_max_end;
-	u64 src_packet_count;
-	u64 src_byte_count;
-	u32 src_new_packet_count;
-	u32 src_new_byte_count;
-	u32 dest_td_max_window;
-	u32 dest_td_end;
-	u32 dest_td_max_end;
-	u64 dest_packet_count;
-	u64 dest_byte_count;
-	u32 dest_new_packet_count;
-	u32 dest_new_byte_count;
-	u32 reason;		/* reason for stats sync message, i.e. destroy, flush, period sync */
-	u64 delta_jiffies;		/* Time to be added to the current timeout to keep the connection alive */
-};
-
-/*
- * connection mark structure
- */
-struct sfe_connection_mark {
-	int protocol;
-	sfe_ip_addr_t src_ip;
-	sfe_ip_addr_t dest_ip;
-	__be16 src_port;
-	__be16 dest_port;
-	u32 mark;
-};
-
-/*
- * Expose the hook for the receive processing.
- */
-extern int (*athrs_fast_nat_recv)(struct sk_buff *skb);
-
-/*
- * Expose what should be a static flag in the TCP connection tracker.
- */
-extern int nf_ct_tcp_no_window_check;
-
-/*
- * This callback will be called in a timer
- * at 100 times per second to sync stats back to
- * Linux connection track.
- *
- * A RCU lock is taken to prevent this callback
- * from unregistering.
- */
-typedef void (*sfe_sync_rule_callback_t)(struct sfe_connection_sync *);
-
-/*
- * IPv4 APIs used by connection manager
- */
-int sfe_ipv4_recv(struct net_device *dev, struct sk_buff *skb);
-int sfe_ipv4_create_rule(struct sfe_connection_create *sic);
-void sfe_ipv4_destroy_rule(struct sfe_connection_destroy *sid);
-void sfe_ipv4_destroy_all_rules_for_dev(struct net_device *dev);
-void sfe_ipv4_register_sync_rule_callback(sfe_sync_rule_callback_t callback);
-void sfe_ipv4_update_rule(struct sfe_connection_create *sic);
-void sfe_ipv4_mark_rule(struct sfe_connection_mark *mark);
-
-#ifdef SFE_SUPPORT_IPV6
-/*
- * IPv6 APIs used by connection manager
- */
-int sfe_ipv6_recv(struct net_device *dev, struct sk_buff *skb);
-int sfe_ipv6_create_rule(struct sfe_connection_create *sic);
-void sfe_ipv6_destroy_rule(struct sfe_connection_destroy *sid);
-void sfe_ipv6_destroy_all_rules_for_dev(struct net_device *dev);
-void sfe_ipv6_register_sync_rule_callback(sfe_sync_rule_callback_t callback);
-void sfe_ipv6_update_rule(struct sfe_connection_create *sic);
-void sfe_ipv6_mark_rule(struct sfe_connection_mark *mark);
-#else
-static inline int sfe_ipv6_recv(struct net_device *dev, struct sk_buff *skb)
-{
-	return 0;
-}
-
-static inline int sfe_ipv6_create_rule(struct sfe_connection_create *sic)
-{
-	return 0;
-}
-
-static inline void sfe_ipv6_destroy_rule(struct sfe_connection_destroy *sid)
-{
-	return;
-}
-
-static inline void sfe_ipv6_destroy_all_rules_for_dev(struct net_device *dev)
-{
-	return;
-}
-
-static inline void sfe_ipv6_register_sync_rule_callback(sfe_sync_rule_callback_t callback)
-{
-	return;
-}
-
-static inline void sfe_ipv6_update_rule(struct sfe_connection_create *sic)
-{
-	return;
-}
-
-static inline void sfe_ipv6_mark_rule(struct sfe_connection_mark *mark)
-{
-	return;
-}
-#endif
-
-/*
- * sfe_ipv6_addr_equal()
- *	compare ipv6 address
- *
- * return: 1, equal; 0, no equal
- */
-static inline int sfe_ipv6_addr_equal(struct sfe_ipv6_addr *a,
-				      struct sfe_ipv6_addr *b)
-{
-	return a->addr[0] == b->addr[0] &&
-	       a->addr[1] == b->addr[1] &&
-	       a->addr[2] == b->addr[2] &&
-	       a->addr[3] == b->addr[3];
-}
-
-/*
- * sfe_ipv4_addr_equal()
- *	compare ipv4 address
- *
- * return: 1, equal; 0, no equal
- */
-#define sfe_ipv4_addr_equal(a, b) ((u32)(a) == (u32)(b))
-
-/*
- * sfe_addr_equal()
- *	compare ipv4 or ipv6 address
- *
- * return: 1, equal; 0, no equal
- */
-static inline int sfe_addr_equal(sfe_ip_addr_t *a,
-				 sfe_ip_addr_t *b, int is_v4)
-{
-	return is_v4 ? sfe_ipv4_addr_equal(a->ip, b->ip) : sfe_ipv6_addr_equal(a->ip6, b->ip6);
-}

xtables-addons/Makefile

@@ -1,200 +0,0 @@
-#
-# Copyright (C) 2009-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=xtables-addons
-PKG_VERSION:=3.18
-PKG_RELEASE:=4
-PKG_HASH:=a77914a483ff381663f52120577e5e9355ca07cca73958b038e09d91247458d5
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://inai.de/files/xtables-addons/
-PKG_BUILD_DEPENDS:=iptables
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
-PKG_LICENSE:=GPL-2.0
-
-PKG_FIXUP:=autoreconf
-PKG_ASLR_PIE:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xtables-addons
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Firewall
-  TITLE:=Extensions not distributed in the main Xtables
-  URL:=https://inai.de/projects/xtables-addons/
-endef
-
-# uses GNU configure
-
-CONFIGURE_ARGS+= \
-	--with-kbuild="$(LINUX_DIR)" \
-	--with-xtlibdir="/usr/lib/iptables"
-
-ifdef CONFIG_EXTERNAL_TOOLCHAIN
-MAKE_FLAGS:= \
-	$(patsubst ARCH=%,ARCH=$(LINUX_KARCH),$(MAKE_FLAGS)) \
-	DEPMOD="/bin/true"
-
-MAKE_INSTALL_FLAGS:= \
-	$(patsubst ARCH=%,ARCH=$(LINUX_KARCH),$(MAKE_FLAGS)) \
-	DEPMOD="/bin/true"
-else
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		$(KERNEL_MAKE_FLAGS) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		DEPMOD="/bin/true" \
-		all
-endef
-
-define Build/Install
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(KERNEL_MAKE_FLAGS) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		DEPMOD="/bin/true" \
-		install
-endef
-endif
-
-# 1: extension/module suffix used in package name
-# 2: extension/module display name used in package title/description
-# 3: list of extensions to package
-# 4: list of modules to package
-# 5: module load priority
-# 6: module depends
-define BuildTemplate
-
- ifneq ($(3),)
-  define Package/iptables-mod-$(1)
-    $$(call Package/xtables-addons)
-    CATEGORY:=Network
-    TITLE:=$(2) iptables extension
-    DEPENDS:=iptables $(if $(4),+kmod-ipt-$(1))
-  endef
-
-  define Package/iptables-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/iptables
-	for m in $(3); do \
-		$(CP) \
-			$(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so \
-			$$(1)/usr/lib/iptables/ ; \
-	done
-  endef
-
-  $$(eval $$(call BuildPackage,iptables-mod-$(1)))
- endif
-
- ifneq ($(4),)
-  define KernelPackage/ipt-$(1)
-    SUBMENU:=Netfilter Extensions
-    TITLE:=$(2) netfilter module
-    DEPENDS:=+kmod-ipt-core $(5)
-    FILES:=$(foreach mod,$(4),$(PKG_BUILD_DIR)/extensions/$(mod).$(LINUX_KMOD_SUFFIX))
-    AUTOLOAD:=$(call AutoProbe,$(notdir $(4)))
-  endef
-
-  $$(eval $$(call KernelPackage,ipt-$(1)))
- endif
-
-endef
-
-
-define Package/iptaccount
-  $(call Package/xtables-addons)
-  CATEGORY:=Network
-  TITLE:=iptables-mod-account control utility
-  DEPENDS:=iptables +iptables-mod-account
-endef
-
-define Package/iptaccount/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxt_ACCOUNT_cl.so* \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/sbin/iptaccount \
-		$(1)/usr/sbin/
-endef
-
-
-define Package/iptgeoip
-  $(call Package/xtables-addons)
-  CATEGORY:=Network
-  TITLE:=iptables-mod-geoip support scripts for MaxMind GeoIP databases
-  DEPENDS:=iptables +iptables-mod-geoip \
-		+perl +perlbase-getopt +perlbase-io +perl-text-csv_xs \
-		+perl-net-cidr-lite \
-		+wget-ssl +!BUSYBOX_CONFIG_ZCAT:gzip
-endef
-
-define Package/iptgeoip/config
-	menu "Select iptgeoip options"
-		config IPTGEOIP_PRESERVE
-			bool "Preserve across sysupgrades"
-			default n
-			help
-			  Backup and restore during sysupgrade (requires >7MB)
-	endmenu
-endef
-
-ifeq ($(CONFIG_IPTGEOIP_PRESERVE),y)
-define Package/iptgeoip/conffiles
-/usr/share/xt_geoip/
-endef
-endif
-
-define Package/iptgeoip/install
-	$(INSTALL_DIR) $(1)/usr/lib/xtables-addons
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/xtables-addons/xt_geoip_{build,dl} \
-		$(1)/usr/lib/xtables-addons/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/bin/xt_geoip_fetch \
-		$(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/xt_geoip
-	touch $(1)/usr/share/xt_geoip/.keep
-endef
-
-
-#$(eval $(call BuildTemplate,SUFFIX,DESCRIPTION,EXTENSION,MODULE,PRIORITY,DEPENDS))
-
-$(eval $(call BuildTemplate,compat-xtables,API compatibilty layer,,compat_xtables,+IPV6:kmod-ip6tables))
-$(eval $(call BuildTemplate,nathelper-rtsp,RTSP Conntrack and NAT,,rtsp/nf_conntrack_rtsp rtsp/nf_nat_rtsp,+kmod-ipt-conntrack-extra +kmod-ipt-nat))
-
-$(eval $(call BuildTemplate,account,ACCOUNT,xt_ACCOUNT,ACCOUNT/xt_ACCOUNT,+kmod-ipt-compat-xtables))
-$(eval $(call BuildTemplate,chaos,CHAOS,xt_CHAOS,xt_CHAOS,+kmod-ipt-compat-xtables +kmod-ipt-delude +kmod-ipt-tarpit))
-$(eval $(call BuildTemplate,condition,Condition,xt_condition,xt_condition,))
-$(eval $(call BuildTemplate,delude,DELUDE,xt_DELUDE,xt_DELUDE,+kmod-ipt-compat-xtables))
-$(eval $(call BuildTemplate,dhcpmac,DHCPMAC,xt_DHCPMAC,xt_DHCPMAC,+kmod-ipt-compat-xtables))
-$(eval $(call BuildTemplate,dnetmap,DNETMAP,xt_DNETMAP,xt_DNETMAP,+kmod-ipt-compat-xtables +kmod-ipt-nat))
-$(eval $(call BuildTemplate,fuzzy,fuzzy,xt_fuzzy,xt_fuzzy,))
-$(eval $(call BuildTemplate,geoip,geoip,xt_geoip,xt_geoip,))
-$(eval $(call BuildTemplate,iface,iface,xt_iface,xt_iface,))
-$(eval $(call BuildTemplate,ipmark,IPMARK,xt_IPMARK,xt_IPMARK,+kmod-ipt-compat-xtables))
-$(eval $(call BuildTemplate,ipp2p,IPP2P,xt_ipp2p,xt_ipp2p,+kmod-ipt-compat-xtables))
-$(eval $(call BuildTemplate,ipv4options,ipv4options,xt_ipv4options,xt_ipv4options,))
-$(eval $(call BuildTemplate,length2,length2,xt_length2,xt_length2,+kmod-ipt-compat-xtables))
-$(eval $(call BuildTemplate,logmark,LOGMARK,xt_LOGMARK,xt_LOGMARK,+kmod-ipt-compat-xtables))
-$(eval $(call BuildTemplate,lscan,lscan,xt_lscan,xt_lscan,))
-$(eval $(call BuildTemplate,lua,Lua PacketScript,xt_LUA,LUA/xt_LUA,+kmod-ipt-conntrack-extra))
-$(eval $(call BuildTemplate,proto,PROTO,xt_PROTO,xt_PROTO,))
-$(eval $(call BuildTemplate,psd,psd,xt_psd,xt_psd,))
-$(eval $(call BuildTemplate,quota2,quota2,xt_quota2,xt_quota2,))
-$(eval $(call BuildTemplate,sysrq,SYSRQ,xt_SYSRQ,xt_SYSRQ,+kmod-ipt-compat-xtables +kmod-crypto-hash))
-$(eval $(call BuildTemplate,tarpit,TARPIT,xt_TARPIT,xt_TARPIT,+kmod-ipt-compat-xtables))
-
-$(eval $(call BuildPackage,iptaccount))
-$(eval $(call BuildPackage,iptgeoip))

xtables-addons/patches/001-fix-kernel-version-detection.patch

@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return
- 
- if test -n "$kbuilddir"; then
- 	AC_MSG_CHECKING([kernel version that we will build against])
--	krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')"
-+	krel="$(make -sC "$kbuilddir" M=$PWD kernelversion | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')"
- 	save_IFS="$IFS"
- 	IFS='.'
- 	set x $krel

xtables-addons/patches/201-fix-lua-packetscript.patch

@@ -1,136 +0,0 @@
---- a/extensions/LUA/xt_LUA_target.c
-+++ b/extensions/LUA/xt_LUA_target.c
-@@ -19,7 +19,7 @@
- #include <linux/kernel.h>
- #include <linux/slab.h>
- #include <linux/module.h>
--#include <asm/uaccess.h>
-+#include <linux/uaccess.h>
- #include <net/ip.h>
- #include <linux/netfilter/x_tables.h>
- #include "xt_LUA.h"
-@@ -64,10 +64,10 @@ uint32_t  lua_state_refs[LUA_STATE_ARRAY
-  * XT_CONTINUE inside the *register_lua_packet_lib* function.
-  */
- 
--spinlock_t lock = SPIN_LOCK_UNLOCKED;
-+DEFINE_SPINLOCK(lock);
- 
- static uint32_t 
--lua_tg(struct sk_buff *pskb, const struct xt_target_param *par)
-+lua_tg(struct sk_buff *pskb, const struct xt_action_param *par)
- {
- 	uint32_t  verdict;
- 	lua_packet_segment *p;
-@@ -79,7 +79,7 @@ lua_tg(struct sk_buff *pskb, const struc
- 
- 	L = lua_envs[info->state_id]->L;
- 
--	if (!skb_make_writable(pskb, pskb->len))
-+	if (skb_ensure_writable(pskb, pskb->len))
- 		return NF_DROP;
- 
- 	/* call the function provided by --function parameter or the default 'process_packet' defined in Lua */
-@@ -88,11 +88,11 @@ lua_tg(struct sk_buff *pskb, const struc
- 	/* push the lua_packet_segment as a parameter */
- 	p = (lua_packet_segment *)lua_newuserdata(L, sizeof(lua_packet_segment));
- 	if (pskb->mac_header)
--		p->start = pskb->mac_header;
-+		p->start = skb_mac_header(pskb);
- 	else if (pskb->network_header)
--		p->start = pskb->network_header;
-+		p->start = skb_network_header(pskb);
- 	else if (pskb->transport_header)
--		p->start = pskb->transport_header;
-+		p->start = skb_transport_header(pskb);
- 	p->offset = 0;
- 	p->length = (unsigned long)pskb->tail - (unsigned long)p->start;
- 	p->changes = NULL;
-@@ -208,16 +208,16 @@ static bool load_script_into_state(uint3
-  * some workqueue initialization. So far this is done each time this function
-  * is called, subject to change.
-  */
--static bool
-+static int
- lua_tg_checkentry(const struct xt_tgchk_param *par)
- {
- 	const struct xt_lua_tginfo *info = par->targinfo;
- 
- 	if (load_script_into_state(info->state_id, info->script_size, (char *)info->buf)) {
- 		lua_state_refs[info->state_id]++;
--		return true;
-+		return 0;
- 	}
--	return false;
-+	return -EINVAL;
- }
- 
- /*::*
---- a/extensions/LUA/lua/llimits.h
-+++ b/extensions/LUA/lua/llimits.h
-@@ -8,7 +8,6 @@
- #define llimits_h
- 
- #include <stddef.h>
--#include <limits.h>
- 
- #include "lua.h"
- 
---- a/extensions/LUA/lua/lapi.c
-+++ b/extensions/LUA/lua/lapi.c
-@@ -4,9 +4,6 @@
- ** See Copyright Notice in lua.h
- */
- 
--#include <stdarg.h>
--#include <math.h>
--#include <assert.h>
- #include <string.h>
- 
- #define lapi_c
---- a/extensions/LUA/lua/ltable.c
-+++ b/extensions/LUA/lua/ltable.c
-@@ -18,7 +18,6 @@
- ** Hence even when the load factor reaches 100%, performance remains good.
- */
- 
--#include <math.h>
- #include <string.h>
- 
- #define ltable_c
---- a/extensions/LUA/lua/luaconf.h
-+++ b/extensions/LUA/lua/luaconf.h
-@@ -13,8 +13,12 @@
- #if !defined(__KERNEL__)
- #include <limits.h>
- #else
-+#include <linux/kernel.h>
-+
-+#undef UCHAR_MAX
-+#undef BUFSIZ
-+#undef NO_FPU
- #define UCHAR_MAX	255
--#define SHRT_MAX        32767
- #define BUFSIZ 		8192
- #define NO_FPU
- #endif
-@@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l;
- */
- #if defined(__KERNEL__)
- #undef LUA_USE_ULONGJMP
-+#define setjmp __builtin_setjmp
-+#define longjmp __builtin_longjmp
- #endif
- 
- #if defined(__cplusplus)
---- a/extensions/LUA/lua/llex.h
-+++ b/extensions/LUA/lua/llex.h
-@@ -10,6 +10,8 @@
- #include "lobject.h"
- #include "lzio.h"
- 
-+/* prevent conflict with definition from asm/current.h */
-+#undef current
- 
- #define FIRST_RESERVED	257
- 

xtables-addons/patches/210-freebsd-build-fix.patch

@@ -1,11 +0,0 @@
---- a/extensions/LUA/Makefile
-+++ b/extensions/LUA/Makefile
-@@ -110,7 +110,7 @@ PKG_CONFIG = /usr/bin/pkg-config
- RANLIB = ranlib
- SED = /bin/sed
- SET_MAKE = 
--SHELL = /bin/bash
-+SHELL = /bin/sh
- STRIP = strip
- VERSION = 1.21
- abs_builddir = /home/andre/Dropbox/xtables-addons/extensions/LUA