From 20a52295775126d1bd5740b6543d1ea8ea239b1b Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Wed, 31 Aug 2011 15:56:34 +0200 Subject: Propagate "expose userspace-relevant parts in ip_set.h" to ipset source With the header file restructuring, the ipset userspace enums IPSET_DIM_* clash with the kernel ones. In this patch the userspace is converted to use the kernel part enums and thus we got rid of userspace enums IPSET_DIM_*. --- src/ipset_bitmap_ip.c | 2 +- src/ipset_bitmap_ipmac.c | 4 ++-- src/ipset_bitmap_port.c | 2 +- src/ipset_hash_ip.c | 2 +- src/ipset_hash_ipport.c | 4 ++-- src/ipset_hash_ipportip.c | 6 +++--- src/ipset_hash_ipportnet.c | 12 ++++++------ src/ipset_hash_net.c | 4 ++-- src/ipset_hash_netiface.c | 4 ++-- src/ipset_hash_netport.c | 8 ++++---- src/ipset_list_set.c | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/ipset_bitmap_ip.c b/src/ipset_bitmap_ip.c index e73bc7c..89f3002 100644 --- a/src/ipset_bitmap_ip.c +++ b/src/ipset_bitmap_ip.c @@ -63,7 +63,7 @@ struct ipset_type ipset_bitmap_ip0 = { .family = AF_INET, .dimension = IPSET_DIM_ONE, .elem = { - [IPSET_DIM_ONE] = { + [IPSET_DIM_ONE - 1] = { .parse = ipset_parse_ip, .print = ipset_print_ip, .opt = IPSET_OPT_IP diff --git a/src/ipset_bitmap_ipmac.c b/src/ipset_bitmap_ipmac.c index f47f25d..f8f7495 100644 --- a/src/ipset_bitmap_ipmac.c +++ b/src/ipset_bitmap_ipmac.c @@ -61,12 +61,12 @@ struct ipset_type ipset_bitmap_ipmac0 = { .dimension = IPSET_DIM_TWO, .last_elem_optional = true, .elem = { - [IPSET_DIM_ONE] = { + [IPSET_DIM_ONE - 1] = { .parse = ipset_parse_single_ip, .print = ipset_print_ip, .opt = IPSET_OPT_IP }, - [IPSET_DIM_TWO] = { + [IPSET_DIM_TWO - 1] = { .parse = ipset_parse_ether, .print = ipset_print_ether, .opt = IPSET_OPT_ETHER diff --git a/src/ipset_bitmap_port.c b/src/ipset_bitmap_port.c index c8c6e1f..9acdf23 100644 --- a/src/ipset_bitmap_port.c +++ b/src/ipset_bitmap_port.c @@ -54,7 +54,7 @@ struct ipset_type ipset_bitmap_port0 = { .family = AF_UNSPEC, .dimension = IPSET_DIM_ONE, .elem = { - [IPSET_DIM_ONE] = { + [IPSET_DIM_ONE - 1] = { .parse = ipset_parse_tcp_port, .print = ipset_print_port, .opt = IPSET_OPT_PORT diff --git a/src/ipset_hash_ip.c b/src/ipset_hash_ip.c index 315804a..7be8e19 100644 --- a/src/ipset_hash_ip.c +++ b/src/ipset_hash_ip.c @@ -86,7 +86,7 @@ struct ipset_type ipset_hash_ip0 = { .family = AF_INET46, .dimension = IPSET_DIM_ONE, .elem = { - [IPSET_DIM_ONE] = { + [IPSET_DIM_ONE - 1] = { .parse = ipset_parse_ip4_single6, .print = ipset_print_ip, .opt = IPSET_OPT_IP diff --git a/src/ipset_hash_ipport.c b/src/ipset_hash_ipport.c index b5bd41b..3738aa4 100644 --- a/src/ipset_hash_ipport.c +++ b/src/ipset_hash_ipport.c @@ -92,12 +92,12 @@ struct ipset_type ipset_hash_ipport1 = { .family = AF_INET46, .dimension = IPSET_DIM_TWO, .elem = { - [IPSET_DIM_ONE] = { + [IPSET_DIM_ONE - 1] = { .parse = ipset_parse_ip4_single6, .print = ipset_print_ip, .opt = IPSET_OPT_IP }, - [IPSET_DIM_TWO] = { + [IPSET_DIM_TWO - 1] = { .parse = ipset_parse_proto_port, .print = ipset_print_proto_port, .opt = IPSET_OPT_PORT diff --git a/src/ipset_hash_ipportip.c b/src/ipset_hash_ipportip.c index b27cebf..9a2c44c 100644 --- a/src/ipset_hash_ipportip.c +++ b/src/ipset_hash_ipportip.c @@ -92,17 +92,17 @@ struct ipset_type ipset_hash_ipportip1 = { .family = AF_INET46, .dimension = IPSET_DIM_THREE, .elem = { - [IPSET_DIM_ONE] = { + [IPSET_DIM_ONE - 1] = { .parse = ipset_parse_ip4_single6, .print = ipset_print_ip, .opt = IPSET_OPT_IP }, - [IPSET_DIM_TWO] = { + [IPSET_DIM_TWO - 1] = { .parse = ipset_parse_proto_port, .print = ipset_print_proto_port, .opt = IPSET_OPT_PORT }, - [IPSET_DIM_THREE] = { + [IPSET_DIM_THREE - 1] = { .parse = ipset_parse_single_ip, .print = ipset_print_ip, .opt = IPSET_OPT_IP2 diff --git a/src/ipset_hash_ipportnet.c b/src/ipset_hash_ipportnet.c index ecab191..b7415dc 100644 --- a/src/ipset_hash_ipportnet.c +++ b/src/ipset_hash_ipportnet.c @@ -93,17 +93,17 @@ struct ipset_type ipset_hash_ipportnet1 = { .family = AF_INET46, .dimension = IPSET_DIM_THREE, .elem = { - [IPSET_DIM_ONE] = { + [IPSET_DIM_ONE - 1] = { .parse = ipset_parse_ip4_single6, .print = ipset_print_ip, .opt = IPSET_OPT_IP }, - [IPSET_DIM_TWO] = { + [IPSET_DIM_TWO - 1] = { .parse = ipset_parse_proto_port, .print = ipset_print_proto_port, .opt = IPSET_OPT_PORT }, - [IPSET_DIM_THREE] = { + [IPSET_DIM_THREE - 1] = { .parse = ipset_parse_ipnet, .print = ipset_print_ip, .opt = IPSET_OPT_IP2 @@ -183,17 +183,17 @@ struct ipset_type ipset_hash_ipportnet2 = { .family = AF_INET46, .dimension = IPSET_DIM_THREE, .elem = { - [IPSET_DIM_ONE] = { + [IPSET_DIM_ONE - 1] = { .parse = ipset_parse_ip4_single6, .print = ipset_print_ip, .opt = IPSET_OPT_IP }, - [IPSET_DIM_TWO] = { + [IPSET_DIM_TWO - 1] = { .parse = ipset_parse_proto_port, .print = ipset_print_proto_port, .opt = IPSET_OPT_PORT }, - [IPSET_DIM_THREE] = { + [IPSET_DIM_THREE - 1] = { .parse = ipset_parse_ip4_net6, .print = ipset_print_ip, .opt = IPSET_OPT_IP2 diff --git a/src/ipset_hash_net.c b/src/ipset_hash_net.c index 665c398..587f891 100644 --- a/src/ipset_hash_net.c +++ b/src/ipset_hash_net.c @@ -76,7 +76,7 @@ struct ipset_type ipset_hash_net0 = { .family = AF_INET46, .dimension = IPSET_DIM_ONE, .elem = { - [IPSET_DIM_ONE] = { + [IPSET_DIM_ONE - 1] = { .parse = ipset_parse_ipnet, .print = ipset_print_ip, .opt = IPSET_OPT_IP @@ -128,7 +128,7 @@ struct ipset_type ipset_hash_net1 = { .family = AF_INET46, .dimension = IPSET_DIM_ONE, .elem = { - [IPSET_DIM_ONE] = { + [IPSET_DIM_ONE - 1] = { .parse = ipset_parse_ip4_net6, .print = ipset_print_ip, .opt = IPSET_OPT_IP diff --git a/src/ipset_hash_netiface.c b/src/ipset_hash_netiface.c index 2fbe27d..d1f5f7e 100644 --- a/src/ipset_hash_netiface.c +++ b/src/ipset_hash_netiface.c @@ -69,12 +69,12 @@ struct ipset_type ipset_hash_netiface0 = { .family = AF_INET46, .dimension = IPSET_DIM_TWO, .elem = { - [IPSET_DIM_ONE] = { + [IPSET_DIM_ONE - 1] = { .parse = ipset_parse_ip4_net6, .print = ipset_print_ip, .opt = IPSET_OPT_IP }, - [IPSET_DIM_TWO] = { + [IPSET_DIM_TWO - 1] = { .parse = ipset_parse_iface, .print = ipset_print_iface, .opt = IPSET_OPT_IFACE diff --git a/src/ipset_hash_netport.c b/src/ipset_hash_netport.c index 480dd84..acf4a29 100644 --- a/src/ipset_hash_netport.c +++ b/src/ipset_hash_netport.c @@ -70,12 +70,12 @@ struct ipset_type ipset_hash_netport1 = { .family = AF_INET46, .dimension = IPSET_DIM_TWO, .elem = { - [IPSET_DIM_ONE] = { + [IPSET_DIM_ONE - 1] = { .parse = ipset_parse_ipnet, .print = ipset_print_ip, .opt = IPSET_OPT_IP }, - [IPSET_DIM_TWO] = { + [IPSET_DIM_TWO - 1] = { .parse = ipset_parse_proto_port, .print = ipset_print_proto_port, .opt = IPSET_OPT_PORT @@ -144,12 +144,12 @@ struct ipset_type ipset_hash_netport2 = { .family = AF_INET46, .dimension = IPSET_DIM_TWO, .elem = { - [IPSET_DIM_ONE] = { + [IPSET_DIM_ONE - 1] = { .parse = ipset_parse_ip4_net6, .print = ipset_print_ip, .opt = IPSET_OPT_IP }, - [IPSET_DIM_TWO] = { + [IPSET_DIM_TWO - 1] = { .parse = ipset_parse_proto_port, .print = ipset_print_proto_port, .opt = IPSET_OPT_PORT diff --git a/src/ipset_list_set.c b/src/ipset_list_set.c index f3fa6df..68616e8 100644 --- a/src/ipset_list_set.c +++ b/src/ipset_list_set.c @@ -53,7 +53,7 @@ struct ipset_type ipset_list_set0 = { .family = AF_UNSPEC, .dimension = IPSET_DIM_ONE, .elem = { - [IPSET_DIM_ONE] = { + [IPSET_DIM_ONE - 1] = { .parse = ipset_parse_setname, .print = ipset_print_name, .opt = IPSET_OPT_NAME -- cgit v1.2.3