diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-10-24 21:42:48 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-10-24 21:42:48 +0200 |
| commit | 0d32c5c070f817229110f92d7b31df9a3e4eeec5 (patch) | |
| tree | 5ee04a9e03de32d2029ad0d708811e382ca922d1 /kernel/ip_set_list_set.c | |
| parent | 62a3d29539aa109fed1c8a20d63ef95948b13842 (diff) | |
Fixes, cleanups, commentsv5.0-pre8
- More comments added to the code
- ICMP and ICMPv6 support added to the hash:ip,port, hash:ip,port,ip
and hash:ip,port,net types
- hash:net and hash:ip,port,net types are reworked
- hash:net,port type added
- Wrong direction parameters fixed in hash:ip,port
- Helps and manpage are updated
- More tests added
- Ugly macros are rewritten to functions in parse.c
(Holger Eitzenberger)
- resize related bug in hash types fixed (Holger Eitzenberger)
- autoreconf patches by Jan Engelhardt applied
- netlink patch minimalized: dumping can be initialized by a second
parsing of the message (thanks to David and Patrick for the suggestion)
- IPv4/IPv6 address attributes are introduced in order to fix the context
(suggested by David)
Diffstat (limited to 'kernel/ip_set_list_set.c')
| -rw-r--r-- | kernel/ip_set_list_set.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/ip_set_list_set.c b/kernel/ip_set_list_set.c index c1e4699..ea3f0a9 100644 --- a/kernel/ip_set_list_set.c +++ b/kernel/ip_set_list_set.c @@ -250,7 +250,8 @@ list_set_uadt(struct ip_set *set, struct nlattr *head, int len, } if (tb[IPSET_ATTR_NAMEREF]) { - refid = ip_set_get_byname(nla_data(tb[IPSET_ATTR_NAMEREF]), &s); + refid = ip_set_get_byname(nla_data(tb[IPSET_ATTR_NAMEREF]), + &s); if (refid == IPSET_INVALID_ID) { ret = -IPSET_ERR_NAMEREF; goto finish; @@ -320,7 +321,8 @@ list_set_uadt(struct ip_set *set, struct nlattr *head, int len, continue; else if (elem->id == id && (before == 0 - || (before > 0 && next_id_eq(map, i, refid)))) + || (before > 0 + && next_id_eq(map, i, refid)))) ret = list_set_del(map, id, i); else if (before < 0 && elem->id == refid && next_id_eq(map, i, id)) |