diff options
| author | Arturo Borrero <arturo.borrero.glez@gmail.com> | 2014-07-14 13:56:52 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-07-21 14:20:47 +0200 |
| commit | 5bf7d66d5430b614b072d3a9e6a262b78992faca (patch) | |
| tree | 3c3da4c2a93080466c7a6befe70d5e84462a46b1 /src | |
| parent | 2cb5ea5831ae15870b5bb999e897ba5d6700f218 (diff) | |
netlink: monitor: fix how rules with intervals are printed
Previous to this patch, if we add a rule like this:
nft add rule filter test ip saddr { 1.1.1.1-2.2.2.2 }
The monitor operation output shows:
add rule ip filter test ip saddr { 0.0.0.0, 1.1.1.1, 2.2.2.3}
The fix suggested by Pablo is to call interval_map_decompose().
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/netlink.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/netlink.c b/src/netlink.c index c0597971..05fae103 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -1753,6 +1753,12 @@ out: return MNL_CB_OK; } +static void rule_map_decompose_cb(struct set *s, void *data) +{ + if (s->flags & NFT_SET_INTERVAL) + interval_map_decompose(s->init); +} + static int netlink_events_rule_cb(const struct nlmsghdr *nlh, int type, struct netlink_mon_handler *monh) { @@ -1773,6 +1779,7 @@ static int netlink_events_rule_cb(const struct nlmsghdr *nlh, int type, if (type == NFT_MSG_NEWRULE) { r = netlink_delinearize_rule(monh->ctx, nlr); + nlr_for_each_set(nlr, rule_map_decompose_cb, NULL); printf("add rule %s %s %s", family, table, chain); rule_print(r); |