From 0d4d4dd840e06c18250d73f27de61261ff141944 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 3 Dec 2019 22:01:19 +0100 Subject: T1843: run interface-definitions though GCC preprocessor A lot of XML code is duplicated (VLAN, interface address) for instance. Such XML definitions should be moved to feature.xml.i files and then just pulled in via GCC preprocessor #include definition in e.g. bond or ethernet definitions. This will give us the ability to single-source repeating node definitions as: * Interface Address * Interface Description * Interface Disable * VLAN (both vif-s and vif-c) The .in suffix of the interface-definitions is a marker that those files are input files to the GCC preprocessor. They will be rendered into proper XML files in the build directory. Some node definitions have been reworder to remove escaped double quote occurances which would have been warned about by the GCC preprocessor. --- Makefile | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7986ccdc9..26f591e29 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,35 @@ TMPL_DIR := templates-cfg OP_TMPL_DIR := templates-op +BUILD_DIR := build +CFLAGS := + +src = $(wildcard interface-definitions/*.xml.in) +obj = $(src:.xml.in=.xml) + +%.xml: %.xml.in + @echo Generating $(BUILD_DIR)/$@ from $< + # -ansi This turns off certain features of GCC that are incompatible + # with ISO C90. Without this regexes containing '/' as in an URL + # won't work + # -x c By default GCC guesses the input language from its file extension, + # thus XML is unknown. Force it to C language + # -E Stop after the preprocessing stage + # -undef Do not predefine any system-specific or GCC-specific macros. + # -nostdinc Do not search the standard system directories for header files + # -P Inhibit generation of linemarkers in the output from the + # preprocessor + @gcc -ansi -x c -E -undef -nostdinc -P -o $(BUILD_DIR)/$@ -c $< + +$(BUILD_DIR): + install -d -m 0755 $(BUILD_DIR)/interface-definitions + install -d -m 0755 $(BUILD_DIR)/op-mode-definitions .PHONY: interface_definitions .ONESHELL: -interface_definitions: +interface_definitions: $(BUILD_DIR) $(obj) mkdir -p $(TMPL_DIR) - find $(CURDIR)/interface-definitions/ -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-templates {} $(CURDIR)/schema/interface_definition.rng $(TMPL_DIR) || exit 1 + find $(BUILD_DIR)/interface-definitions -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-templates {} $(CURDIR)/schema/interface_definition.rng $(TMPL_DIR) || exit 1 # XXX: delete top level node.def's that now live in other packages rm -f $(TMPL_DIR)/firewall/node.def @@ -56,8 +79,9 @@ all: clean interface_definitions op_mode_definitions .PHONY: clean clean: - rm -rf $(TMPL_DIR)/* - rm -rf $(OP_TMPL_DIR)/* + rm -rf $(BUILD_DIR) + rm -rf $(TMPL_DIR) + rm -rf $(OP_TMPL_DIR) .PHONY: test test: -- cgit v1.2.3 From 2d96dbe667de57bc90eb4dc826cce3ed19e94823 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 3 Dec 2019 22:36:32 +0100 Subject: T1843: use include files for VIF/VIF-S interfaces As 219779bc6151 ("T1843: run interface-definitions though GCC preprocessor") implemented the foundation of using the GCC preprocessor to make our XML definitions more lightweight this commit transforms the configuration of VIF and VIF-S interfaces to this new style. It implementes it for the following types: * bond * ethernet * wireless --- Makefile | 2 + interface-definitions/include/vif-s.xml.i | 276 +++++++++++++ interface-definitions/include/vif.xml.i | 185 +++++++++ interface-definitions/interfaces-bonding.xml.in | 406 +----------------- interface-definitions/interfaces-ethernet.xml.in | 503 +---------------------- interface-definitions/interfaces-wireless.xml.in | 93 +---- 6 files changed, 468 insertions(+), 997 deletions(-) create mode 100644 interface-definitions/include/vif-s.xml.i create mode 100644 interface-definitions/include/vif.xml.i (limited to 'Makefile') diff --git a/Makefile b/Makefile index 26f591e29..834e8dd3f 100644 --- a/Makefile +++ b/Makefile @@ -35,12 +35,14 @@ interface_definitions: $(BUILD_DIR) $(obj) rm -f $(TMPL_DIR)/firewall/node.def rm -f $(TMPL_DIR)/interfaces/node.def rm -f $(TMPL_DIR)/interfaces/bonding/node.tag/ip/node.def + rm -f $(TMPL_DIR)/interfaces/bonding/node.tag/vif/node.tag/ip/node.def rm -f $(TMPL_DIR)/interfaces/bridge/node.tag/ip/node.def rm -f $(TMPL_DIR)/interfaces/ethernet/node.tag/ip/node.def rm -f $(TMPL_DIR)/interfaces/ethernet/node.tag/vif/node.tag/ip/node.def rm -f $(TMPL_DIR)/interfaces/ethernet/node.tag/vif-s/node.tag/ip/node.def rm -f $(TMPL_DIR)/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/ip/node.def rm -f $(TMPL_DIR)/interfaces/vxlan/node.tag/ip/node.def + rm -f $(TMPL_DIR)/interfaces/wireless/node.tag/vif/node.tag/ip/node.def rm -f $(TMPL_DIR)/protocols/node.def rm -f $(TMPL_DIR)/protocols/static/node.def rm -f $(TMPL_DIR)/system/node.def diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i new file mode 100644 index 000000000..9726e9156 --- /dev/null +++ b/interface-definitions/include/vif-s.xml.i @@ -0,0 +1,276 @@ + + + QinQ TAG-S Virtual Local Area Network (VLAN) ID + + + + VLAN ID must be between 0 and 4094 + + + + + IP address + + dhcp dhcpv6 + + + ipv4net + IPv4 address and prefix length + + + ipv6net + IPv6 address and prefix length + + + dhcp + Dynamic Host Configuration Protocol + + + dhcpv6 + Dynamic Host Configuration Protocol for IPv6 + + + + (dhcp|dhcpv6) + + + + + + + Interface description + + ^.{1,256}$ + + Interface description too long (limit 256 characters) + + + + + DHCP options + + + + + DHCP client identifier + + + + + DHCP client host name (overrides the system host name) + + + + + DHCP client vendor type + + + + + + + DHCPv6 options + 319 + + + + + Acquire only config parameters, no address + + + + + + IPv6 "temporary" address + + + + + + + + Ignore link state changes + + + + + + Disable this bridge interface + + + + + + Set Ethertype + + 0x88A8 0x8100 + + + 0x88A8 + 802.1ad + + + 0x8100 + 802.1q + + + (0x88A8|0x8100) + + Ethertype must be 0x88A8 or 0x8100 + + + + + Media Access Control (MAC) address + + h:h:h:h:h:h + Hardware (MAC) address + + + + + + + + + Maximum Transmission Unit (MTU) + + 68-9000 + Maximum Transmission Unit + + + + + MTU must be between 68 and 9000 + + + + + QinQ TAG-C Virtual Local Area Network (VLAN) ID + + + + VLAN ID must be between 0 and 4094 + + + + + IP address + + dhcp dhcpv6 + + + ipv4net + IPv4 address and prefix length + + + ipv6net + IPv6 address and prefix length + + + dhcp + Dynamic Host Configuration Protocol + + + dhcpv6 + Dynamic Host Configuration Protocol for IPv6 + + + + (dhcp|dhcpv6) + + + + + + + Interface description + + ^.{1,256}$ + + Interface description too long (limit 256 characters) + + + + + DHCP options + + + + + DHCP client identifier + + + + + DHCP client host name (overrides the system host name) + + + + + DHCP client vendor type + + + + + + + DHCPv6 options + 319 + + + + + Acquire only config parameters, no address + + + + + + IPv6 "temporary" address + + + + + + + + Ignore link state changes + + + + + + Disable this bridge interface + + + + + + Media Access Control (MAC) address + + h:h:h:h:h:h + Hardware (MAC) address + + + + + + + + + Maximum Transmission Unit (MTU) + + 68-9000 + Maximum Transmission Unit + + + + + MTU must be between 68 and 9000 + + + + + + diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i new file mode 100644 index 000000000..c6268dbe5 --- /dev/null +++ b/interface-definitions/include/vif.xml.i @@ -0,0 +1,185 @@ + + + Virtual Local Area Network (VLAN) ID + + 0-4094 + Virtual Local Area Network (VLAN) ID + + + + + VLAN ID must be between 0 and 4094 + + + + + IP address + + dhcp dhcpv6 + + + ipv4net + IPv4 address and prefix length + + + ipv6net + IPv6 address and prefix length + + + dhcp + Dynamic Host Configuration Protocol + + + dhcpv6 + Dynamic Host Configuration Protocol for IPv6 + + + + (dhcp|dhcpv6) + + + + + + + Interface description + + ^.{1,256}$ + + Interface description too long (limit 256 characters) + + + + + DHCP options + + + + + DHCP client identifier + + + + + DHCP client host name (overrides system host name) + + + + + DHCP client vendor type + + + + + + + DHCPv6 options + 319 + + + + + Acquire only config parameters, no address + + + + + + IPv6 "temporary" address + + + + + + + + Ignore link state changes + + + + + + Disable this bridge interface + + + + + + VLAN egress QoS + + + + + [:0-7 ]+$ + + QoS mapping should be in the format of '0:7 2:3' with numbers 0-9 + + + + + VLAN ingress QoS + + + + + [:0-7 ]+$ + + QoS mapping should be in the format of '0:7 2:3' with numbers 0-9 + + + + + + + ARP cache entry timeout in seconds + + 1-86400 + ARP cache entry timout in seconds (default 30) + + + + + ARP cache entry timeout must be between 1 and 86400 seconds + + + + + Enable proxy-arp on this interface + + + + + + Enable private VLAN proxy ARP on this interface + + + + + + + + Media Access Control (MAC) address + + h:h:h:h:h:h + Hardware (MAC) address + + + + + + + + + Maximum Transmission Unit (MTU) + + 68-9000 + Maximum Transmission Unit + + + + + MTU must be between 68 and 9000 + + + + diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in index 12df69364..2f32c7263 100644 --- a/interface-definitions/interfaces-bonding.xml.in +++ b/interface-definitions/interfaces-bonding.xml.in @@ -254,410 +254,8 @@ - - - QinQ TAG-S Virtual Local Area Network (VLAN) ID - - - - VLAN ID must be between 0 and 4094 - - - - - IP address - - dhcp dhcpv6 - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - dhcp - Dynamic Host Configuration Protocol - - - dhcpv6 - Dynamic Host Configuration Protocol for IPv6 - - - - (dhcp|dhcpv6) - - - - - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - - - - DHCP options - - - - - DHCP client identifier - - - - - DHCP client host name (overrides the system host name) - - - - - DHCP client vendor type - - - - - - - DHCPv6 options - 319 - - - - - Acquire only config parameters, no address - - - - - - IPv6 "temporary" address - - - - - - - - Ignore link state changes - - - - - - Disable this bridge interface - - - - - - Set Ethertype - - 0x88A8 0x8100 - - - 0x88A8 - 802.1ad - - - 0x8100 - 802.1q - - - (0x88A8|0x8100) - - Ethertype must be 0x88A8 or 0x8100 - - - - - Media Access Control (MAC) address - - h:h:h:h:h:h - Hardware (MAC) address - - - - - - - - - Maximum Transmission Unit (MTU) - - 68-9000 - Maximum Transmission Unit - - - - - MTU must be between 68 and 9000 - - - - - QinQ TAG-C Virtual Local Area Network (VLAN) ID - - - - VLAN ID must be between 0 and 4094 - - - - - IP address - - dhcp dhcpv6 - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - dhcp - Dynamic Host Configuration Protocol - - - dhcpv6 - Dynamic Host Configuration Protocol for IPv6 - - - - (dhcp|dhcpv6) - - - - - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - - - - DHCP options - - - - - DHCP client identifier - - - - - DHCP client host name (overrides the system host name) - - - - - DHCP client vendor type - - - - - - - DHCPv6 options - 319 - - - - - Acquire only config parameters, no address - - - - - - IPv6 "temporary" address - - - - - - - - Ignore link state changes - - - - - - Disable this bridge interface - - - - - - Media Access Control (MAC) address - - h:h:h:h:h:h - Hardware (MAC) address - - - - - - - - - Maximum Transmission Unit (MTU) - - 68-9000 - Maximum Transmission Unit - - - - - MTU must be between 68 and 9000 - - - - - - - - - Virtual Local Area Network (VLAN) ID - - - - VLAN ID must be between 0 and 4094 - - - - - IP address - - dhcp dhcpv6 - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - dhcp - Dynamic Host Configuration Protocol - - - dhcpv6 - Dynamic Host Configuration Protocol for IPv6 - - - - (dhcp|dhcpv6) - - - - - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - - - - DHCP options - - - - - DHCP client identifier - - - - - DHCP client host name (overrides the system host name) - - - - - DHCP client vendor type - - - - - - - DHCPv6 options - 319 - - - - - Acquire only config parameters, no address - - - - - - IPv6 "temporary" address - - - - - - - - Ignore link state changes - - - - - - Disable this bridge interface - - - - - - Media Access Control (MAC) address - - h:h:h:h:h:h - Hardware (MAC) address - - - - - - - - - Maximum Transmission Unit (MTU) - - 68-9000 - Maximum Transmission Unit - - - - - MTU must be between 68 and 9000 - - - - + #include "include/vif-s.xml.i" + #include "include/vif.xml.i" diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in index 92cfcd2c2..fee17840c 100644 --- a/interface-definitions/interfaces-ethernet.xml.in +++ b/interface-definitions/interfaces-ethernet.xml.in @@ -368,507 +368,8 @@ Speed must be auto, 10, 100, 1000, 2500, 5000, 10000, 25000, 40000, 50000 or 100000 - - - QinQ TAG-S Virtual Local Area Network (VLAN) ID - - 0-4094 - QinQ TAG-S Virtual Local Area Network (VLAN) ID - - - - - VLAN ID must be between 0 and 4094 - - - - - IP address - - dhcp dhcpv6 - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - dhcp - Dynamic Host Configuration Protocol - - - dhcpv6 - Dynamic Host Configuration Protocol for IPv6 - - - - (dhcp|dhcpv6) - - - - - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - - - - DHCP options - - - - - DHCP client identifier - - - - - DHCP client host name (overrides system host name) - - - - - DHCP client vendor type - - - - - - - DHCPv6 options - 319 - - - - - Acquire only config parameters, no address - - - - - - IPv6 "temporary" address - - - - - - - - Ignore link state changes - - - - - - Disable this bridge interface - - - - - - Set Ethertype - - 0x88A8 0x8100 - - - 0x88A8 - 802.1ad - - - 0x8100 - 802.1q - - - (0x88A8|0x8100) - - Ethertype must be 0x88A8 or 0x8100 - - - - - - - Enable proxy-arp on this interface - - - - - - Enable private VLAN proxy ARP on this interface - - - - - - - - Media Access Control (MAC) address - - h:h:h:h:h:h - Hardware (MAC) address - - - - - - - - - Maximum Transmission Unit (MTU) - - 68-9000 - Maximum Transmission Unit - - - - - MTU must be between 68 and 9000 - - - - - QinQ TAG-C Virtual Local Area Network (VLAN) ID - - 0-4094 - QinQ TAG-C Virtual Local Area Network (VLAN) ID - - - - - VLAN ID must be between 0 and 4094 - - - - - IP address - - dhcp dhcpv6 - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - dhcp - Dynamic Host Configuration Protocol - - - dhcpv6 - Dynamic Host Configuration Protocol for IPv6 - - - - (dhcp|dhcpv6) - - - - - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - - - - DHCP options - - - - - DHCP client identifier - - - - - DHCP client host name (overrides system host name) - - - - - DHCP client vendor type - - - - - - - DHCPv6 options - 319 - - - - - Acquire only config parameters, no address - - - - - - IPv6 "temporary" address - - - - - - - - Ignore link state changes - - - - - - Disable this bridge interface - - - - - - - - Enable proxy-arp on this interface - - - - - - Enable private VLAN proxy ARP on this interface - - - - - - - - Media Access Control (MAC) address - - h:h:h:h:h:h - Hardware (MAC) address - - - - - - - - - Maximum Transmission Unit (MTU) - - 68-9000 - Maximum Transmission Unit - - - - - MTU must be between 68 and 9000 - - - - - - - - - Virtual Local Area Network (VLAN) ID - - 0-4094 - Virtual Local Area Network (VLAN) ID - - - - - VLAN ID must be between 0 and 4094 - - - - - IP address - - dhcp dhcpv6 - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - dhcp - Dynamic Host Configuration Protocol - - - dhcpv6 - Dynamic Host Configuration Protocol for IPv6 - - - - (dhcp|dhcpv6) - - - - - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - - - - DHCP options - - - - - DHCP client identifier - - - - - DHCP client host name (overrides system host name) - - - - - DHCP client vendor type - - - - - - - DHCPv6 options - 319 - - - - - Acquire only config parameters, no address - - - - - - IPv6 "temporary" address - - - - - - - - Ignore link state changes - - - - - - Disable this bridge interface - - - - - - VLAN egress QoS - - - - - [:0-7 ]+$ - - QoS mapping should be in the format of '0:7 2:3' with numbers 0-9 - - - - - VLAN ingress QoS - - - - - [:0-7 ]+$ - - QoS mapping should be in the format of '0:7 2:3' with numbers 0-9 - - - - - - - ARP cache entry timeout in seconds - - 1-86400 - ARP cache entry timout in seconds (default 30) - - - - - ARP cache entry timeout must be between 1 and 86400 seconds - - - - - Enable proxy-arp on this interface - - - - - - Enable private VLAN proxy ARP on this interface - - - - - - - - Media Access Control (MAC) address - - h:h:h:h:h:h - Hardware (MAC) address - - - - - - - - - Maximum Transmission Unit (MTU) - - 68-9000 - Maximum Transmission Unit - - - - - MTU must be between 68 and 9000 - - - - + #include "include/vif-s.xml.i" + #include "include/vif.xml.i" diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in index d8779cf72..4d7e5735a 100644 --- a/interface-definitions/interfaces-wireless.xml.in +++ b/interface-definitions/interfaces-wireless.xml.in @@ -815,98 +815,7 @@ Type must be access-point, station or monitor - - - Virtual Local Area Network (VLAN) ID - - - - VLAN ID must be between 0 and 4094 - - - - - IP address - - dhcp dhcpv6 - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - dhcp - Dynamic Host Configuration Protocol - - - dhcpv6 - Dynamic Host Configuration Protocol for IPv6 - - - - (dhcp|dhcpv6) - - - - - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - - - - DHCPv6 options - - - - - Acquire only config parameters, no address - - - - - - IPv6 "temporary" address - - - - - - - - Ignore link state changes - - - - - - Disable this bridge interface - - - - - - Media Access Control (MAC) address - - h:h:h:h:h:h - Hardware (MAC) address - - - - - - - - + #include "include/vif.xml.i" -- cgit v1.2.3 From 6f42d44586fbed3f5addfe81fa5d6b4ab40f2dbf Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 3 Dec 2019 22:38:31 +0100 Subject: T1843: add support for recursive includes An XML include file can now inlude another XML include file. This is very handy on e.g. VIF or VIF-S interfaces that also have an address node. Thus more code is reused and simplified. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 834e8dd3f..97e933694 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ obj = $(src:.xml.in=.xml) # -nostdinc Do not search the standard system directories for header files # -P Inhibit generation of linemarkers in the output from the # preprocessor - @gcc -ansi -x c -E -undef -nostdinc -P -o $(BUILD_DIR)/$@ -c $< + @$(CC) -ansi -x c -E -undef -nostdinc -P -I$(CURDIR)/interface-definitions -o $(BUILD_DIR)/$@ -c $< $(BUILD_DIR): install -d -m 0755 $(BUILD_DIR)/interface-definitions -- cgit v1.2.3