diff options
| author | YuutaW <17158086+Trumeet@users.noreply.github.com> | 2021-01-08 21:27:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-08 21:27:18 -0800 |
| commit | f77bc528725f25be8f6f71cf2f89a1ae1e7c2974 (patch) | |
| tree | 1256c50f16f0c7adc37ab685d47c18afbd5550f0 | |
| parent | dc292ec6aa559f5edf1f1d98d272fdc82df86e7a (diff) | |
| download | dn42peering-revert-3-dev.tar dn42peering-revert-3-dev.tar.gz dn42peering-revert-3-dev.tar.bz2 dn42peering-revert-3-dev.zip | |
Revert "fix(agent/central): support optional endpoint"revert-3-dev
This reverts commit 76f32318d8ff3619cb55d543e32814f61b01ab2e.
5 files changed, 8 insertions, 10 deletions
diff --git a/agent/src/main/java/moe/yuuta/dn42peering/agent/grpc/AgentServiceImpl.java b/agent/src/main/java/moe/yuuta/dn42peering/agent/grpc/AgentServiceImpl.java index c1f3971..565def5 100644 --- a/agent/src/main/java/moe/yuuta/dn42peering/agent/grpc/AgentServiceImpl.java +++ b/agent/src/main/java/moe/yuuta/dn42peering/agent/grpc/AgentServiceImpl.java @@ -69,7 +69,7 @@ class AgentServiceImpl extends VertxAgentGrpc.AgentVertxImplBase { request.getNode().getIpv6(), (int)request.getId(), request.getListenPort(), - request.getEndpoint().isEmpty() ? "" : request.getEndpoint(), + request.getEndpoint(), request.getPeerPubKey(), request.getSelfPrivKey(), request.getSelfPresharedSecret(), @@ -89,7 +89,7 @@ class AgentServiceImpl extends VertxAgentGrpc.AgentVertxImplBase { request.getNode().getIpv6(), (int)request.getId(), request.getListenPort(), - request.getEndpoint().isEmpty() ? "" : request.getEndpoint(), + request.getEndpoint(), request.getPeerPubKey(), request.getSelfPrivKey(), request.getSelfPresharedSecret(), diff --git a/agent/src/main/java/moe/yuuta/dn42peering/agent/provision/IProvisionService.java b/agent/src/main/java/moe/yuuta/dn42peering/agent/provision/IProvisionService.java index c0a9bad..07083e7 100644 --- a/agent/src/main/java/moe/yuuta/dn42peering/agent/provision/IProvisionService.java +++ b/agent/src/main/java/moe/yuuta/dn42peering/agent/provision/IProvisionService.java @@ -52,7 +52,7 @@ public interface IProvisionService { @Nonnull String localIP6, int id, int listenPort, - @Nullable String endpointWithPort, + @Nonnull String endpointWithPort, @Nonnull String peerPubKey, @Nonnull String selfPrivKey, @Nonnull String selfPresharedSecret, @@ -66,7 +66,7 @@ public interface IProvisionService { @Nonnull String localIP6, int id, int listenPort, - @Nullable String endpointWithPort, + @Nonnull String endpointWithPort, @Nonnull String peerPubKey, @Nonnull String selfPrivKey, @Nonnull String selfPresharedSecret, diff --git a/agent/src/main/java/moe/yuuta/dn42peering/agent/provision/ProvisionServiceImpl.java b/agent/src/main/java/moe/yuuta/dn42peering/agent/provision/ProvisionServiceImpl.java index 714f66e..fa672c8 100644 --- a/agent/src/main/java/moe/yuuta/dn42peering/agent/provision/ProvisionServiceImpl.java +++ b/agent/src/main/java/moe/yuuta/dn42peering/agent/provision/ProvisionServiceImpl.java @@ -98,7 +98,7 @@ class ProvisionServiceImpl implements IProvisionService { @Nonnull String localIP6, @Nonnull String dev, int listenPort, - @Nullable String endpointWithPort, + @Nonnull String endpointWithPort, @Nonnull String peerPubKey, @Nonnull String selfPrivKey, @Nonnull String selfPresharedSecret, @@ -206,7 +206,7 @@ class ProvisionServiceImpl implements IProvisionService { @Nonnull String localIP6, int id, int listenPort, - @Nullable String endpointWithPort, + @Nonnull String endpointWithPort, @Nonnull String peerPubKey, @Nonnull String selfPrivKey, @Nonnull String selfPresharedSecret, @@ -240,7 +240,7 @@ class ProvisionServiceImpl implements IProvisionService { @Nonnull String localIP6, int id, int listenPort, - @Nullable String endpointWithPort, + @Nonnull String endpointWithPort, @Nonnull String peerPubKey, @Nonnull String selfPrivKey, @Nonnull String selfPresharedSecret, diff --git a/agent/src/main/resources/wg.conf.ftlh b/agent/src/main/resources/wg.conf.ftlh index f68cb51..57ff790 100644 --- a/agent/src/main/resources/wg.conf.ftlh +++ b/agent/src/main/resources/wg.conf.ftlh @@ -16,7 +16,5 @@ Table = off [Peer] PublicKey = ${peer_pub_key} PresharedKey = ${preshared_key} -<#if endpoint??> Endpoint = ${endpoint} -</#if> AllowedIPs = 0.0.0.0/0, ::/0 diff --git a/central/src/main/java/moe/yuuta/dn42peering/peer/Peer.java b/central/src/main/java/moe/yuuta/dn42peering/peer/Peer.java index 505d441..31560ad 100644 --- a/central/src/main/java/moe/yuuta/dn42peering/peer/Peer.java +++ b/central/src/main/java/moe/yuuta/dn42peering/peer/Peer.java @@ -197,7 +197,7 @@ public class Peer { return WGRequest.newBuilder() .setId(getId()) .setListenPort(Integer.parseInt(calcWireGuardPort())) - .setEndpoint(getWgEndpoint() == null ? "" : String.format("%s:%d", getWgEndpoint(), getWgEndpointPort())) + .setEndpoint(String.format("%s:%d", getWgEndpoint(), getWgEndpointPort())) .setPeerPubKey(getWgPeerPubkey()) .setSelfPrivKey(getWgSelfPrivKey()) .setSelfPresharedSecret(getWgPresharedSecret()) |