server: proxy: drop local unix socket listen option
authorkubistika <kmizrachi18@gmail.com>
Sun, 8 Sep 2019 15:13:41 +0000 (18:13 +0300)
committerkubistika <kmizrachi18@gmail.com>
Mon, 9 Sep 2019 14:42:18 +0000 (17:42 +0300)
server/proxy/pf_config.c
server/proxy/pf_config.h
server/proxy/pf_server.c

index 625dd21..dd8af9b 100644 (file)
@@ -69,7 +69,6 @@ static BOOL pf_config_get_uint32(wIniFile* ini, const char* section, const char*
 static BOOL pf_config_load_server(wIniFile* ini, proxyConfig* config)
 {
        config->Host = _strdup(CONFIG_GET_STR(ini, "Server", "Host"));
-       config->LocalOnly = CONFIG_GET_BOOL(ini, "Server", "LocalOnly");
        
        if (!pf_config_get_uint16(ini, "Server", "Port", &config->Port))
                return FALSE;
index 105b44d..b42f2f7 100644 (file)
@@ -33,7 +33,6 @@ struct proxy_config
        /* server */
        char* Host;
        UINT16 Port;
-       BOOL  LocalOnly;
 
        /* target */
        BOOL UseLoadBalanceInfo;
index d5080b5..fdfe3b9 100644 (file)
@@ -397,9 +397,6 @@ static void pf_server_mainloop(freerdp_listener* listener)
 
 int pf_server_start(proxyConfig* config)
 {
-       char* localSockPath;
-       char localSockName[MAX_PATH];
-       BOOL success;
        WSADATA wsaData;
        freerdp_listener* listener = freerdp_listener_new();
 
@@ -417,33 +414,11 @@ int pf_server_start(proxyConfig* config)
                return -1;
        }
 
-       /* Determine filepath for local socket */
-       sprintf_s(localSockName, sizeof(localSockName), "proxy.%" PRIu16 "", config->Port);
-       localSockPath = GetKnownSubPath(KNOWN_PATH_TEMP, localSockName);
-
-       if (!localSockPath)
-       {
-               freerdp_listener_free(listener);
-               WSACleanup();
-               return -1;
-       }
-
-       /* Listen to local connections */
-       success = listener->OpenLocal(listener, localSockPath);
-
-       /* Listen to remote connections */
-       if (!config->LocalOnly)
-       {
-               success &= listener->Open(listener, config->Host, config->Port);
-       }
-
-       if (success)
+       if (listener->Open(listener, config->Host, config->Port))
        {
                pf_server_mainloop(listener);
        }
 
-       free(localSockPath);
-       freerdp_listener_free(listener);
        WSACleanup();
        return 0;
 }