From 347fc59eb38a542d5f84cf2bce16318d60fffefb Mon Sep 17 00:00:00 2001
From: Oliver Herms <oliver.peter.herms@gmail.com>
Date: Wed, 15 Apr 2020 19:12:47 +0200
Subject: [PATCH] Change references from values to pointers
---
cmd/ris/risserver/server.go | 6 +++---
protocols/bgp/server/bgp_api.go | 4 ++--
route/bgp_path.go | 4 ++--
route/route.go | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cmd/ris/risserver/server.go b/cmd/ris/risserver/server.go
index 1efaf04e..cfbc1826 100644
--- a/cmd/ris/risserver/server.go
+++ b/cmd/ris/risserver/server.go
@@ -87,7 +87,7 @@ func (s *Server) LPM(ctx context.Context, req *pb.LPMRequest) (*pb.LPMResponse,
return nil, err
}
- routes := rib.LPM(bnet.NewPrefixFromProtoPrefix(*req.Pfx))
+ routes := rib.LPM(bnet.NewPrefixFromProtoPrefix(req.Pfx))
res := &pb.LPMResponse{
Routes: make([]*routeapi.Route, 0, len(routes)),
}
@@ -105,7 +105,7 @@ func (s *Server) Get(ctx context.Context, req *pb.GetRequest) (*pb.GetResponse,
return nil, err
}
- route := rib.Get(bnet.NewPrefixFromProtoPrefix(*req.Pfx))
+ route := rib.Get(bnet.NewPrefixFromProtoPrefix(req.Pfx))
if route == nil {
return &pb.GetResponse{
Routes: make([]*routeapi.Route, 0, 0),
@@ -126,7 +126,7 @@ func (s *Server) GetLonger(ctx context.Context, req *pb.GetLongerRequest) (*pb.G
return nil, err
}
- routes := rib.GetLonger(bnet.NewPrefixFromProtoPrefix(*req.Pfx))
+ routes := rib.GetLonger(bnet.NewPrefixFromProtoPrefix(req.Pfx))
res := &pb.GetLongerResponse{
Routes: make([]*routeapi.Route, 0, len(routes)),
}
diff --git a/protocols/bgp/server/bgp_api.go b/protocols/bgp/server/bgp_api.go
index 5546abf9..242c7fb0 100644
--- a/protocols/bgp/server/bgp_api.go
+++ b/protocols/bgp/server/bgp_api.go
@@ -28,7 +28,7 @@ func (s *BGPAPIServer) ListSessions(ctx context.Context, in *api.ListSessionsReq
// DumpRIBIn dumps the RIB in of a peer for a given AFI/SAFI
func (s *BGPAPIServer) DumpRIBIn(in *api.DumpRIBRequest, stream api.BgpService_DumpRIBInServer) error {
- r := s.srv.GetRIBIn(bnet.IPFromProtoIP(*in.Peer), uint16(in.Afi), uint8(in.Safi))
+ r := s.srv.GetRIBIn(bnet.IPFromProtoIP(in.Peer), uint16(in.Afi), uint8(in.Safi))
if r == nil {
return fmt.Errorf("Unable to get AdjRIBIn")
}
@@ -46,7 +46,7 @@ func (s *BGPAPIServer) DumpRIBIn(in *api.DumpRIBRequest, stream api.BgpService_D
// DumpRIBOut dumps the RIB out of a peer for a given AFI/SAFI
func (s *BGPAPIServer) DumpRIBOut(in *api.DumpRIBRequest, stream api.BgpService_DumpRIBOutServer) error {
- r := s.srv.GetRIBOut(bnet.IPFromProtoIP(*in.Peer), uint16(in.Afi), uint8(in.Safi))
+ r := s.srv.GetRIBOut(bnet.IPFromProtoIP(in.Peer), uint16(in.Afi), uint8(in.Safi))
if r == nil {
return fmt.Errorf("Unable to get AdjRIBOut")
}
diff --git a/route/bgp_path.go b/route/bgp_path.go
index 88d5b0e5..378abebc 100644
--- a/route/bgp_path.go
+++ b/route/bgp_path.go
@@ -111,14 +111,14 @@ func (b *BGPPath) ToProto() *api.BGPPath {
func BGPPathFromProtoBGPPath(pb *api.BGPPath, dedup bool) *BGPPath {
p := &BGPPath{
BGPPathA: &BGPPathA{
- NextHop: bnet.IPFromProtoIP(*pb.NextHop),
+ NextHop: bnet.IPFromProtoIP(pb.NextHop),
LocalPref: pb.LocalPref,
OriginatorID: pb.OriginatorId,
Origin: uint8(pb.Origin),
MED: pb.Med,
EBGP: pb.Ebgp,
BGPIdentifier: pb.BgpIdentifier,
- Source: bnet.IPFromProtoIP(*pb.Source),
+ Source: bnet.IPFromProtoIP(pb.Source),
},
PathIdentifier: pb.PathIdentifier,
ASPath: types.ASPathFromProtoASPath(pb.AsPath),
diff --git a/route/route.go b/route/route.go
index 9b523c7d..fd92772e 100644
--- a/route/route.go
+++ b/route/route.go
@@ -269,7 +269,7 @@ func (r *Route) ToProto() *api.Route {
// RouteFromProtoRoute converts a proto Route to a Route
func RouteFromProtoRoute(ar *api.Route, dedup bool) *Route {
r := &Route{
- pfx: net.NewPrefixFromProtoPrefix(*ar.Pfx),
+ pfx: net.NewPrefixFromProtoPrefix(ar.Pfx),
paths: make([]*Path, 0, len(ar.Paths)),
}
--
GitLab