From e9d21d2b8304c184a745382c68a0bfc4122729c4 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu" Date: Tue, 28 Aug 2007 11:23:22 +0000 Subject: New release: 2.3.0 (see ChangeLog) --- ipset.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'ipset.c') diff --git a/ipset.c b/ipset.c index a63b8ec..9d7f78b 100644 --- a/ipset.c +++ b/ipset.c @@ -1151,13 +1151,17 @@ static size_t save_set(void *data, int *bindings, struct settype *settype; size_t used; - DP("offset %u, len %u", offset, len); + DP("offset %u (%u/%u/%u), len %u", offset, + sizeof(struct ip_set_save), + set_save->header_size, set_save->members_size, + len); if (offset + sizeof(struct ip_set_save) > len || offset + sizeof(struct ip_set_save) + set_save->header_size + set_save->members_size > len) exit_error(OTHER_PROBLEM, "Save operation failed, try again later."); + DP("index: %u", set_save->index); if (set_save->index == IP_SET_INVALID_ID) { /* Marker */ *bindings = 1; @@ -1633,6 +1637,10 @@ static int set_bind(struct set *set, const char *adt, /* set may be null: '-U :all: :all:|:default:' */ DP("(%s, %s) -> %s", set ? set->name : IPSET_TOKEN_ALL, adt, binding); + /* Ugly */ + if (strcmp(set->settype->typename, "iptreemap") == 0) + exit_error(PARAMETER_PROBLEM, + "iptreemap type of sets cannot be used at binding operations\n"); /* Alloc memory for the data to send */ size = sizeof(struct ip_set_req_bind); if (op != IP_SET_OP_UNBIND_SET && adt[0] == ':') -- cgit v1.2.3