From ea146a982e26c42f9954f140276f8deeb2edbe98 Mon Sep 17 00:00:00 2001 From: Peter Riley Date: Sun, 2 Sep 2007 13:09:07 +0000 Subject: Remove last vestiges of NFC (Peter Riley ) --- libiptc/libip4tc.c | 8 ++------ libiptc/libip6tc.c | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'libiptc') diff --git a/libiptc/libip4tc.c b/libiptc/libip4tc.c index a0cdc2f8..71af17f6 100644 --- a/libiptc/libip4tc.c +++ b/libiptc/libip4tc.c @@ -148,10 +148,7 @@ dump_entry(STRUCT_ENTRY *e, const TC_HANDLE_T handle) printf("Invflags: %02X\n", e->ip.invflags); printf("Counters: %llu packets, %llu bytes\n", (unsigned long long)e->counters.pcnt, (unsigned long long)e->counters.bcnt); - printf("Cache: %08X ", e->nfcache); - if (e->nfcache & NFC_ALTERED) printf("ALTERED "); - if (e->nfcache & NFC_UNKNOWN) printf("UNKNOWN "); - printf("\n"); + printf("Cache: %08X\n", e->nfcache); IPT_MATCH_ITERATE(e, print_match); @@ -204,8 +201,7 @@ is_same(const STRUCT_ENTRY *a, const STRUCT_ENTRY *b, unsigned char *matchmask) return NULL; } - if (a->nfcache != b->nfcache - || a->target_offset != b->target_offset + if (a->target_offset != b->target_offset || a->next_offset != b->next_offset) return NULL; diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c index 5b3ae0bf..effbd448 100644 --- a/libiptc/libip6tc.c +++ b/libiptc/libip6tc.c @@ -179,10 +179,7 @@ dump_entry(struct ip6t_entry *e, const ip6tc_handle_t handle) printf("Invflags: %02X\n", e->ipv6.invflags); printf("Counters: %llu packets, %llu bytes\n", (unsigned long long)e->counters.pcnt, (unsigned long long)e->counters.bcnt); - printf("Cache: %08X ", e->nfcache); - if (e->nfcache & NFC_ALTERED) printf("ALTERED "); - if (e->nfcache & NFC_UNKNOWN) printf("UNKNOWN "); - printf("\n"); + printf("Cache: %08X\n", e->nfcache); IP6T_MATCH_ITERATE(e, print_match); @@ -236,8 +233,7 @@ is_same(const STRUCT_ENTRY *a, const STRUCT_ENTRY *b, return NULL; } - if (a->nfcache != b->nfcache - || a->target_offset != b->target_offset + if (a->target_offset != b->target_offset || a->next_offset != b->next_offset) return NULL; -- cgit v1.2.3