fix merge issue

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 {

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, "", ""
+}