Deduplicate and maybe works

src/beam-me-up-server.c

@@ -26,7 +26,7 @@
 #include "beam-me-up-get.h"
 #include "beam-me-up-app.h"
 
-static int port;
+static int local_port;
 static SoupServer *glob_server;
 //static const char *tls_cert_file, *tls_key_file;
 
@@ -91,7 +91,7 @@ handle_incoming_file(const char *hash,
                          "s",
                          g_strdup_printf("http://%s:%d/transfer/%s",
                                          origin,
-                                         port,
+                                         local_port,
                                          hash)),
                         g_variant_builder_add (builder, "s", filename);
   value = g_variant_new ("as", builder);
@@ -191,7 +191,8 @@ do_server_timeout (gpointer user_data)
 int
 teleport_server_add_route (gchar *name,
                            gchar *file_to_send,
-                           gchar *destination) {
+                           gchar *destination,
+                           int    remote_port) {
   GFile *file;
   GFileInfo *fileInfo;
   gchar *path;
@@ -211,7 +212,7 @@ teleport_server_add_route (gchar *name,
 
   teleport_get_do_client_notify(g_strdup_printf("http://%s:%d/?token=%s&size=%jd&name=%s\n",
                                                 destination,
-                                                port,
+                                                remote_port,
                                                 name,
                                                 g_file_info_get_size(fileInfo),
                                                 g_file_info_get_display_name(fileInfo)));
@@ -231,10 +232,10 @@ teleport_server_run (void) {
   //GTlsCertificate *cert;
   GError *error = NULL;
 
-  port = 3000;
+  local_port = 3000;
   glob_server = soup_server_new (SOUP_SERVER_SERVER_HEADER, "beam-me-up-httpd ",
                                  NULL);
-  soup_server_listen_all (glob_server, port, 0, &error);
+  soup_server_listen_all (glob_server, local_port, 0, &error);
 
   soup_server_add_handler (glob_server, NULL,
                            server_callback, NULL, NULL);