1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
--- a/ip6tables-restore.c
+++ b/ip6tables-restore.c
@@ -16,6 +16,8 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdarg.h>
+#include <setjmp.h>
#include "ip6tables.h"
#include "xtables.h"
#include "libiptc/libip6tc.h"
@@ -27,6 +29,7 @@
#define DEBUGP(x, args...)
#endif
+static jmp_buf jmp;
static int binary = 0, counters = 0, verbose = 0, noflush = 0;
/* Keeping track of external matches and targets. */
@@ -37,6 +40,7 @@ static const struct option options[] = {
{.name = "test", .has_arg = false, .val = 't'},
{.name = "help", .has_arg = false, .val = 'h'},
{.name = "noflush", .has_arg = false, .val = 'n'},
+ {.name = "lenient", .has_arg = false, .val = 'l'},
{.name = "modprobe", .has_arg = true, .val = 'M'},
{NULL},
};
@@ -52,6 +56,7 @@ static void print_usage(const char *name
" [ --test ]\n"
" [ --help ]\n"
" [ --noflush ]\n"
+ " [ --lenient ]\n"
" [ --modprobe=<command>]\n", name);
exit(1);
@@ -114,6 +119,17 @@ static void free_argv(void) {
free(newargv[i]);
}
+static void catch_exit_error(enum xtables_exittype status, const char *msg, ...)
+{
+ va_list args;
+ fprintf(stderr, "line %d: ", line);
+ va_start(args, msg);
+ vfprintf(stderr, msg, args);
+ va_end(args);
+ fprintf(stderr, "\n");
+ longjmp(jmp, status);
+}
+
#ifdef IPTABLES_MULTI
int ip6tables_restore_main(int argc, char *argv[])
#else
@@ -141,7 +157,7 @@ int main(int argc, char *argv[])
init_extensions();
#endif
- while ((c = getopt_long(argc, argv, "bcvthnM:", options, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "bcvthnlM:", options, NULL)) != -1) {
switch (c) {
case 'b':
binary = 1;
@@ -162,6 +178,9 @@ int main(int argc, char *argv[])
case 'n':
noflush = 1;
break;
+ case 'l':
+ ip6tables_globals.exit_err = catch_exit_error;
+ break;
case 'M':
xtables_modprobe_program = optarg;
break;
@@ -440,8 +459,11 @@ int main(int argc, char *argv[])
for (a = 0; a < newargc; a++)
DEBUGP("argv[%u]: %s\n", a, newargv[a]);
- ret = do_command6(newargc, newargv,
- &newargv[2], &handle);
+ if (!setjmp(jmp))
+ ret = do_command6(newargc, newargv,
+ &newargv[2], &handle);
+ else
+ ret = 1;
free_argv();
fflush(stdout);
--- a/iptables-restore.c
+++ b/iptables-restore.c
@@ -13,6 +13,8 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdarg.h>
+#include <setjmp.h>
#include "iptables.h"
#include "xtables.h"
#include "libiptc/libiptc.h"
@@ -24,6 +26,7 @@
#define DEBUGP(x, args...)
#endif
+static jmp_buf jmp;
static int binary = 0, counters = 0, verbose = 0, noflush = 0;
/* Keeping track of external matches and targets. */
@@ -34,6 +37,7 @@ static const struct option options[] = {
{.name = "test", .has_arg = false, .val = 't'},
{.name = "help", .has_arg = false, .val = 'h'},
{.name = "noflush", .has_arg = false, .val = 'n'},
+ {.name = "lenient", .has_arg = false, .val = 'l'},
{.name = "modprobe", .has_arg = true, .val = 'M'},
{.name = "table", .has_arg = true, .val = 'T'},
{NULL},
@@ -52,6 +56,7 @@ static void print_usage(const char *name
" [ --test ]\n"
" [ --help ]\n"
" [ --noflush ]\n"
+ " [ --lenient ]\n"
" [ --table=<TABLE> ]\n"
" [ --modprobe=<command>]\n", name);
@@ -114,6 +119,17 @@ static void free_argv(void) {
free(newargv[i]);
}
+static void catch_exit_error(enum xtables_exittype status, const char *msg, ...)
+{
+ va_list args;
+ fprintf(stderr, "line %d: ", line);
+ va_start(args, msg);
+ vfprintf(stderr, msg, args);
+ va_end(args);
+ fprintf(stderr, "\n");
+ longjmp(jmp, status);
+}
+
#ifdef IPTABLES_MULTI
int
iptables_restore_main(int argc, char *argv[])
@@ -144,7 +160,7 @@ main(int argc, char *argv[])
init_extensions();
#endif
- while ((c = getopt_long(argc, argv, "bcvthnM:T:", options, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "bcvthnlM:T:", options, NULL)) != -1) {
switch (c) {
case 'b':
binary = 1;
@@ -165,6 +181,9 @@ main(int argc, char *argv[])
case 'n':
noflush = 1;
break;
+ case 'l':
+ iptables_globals.exit_err = catch_exit_error;
+ break;
case 'M':
xtables_modprobe_program = optarg;
break;
@@ -445,8 +464,11 @@ main(int argc, char *argv[])
for (a = 0; a < newargc; a++)
DEBUGP("argv[%u]: %s\n", a, newargv[a]);
- ret = do_command(newargc, newargv,
- &newargv[2], &handle);
+ if (!setjmp(jmp))
+ ret = do_command(newargc, newargv,
+ &newargv[2], &handle);
+ else
+ ret = 1;
free_argv();
fflush(stdout);
|
