pkg/packet/bgp: use netip for LsTLVSrv6SIDInfo

Replace net.IP with netip.Addr for LsTLVSrv6SIDInfo.

Signed-off-by: FUJITA Tomonori <[email protected]>

Author: fujita

cmd/gobgp/global.go

@@ -1684,7 +1684,10 @@ func parseLsSRv6SIDNLRIType(args []string) (bgp.AddrPrefixInterface, *bgp.PathAt
 	}
 	lndTLV := bgp.NewLsTLVNodeDescriptor(lnd, bgp.LS_TLV_LOCAL_NODE_DESC)
 
-	sids, ssiLen := apiutil.StringToNetIPLsTLVSrv6SIDInfo(m["sids"])
+	sids, ssiLen, err := apiutil.StringToNetIPLsTLVSrv6SIDInfo(m["sids"])
+	if err != nil {
+		return nil, nil, err
+	}
 	ssi := &bgp.LsTLVSrv6SIDInfo{
 		LsTLV: bgp.LsTLV{
 			Type:   bgp.LS_TLV_SRV6_SID_INFO,

pkg/apiutil/attribute.go

@@ -892,18 +892,25 @@ func UnmarshalLsPrefixDescriptor(*api.LsPrefixDescriptor) (*bgp.LsPrefixDescript
 	return nil, nil
 }
 
-func StringToNetIPLsTLVSrv6SIDInfo(s []string) ([]net.IP, uint16) {
-	sids := []net.IP{}
+func StringToNetIPLsTLVSrv6SIDInfo(s []string) ([]netip.Addr, uint16, error) {
+	sids := []netip.Addr{}
 	var ssiLen uint16
 	for _, sid := range s {
-		sids = append(sids, net.ParseIP(sid))
+		addr, err := netip.ParseAddr(sid)
+		if err != nil {
+			return nil, 0, err
+		}
+		sids = append(sids, addr)
 		ssiLen += 16
 	}
-	return sids, ssiLen
+	return sids, ssiLen, nil
 }
 
 func UnmarshalLsTLVSrv6SIDInfo(ssi *api.LsSrv6SIDInformation) (*bgp.LsTLVSrv6SIDInfo, error) {
-	sids, ssiLen := StringToNetIPLsTLVSrv6SIDInfo(ssi.Sids)
+	sids, ssiLen, err := StringToNetIPLsTLVSrv6SIDInfo(ssi.Sids)
+	if err != nil {
+		return nil, err
+	}
 	return &bgp.LsTLVSrv6SIDInfo{
 		LsTLV: bgp.LsTLV{
 			Type:   bgp.LS_TLV_SRV6_SID_INFO,

pkg/packet/bgp/bgp.go

@@ -5993,7 +5993,7 @@ func (l *LsPrefixV6NLRI) MarshalJSON() ([]byte, error) {
 
 type LsTLVSrv6SIDInfo struct {
 	LsTLV
-	SIDs []net.IP
+	SIDs []netip.Addr
 }
 
 func (l *LsTLVSrv6SIDInfo) DecodeFromBytes(data []byte) error {
@@ -6003,7 +6003,8 @@ func (l *LsTLVSrv6SIDInfo) DecodeFromBytes(data []byte) error {
 	}
 
 	for i := range len(sid) / 16 {
-		l.SIDs = append(l.SIDs, net.IP(sid[i*16:i*16+16]))
+		addr, _ := netip.AddrFromSlice(sid[i*16 : i*16+16])
+		l.SIDs = append(l.SIDs, addr)
 	}
 
 	return nil
@@ -6013,7 +6014,7 @@ func (l *LsTLVSrv6SIDInfo) Serialize() ([]byte, error) {
 	buf := []byte{}
 
 	for _, sid := range l.SIDs {
-		buf = append(buf, sid...)
+		buf = append(buf, sid.AsSlice()...)
 	}
 
 	return l.LsTLV.Serialize(buf)