From 06f2713ec361b286f1d64b515a113c19a5d203b1 Mon Sep 17 00:00:00 2001 From: ISHIDA Wataru Date: Wed, 12 Apr 2017 04:16:08 +0000 Subject: [PATCH] don't To4() nexthop address when AFI is not IPv4 support for IPv6 NLRI with IPv4 nexthop Signed-off-by: ISHIDA Wataru --- packet/bgp/bgp.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packet/bgp/bgp.go b/packet/bgp/bgp.go index d7479172..dec650a5 100644 --- a/packet/bgp/bgp.go +++ b/packet/bgp/bgp.go @@ -5391,22 +5391,22 @@ func (p *PathAttributeMpReachNLRI) String() string { func NewPathAttributeMpReachNLRI(nexthop string, nlri []AddrPrefixInterface) *PathAttributeMpReachNLRI { t := BGP_ATTR_TYPE_MP_REACH_NLRI - ip := net.ParseIP(nexthop) - if ip.To4() != nil { - ip = ip.To4() - } p := &PathAttributeMpReachNLRI{ PathAttribute: PathAttribute{ Flags: PathAttrFlags[t], Type: t, }, - Nexthop: ip, - Value: nlri, + Value: nlri, } if len(nlri) > 0 { p.AFI = nlri[0].AFI() p.SAFI = nlri[0].SAFI() } + nh := net.ParseIP(nexthop) + if nh.To4() != nil && p.AFI != AFI_IP6 { + nh = nh.To4() + } + p.Nexthop = nh return p }