diff options
| author | Oliver Smith <oliver@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa> | 2013-09-22 20:56:35 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-09-23 14:03:58 +0200 |
| commit | e1cc3d782f3bca89c8d8f2ca6b0fd7885fc91cf8 (patch) | |
| tree | 2a36ae768373a9afa6f9c8d06c0373bcbb739dbf /lib/session.c | |
| parent | f13a2af1f99b4d226231126a7e716635b555df42 (diff) | |
ipset: Support comments in the userspace library.
This adds support to the userspace portion of ipset for handling ipsets
with the comment extension enabled. The library revision has been raised
accordingly.
Signed-off-by: Oliver Smith <oliver@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'lib/session.c')
| -rw-r--r-- | lib/session.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/session.c b/lib/session.c index f1df515..6f89281 100644 --- a/lib/session.c +++ b/lib/session.c @@ -488,6 +488,11 @@ static const struct ipset_attr_policy adt_attrs[] = { .type = MNL_TYPE_U64, .opt = IPSET_OPT_BYTES, }, + [IPSET_ATTR_COMMENT] = { + .type = MNL_TYPE_NUL_STRING, + .opt = IPSET_OPT_ADT_COMMENT, + .len = IPSET_MAX_COMMENT_SIZE + 1, + }, }; static const struct ipset_attr_policy ipaddr_attrs[] = { @@ -522,7 +527,7 @@ generic_data_attr_cb(const struct nlattr *attr, void *data, return MNL_CB_ERROR; } if (policy[type].type == MNL_TYPE_NUL_STRING && - mnl_attr_get_payload_len(attr) > IPSET_MAXNAMELEN) + mnl_attr_get_payload_len(attr) > policy[type].len) return MNL_CB_ERROR; tb[type] = attr; return MNL_CB_OK; |