N0VA/BeamMeUp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[refactor] cleanup server code

Browse Source
This commit is contained in:
Julian Sparber
2017-10-28 21:38:44 +02:00
parent 80a0abc024
commit b7338e75b7
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/teleport-server.c
View File

@@ -17,10 +17,6 @@
*/ */
#include <errno.h> #include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <libsoup/soup.h> #include <libsoup/soup.h>
#include <glib.h> #include <glib.h>
@@ -39,7 +35,6 @@ do_get (SoupServer *server, SoupMessage *msg, const char *path)
{ {
GStatBuf st; GStatBuf st;
printf("paths: %s", path);
if (g_stat (path, &st) == -1) { if (g_stat (path, &st) == -1) {
if (errno == EPERM) if (errno == EPERM)
soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN); soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
@@ -166,8 +161,6 @@ server_callback (SoupServer *server, SoupMessage *msg,
soup_message_set_status (msg, SOUP_STATUS_OK); soup_message_set_status (msg, SOUP_STATUS_OK);
g_print("Handle response\n"); g_print("Handle response\n");
} }
//do_get_response_json (server, msg, "hello world");
} }
else else
soup_message_set_status (msg, SOUP_STATUS_NOT_IMPLEMENTED); soup_message_set_status (msg, SOUP_STATUS_NOT_IMPLEMENTED);
@@ -206,19 +199,26 @@ teleport_server_add_route (gchar *name,
path = g_strdup_printf("/transfer/%s", name); path = g_strdup_printf("/transfer/%s", name);
soup_server_add_handler (glob_server, path, soup_server_add_handler (glob_server, path,
server_callback, g_strdup(file_to_send), NULL); server_callback, g_strdup(file_to_send), NULL);
//send notification of available file to the client
//For getting file size /* send notification of available file to the client */
//https://developer.gnome.org/gio/stable/GFile.html#g-file-query-info /* getting file size */
file = g_file_new_for_path(file_to_send); file = g_file_new_for_path(file_to_send);
//G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, G_FILE_ATTRIBUTE_STANDARD_SIZE fileInfo = g_file_query_info(file,
fileInfo = g_file_query_info(file, "standard::display-name,standard::size", G_FILE_QUERY_INFO_NONE, NULL, NULL); "standard::display-name,standard::size",
G_FILE_QUERY_INFO_NONE,
NULL,
NULL);
teleport_get_do_client_notify(g_strdup_printf("http://%s:%d/?token=%s&size=%jd&name=%s\n", teleport_get_do_client_notify(g_strdup_printf("http://%s:%d/?token=%s&size=%jd&name=%s\n",
destination, destination,
port, port,
name, name,
g_file_info_get_size(fileInfo), g_file_info_get_size(fileInfo),
g_file_info_get_display_name(fileInfo))); g_file_info_get_display_name(fileInfo)));
/* Add timeout of 2 min which removes the route again */
g_timeout_add_seconds (2 * 60, do_server_timeout, path); g_timeout_add_seconds (2 * 60, do_server_timeout, path);
g_object_unref(fileInfo); g_object_unref(fileInfo);
g_object_unref(file); g_object_unref(file);
return 0; return 0;
@@ -248,7 +248,5 @@ teleport_server_run (void) {
} }
g_slist_free (uris); g_slist_free (uris);
g_print ("\nWaiting for requests...\n");
return 0; return 0;
} }