add PortRange() RPC in daemon

JordiSubira · Mar 12, 2024 · 85db1d3 · 85db1d3
1 parent abdba38
commit 85db1d3
Show file tree

Hide file tree

Showing 7 changed files with 451 additions and 335 deletions.
diff --git a/daemon/internal/servers/BUILD.bazel b/daemon/internal/servers/BUILD.bazel
@@ -30,6 +30,7 @@ go_library(
         "@com_github_golang_protobuf//ptypes/duration",
         "@com_github_golang_protobuf//ptypes/timestamp",
         "@com_github_opentracing_opentracing_go//:go_default_library",
+        "@org_golang_google_protobuf//types/known/emptypb:go_default_library",
         "@org_golang_x_sync//singleflight:go_default_library",
     ],
 )
diff --git a/daemon/internal/servers/grpc.go b/daemon/internal/servers/grpc.go
@@ -24,6 +24,7 @@ import (
 	timestamppb "github.com/golang/protobuf/ptypes/timestamp"
 	"github.com/opentracing/opentracing-go"
 	"golang.org/x/sync/singleflight"
+	"google.golang.org/protobuf/types/known/emptypb"
 
 	drkey_daemon "github.com/scionproto/scion/daemon/drkey"
 	"github.com/scionproto/scion/daemon/fetcher"
@@ -243,21 +244,15 @@ func (s *DaemonServer) as(ctx context.Context, req *sdpb.ASRequest) (*sdpb.ASRes
 	if reqIA.Equal(s.IA) {
 		mtu = uint32(s.MTU)
 	}
-	var startPort, endPort uint16
-	if reqIA.Equal(s.IA) {
-		startPort, endPort = s.Topology.PortRange()
-	}
 	core, err := s.ASInspector.HasAttributes(ctx, reqIA, trust.Core)
 	if err != nil {
 		log.FromCtx(ctx).Error("Inspecting ISD-AS", "err", err, "isd_as", reqIA)
 		return nil, serrors.WrapStr("inspecting ISD-AS", err, "isd_as", reqIA)
 	}
 	reply := &sdpb.ASResponse{
-		IsdAs:            uint64(reqIA),
-		Core:             core,
-		Mtu:              mtu,
-		EndhostStartPort: uint32(startPort),
-		EndhostEndPort:   uint32(endPort),
+		IsdAs: uint64(reqIA),
+		Core:  core,
+		Mtu:   mtu,
 	}
 	return reply, nil
 }
@@ -358,6 +353,19 @@ func (s *DaemonServer) notifyInterfaceDown(ctx context.Context,
 	return &sdpb.NotifyInterfaceDownResponse{}, nil
 }
 
+// AS serves the AS request.
+func (s *DaemonServer) PortRange(
+	_ context.Context,
+	_ *emptypb.Empty,
+) (*sdpb.PortRangeResponse, error) {
+
+	startPort, endPort := s.Topology.PortRange()
+	return &sdpb.PortRangeResponse{
+		EndhostStartPort: uint32(startPort),
+		EndhostEndPort:   uint32(endPort),
+	}, nil
+}
+
 func (s *DaemonServer) DRKeyASHost(
 	ctx context.Context,
 	req *pb_daemon.DRKeyASHostRequest,

diff --git a/pkg/daemon/BUILD.bazel b/pkg/daemon/BUILD.bazel
@@ -27,6 +27,7 @@ go_library(
         "//pkg/snet/path:go_default_library",
         "//private/topology:go_default_library",
         "@org_golang_google_grpc//:go_default_library",
+        "@org_golang_google_protobuf//types/known/emptypb:go_default_library",
         "@org_golang_google_protobuf//types/known/timestamppb:go_default_library",
     ],
 )
diff --git a/pkg/daemon/grpc.go b/pkg/daemon/grpc.go
@@ -20,6 +20,7 @@ import (
 	"time"
 
 	"google.golang.org/grpc"
+	"google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/scionproto/scion/pkg/addr"
@@ -75,11 +76,12 @@ func (c grpcConn) LocalIA(ctx context.Context) (addr.IA, error) {
 }
 
 func (c grpcConn) PortRange(ctx context.Context) (uint16, uint16, error) {
-	asInfo, err := c.ASInfo(ctx, 0)
+	client := sdpb.NewDaemonServiceClient(c.conn)
+	response, err := client.PortRange(ctx, &emptypb.Empty{})
 	if err != nil {
 		return 0, 0, err
 	}
-	return asInfo.EndhostStartPort, asInfo.EndhostEndPort, nil
+	return uint16(response.EndhostStartPort), uint16(response.EndhostEndPort), nil
 }
 
 func (c grpcConn) Interfaces(ctx context.Context) (map[uint16]*net.UDPAddr, error) {
@@ -130,10 +132,8 @@ func (c grpcConn) ASInfo(ctx context.Context, ia addr.IA) (ASInfo, error) {
 	}
 	c.metrics.incAS(nil)
 	return ASInfo{
-		IA:               addr.IA(response.IsdAs),
-		MTU:              uint16(response.Mtu),
-		EndhostStartPort: uint16(response.EndhostStartPort),
-		EndhostEndPort:   uint16(response.EndhostEndPort),
+		IA:  addr.IA(response.IsdAs),
+		MTU: uint16(response.Mtu),
 	}, nil
 }