Make the option structures const.
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
diff --git a/extensions/libip6t_CONNMARK.c b/extensions/libip6t_CONNMARK.c
index 69d3a5a..03441d7 100644
--- a/extensions/libip6t_CONNMARK.c
+++ b/extensions/libip6t_CONNMARK.c
@@ -48,7 +48,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "set-mark", 1, 0, '1' },
{ "save-mark", 0, 0, '2' },
{ "restore-mark", 0, 0, '3' },
diff --git a/extensions/libip6t_CONNSECMARK.c b/extensions/libip6t_CONNSECMARK.c
index 805492c..93d0c96 100644
--- a/extensions/libip6t_CONNSECMARK.c
+++ b/extensions/libip6t_CONNSECMARK.c
@@ -24,7 +24,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "save", 0, 0, '1' },
{ "restore", 0, 0, '2' },
{ 0 }
diff --git a/extensions/libip6t_HL.c b/extensions/libip6t_HL.c
index 33bab71..d215eaa 100644
--- a/extensions/libip6t_HL.c
+++ b/extensions/libip6t_HL.c
@@ -138,7 +138,7 @@
printf("%u ", info->hop_limit);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "hl-set", 1, 0, '1' },
{ "hl-dec", 1, 0, '2' },
{ "hl-inc", 1, 0, '3' },
diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c
index 7fdbc0c..a11b8c0 100644
--- a/extensions/libip6t_LOG.c
+++ b/extensions/libip6t_LOG.c
@@ -32,7 +32,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = "log-level", .has_arg = 1, .flag = 0, .val = '!' },
{ .name = "log-prefix", .has_arg = 1, .flag = 0, .val = '#' },
{ .name = "log-tcp-sequence", .has_arg = 0, .flag = 0, .val = '1' },
diff --git a/extensions/libip6t_MARK.c b/extensions/libip6t_MARK.c
index 0ca4059..19bf40d 100644
--- a/extensions/libip6t_MARK.c
+++ b/extensions/libip6t_MARK.c
@@ -20,7 +20,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = "set-mark", .has_arg = 1, .flag = 0, .val = '1' },
{ .name = 0 }
};
diff --git a/extensions/libip6t_NFLOG.c b/extensions/libip6t_NFLOG.c
index 22c99e9..42e2081 100644
--- a/extensions/libip6t_NFLOG.c
+++ b/extensions/libip6t_NFLOG.c
@@ -14,7 +14,7 @@
NFLOG_THRESHOLD = 0x8,
};
-static struct option opts[] = {
+static const struct option opts[] = {
{ "nflog-group", 1, 0, NFLOG_GROUP },
{ "nflog-prefix", 1, 0, NFLOG_PREFIX },
{ "nflog-range", 1, 0, NFLOG_RANGE },
diff --git a/extensions/libip6t_REJECT.c b/extensions/libip6t_REJECT.c
index ffc9680..c67de0e 100644
--- a/extensions/libip6t_REJECT.c
+++ b/extensions/libip6t_REJECT.c
@@ -65,7 +65,7 @@
print_reject_types();
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "reject-with", 1, 0, '1' },
{ 0 }
};
diff --git a/extensions/libip6t_ah.c b/extensions/libip6t_ah.c
index 2379f21..d3048a2 100644
--- a/extensions/libip6t_ah.c
+++ b/extensions/libip6t_ah.c
@@ -20,7 +20,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = "ahspi", .has_arg = 1, .flag = 0, .val = '1' },
{ .name = "ahlen", .has_arg = 1, .flag = 0, .val = '2' },
{ .name = "ahres", .has_arg = 0, .flag = 0, .val = '3' },
diff --git a/extensions/libip6t_condition.c b/extensions/libip6t_condition.c
index 633eef1..40d0522 100644
--- a/extensions/libip6t_condition.c
+++ b/extensions/libip6t_condition.c
@@ -19,7 +19,7 @@
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = "condition", .has_arg = 1, .flag = 0, .val = 'X' },
{ .name = 0 }
};
diff --git a/extensions/libip6t_connmark.c b/extensions/libip6t_connmark.c
index 0a67c3a..427003a 100644
--- a/extensions/libip6t_connmark.c
+++ b/extensions/libip6t_connmark.c
@@ -39,7 +39,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "mark", 1, 0, '1' },
{0}
};
diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c
index 8c9455b..cb49c1f 100644
--- a/extensions/libip6t_dst.c
+++ b/extensions/libip6t_dst.c
@@ -31,7 +31,7 @@
IPTABLES_VERSION, IP6T_OPTS_OPTSNR);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = LNAME "-len", .has_arg = 1, .flag = 0, .val = '1' },
{ .name = LNAME "-opts", .has_arg = 1, .flag = 0, .val = '2' },
{ .name = LNAME "-not-strict", .has_arg = 1, .flag = 0, .val = '3' },
diff --git a/extensions/libip6t_frag.c b/extensions/libip6t_frag.c
index fcdee1b..1e184b7 100644
--- a/extensions/libip6t_frag.c
+++ b/extensions/libip6t_frag.c
@@ -23,7 +23,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = "fragid", .has_arg = 1, .flag = 0, .val = '1' },
{ .name = "fraglen", .has_arg = 1, .flag = 0, .val = '2' },
{ .name = "fragres", .has_arg = 0, .flag = 0, .val = '3' },
diff --git a/extensions/libip6t_hashlimit.c b/extensions/libip6t_hashlimit.c
index 9f820fc..22cca0b 100644
--- a/extensions/libip6t_hashlimit.c
+++ b/extensions/libip6t_hashlimit.c
@@ -46,7 +46,7 @@
"\n", IPTABLES_VERSION, XT_HASHLIMIT_BURST);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "hashlimit", 1, 0, '%' },
{ "hashlimit-burst", 1, 0, '$' },
{ "hashlimit-htable-size", 1, 0, '&' },
diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c
index 4312399..c139c23 100644
--- a/extensions/libip6t_hbh.c
+++ b/extensions/libip6t_hbh.c
@@ -30,14 +30,14 @@
}
#if HOPBYHOP
-static struct option opts[] = {
+static const struct option opts[] = {
{ "hbh-len", 1, 0, '1' },
{ "hbh-opts", 1, 0, '2' },
{ "hbh-not-strict", 1, 0, '3' },
{0}
};
#else
-static struct option opts[] = {
+static const struct option opts[] = {
{ "dst-len", 1, 0, '1' },
{ "dst-opts", 1, 0, '2' },
{ "dst-not-strict", 1, 0, '3' },
diff --git a/extensions/libip6t_hl.c b/extensions/libip6t_hl.c
index 58b9fcf..197ef85 100644
--- a/extensions/libip6t_hl.c
+++ b/extensions/libip6t_hl.c
@@ -120,7 +120,7 @@
printf("--hl-%s %u ", op[info->mode], info->hop_limit);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = "hl", .has_arg = 1, .flag = 0, .val = '2' },
{ .name = "hl-eq", .has_arg = 1, .flag = 0, .val = '2' },
{ .name = "hl-lt", .has_arg = 1, .flag = 0, .val = '3' },
diff --git a/extensions/libip6t_icmp6.c b/extensions/libip6t_icmp6.c
index bc150c2..46c9d38 100644
--- a/extensions/libip6t_icmp6.c
+++ b/extensions/libip6t_icmp6.c
@@ -85,7 +85,7 @@
print_icmpv6types();
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "icmpv6-type", 1, 0, '1' },
{0}
};
diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c
index 858e029..4dab33f 100644
--- a/extensions/libip6t_ipv6header.c
+++ b/extensions/libip6t_ipv6header.c
@@ -148,7 +148,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "header", 1, 0, '1' },
{ "soft", 0, 0, '2' },
{ 0 }
diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c
index 3ae1cd4..d2f9cec 100644
--- a/extensions/libip6t_mh.c
+++ b/extensions/libip6t_mh.c
@@ -226,7 +226,7 @@
printf("--mh-type %u ", mhinfo->types[0]);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "mh-type", 1, 0, '1' },
{0}
};
diff --git a/extensions/libip6t_owner.c b/extensions/libip6t_owner.c
index ff671ab..a5ec8da 100644
--- a/extensions/libip6t_owner.c
+++ b/extensions/libip6t_owner.c
@@ -36,7 +36,7 @@
#endif /* IP6T_OWNER_COMM */
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "uid-owner", 1, 0, '1' },
{ "gid-owner", 1, 0, '2' },
{ "pid-owner", 1, 0, '3' },
diff --git a/extensions/libip6t_policy.c b/extensions/libip6t_policy.c
index b7062c6..4612e14 100644
--- a/extensions/libip6t_policy.c
+++ b/extensions/libip6t_policy.c
@@ -41,7 +41,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] =
+static const struct option opts[] =
{
{
.name = "dir",
diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c
index a36c65a..3c3911e 100644
--- a/extensions/libip6t_rt.c
+++ b/extensions/libip6t_rt.c
@@ -29,7 +29,7 @@
IPTABLES_VERSION, IP6T_RT_HOPS);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "rt-type", 1, 0, '1' },
{ "rt-segsleft", 1, 0, '2' },
{ "rt-len", 1, 0, '3' },
diff --git a/extensions/libip6t_state.c b/extensions/libip6t_state.c
index b7c2517..d7fc83c 100644
--- a/extensions/libip6t_state.c
+++ b/extensions/libip6t_state.c
@@ -23,7 +23,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "state", 1, 0, '1' },
{0}
};
diff --git a/extensions/libipt_CLASSIFY.c b/extensions/libipt_CLASSIFY.c
index 044ea95..3096edc 100644
--- a/extensions/libipt_CLASSIFY.c
+++ b/extensions/libipt_CLASSIFY.c
@@ -21,7 +21,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "set-class", 1, 0, '1' },
{ 0 }
};
diff --git a/extensions/libipt_CLUSTERIP.c b/extensions/libipt_CLUSTERIP.c
index 30ae3bf..aa2ad2c 100644
--- a/extensions/libipt_CLUSTERIP.c
+++ b/extensions/libipt_CLUSTERIP.c
@@ -44,7 +44,7 @@
#define PARAM_LOCALNODE 0x0010
#define PARAM_HASHINIT 0x0020
-static struct option opts[] = {
+static const struct option opts[] = {
{ "new", 0, 0, '1' },
{ "hashmode", 1, 0, '2' },
{ "clustermac", 1, 0, '3' },
diff --git a/extensions/libipt_CONNMARK.c b/extensions/libipt_CONNMARK.c
index fbf0d4d..2797b1b 100644
--- a/extensions/libipt_CONNMARK.c
+++ b/extensions/libipt_CONNMARK.c
@@ -48,7 +48,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "set-mark", 1, 0, '1' },
{ "save-mark", 0, 0, '2' },
{ "restore-mark", 0, 0, '3' },
diff --git a/extensions/libipt_CONNSECMARK.c b/extensions/libipt_CONNSECMARK.c
index 191cd9a..07b8527 100644
--- a/extensions/libipt_CONNSECMARK.c
+++ b/extensions/libipt_CONNSECMARK.c
@@ -24,7 +24,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "save", 0, 0, '1' },
{ "restore", 0, 0, '2' },
{ 0 }
diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c
index 0d78763..9f48e9c 100644
--- a/extensions/libipt_DNAT.c
+++ b/extensions/libipt_DNAT.c
@@ -32,7 +32,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "to-destination", 1, 0, '1' },
{ "random", 0, 0, '2' },
{ 0 }
diff --git a/extensions/libipt_DSCP.c b/extensions/libipt_DSCP.c
index b1a0df0..029c54f 100644
--- a/extensions/libipt_DSCP.c
+++ b/extensions/libipt_DSCP.c
@@ -42,7 +42,7 @@
);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "set-dscp", 1, 0, 'F' },
{ "set-dscp-class", 1, 0, 'G' },
{ 0 }
diff --git a/extensions/libipt_ECN.c b/extensions/libipt_ECN.c
index 7c6c293..314531e 100644
--- a/extensions/libipt_ECN.c
+++ b/extensions/libipt_ECN.c
@@ -37,7 +37,7 @@
#endif
-static struct option opts[] = {
+static const struct option opts[] = {
{ "ecn-tcp-remove", 0, 0, 'F' },
{ "ecn-tcp-cwr", 1, 0, 'G' },
{ "ecn-tcp-ece", 1, 0, 'H' },
diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c
index dca1edf..4be14d5 100644
--- a/extensions/libipt_LOG.c
+++ b/extensions/libipt_LOG.c
@@ -32,7 +32,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = "log-level", .has_arg = 1, .flag = 0, .val = '!' },
{ .name = "log-prefix", .has_arg = 1, .flag = 0, .val = '#' },
{ .name = "log-tcp-sequence", .has_arg = 0, .flag = 0, .val = '1' },
diff --git a/extensions/libipt_MARK.c b/extensions/libipt_MARK.c
index 6a94718..6c96656 100644
--- a/extensions/libipt_MARK.c
+++ b/extensions/libipt_MARK.c
@@ -22,7 +22,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "set-mark", 1, 0, '1' },
{ "and-mark", 1, 0, '2' },
{ "or-mark", 1, 0, '3' },
diff --git a/extensions/libipt_MASQUERADE.c b/extensions/libipt_MASQUERADE.c
index 0a94939..07e93b3 100644
--- a/extensions/libipt_MASQUERADE.c
+++ b/extensions/libipt_MASQUERADE.c
@@ -23,7 +23,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "to-ports", 1, 0, '1' },
{ "random", 0, 0, '2' },
{ 0 }
diff --git a/extensions/libipt_NETMAP.c b/extensions/libipt_NETMAP.c
index 302448f..ef06e01 100644
--- a/extensions/libipt_NETMAP.c
+++ b/extensions/libipt_NETMAP.c
@@ -13,7 +13,7 @@
#define MODULENAME "NETMAP"
-static struct option opts[] = {
+static const struct option opts[] = {
{ "to", 1, 0, '1' },
{ 0 }
};
diff --git a/extensions/libipt_NFLOG.c b/extensions/libipt_NFLOG.c
index 37df5b0..a672e2d 100644
--- a/extensions/libipt_NFLOG.c
+++ b/extensions/libipt_NFLOG.c
@@ -14,7 +14,7 @@
NFLOG_THRESHOLD = 0x8,
};
-static struct option opts[] = {
+static const struct option opts[] = {
{ "nflog-group", 1, 0, NFLOG_GROUP },
{ "nflog-prefix", 1, 0, NFLOG_PREFIX },
{ "nflog-range", 1, 0, NFLOG_RANGE },
diff --git a/extensions/libipt_REDIRECT.c b/extensions/libipt_REDIRECT.c
index 0aff8be..919fde5 100644
--- a/extensions/libipt_REDIRECT.c
+++ b/extensions/libipt_REDIRECT.c
@@ -22,7 +22,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "to-ports", 1, 0, '1' },
{ "random", 1, 0, '2' },
{ 0 }
diff --git a/extensions/libipt_REJECT.c b/extensions/libipt_REJECT.c
index 4e083f3..8aba561 100644
--- a/extensions/libipt_REJECT.c
+++ b/extensions/libipt_REJECT.c
@@ -80,7 +80,7 @@
printf("(*) See man page or read the INCOMPATIBILITES file for compatibility issues.\n");
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "reject-with", 1, 0, '1' },
{ 0 }
};
diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c
index b14c501..fe4df99 100644
--- a/extensions/libipt_SAME.c
+++ b/extensions/libipt_SAME.c
@@ -29,7 +29,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "to", 1, 0, '1' },
{ "nodst", 0, 0, '2'},
{ "random", 0, 0, '3' },
diff --git a/extensions/libipt_SET.c b/extensions/libipt_SET.c
index a095e11..0425d20 100644
--- a/extensions/libipt_SET.c
+++ b/extensions/libipt_SET.c
@@ -34,7 +34,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{"add-set", 1, 0, '1'},
{"del-set", 1, 0, '2'},
{0}
diff --git a/extensions/libipt_SNAT.c b/extensions/libipt_SNAT.c
index a18e36a..9460612 100644
--- a/extensions/libipt_SNAT.c
+++ b/extensions/libipt_SNAT.c
@@ -32,7 +32,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "to-source", 1, 0, '1' },
{ "random", 0, 0, '2' },
{ 0 }
diff --git a/extensions/libipt_TOS.c b/extensions/libipt_TOS.c
index b1e7186..d6b8c36 100644
--- a/extensions/libipt_TOS.c
+++ b/extensions/libipt_TOS.c
@@ -14,7 +14,7 @@
};
/* TOS names and values. */
-static
+static const
struct TOS_value
{
unsigned char TOS;
@@ -47,7 +47,7 @@
fputc('\n', stdout);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "set-tos", 1, 0, '1' },
{ 0 }
};
diff --git a/extensions/libipt_TTL.c b/extensions/libipt_TTL.c
index 6110e0e..fa3205a 100644
--- a/extensions/libipt_TTL.c
+++ b/extensions/libipt_TTL.c
@@ -138,7 +138,7 @@
printf("%u ", info->ttl);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "ttl-set", 1, 0, '1' },
{ "ttl-dec", 1, 0, '2' },
{ "ttl-inc", 1, 0, '3' },
diff --git a/extensions/libipt_ULOG.c b/extensions/libipt_ULOG.c
index 88fc16d..cc65bba 100644
--- a/extensions/libipt_ULOG.c
+++ b/extensions/libipt_ULOG.c
@@ -44,7 +44,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{"ulog-nlgroup", 1, 0, '!'},
{"ulog-prefix", 1, 0, '#'},
{"ulog-cprange", 1, 0, 'A'},
diff --git a/extensions/libipt_addrtype.c b/extensions/libipt_addrtype.c
index ed8b204..f377e90 100644
--- a/extensions/libipt_addrtype.c
+++ b/extensions/libipt_addrtype.c
@@ -12,7 +12,7 @@
#include <linux/netfilter_ipv4/ipt_addrtype.h>
/* from linux/rtnetlink.h, must match order of enumeration */
-static char *rtn_names[] = {
+static const char *const rtn_names[] = {
"UNSPEC",
"UNICAST",
"LOCAL",
@@ -179,7 +179,7 @@
}
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "src-type", 1, 0, '1' },
{ "dst-type", 1, 0, '2' },
{ 0 }
diff --git a/extensions/libipt_ah.c b/extensions/libipt_ah.c
index 3bc2d8d..feba38a 100644
--- a/extensions/libipt_ah.c
+++ b/extensions/libipt_ah.c
@@ -19,7 +19,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "ahspi", 1, 0, '1' },
{0}
};
diff --git a/extensions/libipt_condition.c b/extensions/libipt_condition.c
index 0876cd6..30391d3 100644
--- a/extensions/libipt_condition.c
+++ b/extensions/libipt_condition.c
@@ -19,7 +19,7 @@
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = "condition", .has_arg = 1, .flag = 0, .val = 'X' },
{ .name = 0 }
};
diff --git a/extensions/libipt_connbytes.c b/extensions/libipt_connbytes.c
index 9b40d5a..3c20baf 100644
--- a/extensions/libipt_connbytes.c
+++ b/extensions/libipt_connbytes.c
@@ -20,7 +20,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "connbytes", 1, 0, '1' },
{ "connbytes-dir", 1, 0, '2' },
{ "connbytes-mode", 1, 0, '3' },
diff --git a/extensions/libipt_connmark.c b/extensions/libipt_connmark.c
index 86248d9..31a4554 100644
--- a/extensions/libipt_connmark.c
+++ b/extensions/libipt_connmark.c
@@ -39,7 +39,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "mark", 1, 0, '1' },
{0}
};
diff --git a/extensions/libipt_connrate.c b/extensions/libipt_connrate.c
index 9a7563e..a12cd8a 100644
--- a/extensions/libipt_connrate.c
+++ b/extensions/libipt_connrate.c
@@ -29,7 +29,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "connrate", 1, 0, '1' },
{0}
};
diff --git a/extensions/libipt_conntrack.c b/extensions/libipt_conntrack.c
index b50a58b..d3999cf 100644
--- a/extensions/libipt_conntrack.c
+++ b/extensions/libipt_conntrack.c
@@ -43,7 +43,7 @@
-static struct option opts[] = {
+static const struct option opts[] = {
{ "ctstate", 1, 0, '1' },
{ "ctproto", 1, 0, '2' },
{ "ctorigsrc", 1, 0, '3' },
diff --git a/extensions/libipt_dscp_helper.c b/extensions/libipt_dscp_helper.c
index fb68bb9..34aa1d3 100644
--- a/extensions/libipt_dscp_helper.c
+++ b/extensions/libipt_dscp_helper.c
@@ -14,7 +14,7 @@
#include <xtables.h>
-static struct ds_class
+static const struct ds_class
{
const char *name;
unsigned int dscp;
diff --git a/extensions/libipt_ecn.c b/extensions/libipt_ecn.c
index 8a5a7d3..538966f 100644
--- a/extensions/libipt_ecn.c
+++ b/extensions/libipt_ecn.c
@@ -26,7 +26,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = "ecn-tcp-cwr", .has_arg = 0, .flag = 0, .val = 'F' },
{ .name = "ecn-tcp-ece", .has_arg = 0, .flag = 0, .val = 'G' },
{ .name = "ecn-ip-ect", .has_arg = 1, .flag = 0, .val = 'H' },
diff --git a/extensions/libipt_hashlimit.c b/extensions/libipt_hashlimit.c
index 552d3bf..c1cc7cb 100644
--- a/extensions/libipt_hashlimit.c
+++ b/extensions/libipt_hashlimit.c
@@ -46,7 +46,7 @@
"\n", IPTABLES_VERSION, IPT_HASHLIMIT_BURST);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "hashlimit", 1, 0, '%' },
{ "hashlimit-burst", 1, 0, '$' },
{ "hashlimit-htable-size", 1, 0, '&' },
diff --git a/extensions/libipt_helper.c b/extensions/libipt_helper.c
index e577255..c862541 100644
--- a/extensions/libipt_helper.c
+++ b/extensions/libipt_helper.c
@@ -19,7 +19,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "helper", 1, 0, '1' },
{0}
};
diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c
index 21da4ea..f46c004 100644
--- a/extensions/libipt_icmp.c
+++ b/extensions/libipt_icmp.c
@@ -109,7 +109,7 @@
print_icmptypes();
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "icmp-type", 1, 0, '1' },
{0}
};
diff --git a/extensions/libipt_iprange.c b/extensions/libipt_iprange.c
index 3a039b1..30696aa 100644
--- a/extensions/libipt_iprange.c
+++ b/extensions/libipt_iprange.c
@@ -20,7 +20,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "src-range", 1, 0, '1' },
{ "dst-range", 1, 0, '2' },
{0}
diff --git a/extensions/libipt_owner.c b/extensions/libipt_owner.c
index c721774..03f9b05 100644
--- a/extensions/libipt_owner.c
+++ b/extensions/libipt_owner.c
@@ -38,7 +38,7 @@
#endif /* IPT_OWNER_COMM */
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "uid-owner", 1, 0, '1' },
{ "gid-owner", 1, 0, '2' },
{ "pid-owner", 1, 0, '3' },
diff --git a/extensions/libipt_policy.c b/extensions/libipt_policy.c
index 978edb0..97b7d02 100644
--- a/extensions/libipt_policy.c
+++ b/extensions/libipt_policy.c
@@ -40,7 +40,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] =
+static const struct option opts[] =
{
{
.name = "dir",
diff --git a/extensions/libipt_realm.c b/extensions/libipt_realm.c
index 445bcc8..0b11457 100644
--- a/extensions/libipt_realm.c
+++ b/extensions/libipt_realm.c
@@ -25,7 +25,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "realm", 1, 0, '1' },
{0}
};
diff --git a/extensions/libipt_recent.c b/extensions/libipt_recent.c
index 38d5871..94721b3 100644
--- a/extensions/libipt_recent.c
+++ b/extensions/libipt_recent.c
@@ -22,7 +22,7 @@
#endif /* IPT_RECENT_NAME_LEN */
/* Options for this module */
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = "set", .has_arg = 0, .flag = 0, .val = 201 },
{ .name = "rcheck", .has_arg = 0, .flag = 0, .val = 202 },
{ .name = "update", .has_arg = 0, .flag = 0, .val = 203 },
diff --git a/extensions/libipt_set.c b/extensions/libipt_set.c
index 4bd9bd2..d5cc1c3 100644
--- a/extensions/libipt_set.c
+++ b/extensions/libipt_set.c
@@ -32,7 +32,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{"set", 1, 0, '1'},
{0}
};
diff --git a/extensions/libipt_state.c b/extensions/libipt_state.c
index a6d9dc3..c4e5ef3 100644
--- a/extensions/libipt_state.c
+++ b/extensions/libipt_state.c
@@ -23,7 +23,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "state", 1, 0, '1' },
{0}
};
diff --git a/extensions/libipt_statistic.c b/extensions/libipt_statistic.c
index 52357ec..2112259 100644
--- a/extensions/libipt_statistic.c
+++ b/extensions/libipt_statistic.c
@@ -23,7 +23,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "mode", 1, 0, '1' },
{ "probability", 1, 0, '2' },
{ "every", 1, 0, '3' },
diff --git a/extensions/libipt_tos.c b/extensions/libipt_tos.c
index efc216c..2f5f915 100644
--- a/extensions/libipt_tos.c
+++ b/extensions/libipt_tos.c
@@ -9,7 +9,7 @@
#include <linux/netfilter_ipv4/ipt_tos.h>
/* TOS names and values. */
-static
+static const
struct TOS_value
{
unsigned char TOS;
@@ -42,7 +42,7 @@
fputc('\n', stdout);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "tos", 1, 0, '1' },
{0}
};
diff --git a/extensions/libipt_ttl.c b/extensions/libipt_ttl.c
index 5409dee..f5602f5 100644
--- a/extensions/libipt_ttl.c
+++ b/extensions/libipt_ttl.c
@@ -143,7 +143,7 @@
printf("%u ", info->ttl);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "ttl", 1, 0, '2' },
{ "ttl-eq", 1, 0, '2'},
{ "ttl-lt", 1, 0, '3'},
diff --git a/extensions/libxt_NFQUEUE.c b/extensions/libxt_NFQUEUE.c
index 7b3dcec..c5e7325 100644
--- a/extensions/libxt_NFQUEUE.c
+++ b/extensions/libxt_NFQUEUE.c
@@ -27,7 +27,7 @@
);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "queue-num", 1, 0, 'F' },
{ 0 }
};
diff --git a/extensions/libxt_SECMARK.c b/extensions/libxt_SECMARK.c
index 8bf19bc..11a617b 100644
--- a/extensions/libxt_SECMARK.c
+++ b/extensions/libxt_SECMARK.c
@@ -23,7 +23,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "selctx", 1, 0, '1' },
{ 0 }
};
diff --git a/extensions/libxt_TCPMSS.c b/extensions/libxt_TCPMSS.c
index cd2fc42..12b4cb6 100644
--- a/extensions/libxt_TCPMSS.c
+++ b/extensions/libxt_TCPMSS.c
@@ -36,7 +36,7 @@
__help(60);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "set-mss", 1, 0, '1' },
{ "clamp-mss-to-pmtu", 0, 0, '2' },
{ 0 }
diff --git a/extensions/libxt_comment.c b/extensions/libxt_comment.c
index 770a3ec..db45ab6 100644
--- a/extensions/libxt_comment.c
+++ b/extensions/libxt_comment.c
@@ -24,7 +24,7 @@
);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "comment", 1, 0, '1' },
{0}
};
diff --git a/extensions/libxt_dccp.c b/extensions/libxt_dccp.c
index f4918dd..45c7e38 100644
--- a/extensions/libxt_dccp.c
+++ b/extensions/libxt_dccp.c
@@ -46,7 +46,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = "source-port", .has_arg = 1, .flag = 0, .val = '1' },
{ .name = "sport", .has_arg = 1, .flag = 0, .val = '1' },
{ .name = "destination-port", .has_arg = 1, .flag = 0, .val = '2' },
diff --git a/extensions/libxt_dscp.c b/extensions/libxt_dscp.c
index 3f5f6c6..e2de940 100644
--- a/extensions/libxt_dscp.c
+++ b/extensions/libxt_dscp.c
@@ -39,7 +39,7 @@
);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "dscp", 1, 0, 'F' },
{ "dscp-class", 1, 0, 'G' },
{ 0 }
diff --git a/extensions/libxt_esp.c b/extensions/libxt_esp.c
index 7eb030e..6836dfc 100644
--- a/extensions/libxt_esp.c
+++ b/extensions/libxt_esp.c
@@ -19,7 +19,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "espspi", 1, 0, '1' },
{0}
};
diff --git a/extensions/libxt_length.c b/extensions/libxt_length.c
index 345423d..46a4ad2 100644
--- a/extensions/libxt_length.c
+++ b/extensions/libxt_length.c
@@ -20,7 +20,7 @@
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "length", 1, 0, '1' },
{0}
};
diff --git a/extensions/libxt_limit.c b/extensions/libxt_limit.c
index c85536b..f8c9e64 100644
--- a/extensions/libxt_limit.c
+++ b/extensions/libxt_limit.c
@@ -30,7 +30,7 @@
"\n", IPTABLES_VERSION, XT_LIMIT_BURST);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "limit", 1, 0, '%' },
{ "limit-burst", 1, 0, '$' },
{ 0 }
diff --git a/extensions/libxt_mac.c b/extensions/libxt_mac.c
index b907594..b935ea5 100644
--- a/extensions/libxt_mac.c
+++ b/extensions/libxt_mac.c
@@ -23,7 +23,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "mac-source", 1, 0, '1' },
{0}
};
diff --git a/extensions/libxt_mark.c b/extensions/libxt_mark.c
index 04104d1..23643dc 100644
--- a/extensions/libxt_mark.c
+++ b/extensions/libxt_mark.c
@@ -20,7 +20,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "mark", 1, 0, '1' },
{0}
};
diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c
index 274a583..f7e67da 100644
--- a/extensions/libxt_multiport.c
+++ b/extensions/libxt_multiport.c
@@ -45,7 +45,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "source-ports", 1, 0, '1' },
{ "sports", 1, 0, '1' }, /* synonym */
{ "destination-ports", 1, 0, '2' },
diff --git a/extensions/libxt_physdev.c b/extensions/libxt_physdev.c
index 0f862c0..5517472 100644
--- a/extensions/libxt_physdev.c
+++ b/extensions/libxt_physdev.c
@@ -25,7 +25,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "physdev-in", 1, 0, '1' },
{ "physdev-out", 1, 0, '2' },
{ "physdev-is-in", 0, 0, '3' },
diff --git a/extensions/libxt_pkttype.c b/extensions/libxt_pkttype.c
index 81cd943..3732034 100644
--- a/extensions/libxt_pkttype.c
+++ b/extensions/libxt_pkttype.c
@@ -64,7 +64,7 @@
print_types();
}
-static struct option opts[] = {
+static const struct option opts[] = {
{"pkt-type", 1, 0, '1'},
{0}
};
diff --git a/extensions/libxt_quota.c b/extensions/libxt_quota.c
index f97f02c..ab4fb96 100644
--- a/extensions/libxt_quota.c
+++ b/extensions/libxt_quota.c
@@ -11,7 +11,7 @@
#include <linux/netfilter/xt_quota.h>
-static struct option opts[] = {
+static const struct option opts[] = {
{"quota", 1, 0, '1'},
{0}
};
diff --git a/extensions/libxt_sctp.c b/extensions/libxt_sctp.c
index 5d23f09..734e706 100644
--- a/extensions/libxt_sctp.c
+++ b/extensions/libxt_sctp.c
@@ -69,7 +69,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = "source-port", .has_arg = 1, .flag = 0, .val = '1' },
{ .name = "sport", .has_arg = 1, .flag = 0, .val = '1' },
{ .name = "destination-port", .has_arg = 1, .flag = 0, .val = '2' },
diff --git a/extensions/libxt_string.c b/extensions/libxt_string.c
index c58f481..ea0a2aa 100644
--- a/extensions/libxt_string.c
+++ b/extensions/libxt_string.c
@@ -44,7 +44,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "from", 1, 0, '1' },
{ "to", 1, 0, '2' },
{ "algo", 1, 0, '3' },
diff --git a/extensions/libxt_tcp.c b/extensions/libxt_tcp.c
index da4922b..e5db637 100644
--- a/extensions/libxt_tcp.c
+++ b/extensions/libxt_tcp.c
@@ -27,7 +27,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "source-port", 1, 0, '1' },
{ "sport", 1, 0, '1' }, /* synonym */
{ "destination-port", 1, 0, '2' },
diff --git a/extensions/libxt_tcpmss.c b/extensions/libxt_tcpmss.c
index 4b421b2..817578a 100644
--- a/extensions/libxt_tcpmss.c
+++ b/extensions/libxt_tcpmss.c
@@ -19,7 +19,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "mss", 1, 0, '1' },
{0}
};
diff --git a/extensions/libxt_udp.c b/extensions/libxt_udp.c
index 6942043..81ff314 100644
--- a/extensions/libxt_udp.c
+++ b/extensions/libxt_udp.c
@@ -22,7 +22,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "source-port", 1, 0, '1' },
{ "sport", 1, 0, '1' }, /* synonym */
{ "destination-port", 1, 0, '2' },