From c0ea35abe01f5f256272a7ff2030b2712f18be03 Mon Sep 17 00:00:00 2001 From: Bart De Schuymer Date: Tue, 16 Jul 2002 20:01:14 +0000 Subject: *** empty log message *** --- .../ebtables-v2.0pre10.001.diff | 22 ++++++++++++++++----- userspace/patches/zipped/ebtables-v2.0pre10.tar.gz | Bin 44511 -> 44600 bytes 2 files changed, 17 insertions(+), 5 deletions(-) (limited to 'userspace') diff --git a/userspace/patches/incremental-patches/ebtables-v2.0pre10.001.diff b/userspace/patches/incremental-patches/ebtables-v2.0pre10.001.diff index 86f7e36..55ee566 100644 --- a/userspace/patches/incremental-patches/ebtables-v2.0pre10.001.diff +++ b/userspace/patches/incremental-patches/ebtables-v2.0pre10.001.diff @@ -24,7 +24,7 @@ clean: rm -f ebtables --- ebtables-v2.0pre9/ebtables.c Sat Jun 29 11:41:57 2002 -+++ ebtables-v2.0pre10.001/ebtables.c Mon Jul 15 22:14:59 2002 ++++ ebtables-v2.0pre10.001/ebtables.c Tue Jul 16 20:36:50 2002 @@ -62,11 +62,17 @@ }; @@ -303,7 +303,7 @@ // getopt saves the day while ((c = getopt_long(argc, argv, -@@ -2013,8 +2064,78 @@ +@@ -2013,8 +2064,90 @@ allowbc = *optarg; break; @@ -352,7 +352,13 @@ + strcpy(replace.filename, optarg); + // get the information from the file + get_table(&replace); -+ replace.num_counters = 0; ++ if (replace.nentries) { ++ counterchanges = (unsigned short *) ++ malloc(sizeof(unsigned short) * (replace.nentries + 1)); ++ for (i = 0; i < replace.nentries; i++) ++ counterchanges[i] = CNT_NORM; ++ counterchanges[i] = CNT_END; ++ } + free(replace.filename); + replace.filename = NULL; + break; @@ -371,7 +377,13 @@ + print_error("can't initialize ebtables " + "table %s", replace.name); + } -+ replace.num_counters = 0; ++ if (replace.nentries) { ++ counterchanges = (unsigned short *) ++ malloc(sizeof(unsigned short) * (replace.nentries + 1)); ++ for (i = 0; i < replace.nentries; i++) ++ counterchanges[i] = CNT_NORM; ++ counterchanges[i] = CNT_END; ++ } + if (c == 11) + break; + case 9 : // atomic @@ -383,7 +395,7 @@ // is it a target option? t = (struct ebt_u_target *)new_entry->t; if ((t->parse(c - t->option_offset, argv, argc, -@@ -2142,7 +2263,8 @@ +@@ -2142,7 +2275,8 @@ } } else if (replace.command == 'D') delete_rule(rule_nr); diff --git a/userspace/patches/zipped/ebtables-v2.0pre10.tar.gz b/userspace/patches/zipped/ebtables-v2.0pre10.tar.gz index d89c210..9bb2073 100644 Binary files a/userspace/patches/zipped/ebtables-v2.0pre10.tar.gz and b/userspace/patches/zipped/ebtables-v2.0pre10.tar.gz differ -- cgit v1.2.3