diff options
author | Johann Latocha | 2012-01-30 12:28:38 +0100 |
---|---|---|
committer | Johann Latocha | 2012-01-30 12:28:38 +0100 |
commit | 23c91a086d70898303ca3f8a0fb70a161b79bb37 (patch) | |
tree | 35b25a6578dd2c41357723109883aa04f0ab1c59 /src/server/server.c | |
parent | [SERVER] Reload configuration at runtime (diff) | |
download | dnbd3-23c91a086d70898303ca3f8a0fb70a161b79bb37.tar.gz dnbd3-23c91a086d70898303ca3f8a0fb70a161b79bb37.tar.xz dnbd3-23c91a086d70898303ca3f8a0fb70a161b79bb37.zip |
[KERNEL] Change server at runtime
[SERVER] Build error/warning on x64 fixed
Diffstat (limited to 'src/server/server.c')
-rw-r--r-- | src/server/server.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/server.c b/src/server/server.c index 90ec77b..4dbeb7f 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -79,7 +79,6 @@ void handle_sighup(int signum) pthread_spin_lock(&spinlock); reload_config(config_file_name); pthread_spin_unlock(&spinlock); - // TODO: stop handle_query or use mutex before image_file = open(ht_search(request.image_id), O_RDONLY); } void handle_sigterm(int signum) @@ -94,7 +93,7 @@ void *handle_query(void *client_socket) { int image_file = -1; off_t filesize = 0; - int sock = (int) client_socket; + int sock = (int)(uintptr_t) client_socket; struct dnbd3_request request; struct dnbd3_reply reply; uint16_t cmd; @@ -258,7 +257,7 @@ int main(int argc, char* argv[]) // FIXME: catch SIGKILL/SIGTERM and close all socket before exit pthread_t thread; - pthread_create(&(thread), NULL, handle_query, (void *) fd); + pthread_create(&(thread), NULL, handle_query, (void *)(uintptr_t) fd); pthread_detach(thread); } |