|
 |
80ddfa2 |
From d1d746dde7089b39598f2d7b7fef61fc52f52c25 Mon Sep 17 00:00:00 2001
|
|
|
80ddfa2 |
From: Sanket Shah <sanket.shah@cyberoam.com>
|
|
|
80ddfa2 |
Date: Wed, 31 Jul 2013 21:40:08 +0200
|
|
|
80ddfa2 |
Subject: [PATCH] Add --noflush command line support for ebtables-restore
|
|
 |
8e67d1c |
|
|
|
80ddfa2 |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
80ddfa2 |
---
|
|
|
80ddfa2 |
ebtables-restore.c | 29 +++++++++++++++++++++++++----
|
|
|
80ddfa2 |
1 file changed, 25 insertions(+), 4 deletions(-)
|
|
|
8e67d1c |
|
|
|
8e67d1c |
diff --git a/ebtables-restore.c b/ebtables-restore.c
|
|
|
80ddfa2 |
index ea0296055212e..bb4d0cffda1cc 100644
|
|
|
8e67d1c |
--- a/ebtables-restore.c
|
|
|
8e67d1c |
+++ b/ebtables-restore.c
|
|
|
8e67d1c |
@@ -22,13 +22,25 @@
|
|
|
8e67d1c |
#include <string.h>
|
|
|
8e67d1c |
#include <errno.h>
|
|
|
8e67d1c |
#include <unistd.h>
|
|
|
8e67d1c |
+#include <getopt.h>
|
|
|
8e67d1c |
#include "include/ebtables_u.h"
|
|
|
8e67d1c |
|
|
|
8e67d1c |
+static const struct option options[] = {
|
|
|
8e67d1c |
+ {.name = "noflush", .has_arg = 0, .val = 'n'},
|
|
|
8e67d1c |
+ { 0 }
|
|
|
8e67d1c |
+};
|
|
|
8e67d1c |
+
|
|
|
8e67d1c |
static struct ebt_u_replace replace[3];
|
|
|
8e67d1c |
void ebt_early_init_once();
|
|
|
8e67d1c |
|
|
|
8e67d1c |
#define OPT_KERNELDATA 0x800 /* Also defined in ebtables.c */
|
|
|
8e67d1c |
|
|
|
8e67d1c |
+static void print_usage()
|
|
|
8e67d1c |
+{
|
|
|
8e67d1c |
+ fprintf(stderr, "Usage: ebtables-restore [ --noflush ]\n");
|
|
|
8e67d1c |
+ exit(1);
|
|
|
8e67d1c |
+}
|
|
|
8e67d1c |
+
|
|
|
8e67d1c |
static void copy_table_names()
|
|
|
8e67d1c |
{
|
|
|
8e67d1c |
strcpy(replace[0].name, "filter");
|
|
|
8e67d1c |
@@ -41,11 +53,20 @@ static void copy_table_names()
|
|
|
8e67d1c |
int main(int argc_, char *argv_[])
|
|
|
8e67d1c |
{
|
|
|
8e67d1c |
char *argv[EBTD_ARGC_MAX], cmdline[EBTD_CMDLINE_MAXLN];
|
|
|
8e67d1c |
- int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace;
|
|
|
8e67d1c |
+ int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace, c, flush = 1;
|
|
|
8e67d1c |
char ebtables_str[] = "ebtables";
|
|
|
8e67d1c |
|
|
|
8e67d1c |
- if (argc_ != 1)
|
|
|
8e67d1c |
- ebtrest_print_error("options are not supported");
|
|
|
8e67d1c |
+ while ((c = getopt_long(argc_, argv_, "n", options, NULL)) != -1) {
|
|
|
8e67d1c |
+ switch(c) {
|
|
|
8e67d1c |
+ case 'n':
|
|
|
8e67d1c |
+ flush = 0;
|
|
|
8e67d1c |
+ break;
|
|
|
8e67d1c |
+ default:
|
|
|
8e67d1c |
+ print_usage();
|
|
|
8e67d1c |
+ break;
|
|
|
8e67d1c |
+ }
|
|
|
8e67d1c |
+ }
|
|
|
8e67d1c |
+
|
|
|
8e67d1c |
ebt_silent = 0;
|
|
|
8e67d1c |
copy_table_names();
|
|
|
8e67d1c |
ebt_early_init_once();
|
|
|
8e67d1c |
@@ -68,7 +89,7 @@ int main(int argc_, char *argv_[])
|
|
|
8e67d1c |
ebtrest_print_error("table '%s' was not recognized", cmdline+1);
|
|
|
8e67d1c |
table_nr = i;
|
|
|
8e67d1c |
replace[table_nr].command = 11;
|
|
|
8e67d1c |
- ebt_get_kernel_table(&replace[table_nr], 1);
|
|
|
8e67d1c |
+ ebt_get_kernel_table(&replace[table_nr], flush);
|
|
|
8e67d1c |
replace[table_nr].command = 0;
|
|
|
8e67d1c |
replace[table_nr].flags = OPT_KERNELDATA; /* Prevent do_command from initialising replace */
|
|
|
8e67d1c |
continue;
|
|
|
80ddfa2 |
--
|
|
|
80ddfa2 |
2.21.0
|
|
|
80ddfa2 |
|