diff options
Diffstat (limited to 'userspace/patches/incremental-patches/ebtables-v2.0pre6.001.diff')
| -rw-r--r-- | userspace/patches/incremental-patches/ebtables-v2.0pre6.001.diff | 314 |
1 files changed, 314 insertions, 0 deletions
diff --git a/userspace/patches/incremental-patches/ebtables-v2.0pre6.001.diff b/userspace/patches/incremental-patches/ebtables-v2.0pre6.001.diff new file mode 100644 index 0000000..a143d62 --- /dev/null +++ b/userspace/patches/incremental-patches/ebtables-v2.0pre6.001.diff @@ -0,0 +1,314 @@ +--- ebtables-v2.0pre5/Makefile Mon May 20 14:06:38 2002 ++++ ebtables-v2.0pre6.001/Makefile Thu May 30 18:39:04 2002 +@@ -2,7 +2,7 @@ + + KERNEL_DIR?=/usr/src/linux + PROGNAME:=ebtables +-PROGVERSION:="2.0pre5 (May 2002)" ++PROGVERSION:="2.0pre6 (May 2002)" + + MANDIR?=/usr/local/man + CFLAGS:=-Wall -Wunused +@@ -15,6 +15,8 @@ + KERNEL_INCLUDES=headers + endif + ++all: ebtables ++ + .PHONY: headers + headers: + mkdir -p /usr/include/linux/netfilter_bridge +@@ -52,3 +54,5 @@ + + clean: + -rm -f ebtables ++ rm -f *.o *.c~ ++ rm -f extensions/*.o extensions/*.c~ +--- /dev/null Thu Aug 24 11:00:32 2000 ++++ ebtables-v2.0pre6.001/extensions/ebt_vlan.c Thu May 30 18:38:44 2002 +@@ -0,0 +1,231 @@ ++/* ++ * Summary: ebt_vlan userspace module ++ * ++ * Description: 802.1Q Virtual LAN match support module for ebtables project. ++ * Enable to match 802.1Q VLAN tagged frames by VLAN numeric ++ * identifier (12-bites field) and frame priority (3-bites field) ++ * ++ * Authors: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * Nick Fedchik <nick@fedchik.org.ua> ++ * ++ * May, 2002 ++ */ ++ ++#include <stdio.h> ++#include <string.h> ++#include <stdlib.h> ++#include <sys/socket.h> ++#include <netinet/in.h> ++#include <linux/netfilter_bridge/ebtables.h> ++#include <getopt.h> ++#include "../include/ebtables_u.h" ++#include <linux/netfilter_bridge/ebt_vlan.h> ++ ++#define VLAN_ID '1' ++#define VLAN_PRIO '2' ++ ++static struct option opts[] = { ++ {"vlan-id", required_argument, 0, VLAN_ID}, ++ {"vlan-prio", required_argument, 0, VLAN_PRIO}, ++ {0} ++}; ++ ++/* ++ * Print out help for ebtables -h vlan ++ */ ++static void print_help () ++{ ++ printf ("802.1Q VLAN options:\n" ++ "--vlan-id [!] id : VLAN ID 1-4095 (integer)\n" ++ "--vlan-prio [!] prio : VLAN Priority 0-7 (integer)\n"); ++} ++ ++/* ++ * Initialization function ++ */ ++static void init (struct ebt_entry_match *match) ++{ ++ struct ebt_vlan_info *vlaninfo = ++ (struct ebt_vlan_info *) match->data; ++ /* ++ * Just clean initial values ++ */ ++ vlaninfo->id = 0; ++ vlaninfo->prio = 0; ++ vlaninfo->invflags = 0; ++ vlaninfo->bitmask = 0; ++} ++ ++#define OPT_VLAN_ID 0x01 ++#define OPT_VLAN_PRIO 0x02 ++static int ++parse (int c, char **argv, int argc, ++ const struct ebt_u_entry *entry, unsigned int *flags, ++ struct ebt_entry_match **match) ++{ ++ struct ebt_vlan_info *vlaninfo = ++ (struct ebt_vlan_info *) (*match)->data; ++ unsigned short i; ++ char *end; ++ ++ switch (c) { ++ case VLAN_ID: ++ check_option (flags, OPT_VLAN_ID); ++ /* ++ * Check If we got inversed arg for VID, ++ * otherwise unset inversion flag ++ */ ++ if (check_inverse (optarg)) ++ vlaninfo->invflags |= EBT_VLAN_ID; ++ /* ++ * Check arg value presense ++ */ ++ if (optind > argc) ++ print_error ("Missing VLAN ID argument\n"); ++ /* ++ * Convert argv to long int, ++ * set *end to end of argv string, ++ * base set 10 for decimal only ++ */ ++ (unsigned short) i = strtol (argv[optind - 1], &end, 10); ++ /* ++ * Check arg val range ++ */ ++ if (i < 1 || i >= 4096 || *end != '\0') { ++ i = 0; ++ print_error ++ ("Problem with specified VLAN ID range\n"); ++ } ++ vlaninfo->id = i; ++ vlaninfo->bitmask|=EBT_VLAN_ID; ++ break; ++ ++ case VLAN_PRIO: ++ check_option (flags, OPT_VLAN_PRIO); ++ if (check_inverse (optarg)) ++ vlaninfo->invflags |= EBT_VLAN_PRIO; ++ if (optind > argc) ++ print_error ++ ("Missing VLAN Priority level argument\n"); ++ /* ++ * Convert argv to long int, ++ * set *end to end of argv string, ++ * base set 10 for decimal only ++ */ ++ (unsigned short) i = strtol (argv[optind - 1], &end, 10); ++ /* ++ * Check arg val range ++ */ ++ if (i >= 8 || *end != '\0') { ++ i = 0; ++ print_error ++ ("Problem with specified VLAN Priority range\n"); ++ } ++ vlaninfo->prio = i; ++ vlaninfo->bitmask|=EBT_VLAN_PRIO; ++ break; ++ ++ default: ++ return 0; ++ } ++ return 1; ++} ++ ++/* ++ * Final check ++ */ ++static void ++final_check (const struct ebt_u_entry *entry, ++ const struct ebt_entry_match *match, ++ const char *name, unsigned int hook) ++{ ++ /* ++ * Is any proto supplied there? Or specified proto isn't 802.1Q? ++ */ ++ if (entry->bitmask & EBT_NOPROTO || entry->ethproto != ETH_P_8021Q) ++ print_error ++ ("For matching 802.1Q VLAN the protocol must be specified as 802_1Q\n"); ++} ++ ++/* ++ * Print line when listing rules by ebtables -L ++ */ ++static void ++print (const struct ebt_u_entry *entry, ++ const struct ebt_entry_match *match) ++{ ++ struct ebt_vlan_info *vlaninfo = ++ (struct ebt_vlan_info *) match->data; ++ ++ /* ++ * Print VLAN ID if they are specified ++ */ ++ if (vlaninfo->bitmask & EBT_VLAN_ID) { ++ printf ("vlan id: %s%d, ", ++ vlaninfo->invflags & EBT_VLAN_ID ? "!" : "", ++ vlaninfo->id); ++ } ++ /* ++ * Print VLAN priority if they are specified ++ */ ++ if (vlaninfo->bitmask & EBT_VLAN_PRIO) { ++ printf ("vlan prio: %s%d, ", ++ vlaninfo->invflags & EBT_VLAN_PRIO ? "!" : "", ++ vlaninfo->prio); ++ } ++} ++ ++ ++static int ++compare (const struct ebt_entry_match *vlan1, ++ const struct ebt_entry_match *vlan2) ++{ ++ struct ebt_vlan_info *vlaninfo1 = ++ (struct ebt_vlan_info *) vlan1->data; ++ struct ebt_vlan_info *vlaninfo2 = ++ (struct ebt_vlan_info *) vlan2->data; ++ /* ++ * Compare argc ++ */ ++ if (vlaninfo1->bitmask != vlaninfo2->bitmask) ++ return 0; ++ /* ++ * Compare inv flags ++ */ ++ if (vlaninfo1->invflags != vlaninfo2->invflags) ++ return 0; ++ /* ++ * Compare VLAN ID if they are present ++ */ ++ if (vlaninfo1->bitmask & EBT_VLAN_ID) { ++ if (vlaninfo1->id != vlaninfo2->id) ++ return 0; ++ }; ++ /* ++ * Compare VLAN Prio if they are present ++ */ ++ if (vlaninfo1->bitmask & EBT_VLAN_PRIO) { ++ if (vlaninfo1->prio != vlaninfo2->prio) ++ return 0; ++ }; ++ return 1; ++} ++ ++static struct ebt_u_match vlan_match = { ++ EBT_VLAN_MATCH, ++ sizeof (struct ebt_vlan_info), ++ print_help, ++ init, ++ parse, ++ final_check, ++ print, ++ compare, ++ opts, ++}; ++ ++static void _init (void) __attribute__ ((constructor)); ++static void _init (void) ++{ ++ register_match (&vlan_match); ++} +--- ebtables-v2.0pre5/extensions/Makefile Sat Apr 27 22:31:21 2002 ++++ ebtables-v2.0pre6.001/extensions/Makefile Thu May 30 18:38:44 2002 +@@ -1,6 +1,6 @@ + #! /usr/bin/make + +-EXT_FUNC+=nat arp ip standard log redirect ++EXT_FUNC+=nat arp ip standard log redirect vlan + EXT_TABLES+=filter nat broute + EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/ebt_$(T).o) + EXT_OBJS+=$(foreach T,$(EXT_TABLES), extensions/ebtable_$(T).o) +--- ebtables-v2.0pre5/ebtables.8 Fri May 3 21:08:25 2002 ++++ ebtables-v2.0pre6.001/ebtables.8 Thu May 30 18:43:19 2002 +@@ -315,6 +315,17 @@ + .TP + .BR "--arp-ip-dst " "[!] \fIaddress\fP[/\fImask\fP]" + The ARP IP destination address specification. ++.SS vlan ++Specify 802.1Q VLAN specific fields. These will only work if the protocol equals ++.BR 802_1Q . ++For more details see ++.BR "ebtables -h vlan" . ++.TP ++.BR "--vlan-id " "[!] \fIid\fP" ++The VLAN identifier (decimal number from 0 to 4095). ++.TP ++.BR "--vlan-prio " "[!] \fIprio\fP" ++The VLAN priority type, this can be a decimal number from 0 to 7. The default value is 0. + .SH WATCHER EXTENSION(S) + Watchers are things that only look at frames passing by. These watchers only see the + frame if the frame passes all the matches of the rule. +--- ebtables-v2.0pre5/ethertypes Sat May 18 10:30:10 2002 ++++ ebtables-v2.0pre6.001/ethertypes Thu May 30 18:38:44 2002 +@@ -1,15 +1,15 @@ +- # all whitespace is ignored +- # comment lines must have a '#' as the first character +- # all protocol numbers are in hexadecimal form +- # maximum namesize = 20 characters +- # always put tabs or spaces between the name and the protocol number ++# all whitespace is ignored ++# comment lines must have a '#' as the first character ++# all protocol numbers are in hexadecimal form ++# maximum namesize = 20 characters ++# always put tabs or spaces between the name and the protocol number + # don't use more than 4 digits for the protocol number + # programs using this file should not be case sensitive + # that's all :-)) + IPV4 0800 put your comments behind, on the same line, after a tab + X25 0800 or whitespace + ARP 0806 +-VLAN 8100 ++802_1Q 8100 802.1Q Virtual LAN tagged frame + IPX 8137 + IPV6 86DD + NetBEUI 8191 |