diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-06-15 13:30:55 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-06-15 13:30:55 +0200 |
| commit | 3fd6b24ace319b139ec3c4e3031a5f05d21e304e (patch) | |
| tree | e6ac952e95fa44968196149e0172b1ef13e8236f /src/ipset_bitmap_ip.c | |
| parent | 00bcb2b40450eca4c7ad785bf85b12692e8d29af (diff) | |
ipset 5 in an almost ready state - milestonev5.0-pre1
Reworked protocol and internal interfaces, missing set types added,
backward compatibility verified, lots of tests added (and thanks to the tests,
bugs fixed), even the manpage is rewritten ;-). Countless changes everywhere...
The missing bits before announcing ipset 5:
- net namespace support
- new iptables/ip6tables extension library
- iptables/ip6tables match and target tests (backward/forward compatibility)
- tests on catching syntax errors
Diffstat (limited to 'src/ipset_bitmap_ip.c')
| -rw-r--r-- | src/ipset_bitmap_ip.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ipset_bitmap_ip.c b/src/ipset_bitmap_ip.c index 471cc96..e28432b 100644 --- a/src/ipset_bitmap_ip.c +++ b/src/ipset_bitmap_ip.c @@ -11,28 +11,28 @@ /* Parse commandline arguments */ static const struct ipset_arg bitmap_ip_create_args[] = { - { .name = { "range", "--range", NULL }, + { .name = { "range", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_IP, .parse = ipset_parse_netrange, .print = ipset_print_ip, }, - { .name = { "netmask", "--netmask", NULL }, + { .name = { "netmask", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_NETMASK, .parse = ipset_parse_netmask, .print = ipset_print_number, }, - { .name = { "timeout", "--timeout", NULL }, + { .name = { "timeout", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, .parse = ipset_parse_uint32, .print = ipset_print_number, }, /* Backward compatibility */ - { .name = { "--from", NULL }, + { .name = { "from", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_IP, .parse = ipset_parse_single_ip, }, - { .name = { "--to", NULL }, + { .name = { "to", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_IP_TO, .parse = ipset_parse_single_ip, }, - { .name = { "--network", NULL }, + { .name = { "network", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_IP, .parse = ipset_parse_net, }, @@ -40,7 +40,7 @@ static const struct ipset_arg bitmap_ip_create_args[] = { }; static const struct ipset_arg bitmap_ip_add_args[] = { - { .name = { "timeout", "--timeout", NULL }, + { .name = { "timeout", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, .parse = ipset_parse_uint32, .print = ipset_print_number, }, @@ -56,7 +56,7 @@ static const char bitmap_ip_usage[] = struct ipset_type ipset_bitmap_ip0 = { .name = "bitmap:ip", - .alias = "ipmap", + .alias = { "ipmap", NULL }, .revision = 0, .family = AF_INET, .dimension = IPSET_DIM_ONE, |