diff options
author | Bart De Schuymer <bdschuym@pandora.be> | 2002-06-23 08:03:12 +0000 |
---|---|---|
committer | Bart De Schuymer <bdschuym@pandora.be> | 2002-06-23 08:03:12 +0000 |
commit | 0ceadf9abe94b3774b0b1fa7af9d9d932af8c9c3 (patch) | |
tree | 961ede8e4ce64048528844c5526b8a6040340c23 /userspace/ebtables2/extensions/ebt_vlan.c | |
parent | cd54b43d64f35286514cd7742dde0f1e1e2b8843 (diff) |
*** empty log message ***
Diffstat (limited to 'userspace/ebtables2/extensions/ebt_vlan.c')
-rw-r--r-- | userspace/ebtables2/extensions/ebt_vlan.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/userspace/ebtables2/extensions/ebt_vlan.c b/userspace/ebtables2/extensions/ebt_vlan.c index 2379f97..06708da 100644 --- a/userspace/ebtables2/extensions/ebt_vlan.c +++ b/userspace/ebtables2/extensions/ebt_vlan.c @@ -19,7 +19,6 @@ #include <sys/socket.h> #include <netinet/in.h> #include <string.h> -#include <linux/netfilter_bridge/ebtables.h> #include <getopt.h> #include "../include/ebtables_u.h" #include <linux/netfilter_bridge/ebt_vlan.h> @@ -194,7 +193,7 @@ parse (int c, char **argv, int argc, static void final_check (const struct ebt_u_entry *entry, const struct ebt_entry_match *match, - const char *name, unsigned int hook) + const char *name, unsigned int hook_mask) { /* * Is any proto supplied there? Or specified proto isn't 802.1Q? @@ -218,7 +217,7 @@ print (const struct ebt_u_entry *entry, * Print VLAN ID if they are specified */ if (vlaninfo->bitmask & EBT_VLAN_ID) { - printf ("vlan id: %s%d, ", + printf ("--vlan-id %s %d, ", vlaninfo->invflags & EBT_VLAN_ID ? "!" : "", vlaninfo->id); } @@ -226,7 +225,7 @@ print (const struct ebt_u_entry *entry, * Print VLAN priority if they are specified */ if (vlaninfo->bitmask & EBT_VLAN_PRIO) { - printf ("vlan prio: %s%d, ", + printf ("--vlan-prio %s %d, ", vlaninfo->invflags & EBT_VLAN_PRIO ? "!" : "", vlaninfo->prio); } @@ -234,7 +233,7 @@ print (const struct ebt_u_entry *entry, * Print VLAN encapsulated protocol if they are specified */ if (vlaninfo->bitmask & EBT_VLAN_ENCAP) { - printf ("vlan encap: %s%2.4X, ", + printf ("--vlan-encap %s %2.4X, ", vlaninfo->invflags & EBT_VLAN_ENCAP ? "!" : "", ntohs (vlaninfo->encap)); } |