summaryrefslogtreecommitdiffstats
path: root/extensions/libxt_CONNMARK.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-08-03 17:21:18 +0200
committerPatrick McHardy <kaber@trash.net>2010-08-03 17:21:18 +0200
commita653f2936c56bfc541f13a7888484d5ae21c057a (patch)
tree6cd810640b26d9c3c330c4538424edbcc5570285 /extensions/libxt_CONNMARK.c
parentd8b511ed36f00280dd141e59c08874c7fb116504 (diff)
parent422342e47c18e70757231f2210b13df8e1f5931c (diff)
Merge branch 'iptables-next'
Diffstat (limited to 'extensions/libxt_CONNMARK.c')
-rw-r--r--extensions/libxt_CONNMARK.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/extensions/libxt_CONNMARK.c b/extensions/libxt_CONNMARK.c
index 6aba5f3c..67728775 100644
--- a/extensions/libxt_CONNMARK.c
+++ b/extensions/libxt_CONNMARK.c
@@ -19,6 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdbool.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -49,11 +50,11 @@ static void CONNMARK_help(void)
}
static const struct option CONNMARK_opts[] = {
- { "set-mark", 1, NULL, '1' },
- { "save-mark", 0, NULL, '2' },
- { "restore-mark", 0, NULL, '3' },
- { "mask", 1, NULL, '4' },
- { .name = NULL }
+ {.name = "set-mark", .has_arg = true, .val = '1'},
+ {.name = "save-mark", .has_arg = false, .val = '2'},
+ {.name = "restore-mark", .has_arg = false, .val = '3'},
+ {.name = "mask", .has_arg = true, .val = '4'},
+ XT_GETOPT_TABLEEND,
};
static const struct option connmark_tg_opts[] = {
@@ -67,7 +68,7 @@ static const struct option connmark_tg_opts[] = {
{.name = "ctmask", .has_arg = true, .val = 'c'},
{.name = "nfmask", .has_arg = true, .val = 'n'},
{.name = "mask", .has_arg = true, .val = 'm'},
- {.name = NULL},
+ XT_GETOPT_TABLEEND,
};
static void connmark_tg_help(void)