diff options
| author | ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> | 2015-06-23 11:13:40 +0900 |
|---|---|---|
| committer | ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> | 2015-06-23 11:13:40 +0900 |
| commit | 4867124319c179d2a573d465a5dff2845176fb99 (patch) | |
| tree | 395c5f3b782156112c900752a5b6b4c5b964be5b /table/message.go | |
| parent | 706ccc9d71b3bd7b0555bf657dc80268b79222df (diff) | |
table: add Equal() method to compare PeerInfo
this patch fixes the wrong behavior shown below
$ gobgp global rib add 10.0.0.0/24
$ gobgp global rib del 10.0.0.0/24
$ gobgp global rib
Network Next Hop AS_PATH Age Attrs
*> 10.0.0.0/24 0.0.0.0 65000 00:05:48 [{Origin: IGP}]
since we used to compare path's source by PeerInfo's pointer, locally
originated routes is considered as a different route even if they have
same prefix.
this patch introduce Equal() method to compare PeerInfo's content and
fix this wrong behavior.
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Diffstat (limited to 'table/message.go')
| -rw-r--r-- | table/message.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/table/message.go b/table/message.go index 5b444ce0..4455e06b 100644 --- a/table/message.go +++ b/table/message.go @@ -215,7 +215,7 @@ func isMergeable(p1 Path, p2 Path) bool { if p1.GetRouteFamily() != bgp.RF_IPv4_UC { return false } - if p1.GetSource() == p2.GetSource() && isSamePathAttrs(p1.getPathAttrs(), p2.getPathAttrs()) { + if p1.GetSource().Equal(p2.GetSource()) && isSamePathAttrs(p1.getPathAttrs(), p2.getPathAttrs()) { return true } return false |