summaryrefslogtreecommitdiffstats
path: root/src/server/net.c
diff options
context:
space:
mode:
authorsr2013-07-15 20:46:42 +0200
committersr2013-07-15 20:46:42 +0200
commit2c9731d63810c839c8040d9d7131326ad48d515b (patch)
tree5350a04a8f39b07e2c70bb54af99aebbaf0c8b94 /src/server/net.c
parentRewriiiiiiiiite (diff)
downloaddnbd3-2c9731d63810c839c8040d9d7131326ad48d515b.tar.gz
dnbd3-2c9731d63810c839c8040d9d7131326ad48d515b.tar.xz
dnbd3-2c9731d63810c839c8040d9d7131326ad48d515b.zip
"It's compiling!"
Diffstat (limited to 'src/server/net.c')
-rw-r--r--src/server/net.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/server/net.c b/src/server/net.c
index 5a75a9b..6aa5d5b 100644
--- a/src/server/net.c
+++ b/src/server/net.c
@@ -115,24 +115,24 @@ void *net_client_handler(void *dnbd3_client)
dnbd3_image_t *image = NULL;
int image_file = -1;
- int i, num;
+ int num;
int bOk = FALSE;
- uint64_t map_y;
- char map_x, bit_mask;
serialized_buffer_t payload;
char *image_name;
uint16_t rid, client_version;
+ /*
+ char map_x, bit_mask;
+ uint64_t map_y;
uint64_t todo_size = 0;
uint64_t todo_offset = 0;
uint64_t cur_offset = 0;
uint64_t last_offset = 0;
+ */
dnbd3_server_entry_t server_list[NUMBER_SERVERS];
- int dirty = 0;
-
reply.magic = dnbd3_packet_magic;
// Receive first packet. This must be CMD_SELECT_IMAGE by protocol specification
@@ -153,7 +153,6 @@ void *net_client_handler(void *dnbd3_client)
}
} else {
image = image_get( image_name, rid );
- const time_t now = time( NULL );
if ( image == NULL ) {
printf( "[DEBUG] Client requested non-existent image '%s' (rid:%d), rejected\n", image_name, (int)rid );
} else if ( !image->working ) {
@@ -357,8 +356,6 @@ void *net_client_handler(void *dnbd3_client)
}
exit_client_cleanup: if ( client->sock != -1 ) close( client->sock );
if ( image_file != -1 ) close( image_file );
- image_release( image );
- client->image = image = NULL;
- dnbd3_free_client( client );
+ dnbd3_remove_client( client );
pthread_exit( (void *)0 );
}