diff options
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/api/api_test.go | 4 | ||||
| -rw-r--r-- | internal/server/server.go | 2 | ||||
| -rw-r--r-- | internal/wireguard/wireguard.go | 15 |
3 files changed, 11 insertions, 10 deletions
diff --git a/internal/api/api_test.go b/internal/api/api_test.go index f15bac4..9648544 100644 --- a/internal/api/api_test.go +++ b/internal/api/api_test.go @@ -497,8 +497,8 @@ PrivateKey = .*`, if gcd.Proxy.SourcePort <= 0 { t.Fatalf("got proxy source port is smaller or equal to 0: %v", gcd.Proxy.SourcePort) } - if !strings.Contains(gcd.Proxy.Listen, "127.0.0.1") { - t.Fatalf("proxy listen does not contain 127.0.0.1: %s", gcd.Proxy.Listen) + if gcd.Proxy.ListenPort <= 0 { + t.Fatalf("proxy listen port is smaller or equal to 0: %v", gcd.Proxy.ListenPort) } c.cd.Proxy = gcd.Proxy } diff --git a/internal/server/server.go b/internal/server/server.go index eac1c2a..8ec7a3f 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -142,7 +142,7 @@ func (s *Server) connect(ctx context.Context, pTCP bool) (*srvtypes.Configuratio if apicfg.Proxy != nil { proxy = &srvtypes.Proxy{ SourcePort: apicfg.Proxy.SourcePort, - Listen: apicfg.Proxy.Listen, + ListenPort: apicfg.Proxy.ListenPort, Peer: apicfg.Proxy.Peer, } } diff --git a/internal/wireguard/wireguard.go b/internal/wireguard/wireguard.go index a70f21a..9239835 100644 --- a/internal/wireguard/wireguard.go +++ b/internal/wireguard/wireguard.go @@ -40,8 +40,8 @@ func availableUDPPort() (int, error) { type Proxy struct { // SourcePort is the source port of the TCP socket SourcePort int - // Listen is the IP:PORT of the udp listener - Listen string + // ListenPort is the PORT of the udp listener + ListenPort int // Peer is the hostname/ip:port of the WireGuard peer Peer string } @@ -54,22 +54,23 @@ func Config(cfg string, key *wgtypes.Key, proxy bool) (string, *Proxy, error) { } var tcpp int - var plisten string + var udpp int var err error + var udpl string if proxy { tcpp, err = availableTCPPort() if err != nil { return "", nil, err } - udpp, err := availableUDPPort() + udpp, err = availableUDPPort() if err != nil { return "", nil, err } - plisten = fmt.Sprintf("127.0.0.1:%d", udpp) + udpl = fmt.Sprintf("127.0.0.1:%d", udpp) } - rcfg, peer, err := configReplace(cfg, *key, plisten) + rcfg, peer, err := configReplace(cfg, *key, udpl) if err != nil { return "", nil, err } @@ -77,7 +78,7 @@ func Config(cfg string, key *wgtypes.Key, proxy bool) (string, *Proxy, error) { if proxy { retP = &Proxy{ SourcePort: tcpp, - Listen: plisten, + ListenPort: udpp, Peer: peer, } } |