diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2019-10-25 12:01:02 +0200 |
|---|---|---|
| committer | Donatas Abraitis <donatas.abraitis@gmail.com> | 2019-10-25 12:05:49 +0200 |
| commit | b550350618895bd6bff307fe2a1ea8d15c1a367c (patch) | |
| tree | 0897723bc9b57d0ee67d73ba8bc3d99c6ccd6640 /nhrpd | |
| parent | Merge pull request #5213 from mjstapp/fix_sysctl_h (diff) | |
| download | frr-b550350618895bd6bff307fe2a1ea8d15c1a367c.tar.xz frr-b550350618895bd6bff307fe2a1ea8d15c1a367c.zip | |
nhrp: Make sure `no ip nhrp map <something>` works as expected
We passed peer as NULL and nothing happened.
exit2-debian-9# conf
exit2-debian-9(config)# int gre1
exit2-debian-9(config-if)# ip nhrp map 1.1.1.1 local
exit2-debian-9(config-if)# ip nhrp map 2.2.2.2 3.3.3.3
exit2-debian-9(config-if)# do sh run
...
!
interface gre1
ip nhrp map 1.1.1.1 local
ip nhrp map 2.2.2.2 3.3.3.3
!
...
exit2-debian-9(config-if)# no ip nhrp map 1.1.1.1
exit2-debian-9(config-if)# do sh run
...
!
interface gre1
ip nhrp map 2.2.2.2 3.3.3.3
!
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
Diffstat (limited to 'nhrpd')
| -rw-r--r-- | nhrpd/nhrp_vty.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nhrpd/nhrp_vty.c b/nhrpd/nhrp_vty.c index cfedc1c6b..ba8c5d495 100644 --- a/nhrpd/nhrp_vty.c +++ b/nhrpd/nhrp_vty.c @@ -523,7 +523,7 @@ DEFUN(if_no_nhrp_map, if_no_nhrp_map_cmd, { VTY_DECLVAR_CONTEXT(interface, ifp); afi_t afi = cmd_to_afi(argv[1]); - union sockunion proto_addr; + union sockunion proto_addr, nbma_addr; struct nhrp_cache *c; if (str2sockunion(argv[4]->arg, &proto_addr) < 0 @@ -534,7 +534,8 @@ DEFUN(if_no_nhrp_map, if_no_nhrp_map_cmd, if (!c || !c->map) return nhrp_vty_return(vty, NHRP_ERR_ENTRY_NOT_FOUND); - nhrp_cache_update_binding(c, c->cur.type, -1, NULL, 0, NULL); + nhrp_cache_update_binding(c, c->cur.type, -1, + nhrp_peer_get(ifp, &nbma_addr), 0, NULL); return CMD_SUCCESS; } |