[netfilter-cvslog] r6974 - trunk/iptables/extensions
yasuyuki at netfilter.org
yasuyuki at netfilter.org
Mon Jul 30 16:46:52 CEST 2007
Author: yasuyuki at netfilter.org
Date: 2007-07-30 16:46:51 +0200 (Mon, 30 Jul 2007)
New Revision: 6974
Modified:
trunk/iptables/extensions/libip6t_CONNMARK.c
trunk/iptables/extensions/libip6t_CONNSECMARK.c
trunk/iptables/extensions/libip6t_HL.c
trunk/iptables/extensions/libip6t_LOG.c
trunk/iptables/extensions/libip6t_MARK.c
trunk/iptables/extensions/libip6t_NFLOG.c
trunk/iptables/extensions/libip6t_REJECT.c
trunk/iptables/extensions/libip6t_ah.c
trunk/iptables/extensions/libip6t_condition.c
trunk/iptables/extensions/libip6t_connmark.c
trunk/iptables/extensions/libip6t_dst.c
trunk/iptables/extensions/libip6t_frag.c
trunk/iptables/extensions/libip6t_hashlimit.c
trunk/iptables/extensions/libip6t_hbh.c
trunk/iptables/extensions/libip6t_hl.c
trunk/iptables/extensions/libip6t_icmp6.c
trunk/iptables/extensions/libip6t_ipv6header.c
trunk/iptables/extensions/libip6t_mh.c
trunk/iptables/extensions/libip6t_owner.c
trunk/iptables/extensions/libip6t_policy.c
trunk/iptables/extensions/libip6t_rt.c
trunk/iptables/extensions/libip6t_state.c
trunk/iptables/extensions/libipt_CLASSIFY.c
trunk/iptables/extensions/libipt_CLUSTERIP.c
trunk/iptables/extensions/libipt_CONNMARK.c
trunk/iptables/extensions/libipt_CONNSECMARK.c
trunk/iptables/extensions/libipt_DNAT.c
trunk/iptables/extensions/libipt_DSCP.c
trunk/iptables/extensions/libipt_ECN.c
trunk/iptables/extensions/libipt_LOG.c
trunk/iptables/extensions/libipt_MARK.c
trunk/iptables/extensions/libipt_MASQUERADE.c
trunk/iptables/extensions/libipt_NETMAP.c
trunk/iptables/extensions/libipt_NFLOG.c
trunk/iptables/extensions/libipt_REDIRECT.c
trunk/iptables/extensions/libipt_REJECT.c
trunk/iptables/extensions/libipt_SAME.c
trunk/iptables/extensions/libipt_SET.c
trunk/iptables/extensions/libipt_SNAT.c
trunk/iptables/extensions/libipt_TOS.c
trunk/iptables/extensions/libipt_TTL.c
trunk/iptables/extensions/libipt_ULOG.c
trunk/iptables/extensions/libipt_addrtype.c
trunk/iptables/extensions/libipt_ah.c
trunk/iptables/extensions/libipt_condition.c
trunk/iptables/extensions/libipt_connbytes.c
trunk/iptables/extensions/libipt_connmark.c
trunk/iptables/extensions/libipt_connrate.c
trunk/iptables/extensions/libipt_conntrack.c
trunk/iptables/extensions/libipt_dscp_helper.c
trunk/iptables/extensions/libipt_ecn.c
trunk/iptables/extensions/libipt_hashlimit.c
trunk/iptables/extensions/libipt_helper.c
trunk/iptables/extensions/libipt_icmp.c
trunk/iptables/extensions/libipt_iprange.c
trunk/iptables/extensions/libipt_owner.c
trunk/iptables/extensions/libipt_policy.c
trunk/iptables/extensions/libipt_realm.c
trunk/iptables/extensions/libipt_recent.c
trunk/iptables/extensions/libipt_set.c
trunk/iptables/extensions/libipt_state.c
trunk/iptables/extensions/libipt_statistic.c
trunk/iptables/extensions/libipt_tos.c
trunk/iptables/extensions/libipt_ttl.c
trunk/iptables/extensions/libxt_NFQUEUE.c
trunk/iptables/extensions/libxt_SECMARK.c
trunk/iptables/extensions/libxt_TCPMSS.c
trunk/iptables/extensions/libxt_comment.c
trunk/iptables/extensions/libxt_dccp.c
trunk/iptables/extensions/libxt_dscp.c
trunk/iptables/extensions/libxt_esp.c
trunk/iptables/extensions/libxt_length.c
trunk/iptables/extensions/libxt_limit.c
trunk/iptables/extensions/libxt_mac.c
trunk/iptables/extensions/libxt_mark.c
trunk/iptables/extensions/libxt_multiport.c
trunk/iptables/extensions/libxt_physdev.c
trunk/iptables/extensions/libxt_pkttype.c
trunk/iptables/extensions/libxt_quota.c
trunk/iptables/extensions/libxt_sctp.c
trunk/iptables/extensions/libxt_string.c
trunk/iptables/extensions/libxt_tcp.c
trunk/iptables/extensions/libxt_tcpmss.c
trunk/iptables/extensions/libxt_udp.c
Log:
Make the option structures const.
Signed-off-by: Jan Engelhardt <jengelh at gmx.de>
Modified: trunk/iptables/extensions/libip6t_CONNMARK.c
===================================================================
--- trunk/iptables/extensions/libip6t_CONNMARK.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_CONNMARK.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libip6t_CONNSECMARK.c
===================================================================
--- trunk/iptables/extensions/libip6t_CONNSECMARK.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_CONNSECMARK.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -24,7 +24,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "save", 0, 0, '1' },
{ "restore", 0, 0, '2' },
{ 0 }
Modified: trunk/iptables/extensions/libip6t_HL.c
===================================================================
--- trunk/iptables/extensions/libip6t_HL.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_HL.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libip6t_LOG.c
===================================================================
--- trunk/iptables/extensions/libip6t_LOG.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_LOG.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libip6t_MARK.c
===================================================================
--- trunk/iptables/extensions/libip6t_MARK.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_MARK.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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 }
};
Modified: trunk/iptables/extensions/libip6t_NFLOG.c
===================================================================
--- trunk/iptables/extensions/libip6t_NFLOG.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_NFLOG.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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 },
Modified: trunk/iptables/extensions/libip6t_REJECT.c
===================================================================
--- trunk/iptables/extensions/libip6t_REJECT.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_REJECT.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -65,7 +65,7 @@
print_reject_types();
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "reject-with", 1, 0, '1' },
{ 0 }
};
Modified: trunk/iptables/extensions/libip6t_ah.c
===================================================================
--- trunk/iptables/extensions/libip6t_ah.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_ah.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libip6t_condition.c
===================================================================
--- trunk/iptables/extensions/libip6t_condition.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_condition.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -19,7 +19,7 @@
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = "condition", .has_arg = 1, .flag = 0, .val = 'X' },
{ .name = 0 }
};
Modified: trunk/iptables/extensions/libip6t_connmark.c
===================================================================
--- trunk/iptables/extensions/libip6t_connmark.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_connmark.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -39,7 +39,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "mark", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libip6t_dst.c
===================================================================
--- trunk/iptables/extensions/libip6t_dst.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_dst.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libip6t_frag.c
===================================================================
--- trunk/iptables/extensions/libip6t_frag.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_frag.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libip6t_hashlimit.c
===================================================================
--- trunk/iptables/extensions/libip6t_hashlimit.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_hashlimit.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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, '&' },
Modified: trunk/iptables/extensions/libip6t_hbh.c
===================================================================
--- trunk/iptables/extensions/libip6t_hbh.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_hbh.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libip6t_hl.c
===================================================================
--- trunk/iptables/extensions/libip6t_hl.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_hl.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libip6t_icmp6.c
===================================================================
--- trunk/iptables/extensions/libip6t_icmp6.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_icmp6.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -85,7 +85,7 @@
print_icmpv6types();
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "icmpv6-type", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libip6t_ipv6header.c
===================================================================
--- trunk/iptables/extensions/libip6t_ipv6header.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_ipv6header.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -148,7 +148,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "header", 1, 0, '1' },
{ "soft", 0, 0, '2' },
{ 0 }
Modified: trunk/iptables/extensions/libip6t_mh.c
===================================================================
--- trunk/iptables/extensions/libip6t_mh.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_mh.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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}
};
Modified: trunk/iptables/extensions/libip6t_owner.c
===================================================================
--- trunk/iptables/extensions/libip6t_owner.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_owner.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libip6t_policy.c
===================================================================
--- trunk/iptables/extensions/libip6t_policy.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_policy.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -41,7 +41,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] =
+static const struct option opts[] =
{
{
.name = "dir",
Modified: trunk/iptables/extensions/libip6t_rt.c
===================================================================
--- trunk/iptables/extensions/libip6t_rt.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_rt.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libip6t_state.c
===================================================================
--- trunk/iptables/extensions/libip6t_state.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libip6t_state.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -23,7 +23,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "state", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libipt_CLASSIFY.c
===================================================================
--- trunk/iptables/extensions/libipt_CLASSIFY.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_CLASSIFY.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -21,7 +21,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "set-class", 1, 0, '1' },
{ 0 }
};
Modified: trunk/iptables/extensions/libipt_CLUSTERIP.c
===================================================================
--- trunk/iptables/extensions/libipt_CLUSTERIP.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_CLUSTERIP.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libipt_CONNMARK.c
===================================================================
--- trunk/iptables/extensions/libipt_CONNMARK.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_CONNMARK.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libipt_CONNSECMARK.c
===================================================================
--- trunk/iptables/extensions/libipt_CONNSECMARK.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_CONNSECMARK.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -24,7 +24,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "save", 0, 0, '1' },
{ "restore", 0, 0, '2' },
{ 0 }
Modified: trunk/iptables/extensions/libipt_DNAT.c
===================================================================
--- trunk/iptables/extensions/libipt_DNAT.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_DNAT.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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 }
Modified: trunk/iptables/extensions/libipt_DSCP.c
===================================================================
--- trunk/iptables/extensions/libipt_DSCP.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_DSCP.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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 }
Modified: trunk/iptables/extensions/libipt_ECN.c
===================================================================
--- trunk/iptables/extensions/libipt_ECN.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_ECN.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libipt_LOG.c
===================================================================
--- trunk/iptables/extensions/libipt_LOG.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_LOG.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libipt_MARK.c
===================================================================
--- trunk/iptables/extensions/libipt_MARK.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_MARK.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libipt_MASQUERADE.c
===================================================================
--- trunk/iptables/extensions/libipt_MASQUERADE.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_MASQUERADE.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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 }
Modified: trunk/iptables/extensions/libipt_NETMAP.c
===================================================================
--- trunk/iptables/extensions/libipt_NETMAP.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_NETMAP.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -13,7 +13,7 @@
#define MODULENAME "NETMAP"
-static struct option opts[] = {
+static const struct option opts[] = {
{ "to", 1, 0, '1' },
{ 0 }
};
Modified: trunk/iptables/extensions/libipt_NFLOG.c
===================================================================
--- trunk/iptables/extensions/libipt_NFLOG.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_NFLOG.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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 },
Modified: trunk/iptables/extensions/libipt_REDIRECT.c
===================================================================
--- trunk/iptables/extensions/libipt_REDIRECT.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_REDIRECT.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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 }
Modified: trunk/iptables/extensions/libipt_REJECT.c
===================================================================
--- trunk/iptables/extensions/libipt_REJECT.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_REJECT.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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 }
};
Modified: trunk/iptables/extensions/libipt_SAME.c
===================================================================
--- trunk/iptables/extensions/libipt_SAME.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_SAME.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libipt_SET.c
===================================================================
--- trunk/iptables/extensions/libipt_SET.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_SET.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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}
Modified: trunk/iptables/extensions/libipt_SNAT.c
===================================================================
--- trunk/iptables/extensions/libipt_SNAT.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_SNAT.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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 }
Modified: trunk/iptables/extensions/libipt_TOS.c
===================================================================
--- trunk/iptables/extensions/libipt_TOS.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_TOS.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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 }
};
Modified: trunk/iptables/extensions/libipt_TTL.c
===================================================================
--- trunk/iptables/extensions/libipt_TTL.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_TTL.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libipt_ULOG.c
===================================================================
--- trunk/iptables/extensions/libipt_ULOG.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_ULOG.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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'},
Modified: trunk/iptables/extensions/libipt_addrtype.c
===================================================================
--- trunk/iptables/extensions/libipt_addrtype.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_addrtype.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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 }
Modified: trunk/iptables/extensions/libipt_ah.c
===================================================================
--- trunk/iptables/extensions/libipt_ah.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_ah.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -19,7 +19,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "ahspi", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libipt_condition.c
===================================================================
--- trunk/iptables/extensions/libipt_condition.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_condition.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -19,7 +19,7 @@
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ .name = "condition", .has_arg = 1, .flag = 0, .val = 'X' },
{ .name = 0 }
};
Modified: trunk/iptables/extensions/libipt_connbytes.c
===================================================================
--- trunk/iptables/extensions/libipt_connbytes.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_connbytes.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libipt_connmark.c
===================================================================
--- trunk/iptables/extensions/libipt_connmark.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_connmark.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -39,7 +39,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "mark", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libipt_connrate.c
===================================================================
--- trunk/iptables/extensions/libipt_connrate.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_connrate.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -29,7 +29,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "connrate", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libipt_conntrack.c
===================================================================
--- trunk/iptables/extensions/libipt_conntrack.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_conntrack.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libipt_dscp_helper.c
===================================================================
--- trunk/iptables/extensions/libipt_dscp_helper.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_dscp_helper.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -14,7 +14,7 @@
#include <xtables.h>
-static struct ds_class
+static const struct ds_class
{
const char *name;
unsigned int dscp;
Modified: trunk/iptables/extensions/libipt_ecn.c
===================================================================
--- trunk/iptables/extensions/libipt_ecn.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_ecn.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libipt_hashlimit.c
===================================================================
--- trunk/iptables/extensions/libipt_hashlimit.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_hashlimit.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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, '&' },
Modified: trunk/iptables/extensions/libipt_helper.c
===================================================================
--- trunk/iptables/extensions/libipt_helper.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_helper.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -19,7 +19,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "helper", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libipt_icmp.c
===================================================================
--- trunk/iptables/extensions/libipt_icmp.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_icmp.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -109,7 +109,7 @@
print_icmptypes();
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "icmp-type", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libipt_iprange.c
===================================================================
--- trunk/iptables/extensions/libipt_iprange.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_iprange.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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}
Modified: trunk/iptables/extensions/libipt_owner.c
===================================================================
--- trunk/iptables/extensions/libipt_owner.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_owner.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libipt_policy.c
===================================================================
--- trunk/iptables/extensions/libipt_policy.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_policy.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -40,7 +40,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] =
+static const struct option opts[] =
{
{
.name = "dir",
Modified: trunk/iptables/extensions/libipt_realm.c
===================================================================
--- trunk/iptables/extensions/libipt_realm.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_realm.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -25,7 +25,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "realm", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libipt_recent.c
===================================================================
--- trunk/iptables/extensions/libipt_recent.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_recent.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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 },
Modified: trunk/iptables/extensions/libipt_set.c
===================================================================
--- trunk/iptables/extensions/libipt_set.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_set.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -32,7 +32,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{"set", 1, 0, '1'},
{0}
};
Modified: trunk/iptables/extensions/libipt_state.c
===================================================================
--- trunk/iptables/extensions/libipt_state.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_state.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -23,7 +23,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "state", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libipt_statistic.c
===================================================================
--- trunk/iptables/extensions/libipt_statistic.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_statistic.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libipt_tos.c
===================================================================
--- trunk/iptables/extensions/libipt_tos.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_tos.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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}
};
Modified: trunk/iptables/extensions/libipt_ttl.c
===================================================================
--- trunk/iptables/extensions/libipt_ttl.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libipt_ttl.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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'},
Modified: trunk/iptables/extensions/libxt_NFQUEUE.c
===================================================================
--- trunk/iptables/extensions/libxt_NFQUEUE.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_NFQUEUE.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -27,7 +27,7 @@
);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "queue-num", 1, 0, 'F' },
{ 0 }
};
Modified: trunk/iptables/extensions/libxt_SECMARK.c
===================================================================
--- trunk/iptables/extensions/libxt_SECMARK.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_SECMARK.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -23,7 +23,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "selctx", 1, 0, '1' },
{ 0 }
};
Modified: trunk/iptables/extensions/libxt_TCPMSS.c
===================================================================
--- trunk/iptables/extensions/libxt_TCPMSS.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_TCPMSS.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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 }
Modified: trunk/iptables/extensions/libxt_comment.c
===================================================================
--- trunk/iptables/extensions/libxt_comment.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_comment.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -24,7 +24,7 @@
);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "comment", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libxt_dccp.c
===================================================================
--- trunk/iptables/extensions/libxt_dccp.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_dccp.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libxt_dscp.c
===================================================================
--- trunk/iptables/extensions/libxt_dscp.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_dscp.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -39,7 +39,7 @@
);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "dscp", 1, 0, 'F' },
{ "dscp-class", 1, 0, 'G' },
{ 0 }
Modified: trunk/iptables/extensions/libxt_esp.c
===================================================================
--- trunk/iptables/extensions/libxt_esp.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_esp.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -19,7 +19,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "espspi", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libxt_length.c
===================================================================
--- trunk/iptables/extensions/libxt_length.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_length.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -20,7 +20,7 @@
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "length", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libxt_limit.c
===================================================================
--- trunk/iptables/extensions/libxt_limit.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_limit.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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 }
Modified: trunk/iptables/extensions/libxt_mac.c
===================================================================
--- trunk/iptables/extensions/libxt_mac.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_mac.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -23,7 +23,7 @@
"\n", IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "mac-source", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libxt_mark.c
===================================================================
--- trunk/iptables/extensions/libxt_mark.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_mark.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -20,7 +20,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "mark", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libxt_multiport.c
===================================================================
--- trunk/iptables/extensions/libxt_multiport.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_multiport.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libxt_physdev.c
===================================================================
--- trunk/iptables/extensions/libxt_physdev.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_physdev.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libxt_pkttype.c
===================================================================
--- trunk/iptables/extensions/libxt_pkttype.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_pkttype.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -64,7 +64,7 @@
print_types();
}
-static struct option opts[] = {
+static const struct option opts[] = {
{"pkt-type", 1, 0, '1'},
{0}
};
Modified: trunk/iptables/extensions/libxt_quota.c
===================================================================
--- trunk/iptables/extensions/libxt_quota.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_quota.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -11,7 +11,7 @@
#include <linux/netfilter/xt_quota.h>
-static struct option opts[] = {
+static const struct option opts[] = {
{"quota", 1, 0, '1'},
{0}
};
Modified: trunk/iptables/extensions/libxt_sctp.c
===================================================================
--- trunk/iptables/extensions/libxt_sctp.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_sctp.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libxt_string.c
===================================================================
--- trunk/iptables/extensions/libxt_string.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_string.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libxt_tcp.c
===================================================================
--- trunk/iptables/extensions/libxt_tcp.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_tcp.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
Modified: trunk/iptables/extensions/libxt_tcpmss.c
===================================================================
--- trunk/iptables/extensions/libxt_tcpmss.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_tcpmss.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -19,7 +19,7 @@
IPTABLES_VERSION);
}
-static struct option opts[] = {
+static const struct option opts[] = {
{ "mss", 1, 0, '1' },
{0}
};
Modified: trunk/iptables/extensions/libxt_udp.c
===================================================================
--- trunk/iptables/extensions/libxt_udp.c 2007-07-30 14:32:26 UTC (rev 6973)
+++ trunk/iptables/extensions/libxt_udp.c 2007-07-30 14:46:51 UTC (rev 6974)
@@ -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' },
More information about the netfilter-cvslog
mailing list