xfreerdp-server: add better path detection support for finding server keys

diff --git a/include/freerdp/utils/file.h b/include/freerdp/utils/file.h
index 2236760..da74b81 100644 (file)
--- a/include/freerdp/utils/file.h
+++ b/include/freerdp/utils/file.h
@@ -29,6 +29,7 @@ FREERDP_API boolean freerdp_check_file_exists(char* file);
 FREERDP_API char* freerdp_get_home_path(rdpSettings* settings);
 FREERDP_API char* freerdp_get_config_path(rdpSettings* settings);
 FREERDP_API char* freerdp_get_current_path(rdpSettings* settings);
+FREERDP_API char* freerdp_construct_path(char* base_path, char* relative_path);
 FREERDP_API char* freerdp_get_parent_path(char* base_path, int depth);
 FREERDP_API boolean freerdp_detect_development_mode(rdpSettings* settings);
 FREERDP_API void freerdp_detect_paths(rdpSettings* settings);

diff --git a/libfreerdp-utils/file.c b/libfreerdp-utils/file.c
index f98a825..0d5a8d2 100644 (file)
--- a/libfreerdp-utils/file.c
+++ b/libfreerdp-utils/file.c
@@ -95,6 +95,23 @@ char* freerdp_get_current_path(rdpSettings* settings)
        return settings->current_path;
 }
 
+char* freerdp_construct_path(char* base_path, char* relative_path)
+{
+       char* path;
+       int length;
+       int base_path_length;
+       int relative_path_length;
+
+       base_path_length = strlen(base_path);
+       relative_path_length = strlen(relative_path);
+       length = base_path_length + relative_path_length + 1;
+
+       path = xmalloc(length + 1);
+       sprintf(path, "%s" PATH_SEPARATOR_STR "%s", base_path, relative_path);
+
+       return path;
+}
+
 char* freerdp_get_parent_path(char* base_path, int depth)
 {
        int i;

diff --git a/server/X11/xf_peer.c b/server/X11/xf_peer.c
index 874ba27..1ab33f4 100644 (file)
--- a/server/X11/xf_peer.c
+++ b/server/X11/xf_peer.c
@@ -29,6 +29,7 @@
 #include <sys/select.h>
 #include <freerdp/kbd/kbd.h>
 #include <freerdp/codec/color.h>
+#include <freerdp/utils/file.h>
 #include <freerdp/utils/sleep.h>
 #include <freerdp/utils/memory.h>
 #include <freerdp/utils/thread.h>
@@ -804,6 +805,8 @@ void* xf_peer_main_loop(void* arg)
        int rcount;
        void* rfds[32];
        fd_set rfds_set;
+       rdpSettings* settings;
+       char* server_file_path;
        freerdp_peer* client = (freerdp_peer*) arg;
 
        memset(rfds, 0, sizeof(rfds));
@@ -811,12 +814,27 @@ void* xf_peer_main_loop(void* arg)
        printf("We've got a client %s\n", client->hostname);
 
        xf_peer_init(client);
+       settings = client->settings;
 
        /* Initialize the real server settings here */
-       client->settings->cert_file = xstrdup("server.crt");
-       client->settings->privatekey_file = xstrdup("server.key");
-       client->settings->nla_security = false;
-       client->settings->rfx_codec = true;
+
+       if (settings->development_mode)
+       {
+               server_file_path = freerdp_construct_path(settings->development_path, "server/X11");
+       }
+       else
+       {
+               server_file_path = freerdp_construct_path(settings->config_path, "server");
+
+               if (!freerdp_check_file_exists(server_file_path))
+                       freerdp_mkdir(server_file_path);
+       }
+
+       settings->cert_file = freerdp_construct_path(server_file_path, "server.crt");
+       settings->privatekey_file = freerdp_construct_path(server_file_path, "server.key");
+
+       settings->nla_security = false;
+       settings->rfx_codec = true;
 
        client->Capabilities = xf_peer_capabilities;
        client->PostConnect = xf_peer_post_connect;