From 5d4613b99cf56456acd0e83604ab4c7d2528e808 Mon Sep 17 00:00:00 2001 From: Vittorio Parrella Date: Tue, 17 Sep 2024 08:14:11 +0200 Subject: [PATCH] fix merge issue --- workers/client/client_proxy_listener.go | 4 ++-- workers/gateway/gateway_interface_darwin.go | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/workers/client/client_proxy_listener.go b/workers/client/client_proxy_listener.go index eebc4b6..cb8a052 100644 --- a/workers/client/client_proxy_listener.go +++ b/workers/client/client_proxy_listener.go @@ -1,7 +1,7 @@ package client import ( - "github.com/Project-Faster/qpep/shared" + "github.com/Project-Faster/qpep/shared/errors" "net" ) @@ -40,7 +40,7 @@ func (listener *ClientProxyListener) Accept() (net.Conn, error) { // AcceptTProxy method accepts the connections and casts those to a tcp connection type func (listener *ClientProxyListener) AcceptTProxy() (*net.TCPConn, error) { if listener.base == nil { - return nil, shared.ErrFailed + return nil, errors.ErrFailed } tcpConn, err := listener.base.AcceptTCP() if err != nil { diff --git a/workers/gateway/gateway_interface_darwin.go b/workers/gateway/gateway_interface_darwin.go index 97c6b4f..a6e182e 100644 --- a/workers/gateway/gateway_interface_darwin.go +++ b/workers/gateway/gateway_interface_darwin.go @@ -215,3 +215,11 @@ func parseProxyUrlFromOutput(output []byte) string { return fmt.Sprintf("%s:%s", proxyHost, proxyPort) } + +func SetConnectionDiverter(active bool, gatewayAddr, listenAddr string, gatewayPort, listenPort, numThreads int, gatewayInterface int64) bool { + return true +} + +func GetConnectionDivertedState(local, remote *net.TCPAddr) (bool, int, int, string, string) { + return false, -1, -1, "", "" +}