mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ebtables-extension: setup repo

Browse source
This commit is contained in:
Rahul Thakur 2024-05-17 15:09:21 +05:30
parent c165587b54
commit 3fb8a697a0
7 changed files with 26 additions and 321 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ebtables-extensions/Makefile
View file

@ -6,15 +6,24 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ebtables-extensions
PKG_VERSION:=1.0.0
PKG_VERSION:=1.0.1
PKG_LICENSE:=GPL-2.0
LOCAL_DEV:=0
ifneq ($(LOCAL_DEV),1)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=baba80b0de3aa5aeca2ad442d09812a7643a4db4
PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ebtables-extensions.git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MIRROR_HASH:=skip
endif
include $(INCLUDE_DIR)/package.mk
define KernelPackage/vlantranslation
SUBMENU:=Other modules
TITLE:=Kernel module for ebtables VLAN translation
FILES:=$(PKG_BUILD_DIR)/ebt_vlantranslation.ko
FILES:=$(PKG_BUILD_DIR)/src/ebt_vlantranslation.ko
DEPENDS+=+kmod-ebtables +ebtables-legacy
AUTOLOAD:=$(call AutoLoad,30,ebt_vlantranslation,1)
KCONFIG:=
@ -24,7 +33,7 @@ define KernelPackage/dscp2pbit
SUBMENU:=Other modules
TITLE:=Kernel module for DSCP-to-Pbit mapping
DEPENDS+=+kmod-ebtables +ebtables-legacy
FILES:=$(PKG_BUILD_DIR)/ebt_dscp2pbit.ko
FILES:=$(PKG_BUILD_DIR)/src/ebt_dscp2pbit.ko
AUTOLOAD:=$(call AutoLoad,30,ebt_dscp2pbit,1)
KCONFIG:=
endef
@ -41,22 +50,30 @@ ifeq ($(CONFIG_TARGET_brcmbca),y)
include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
endif
ifeq ($(LOCAL_DEV),1)
define Build/Prepare
$(CP) -rf ./src/* $(PKG_BUILD_DIR)/
$(CP) $(PKG_BUILD_DIR)/ebt_vlantranslation.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
$(CP) $(PKG_BUILD_DIR)/ebt_dscp2pbit.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
$(CP) $(PKG_BUILD_DIR)/src/ebt_vlantranslation.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
$(CP) $(PKG_BUILD_DIR)/src/ebt_dscp2pbit.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
endef
else
define Build/Prepare
$(Build/Prepare/Default)
$(CP) $(PKG_BUILD_DIR)/src/ebt_vlantranslation.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
$(CP) $(PKG_BUILD_DIR)/src/ebt_dscp2pbit.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
endef
endif
define Build/InstallDev
$(INSTALL_DIR) $(1)/include/uapi/linux/netfilter_bridge/
$(CP) $(PKG_BUILD_DIR)/ebt_vlantranslation.h $(1)/include/uapi/linux/netfilter_bridge/
$(CP) $(PKG_BUILD_DIR)/ebt_dscp2pbit.h $(1)/include/uapi/linux/netfilter_bridge/
$(CP) $(PKG_BUILD_DIR)/src/ebt_vlantranslation.h $(1)/include/uapi/linux/netfilter_bridge/
$(CP) $(PKG_BUILD_DIR)/src/ebt_dscp2pbit.h $(1)/include/uapi/linux/netfilter_bridge/
endef
KERNEL_MAKE_FLAGS += -I$(LINUX_DIR)/include
define Build/Compile
$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src" modules
endef
$(eval $(call KernelPackage,vlantranslation))

2
ebtables-extensions/src/Makefile
View file

@ -1,2 +0,0 @@
obj-m += ebt_vlantranslation.o
obj-m += ebt_dscp2pbit.o

172
ebtables-extensions/src/ebt_dscp2pbit.c
View file

@ -1,172 +0,0 @@
/*
* ebt_dscp2pbit
*
* Authors:
* Markus Gothe <markus.gothe@genexis.eu>
*
* April, 2024
*
* SPDX-License-Identifier: GPL-2.0
*/
#include <linux/ipv6.h>
#include <linux/ip.h>
#include <linux/if_vlan.h>
#include <linux/if_pppox.h>
#include <linux/ppp_defs.h>
#include <net/dsfield.h>
#include <linux/module.h>
#include <linux/netfilter.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter_bridge/ebtables.h>
#include <linux/netfilter_bridge/ebt_dscp2pbit.h>
static inline __be16 pppoe_proto(const struct sk_buff *skb)
{
return *((__be16 *)((void *)pppoe_hdr(skb)->tag));
}
static inline bool is_pppoe_ip(const struct sk_buff *skb)
{
return pppoe_proto(skb) == htons(PPP_IP);
}
static inline bool is_pppoe_ipv6(const struct sk_buff *skb)
{
return pppoe_proto(skb) == htons(PPP_IPV6);
}
static unsigned int ebt_dscp2pbit_tg(struct sk_buff *skb, const struct xt_action_param *par)
{
const struct ebt_dscp2pbit_info *info = par->targinfo;
const struct ipv6hdr *ipv6h = NULL;
const struct iphdr *iph = NULL;
uint8_t dscp_value = 0, pbit = NOPBITS;
unsigned int vlan_hdr_count = 0;
unsigned int ret = info->target;
__be16 protocol;
bool orig_vlan_tag_present = false;
/* Don't just assume the skb is linear, make sure it is! */
if (unlikely(skb_linearize(skb))) {
return EBT_DROP;
}
protocol = skb_protocol(skb, false);
again:
switch (protocol) {
case htons(ETH_P_IP):
iph = ip_hdr(skb);
break;
case htons(ETH_P_IPV6):
ipv6h = ipv6_hdr(skb);
break;
case htons(ETH_P_PPP_SES):
if (unlikely(skb->len < sizeof(struct pppoe_hdr))) {
ret = EBT_CONTINUE;
goto out;
}
if (is_pppoe_ipv6(skb)) {
ipv6h = (struct ipv6hdr *)(((void *)pppoe_hdr(skb)->tag) + 2);
} else if (is_pppoe_ip(skb)) {
iph = (struct iphdr *)(((void *)pppoe_hdr(skb)->tag) + 2);
}
break;
case htons(ETH_P_QINQ1): /* fall through */
case htons(ETH_P_QINQ2): /* fall through */
case htons(ETH_P_QINQ3): /* fall through */
case htons(ETH_P_8021AD): /* fall through */
case htons(ETH_P_8021Q):
if (skb_vlan_tag_present(skb) && !orig_vlan_tag_present) {
protocol = skb->protocol;
orig_vlan_tag_present = true;
} else {
struct vlan_hdr *vlan = (struct vlan_hdr *)skb->data;
protocol = vlan->h_vlan_encapsulated_proto;
skb_pull(skb, VLAN_HLEN);
skb_reset_network_header(skb);
vlan_hdr_count++;
}
goto again;
default:
ret = EBT_CONTINUE;
goto out;
}
if (iph != NULL && likely(skb->len >= sizeof(struct iphdr) && iph->version == 4)) {
dscp_value = ipv4_get_dsfield(iph);
} else if (ipv6h != NULL && likely(skb->len >= sizeof(struct ipv6hdr) && ipv6h->version == 6)) {
dscp_value = ipv6_get_dsfield(ipv6h);
} else {
ret = EBT_CONTINUE;
goto out;
}
pbit = info->dscp2pbitmapping[(dscp_value >> DSCP_OFFSET)];
if (pbit == NOPBITS) {
ret = EBT_CONTINUE;
goto out;
}
skb_vlan_tag_get(skb) &= ~VLAN_PRIO_MASK;
skb_vlan_tag_get(skb) |= (pbit << VLAN_PRIO_SHIFT);
out:
/* Restore the skb for the pulled VLAN tags */
while (vlan_hdr_count--) {
skb_push(skb, VLAN_HLEN);
skb_reset_network_header(skb);
}
return ret;
}
static int ebt_dscp2pbit_tg_check(const struct xt_tgchk_param *par)
{
const struct ebt_dscp2pbit_info *info = par->targinfo;
const struct ebt_entry *e = par->entryinfo;
unsigned int hook_mask;
if (e->ethproto != htons(ETH_P_8021Q) && e->ethproto != htons(ETH_P_8021AD) && e->ethproto != htons(ETH_P_QINQ1) && e->ethproto != htons(ETH_P_QINQ2) && e->ethproto != htons(ETH_P_QINQ3))
return -EINVAL;
if (BASE_CHAIN && info->target == EBT_RETURN)
return -EINVAL;
hook_mask = par->hook_mask & ~(1 << NF_BR_NUMHOOKS);
if ((strcmp(par->table, "nat") != 0 || hook_mask & ~((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_POST_ROUTING) | (1 << NF_BR_LOCAL_OUT))) &&
(strcmp(par->table, "broute") != 0 || hook_mask & ~(1 << NF_BR_BROUTING)))
return -EINVAL;
if (ebt_invalid_target(info->target))
return -EINVAL;
return 0;
}
static struct xt_target ebt_dscp2pbit_tg_reg __read_mostly = {
.name = "dscp2pbit",
.revision = 0,
.family = NFPROTO_BRIDGE,
.hooks = (1 << NF_BR_NUMHOOKS) | (1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_POST_ROUTING) | (1 << NF_BR_LOCAL_OUT) | (1 << NF_BR_BROUTING),
.target = ebt_dscp2pbit_tg,
.checkentry = ebt_dscp2pbit_tg_check,
.targetsize = sizeof(struct ebt_dscp2pbit_info),
.me = THIS_MODULE,
};
static int __init ebt_dscp2pbit_init(void)
{
return xt_register_target(&ebt_dscp2pbit_tg_reg);
}
static void __exit ebt_dscp2pbit_fini(void)
{
xt_unregister_target(&ebt_dscp2pbit_tg_reg);
}
module_init(ebt_dscp2pbit_init);
module_exit(ebt_dscp2pbit_fini);
MODULE_DESCRIPTION("Ebtables: DSCP-to-Pbit manipulation");
MODULE_LICENSE("GPL");

29
ebtables-extensions/src/ebt_dscp2pbit.h
View file

@ -1,29 +0,0 @@
/*
* ebt_dscp2pbit
*
* Authors:
* Markus Gothe <markus.gothe@genexis.eu>
*
* April, 2024
* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
*/
#ifndef __LINUX_BRIDGE_EBT_DSCP2PBIT_H
#define __LINUX_BRIDGE_EBT_DSCP2PBIT_H
#include <linux/types.h>
#define DSCP_BITS 0xfc
#define DSCP_OFFSET 2
#define PBITS 0x7
#define NOPBITS 0xff
struct ebt_dscp2pbit_info
{
uint8_t dscp2pbitmapping[(DSCP_BITS >> DSCP_OFFSET)+1]; /* DSCP value 0-63 -> Pbit 0-7 */
int target;
uint8_t bitmask;
uint8_t invflags;
};
#endif

82
ebtables-extensions/src/ebt_vlantranslation.c
View file

@ -1,82 +0,0 @@
/*
* ebt_vlantranslation
*
* Authors:
* Markus Gothe <markus.gothe@genexis.eu>
*
* May, 2024
*
* SPDX-License-Identifier: GPL-2.0
*/
#include <linux/if_vlan.h>
#include <linux/module.h>
#include <linux/netfilter.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter_bridge/ebtables.h>
#include <linux/netfilter_bridge/ebt_vlantranslation.h>
static unsigned int ebt_vlantranslation_tg(struct sk_buff *skb, const struct xt_action_param *par)
{
const struct ebt_vlantranslation_info *info = par->targinfo;
if (info->bitmask & XLATE_VLANID) {
skb_vlan_tag_get(skb) &= ~VLAN_VID_MASK;
skb_vlan_tag_get(skb) |= (VLAN_VID_MASK & info->vlanid);
}
if (info->bitmask & XLATE_PBIT) {
skb_vlan_tag_get(skb) &= ~VLAN_PRIO_MASK;
skb_vlan_tag_get(skb) |= ((0x7 & info->pbit) << VLAN_PRIO_SHIFT);
}
return info->target;
}
static int ebt_vlantranslation_tg_check(const struct xt_tgchk_param *par)
{
const struct ebt_vlantranslation_info *info = par->targinfo;
const struct ebt_entry *e = par->entryinfo;
unsigned int hook_mask;
if (e->ethproto != htons(ETH_P_8021Q) && e->ethproto != htons(ETH_P_8021AD) && e->ethproto != htons(ETH_P_QINQ1) && e->ethproto != htons(ETH_P_QINQ2) && e->ethproto != htons(ETH_P_QINQ3))
return -EINVAL;
if (BASE_CHAIN && info->target == EBT_RETURN)
return -EINVAL;
hook_mask = par->hook_mask & ~(1 << NF_BR_NUMHOOKS);
if ((strcmp(par->table, "nat") != 0 || hook_mask & ~((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_POST_ROUTING) | (1 << NF_BR_LOCAL_OUT))) &&
(strcmp(par->table, "broute") != 0 || hook_mask & ~(1 << NF_BR_BROUTING)))
return -EINVAL;
if (ebt_invalid_target(info->target))
return -EINVAL;
return 0;
}
static struct xt_target ebt_vlantranslation_tg_reg __read_mostly = {
.name = "vlantranslation",
.revision = 0,
.family = NFPROTO_BRIDGE,
.hooks = (1 << NF_BR_NUMHOOKS) | (1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_POST_ROUTING) | (1 << NF_BR_LOCAL_OUT) | (1 << NF_BR_BROUTING),
.target = ebt_vlantranslation_tg,
.checkentry = ebt_vlantranslation_tg_check,
.targetsize = sizeof(struct ebt_vlantranslation_info),
.me = THIS_MODULE,
};
static int __init ebt_vlantranslation_init(void)
{
return xt_register_target(&ebt_vlantranslation_tg_reg);
}
static void __exit ebt_vlantranslation_fini(void)
{
xt_unregister_target(&ebt_vlantranslation_tg_reg);
}
module_init(ebt_vlantranslation_init);
module_exit(ebt_vlantranslation_fini);
MODULE_DESCRIPTION("Ebtables: VLAN translation");
MODULE_LICENSE("GPL");

28
ebtables-extensions/src/ebt_vlantranslation.h
View file

@ -1,28 +0,0 @@
/*
* ebt_vlantranslation
*
* Authors:
* Markus Gothe <markus.gothe@genexis.eu>
*
* May, 2024
* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
*/
#ifndef __LINUX_BRIDGE_EBT_VLANTRANSLATION_H
#define __LINUX_BRIDGE_EBT_VLANTRANSLATION_H
#include <linux/types.h>
#define XLATE_VLANID 0x1
#define XLATE_PBIT 0x2
struct ebt_vlantranslation_info
{
unsigned int vlanid;
uint8_t pbit;
int target;
uint8_t bitmask;
uint8_t invflags;
};
#endif

1
qosmngr/Makefile
View file

@ -29,6 +29,7 @@ define Package/qosmngr
CATEGORY:=Utilities
TITLE:=QoS Manager
DEPENDS:=+libbbfdm-api +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos +!(TARGET_brcmbca||TARGET_airoha):tc-full
DEPENDS+=+kmod-vlantranslation +kmod-dscp2pbit
endef
define Package/qosmngr/description