From 65da9635a46a30b9ff9d4ec72ee3e7291be926f2 Mon Sep 17 00:00:00 2001 From: Bart De Schuymer Date: Thu, 29 Aug 2002 16:48:36 +0000 Subject: *** empty log message *** --- userspace/ebtables2/extensions/ebt_arp.c | 3 +-- userspace/ebtables2/extensions/ebt_ip.c | 3 +-- userspace/ebtables2/extensions/ebt_vlan.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'userspace/ebtables2') diff --git a/userspace/ebtables2/extensions/ebt_arp.c b/userspace/ebtables2/extensions/ebt_arp.c index f83146a..da3d9d6 100644 --- a/userspace/ebtables2/extensions/ebt_arp.c +++ b/userspace/ebtables2/extensions/ebt_arp.c @@ -176,8 +176,7 @@ static void final_check(const struct ebt_u_entry *entry, const struct ebt_entry_match *match, const char *name, unsigned int hookmask, unsigned int time) { - if (entry->bitmask & EBT_NOPROTO || entry->bitmask & EBT_802_3 || - (entry->ethproto != ETH_P_ARP && entry->ethproto != ETH_P_RARP) || + if ((entry->ethproto != ETH_P_ARP && entry->ethproto != ETH_P_RARP) || entry->invflags & EBT_IPROTO) print_error("For (R)ARP filtering the protocol must be " "specified as ARP or RARP"); diff --git a/userspace/ebtables2/extensions/ebt_ip.c b/userspace/ebtables2/extensions/ebt_ip.c index 94daef3..7080505 100644 --- a/userspace/ebtables2/extensions/ebt_ip.c +++ b/userspace/ebtables2/extensions/ebt_ip.c @@ -219,8 +219,7 @@ static void final_check(const struct ebt_u_entry *entry, const struct ebt_entry_match *match, const char *name, unsigned int hookmask, unsigned int time) { - if (entry->bitmask & EBT_NOPROTO || entry->bitmask & EBT_802_3 || - entry->ethproto != ETH_P_IP || entry->invflags & EBT_IPROTO) + if (entry->ethproto != ETH_P_IP || entry->invflags & EBT_IPROTO) print_error("For IP filtering the protocol must be " "specified as IPv4"); } diff --git a/userspace/ebtables2/extensions/ebt_vlan.c b/userspace/ebtables2/extensions/ebt_vlan.c index 1bab20c..382961f 100644 --- a/userspace/ebtables2/extensions/ebt_vlan.c +++ b/userspace/ebtables2/extensions/ebt_vlan.c @@ -221,9 +221,9 @@ final_check (const struct ebt_u_entry *entry, struct ebt_vlan_info *vlaninfo = (struct ebt_vlan_info *) match->data; /* - * Is any proto param specified there? Or specified proto isn't 802.1Q? + * Specified proto isn't 802.1Q? */ - if (entry->bitmask & EBT_NOPROTO || entry->ethproto != ETH_P_8021Q || + if (entry->ethproto != ETH_P_8021Q || entry->invflags & EBT_IPROTO) print_error ("For use 802.1Q extension the protocol must be specified as 802_1Q"); -- cgit v1.2.3