diff options
| author | Chirag Shah <chirag@nvidia.com> | 2023-03-16 21:47:07 -0700 |
|---|---|---|
| committer | Chirag Shah <chirag@nvidia.com> | 2023-03-17 17:01:13 -0700 |
| commit | 03494887eddaa255d9b6a217bfff60cc63cede42 (patch) | |
| tree | b2c15973f3e6be898eeebc48c0f77b2b6b6c3dbb /pbrd | |
| parent | 7644097f618d129c9a77746f7999ec674b5fcfae (diff) | |
pbrd:fix mismatching in match src-dst
upstream commit 67765a232d has incorect
address family check which prevent from
deleting src/dst config under pbr rule.
Ticket:#3405024
Issue:3405024
Testing Done:
Config:
pbr-map map6 seq 1
match src-ip 2000::200:100:100:0/96
match dst-ip 2000::100:100:100:0/96
set nexthop-group group3
Before:
torc-12(config)# pbr-map map6 seq 1
torc-12(config-pbr-map)# no match src-ip 2000::200:100:100:0/96
Cannot mismatch families within match src/dst
After:
torc-12(config)# pbr-map map6 seq 1
torc-12(config-pbr-map)# no match src-ip 2000::200:100:100:0/96
torc-12(config-pbr-map)#
Signed-off-by: Chirag Shah <chirag@nvidia.com>
Diffstat (limited to 'pbrd')
| -rw-r--r-- | pbrd/pbr_vty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pbrd/pbr_vty.c b/pbrd/pbr_vty.c index bb09a10b98..c4e36ebd46 100644 --- a/pbrd/pbr_vty.c +++ b/pbrd/pbr_vty.c @@ -125,7 +125,7 @@ DEFPY(pbr_map_match_src, pbr_map_match_src_cmd, if (!pbrms) return CMD_WARNING_CONFIG_FAILED; - if (pbrms->dst && pbrms->family && prefix->family != pbrms->family) { + if (pbrms->dst && prefix->family != pbrms->dst->family) { vty_out(vty, "Cannot mismatch families within match src/dst\n"); return CMD_WARNING_CONFIG_FAILED; } @@ -161,7 +161,7 @@ DEFPY(pbr_map_match_dst, pbr_map_match_dst_cmd, if (!pbrms) return CMD_WARNING_CONFIG_FAILED; - if (pbrms->src && pbrms->family && prefix->family != pbrms->family) { + if (pbrms->src && prefix->family != pbrms->src->family) { vty_out(vty, "Cannot mismatch families within match src/dst\n"); return CMD_WARNING_CONFIG_FAILED; } |