summaryrefslogtreecommitdiff
path: root/zebra/zserv.c
diff options
context:
space:
mode:
authorPhilippe Guibert <philippe.guibert@6wind.com>2018-03-08 15:20:49 +0100
committerPhilippe Guibert <philippe.guibert@6wind.com>2018-04-16 14:40:43 +0200
commit1907e4b80b03dbaea9cb13eb4b52b33d1b9d30d3 (patch)
treec9a89b39b37f2cd3e35936078375fc16b93024dd /zebra/zserv.c
parent425bdd6bf10123c2027ed602536490aeb5fb72a0 (diff)
zebra: pbr rule structure is being added fwmark tag
PBR rule is being added a 32 bit value that can be used to record a rule in the kernel, by using a fwmark information. Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
Diffstat (limited to 'zebra/zserv.c')
-rw-r--r--zebra/zserv.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/zebra/zserv.c b/zebra/zserv.c
index f38ea81adb..4d9898ae2d 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -2741,13 +2741,17 @@ static inline void zread_rule(ZAPI_HANDLER_ARGS)
STREAM_GET(&zpr.filter.dst_ip.u.prefix, s,
prefix_blen(&zpr.filter.dst_ip));
STREAM_GETW(s, zpr.filter.dst_port);
+ STREAM_GETL(s, zpr.filter.fwmark);
STREAM_GETL(s, zpr.action.table);
STREAM_GETL(s, ifindex);
- zpr.ifp = if_lookup_by_index(ifindex, VRF_UNKNOWN);
- if (!zpr.ifp) {
- zlog_debug("Failed to lookup ifindex: %u", ifindex);
- return;
+ if (ifindex) {
+ zpr.ifp = if_lookup_by_index(ifindex, VRF_UNKNOWN);
+ if (!zpr.ifp) {
+ zlog_debug("Failed to lookup ifindex: %u",
+ ifindex);
+ return;
+ }
}
if (!is_default_prefix(&zpr.filter.src_ip))
@@ -2762,6 +2766,9 @@ static inline void zread_rule(ZAPI_HANDLER_ARGS)
if (zpr.filter.dst_port)
zpr.filter.filter_bm |= PBR_FILTER_DST_PORT;
+ if (zpr.filter.fwmark)
+ zpr.filter.filter_bm |= PBR_FILTER_FWMARK;
+
if (hdr->command == ZEBRA_RULE_ADD)
zebra_pbr_add_rule(zvrf->zns, &zpr);
else