Synchronize invert flag order with manpages

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/extensions/libip6t_ah.c b/extensions/libip6t_ah.c
index ce2d7fc11a91e8d83a1c10fd4cf0bf402a747875..5483e300e678a7364a44fd8865d3577969a49f34 100644 (file)
--- a/extensions/libip6t_ah.c
+++ b/extensions/libip6t_ah.c
@@ -13,8 +13,8 @@ static void ah_help(void)
 {
        printf(
 "ah match options:\n"
-" --ahspi [!] spi[:spi]         match spi (range)\n"
-" --ahlen [!] length            total length of this header\n"
+"[!] --ahspi spi[:spi]          match spi (range)\n"
+"[!] --ahlen length             total length of this header\n"
 " --ahres                       check the reserved filed, too\n");
 }
 

diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c
index d3c54dd5c2635e0bf36b98cd30b27e9534b311e8..8882b1171c9709267832727e8bddbd99a985c196 100644 (file)
--- a/extensions/libip6t_dst.c
+++ b/extensions/libip6t_dst.c
@@ -16,7 +16,7 @@ static void dst_help(void)
 {
        printf(
 "dst match options:\n"
-"  --dst-len [!] length          total length of this header\n"
+"[!] --dst-len length            total length of this header\n"
 "  --dst-opts TYPE[:LEN][,TYPE[:LEN]...]\n"
 "                                Options and its length (list, max: %d)\n",
 IP6T_OPTS_OPTSNR);

diff --git a/extensions/libip6t_frag.c b/extensions/libip6t_frag.c
index 64e110d3da0c18c2550d019c5bc340ead2202a2d..1dd48baf894b5af51573bfd2726baa538d046a4a 100644 (file)
--- a/extensions/libip6t_frag.c
+++ b/extensions/libip6t_frag.c
@@ -13,8 +13,8 @@ static void frag_help(void)
 {
        printf(
 "frag match options:\n"
-" --fragid [!] id[:id]          match the id (range)\n"
-" --fraglen [!] length          total length of this header\n"
+"[!] --fragid id[:id]           match the id (range)\n"
+"[!] --fraglen length           total length of this header\n"
 " --fragres                     check the reserved filed, too\n"
 " --fragfirst                   matches on the first fragment\n"
 " [--fragmore|--fraglast]       there are more fragments or this\n"

diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c
index e12fe4ed6a579f95378103d93fc8b88cd665f462..6492f9f4fcb606049a15db001a9e6f302162262f 100644 (file)
--- a/extensions/libip6t_hbh.c
+++ b/extensions/libip6t_hbh.c
@@ -19,7 +19,7 @@ static void hbh_help(void)
 {
        printf(
 "hbh match options:\n"
-"  --hbh-len [!] length          total length of this header\n"
+"[!] --hbh-len length            total length of this header\n"
 "  --hbh-opts TYPE[:LEN][,TYPE[:LEN]...] \n"
 "                                Options and its length (list, max: %d)\n",
 IP6T_OPTS_OPTSNR);

diff --git a/extensions/libip6t_hl.c b/extensions/libip6t_hl.c
index 2af9a20694e8f66c692973cf8421035feaa740eb..b895e3649f7051f1e069dfc4ae064b579ace79e6 100644 (file)
--- a/extensions/libip6t_hl.c
+++ b/extensions/libip6t_hl.c
@@ -19,7 +19,7 @@ static void hl_help(void)
 {
        printf(
 "hl match options:\n"
-"  --hl-eq [!] value   Match hop limit value\n"
+"[!] --hl-eq value     Match hop limit value\n"
 "  --hl-lt value       Match HL < value\n"
 "  --hl-gt value       Match HL > value\n");
 }

diff --git a/extensions/libip6t_icmp6.c b/extensions/libip6t_icmp6.c
index caecc4f2185c607afb769cbc13f4ff4bde5bfae0..c29fe617d98a09f5ead37bc8cd28cae2ca810f87 100644 (file)
--- a/extensions/libip6t_icmp6.c
+++ b/extensions/libip6t_icmp6.c
@@ -78,7 +78,7 @@ static void icmp6_help(void)
 {
        printf(
 "icmpv6 match options:\n"
-" --icmpv6-type [!] typename   match icmpv6 type\n"
+"[!] --icmpv6-type typename    match icmpv6 type\n"
 "                              (or numeric type or type/code)\n");
        print_icmpv6types();
 }

diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c
index 55978726cb99b7ce8963c9d14c37301154ab2e0c..547f96659ec1fb5468425c36a9ea619afc92212f 100644 (file)
--- a/extensions/libip6t_ipv6header.c
+++ b/extensions/libip6t_ipv6header.c
@@ -138,7 +138,7 @@ static void ipv6header_help(void)
 {
        printf(
 "ipv6header match options:\n"
-"--header [!] headers     Type of header to match, by name\n"
+"[!] --header headers     Type of header to match, by name\n"
 "                         names: hop,dst,route,frag,auth,esp,none,proto\n"
 "                    long names: hop-by-hop,ipv6-opts,ipv6-route,\n"
 "                                ipv6-frag,ah,esp,ipv6-nonxt,protocol\n"

diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c
index a6cd5622c67631db5f7c138671a5b933adde08a9..cc7476e55b8810ab1a626498fd1b57cff48c787e 100644 (file)
--- a/extensions/libip6t_mh.c
+++ b/extensions/libip6t_mh.c
@@ -62,7 +62,7 @@ static void mh_help(void)
 {
        printf(
 "mh match options:\n"
-" --mh-type [!] type[:type]    match mh type\n");
+"[!] --mh-type type[:type]     match mh type\n");
        print_types_all();
 }
 

diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c
index b5f54eee0d9838ae8cddbae698c539b29e81aaf1..50c94444dd2f58ee0a34aa01b02b22b36a84e783 100644 (file)
--- a/extensions/libip6t_rt.c
+++ b/extensions/libip6t_rt.c
@@ -19,9 +19,9 @@ static void rt_help(void)
 {
        printf(
 "rt match options:\n"
-" --rt-type [!] type            match the type\n"
-" --rt-segsleft [!] num[:num]   match the Segments Left field (range)\n"
-" --rt-len [!] length           total length of this header\n"
+"[!] --rt-type type             match the type\n"
+"[!] --rt-segsleft num[:num]    match the Segments Left field (range)\n"
+"[!] --rt-len length            total length of this header\n"
 " --rt-0-res                    check the reserved filed, too (type 0)\n"
 " --rt-0-addrs ADDR[,ADDR...]   Type=0 addresses (list, max: %d)\n"
 " --rt-0-not-strict             List of Type=0 addresses not a strict list\n",

diff --git a/extensions/libipt_ah.c b/extensions/libipt_ah.c
index 182b51a3c542f6a4a07657e5ab5505f6040b7af3..386c43f22b8bc70500a83b74711e19ae9667d83c 100644 (file)
--- a/extensions/libipt_ah.c
+++ b/extensions/libipt_ah.c
@@ -13,7 +13,7 @@ static void ah_help(void)
 {
        printf(
 "ah match options:\n"
-" --ahspi [!] spi[:spi]\n"
+"[!] --ahspi spi[:spi]\n"
 "                              match spi (range)\n");
 }
 

diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c
index 4361f13528f57aa207b2e61f902a626613b93d98..f57503a899bc5d30f7b772441f2df5d30d763111 100644 (file)
--- a/extensions/libipt_icmp.c
+++ b/extensions/libipt_icmp.c
@@ -102,7 +102,7 @@ static void icmp_help(void)
 {
        printf(
 "icmp match options:\n"
-" --icmp-type [!] typename     match icmp type\n"
+"[!] --icmp-type typename      match icmp type\n"
 "                              (or numeric type or type/code)\n");
        print_icmptypes();
 }

diff --git a/extensions/libipt_realm.c b/extensions/libipt_realm.c
index 7fdc29307d140df498fdb517185d8d46db1463a0..1e7f69000c4d59b8188020e078b51f79047c1cb3 100644 (file)
--- a/extensions/libipt_realm.c
+++ b/extensions/libipt_realm.c
@@ -19,7 +19,7 @@ static void realm_help(void)
 {
        printf(
 "realm match options:\n"
-" --realm [!] value[/mask]\n"
+"[!] --realm value[/mask]\n"
 "                              Match realm\n");
 }
 

diff --git a/extensions/libxt_dccp.c b/extensions/libxt_dccp.c
index c368ba484946e0d26941cf258d9a245923669dc3..8aa3d06ba0c70cf58e315bf31a32a525c7d52c64 100644 (file)
--- a/extensions/libxt_dccp.c
+++ b/extensions/libxt_dccp.c
@@ -36,9 +36,9 @@ static void dccp_help(void)
 {
        printf(
 "dccp match options\n"
-" --source-port [!] port[:port]                          match source port(s)\n"
+"[!] --source-port port[:port]                          match source port(s)\n"
 " --sport ...\n"
-" --destination-port [!] port[:port]                     match destination port(s)\n"
+"[!] --destination-port port[:port]                     match destination port(s)\n"
 " --dport ...\n");
 }
 

diff --git a/extensions/libxt_esp.c b/extensions/libxt_esp.c
index 82749f5b3f794c87b8c67708569c3250a5c4589a..1da82459a72e44ec4e9beadecfa6cc3a36f21070 100644 (file)
--- a/extensions/libxt_esp.c
+++ b/extensions/libxt_esp.c
@@ -13,7 +13,7 @@ static void esp_help(void)
 {
        printf(
 "esp match options:\n"
-" --espspi [!] spi[:spi]\n"
+"[!] --espspi spi[:spi]\n"
 "                              match spi (range)\n");
 }
 

diff --git a/extensions/libxt_mac.c b/extensions/libxt_mac.c
index f13d90522918b498adb5c5a1cdf06638f36a1e70..a842ee9b926e50539571af5678ac1cafcf15ecd3 100644 (file)
--- a/extensions/libxt_mac.c
+++ b/extensions/libxt_mac.c
@@ -17,7 +17,7 @@ static void mac_help(void)
 {
        printf(
 "mac match options:\n"
-" --mac-source [!] XX:XX:XX:XX:XX:XX\n"
+"[!] --mac-source XX:XX:XX:XX:XX:XX\n"
 "                              Match source MAC address\n");
 }
 

diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c
index 413f178db4883d07abeb6f116fbe7b5dba7beb65..3c2ece1af87dbdc51a01a457356efa5751288ede 100644 (file)
--- a/extensions/libxt_multiport.c
+++ b/extensions/libxt_multiport.c
@@ -31,13 +31,13 @@ static void multiport_help_v1(void)
 {
        printf(
 "multiport match options:\n"
-" --source-ports [!] port[,port:port,port...]\n"
+"[!] --source-ports port[,port:port,port...]\n"
 " --sports ...\n"
 "                              match source port(s)\n"
-" --destination-ports [!] port[,port:port,port...]\n"
+"[!] --destination-ports port[,port:port,port...]\n"
 " --dports ...\n"
 "                              match destination port(s)\n"
-" --ports [!] port[,port:port,port]\n"
+"[!] --ports port[,port:port,port]\n"
 "                              match both source and destination port(s)\n");
 }
 

diff --git a/extensions/libxt_physdev.c b/extensions/libxt_physdev.c
index 0a937eacefeebea9f4c7c07fdf148168d5a5e76d..a40cdf7297857053f6f9653c06362856f8ba0c19 100644 (file)
--- a/extensions/libxt_physdev.c
+++ b/extensions/libxt_physdev.c
@@ -16,8 +16,8 @@ static void physdev_help(void)
 {
        printf(
 "physdev match options:\n"
-" --physdev-in [!] input name[+]               bridge port name ([+] for wildcard)\n"
-" --physdev-out [!] output name[+]     bridge port name ([+] for wildcard)\n"
+" [!] --physdev-in inputname[+]                bridge port name ([+] for wildcard)\n"
+" [!] --physdev-out outputname[+]      bridge port name ([+] for wildcard)\n"
 " [!] --physdev-is-in                  arrived on a bridge device\n"
 " [!] --physdev-is-out                 will leave on a bridge device\n"
 " [!] --physdev-is-bridged             it's a bridged packet\n");

diff --git a/extensions/libxt_sctp.c b/extensions/libxt_sctp.c
index 653b601bef104bb80d8544495832f71082f00f73..8f363ffa6628e550b17b04bdb0b20764bb3d2e06 100644 (file)
--- a/extensions/libxt_sctp.c
+++ b/extensions/libxt_sctp.c
@@ -57,11 +57,11 @@ static void sctp_help(void)
 {
        printf(
 "sctp match options\n"
-" --source-port [!] port[:port]                          match source port(s)\n"
+"[!] --source-port port[:port]                          match source port(s)\n"
 " --sport ...\n"
-" --destination-port [!] port[:port]                     match destination port(s)\n"
+"[!] --destination-port port[:port]                     match destination port(s)\n"
 " --dport ...\n" 
-" --chunk-types [!] (all|any|none) (chunktype[:flags])+        match if all, any or none of\n"
+"[!] --chunk-types (all|any|none) (chunktype[:flags])+ match if all, any or none of\n"
 "                                                      chunktypes are present\n"
 "chunktypes - DATA INIT INIT_ACK SACK HEARTBEAT HEARTBEAT_ACK ABORT SHUTDOWN SHUTDOWN_ACK ERROR COOKIE_ECHO COOKIE_ACK ECN_ECNE ECN_CWR SHUTDOWN_COMPLETE ASCONF ASCONF_ACK ALL NONE\n");
 }

diff --git a/extensions/libxt_tcp.c b/extensions/libxt_tcp.c
index 743c5a23645a8bd40b13d0f0ebc2d8e8ccaa4a74..d7800644cbd22ecaecb15e83821054099e680463 100644 (file)
--- a/extensions/libxt_tcp.c
+++ b/extensions/libxt_tcp.c
@@ -12,17 +12,17 @@ static void tcp_help(void)
 {
        printf(
 "tcp match options:\n"
-" --tcp-flags [!] mask comp    match when TCP flags & mask == comp\n"
+"[!] --tcp-flags mask comp     match when TCP flags & mask == comp\n"
 "                              (Flags: SYN ACK FIN RST URG PSH ALL NONE)\n"
 "[!] --syn                     match when only SYN flag set\n"
 "                              (equivalent to --tcp-flags SYN,RST,ACK,FIN SYN)\n"
-" --source-port [!] port[:port]\n"
+"[!] --source-port port[:port]\n"
 " --sport ...\n"
 "                              match source port(s)\n"
-" --destination-port [!] port[:port]\n"
+"[!] --destination-port port[:port]\n"
 " --dport ...\n"
 "                              match destination port(s)\n"
-" --tcp-option [!] number       match if TCP option set\n");
+"[!] --tcp-option number        match if TCP option set\n");
 }
 
 static const struct option tcp_opts[] = {

diff --git a/extensions/libxt_udp.c b/extensions/libxt_udp.c
index 9c3665a4095abee7eef026072728334cbdc71f64..a749f13d99367c8929f5ec6e7394af1973b90c09 100644 (file)
--- a/extensions/libxt_udp.c
+++ b/extensions/libxt_udp.c
@@ -12,10 +12,10 @@ static void udp_help(void)
 {
        printf(
 "udp match options:\n"
-" --source-port [!] port[:port]\n"
+"[!] --source-port port[:port]\n"
 " --sport ...\n"
 "                              match source port(s)\n"
-" --destination-port [!] port[:port]\n"
+"[!] --destination-port port[:port]\n"
 " --dport ...\n"
 "                              match destination port(s)\n");
 }

diff --git a/ip6tables.c b/ip6tables.c
index 283a1c2d5524d79954d8e397b070bf90697a7229..12298ca6135ef434c594cf1c910f80c21921e8d0 100644 (file)
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -320,12 +320,12 @@ exit_printhelp(struct ip6tables_rule_match *matches)
 "                              Change chain name, (moving any references)\n"
 
 "Options:\n"
-"  --proto     -p [!] proto    protocol: by number or name, eg. `tcp'\n"
-"  --source    -s [!] address[/mask]\n"
+"[!] --proto   -p proto        protocol: by number or name, eg. `tcp'\n"
+"[!] --source  -s address[/mask]\n"
 "                              source specification\n"
-"  --destination -d [!] address[/mask]\n"
+"[!] --destination -d address[/mask]\n"
 "                              destination specification\n"
-"  --in-interface -i [!] input name[+]\n"
+"[!] --in-interface -i input name[+]\n"
 "                              network interface name ([+] for wildcard)\n"
 "  --jump      -j target\n"
 "                              target for rule (may load target extension)\n"
@@ -336,7 +336,7 @@ exit_printhelp(struct ip6tables_rule_match *matches)
 "  --match     -m match\n"
 "                              extended match (may load extension)\n"
 "  --numeric   -n              numeric output of addresses and ports\n"
-"  --out-interface -o [!] output name[+]\n"
+"[!] --out-interface -o output name[+]\n"
 "                              network interface name ([+] for wildcard)\n"
 "  --table     -t table        table to manipulate (default: `filter')\n"
 "  --verbose   -v              verbose mode\n"

diff --git a/iptables.c b/iptables.c
index 6a105f8061ce6439cc64585ecaaf99cf8a0b0d96..b927a117f133514433cbee22cc33a0158da952c1 100644 (file)
--- a/iptables.c
+++ b/iptables.c
@@ -322,14 +322,14 @@ exit_printhelp(struct iptables_rule_match *matches)
 "                              Change chain name, (moving any references)\n"
 
 "Options:\n"
-"  --proto     -p [!] proto    protocol: by number or name, eg. `tcp'\n"
-"  --source    -s [!] address[/mask]\n"
+"[!] --proto   -p proto        protocol: by number or name, eg. `tcp'\n"
+"[!] --source  -s address[/mask]\n"
 "                              source specification\n"
-"  --destination -d [!] address[/mask]\n"
+"[!] --destination -d address[/mask]\n"
 "                              destination specification\n"
-"  --in-interface -i [!] input name[+]\n"
+"[!] --in-interface -i input name[+]\n"
 "                              network interface name ([+] for wildcard)\n"
-"  --jump      -j target\n"
+" --jump       -j target\n"
 "                              target for rule (may load target extension)\n"
 #ifdef IPT_F_GOTO
 "  --goto      -g chain\n"
@@ -338,7 +338,7 @@ exit_printhelp(struct iptables_rule_match *matches)
 "  --match     -m match\n"
 "                              extended match (may load extension)\n"
 "  --numeric   -n              numeric output of addresses and ports\n"
-"  --out-interface -o [!] output name[+]\n"
+"[!] --out-interface -o output name[+]\n"
 "                              network interface name ([+] for wildcard)\n"
 "  --table     -t table        table to manipulate (default: `filter')\n"
 "  --verbose   -v              verbose mode\n"