[ME-4826] Propagate Peer Private IP Addresses

Author: adrianosela

common/messages.pb.go

@@ -11,10 +11,11 @@ import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
 
 message DiscoveryDetailsMessage {
-  bool discoverable = 1;           // whether the peer should be returned along with the networks it's in
-  string endpoint_public_udp4 = 2; // the endpoint (IPv4 + port) to send packets to for the peer
-  string endpoint_public_udp6 = 3; // the endpoint (IPv6 + port) to send packets to for the peer
-  string public_key = 4;           // the public key of the peer, only used in connector
+  bool discoverable = 1;                               // whether the peer should be returned along with the networks it's in
+  string endpoint_public_udp4 = 2 [deprecated = true]; // the endpoint (IPv4 + port) to send packets to for the peer
+  string endpoint_public_udp6 = 3 [deprecated = true]; // the endpoint (IPv6 + port) to send packets to for the peer
+  string public_key = 4;                               // the public key of the peer, only used in connector
+  repeated IPAddrPort addresses = 5;                   // all ip address and port combinations that the peer can tx/rx traffic
 }
 
 message HeartbeatMessage {}
@@ -75,11 +76,12 @@ message WireGuardPeer {
   string ipv6 = 3;                                     // the peer's (private) IPv6 address in the WireGuard network
   repeated string allowed_ips = 4 [deprecated = true]; // list of routes (CIDRs) to be routed through this peer (most peers will just have their own IP/32). (this field is now deprecated in favor of building the allowed_ips list from ipv4 + ipv6 + service ips + subnet routes)
   uint32 persistent_keepalive_interval_seconds = 5;    // the interval for sending keepalive packets (0 means disabled)
-  string public_udp4_endpoint = 6;                     // endpoint for UDP peer-to-peer communication over IPv4 (public IPv4 + port as seen from the Internet)
-  string public_udp6_endpoint = 7;                     // endpoint for UDP peer-to-peer communication over IPv6 (public IPv6 + port as seen from the Internet)
+  string public_udp4_endpoint = 6 [deprecated = true]; // endpoint for UDP peer-to-peer communication over IPv4 (public IPv4 + port as seen from the Internet)
+  string public_udp6_endpoint = 7 [deprecated = true]; // endpoint for UDP peer-to-peer communication over IPv6 (public IPv6 + port as seen from the Internet)
   PeerType type = 8;                                   // client or connector
   repeated Service services = 9;                       // applicable only when PeerType == PEER_TYPE_CONNECTOR
-  string name = 10;                                   // device (client or connector) name
+  string name = 10;                                    // device (client or connector) name
+  repeated IPAddrPort addresses = 11;                  // all ip address and port combinations that the peer can tx/rx traffic
 }
 
 message Service {
@@ -103,11 +105,23 @@ message IPAddressWithMetadata {
   google.protobuf.Struct metadata = 3;
 }
 
+message IPAddrPort {
+  string ip_address = 1;
+  IPAddressType ip_version = 2;
+  IPAddressScope ip_scope = 3;
+  uint32 port = 4;
+}
+
 enum IPAddressType {
    IPV4 = 0;
    IPV6 = 1;
 }
 
+enum IPAddressScope {
+  IP_ADDRESS_SCOPE_PRIVATE = 0;
+  IP_ADDRESS_SCOPE_PUBLIC = 1;
+}
+
 enum PeerType {
   PEER_TYPE_UNKNOWN = 0;
   PEER_TYPE_DEVICE = 1;

common/messages.proto

@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine3.20
+FROM golang:1.24-alpine3.22
 
 RUN apk --no-cache update
 RUN apk --no-cache upgrade

connector/connector.pb.go

@@ -52,9 +52,9 @@ public object DiscoveryDetailsMessageKt {
      * the endpoint (IPv4 + port) to send packets to for the peer
      * </pre>
      *
-     * <code>string endpoint_public_udp4 = 2;</code>
+     * <code>string endpoint_public_udp4 = 2 [deprecated = true];</code>
      */
-    public var endpointPublicUdp4: kotlin.String
+    @kotlin.Deprecated(message = "Field endpointPublicUdp4 is deprecated") public var endpointPublicUdp4: kotlin.String
       @JvmName("getEndpointPublicUdp4")
       get() = _builder.getEndpointPublicUdp4()
       @JvmName("setEndpointPublicUdp4")
@@ -66,7 +66,9 @@ public object DiscoveryDetailsMessageKt {
      * the endpoint (IPv4 + port) to send packets to for the peer
      * </pre>
      *
-     * <code>string endpoint_public_udp4 = 2;</code>
+     * <code>string endpoint_public_udp4 = 2 [deprecated = true];</code>
+     * @deprecated border0.common.v1.DiscoveryDetailsMessage.endpoint_public_udp4 is deprecated.
+     *     See messages.proto;l=14
      */
     public fun clearEndpointPublicUdp4() {
       _builder.clearEndpointPublicUdp4()
@@ -77,9 +79,9 @@ public object DiscoveryDetailsMessageKt {
      * the endpoint (IPv6 + port) to send packets to for the peer
      * </pre>
      *
-     * <code>string endpoint_public_udp6 = 3;</code>
+     * <code>string endpoint_public_udp6 = 3 [deprecated = true];</code>
      */
-    public var endpointPublicUdp6: kotlin.String
+    @kotlin.Deprecated(message = "Field endpointPublicUdp6 is deprecated") public var endpointPublicUdp6: kotlin.String
       @JvmName("getEndpointPublicUdp6")
       get() = _builder.getEndpointPublicUdp6()
       @JvmName("setEndpointPublicUdp6")
@@ -91,7 +93,9 @@ public object DiscoveryDetailsMessageKt {
      * the endpoint (IPv6 + port) to send packets to for the peer
      * </pre>
      *
-     * <code>string endpoint_public_udp6 = 3;</code>
+     * <code>string endpoint_public_udp6 = 3 [deprecated = true];</code>
+     * @deprecated border0.common.v1.DiscoveryDetailsMessage.endpoint_public_udp6 is deprecated.
+     *     See messages.proto;l=15
      */
     public fun clearEndpointPublicUdp6() {
       _builder.clearEndpointPublicUdp6()
@@ -121,6 +125,106 @@ public object DiscoveryDetailsMessageKt {
     public fun clearPublicKey() {
       _builder.clearPublicKey()
     }
+
+    /**
+     * An uninstantiable, behaviorless type to represent the field in
+     * generics.
+     */
+    @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)
+    public class AddressesProxy private constructor() : com.google.protobuf.kotlin.DslProxy()
+    /**
+     * <pre>
+     * all ip address and port combinations that the peer can tx/rx traffic
+     * </pre>
+     *
+     * <code>repeated .border0.common.v1.IPAddrPort addresses = 5;</code>
+     */
+     public val addresses: com.google.protobuf.kotlin.DslList<border0.common.v1.Messages.IPAddrPort, AddressesProxy>
+      @kotlin.jvm.JvmSynthetic
+      get() = com.google.protobuf.kotlin.DslList(
+        _builder.getAddressesList()
+      )
+    /**
+     * <pre>
+     * all ip address and port combinations that the peer can tx/rx traffic
+     * </pre>
+     *
+     * <code>repeated .border0.common.v1.IPAddrPort addresses = 5;</code>
+     * @param value The addresses to add.
+     */
+    @kotlin.jvm.JvmSynthetic
+    @kotlin.jvm.JvmName("addAddresses")
+    public fun com.google.protobuf.kotlin.DslList<border0.common.v1.Messages.IPAddrPort, AddressesProxy>.add(value: border0.common.v1.Messages.IPAddrPort) {
+      _builder.addAddresses(value)
+    }
+    /**
+     * <pre>
+     * all ip address and port combinations that the peer can tx/rx traffic
+     * </pre>
+     *
+     * <code>repeated .border0.common.v1.IPAddrPort addresses = 5;</code>
+     * @param value The addresses to add.
+     */
+    @kotlin.jvm.JvmSynthetic
+    @kotlin.jvm.JvmName("plusAssignAddresses")
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun com.google.protobuf.kotlin.DslList<border0.common.v1.Messages.IPAddrPort, AddressesProxy>.plusAssign(value: border0.common.v1.Messages.IPAddrPort) {
+      add(value)
+    }
+    /**
+     * <pre>
+     * all ip address and port combinations that the peer can tx/rx traffic
+     * </pre>
+     *
+     * <code>repeated .border0.common.v1.IPAddrPort addresses = 5;</code>
+     * @param values The addresses to add.
+     */
+    @kotlin.jvm.JvmSynthetic
+    @kotlin.jvm.JvmName("addAllAddresses")
+    public fun com.google.protobuf.kotlin.DslList<border0.common.v1.Messages.IPAddrPort, AddressesProxy>.addAll(values: kotlin.collections.Iterable<border0.common.v1.Messages.IPAddrPort>) {
+      _builder.addAllAddresses(values)
+    }
+    /**
+     * <pre>
+     * all ip address and port combinations that the peer can tx/rx traffic
+     * </pre>
+     *
+     * <code>repeated .border0.common.v1.IPAddrPort addresses = 5;</code>
+     * @param values The addresses to add.
+     */
+    @kotlin.jvm.JvmSynthetic
+    @kotlin.jvm.JvmName("plusAssignAllAddresses")
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun com.google.protobuf.kotlin.DslList<border0.common.v1.Messages.IPAddrPort, AddressesProxy>.plusAssign(values: kotlin.collections.Iterable<border0.common.v1.Messages.IPAddrPort>) {
+      addAll(values)
+    }
+    /**
+     * <pre>
+     * all ip address and port combinations that the peer can tx/rx traffic
+     * </pre>
+     *
+     * <code>repeated .border0.common.v1.IPAddrPort addresses = 5;</code>
+     * @param index The index to set the value at.
+     * @param value The addresses to set.
+     */
+    @kotlin.jvm.JvmSynthetic
+    @kotlin.jvm.JvmName("setAddresses")
+    public operator fun com.google.protobuf.kotlin.DslList<border0.common.v1.Messages.IPAddrPort, AddressesProxy>.set(index: kotlin.Int, value: border0.common.v1.Messages.IPAddrPort) {
+      _builder.setAddresses(index, value)
+    }
+    /**
+     * <pre>
+     * all ip address and port combinations that the peer can tx/rx traffic
+     * </pre>
+     *
+     * <code>repeated .border0.common.v1.IPAddrPort addresses = 5;</code>
+     */
+    @kotlin.jvm.JvmSynthetic
+    @kotlin.jvm.JvmName("clearAddresses")
+    public fun com.google.protobuf.kotlin.DslList<border0.common.v1.Messages.IPAddrPort, AddressesProxy>.clear() {
+      _builder.clearAddresses()
+    }
+
   }
 }
 @kotlin.jvm.JvmSynthetic

connector/connector_grpc.pb.go

@@ -0,0 +1,97 @@
+//Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: messages.proto
+
+package border0.common.v1;
+
+@kotlin.jvm.JvmName("-initializeiPAddrPort")
+public inline fun iPAddrPort(block: border0.common.v1.IPAddrPortKt.Dsl.() -> kotlin.Unit): border0.common.v1.Messages.IPAddrPort =
+  border0.common.v1.IPAddrPortKt.Dsl._create(border0.common.v1.Messages.IPAddrPort.newBuilder()).apply { block() }._build()
+public object IPAddrPortKt {
+  @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)
+  @com.google.protobuf.kotlin.ProtoDslMarker
+  public class Dsl private constructor(
+    private val _builder: border0.common.v1.Messages.IPAddrPort.Builder
+  ) {
+    public companion object {
+      @kotlin.jvm.JvmSynthetic
+      @kotlin.PublishedApi
+      internal fun _create(builder: border0.common.v1.Messages.IPAddrPort.Builder): Dsl = Dsl(builder)
+    }
+
+    @kotlin.jvm.JvmSynthetic
+    @kotlin.PublishedApi
+    internal fun _build(): border0.common.v1.Messages.IPAddrPort = _builder.build()
+
+    /**
+     * <code>string ip_address = 1;</code>
+     */
+    public var ipAddress: kotlin.String
+      @JvmName("getIpAddress")
+      get() = _builder.getIpAddress()
+      @JvmName("setIpAddress")
+      set(value) {
+        _builder.setIpAddress(value)
+      }
+    /**
+     * <code>string ip_address = 1;</code>
+     */
+    public fun clearIpAddress() {
+      _builder.clearIpAddress()
+    }
+
+    /**
+     * <code>.border0.common.v1.IPAddressType ip_version = 2;</code>
+     */
+    public var ipVersion: border0.common.v1.Messages.IPAddressType
+      @JvmName("getIpVersion")
+      get() = _builder.getIpVersion()
+      @JvmName("setIpVersion")
+      set(value) {
+        _builder.setIpVersion(value)
+      }
+    /**
+     * <code>.border0.common.v1.IPAddressType ip_version = 2;</code>
+     */
+    public fun clearIpVersion() {
+      _builder.clearIpVersion()
+    }
+
+    /**
+     * <code>.border0.common.v1.IPAddressScope ip_scope = 3;</code>
+     */
+    public var ipScope: border0.common.v1.Messages.IPAddressScope
+      @JvmName("getIpScope")
+      get() = _builder.getIpScope()
+      @JvmName("setIpScope")
+      set(value) {
+        _builder.setIpScope(value)
+      }
+    /**
+     * <code>.border0.common.v1.IPAddressScope ip_scope = 3;</code>
+     */
+    public fun clearIpScope() {
+      _builder.clearIpScope()
+    }
+
+    /**
+     * <code>uint32 port = 4;</code>
+     */
+    public var port: kotlin.Int
+      @JvmName("getPort")
+      get() = _builder.getPort()
+      @JvmName("setPort")
+      set(value) {
+        _builder.setPort(value)
+      }
+    /**
+     * <code>uint32 port = 4;</code>
+     */
+    public fun clearPort() {
+      _builder.clearPort()
+    }
+  }
+}
+@kotlin.jvm.JvmSynthetic
+public inline fun border0.common.v1.Messages.IPAddrPort.copy(block: border0.common.v1.IPAddrPortKt.Dsl.() -> kotlin.Unit): border0.common.v1.Messages.IPAddrPort =
+  border0.common.v1.IPAddrPortKt.Dsl._create(this.toBuilder()).apply { block() }._build()
+