From 7b2c731331434137df18460fc7d6ffbde7fa31e8 Mon Sep 17 00:00:00 2001 From: Philippe Guibert Date: Wed, 13 Jun 2018 11:12:08 +0200 Subject: [PATCH] bgpd, lib: share flags values for iptable configuration Those flags can be shared between BGP and Zebra. That is why those flags are moved to common pbr.h header file. Signed-off-by: Philippe Guibert --- bgpd/bgp_pbr.c | 1 + bgpd/bgp_pbr.h | 6 ------ lib/pbr.h | 10 ++++++++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bgpd/bgp_pbr.c b/bgpd/bgp_pbr.c index a554860647..bf09a999d4 100644 --- a/bgpd/bgp_pbr.c +++ b/bgpd/bgp_pbr.c @@ -21,6 +21,7 @@ #include "prefix.h" #include "zclient.h" #include "jhash.h" +#include "pbr.h" #include "bgpd/bgpd.h" #include "bgpd/bgp_pbr.h" diff --git a/bgpd/bgp_pbr.h b/bgpd/bgp_pbr.h index a39fba82c1..6a06ba3893 100644 --- a/bgpd/bgp_pbr.h +++ b/bgpd/bgp_pbr.h @@ -178,12 +178,6 @@ struct bgp_pbr_match { */ uint32_t type; -#define MATCH_IP_SRC_SET (1 << 0) -#define MATCH_IP_DST_SET (1 << 1) -#define MATCH_PORT_SRC_SET (1 << 2) -#define MATCH_PORT_DST_SET (1 << 3) -#define MATCH_PORT_SRC_RANGE_SET (1 << 4) -#define MATCH_PORT_DST_RANGE_SET (1 << 5) uint32_t flags; uint16_t pkt_len_min; diff --git a/lib/pbr.h b/lib/pbr.h index 832788d784..72a870f1f3 100644 --- a/lib/pbr.h +++ b/lib/pbr.h @@ -97,6 +97,16 @@ struct pbr_rule { | TCP_HEADER_RST | TCP_HEADER_PSH \ | TCP_HEADER_ACK | TCP_HEADER_URG) +/* Pbr IPTable defines + * those are common flags shared between BGP and Zebra + */ +#define MATCH_IP_SRC_SET (1 << 0) +#define MATCH_IP_DST_SET (1 << 1) +#define MATCH_PORT_SRC_SET (1 << 2) +#define MATCH_PORT_DST_SET (1 << 3) +#define MATCH_PORT_SRC_RANGE_SET (1 << 4) +#define MATCH_PORT_DST_RANGE_SET (1 << 5) + extern int zapi_pbr_rule_encode(uint8_t cmd, struct stream *s, struct pbr_rule *zrule); -- 2.39.5