draft 2nd

Signed-off-by: Songpon Srisawai <[email protected]>

Author: songponssw

pkg/guestagent/api/client/client.go

@@ -76,3 +76,11 @@ func (c *GuestAgentClient) Tunnel(ctx context.Context) (api.GuestService_TunnelC
 	}
 	return stream, nil
 }
+
+func (c *GuestAgentClient) IPv4(ctx context.Context) (*api.CommandOutput, error) {
+	return c.cli.GetIPv4(ctx, &emptypb.Empty{})
+}
+
+func (c *GuestAgentClient) IPv6(ctx context.Context) (*api.CommandOutput, error) {
+	return c.cli.GetIPv6(ctx, &emptypb.Empty{})
+}

pkg/guestagent/api/guestservice.pb.desc

@@ -1,20 +1,21 @@
 
-�
+�
 guestservice.protogoogle/protobuf/empty.protogoogle/protobuf/timestamp.proto"0
 Info(
 local_ports
 (2.IPPortR
-localPorts"�

+localPorts"�

 Event.
 time
 
(2.google.protobuf.TimestampRtime3
 local_ports_added (2.IPPortRlocalPortsAdded7
 local_ports_removed (2.IPPortRlocalPortsRemoved
-errors (	Rerrors
-
-json_bytes 
(R	jsonBytes"H
+errors (	Rerrors"H
 IPPort
 protocol
 
(	Rprotocol
 ip 
(	Rip
-port 
(Rport"X
+port 
(Rport"B
+CommandOutput
+is_json
 
(RisJson
+payload 
(Rpayload"X
 Inotify
 
 mount_path
 
(	R	mountPath.
@@ -24,9 +25,11 @@ mount_path
 
(	R	mountPath.
 protocol 
(	Rprotocol
 data 
(Rdata
 	guestAddr 
(	R	guestAddr$
-udpTargetAddr 
(	RudpTargetAddr2�

+udpTargetAddr 
(	RudpTargetAddr2�
 GuestService(
 GetInfo.google.protobuf.Empty.Info-
 	GetEvents.google.protobuf.Empty.Event0
1
 PostInotify.Inotify.google.protobuf.Empty(
,
-Tunnel.TunnelMessage.TunnelMessage(
0
B!Zgithub.com/lima-vm/lima/pkg/apibproto3
+Tunnel.TunnelMessage.TunnelMessage(
0
1
+GetIPv4.google.protobuf.Empty.CommandOutput1
+GetIPv6.google.protobuf.Empty.CommandOutputB!Zgithub.com/lima-vm/lima/pkg/apibproto3

pkg/guestagent/api/guestservice.pb.go

@@ -10,6 +10,8 @@ service GuestService {
   rpc PostInotify(stream Inotify) returns (google.protobuf.Empty);
 
   rpc Tunnel(stream TunnelMessage) returns (stream TunnelMessage);
+  rpc GetIPv4(google.protobuf.Empty) returns (CommandOutput);
+  rpc GetIPv6(google.protobuf.Empty) returns (CommandOutput);
 }
 
 message Info {
@@ -21,7 +23,6 @@ message Event {
   repeated IPPort local_ports_added = 2;
   repeated IPPort local_ports_removed = 3;
   repeated string errors = 4;
-  bytes json_bytes = 5;
 }
 
 message IPPort {
@@ -30,6 +31,11 @@ message IPPort {
   int32 port = 3;
 }
 
+message CommandOutput {
+  bool is_json = 1;
+  bytes payload = 2;
+}
+
 message Inotify {
   string mount_path = 1;
   google.protobuf.Timestamp time = 2;

pkg/guestagent/api/guestservice.proto

@@ -56,3 +56,11 @@ func (s *GuestServer) PostInotify(server api.GuestService_PostInotifyServer) err
 func (s *GuestServer) Tunnel(stream api.GuestService_TunnelServer) error {
 	return s.TunnelS.Start(stream)
 }
+
+func (s *GuestServer) GetIPv4(ctx context.Context, _ *emptypb.Empty) (*api.CommandOutput, error) {
+	return s.Agent.IPv4(ctx)
+}
+
+func (s *GuestServer) GetIPv6(ctx context.Context, _ *emptypb.Empty) (*api.CommandOutput, error) {
+	return s.Agent.IPv6(ctx)
+}

pkg/guestagent/api/guestservice_grpc.pb.go

@@ -14,4 +14,10 @@ type Agent interface {
 	Events(ctx context.Context, ch chan *api.Event)
 	LocalPorts(ctx context.Context) ([]*api.IPPort, error)
 	HandleInotify(event *api.Inotify)
+	IPv4(ctx context.Context) (*api.CommandOutput, error)
+	IPv6(ctx context.Context) (*api.CommandOutput, error)
+}
+
+type RouteEntry struct {
+	Dev string `json:"dev"`
 }