diff options
| author | Johann Latocha | 2012-02-16 19:54:15 +0100 |
|---|---|---|
| committer | Johann Latocha | 2012-02-16 19:54:15 +0100 |
| commit | 80fd019d337aefe04532476d342ddb0d1aff2851 (patch) | |
| tree | aea7173ff3535dc25943d0488b0be6abc9e69e55 /src/server | |
| parent | [KERNEL] Switch server on connection lost (diff) | |
| download | dnbd3-80fd019d337aefe04532476d342ddb0d1aff2851.tar.gz dnbd3-80fd019d337aefe04532476d342ddb0d1aff2851.tar.xz dnbd3-80fd019d337aefe04532476d342ddb0d1aff2851.zip | |
[KERNEL] Major bug fixes
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/net.c | 6 | ||||
| -rw-r--r-- | src/server/server.c | 2 | ||||
| -rw-r--r-- | src/server/utils.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/server/net.c b/src/server/net.c index af521b9..a42588d 100644 --- a/src/server/net.c +++ b/src/server/net.c @@ -63,14 +63,14 @@ void *dnbd3_handle_query(void *dnbd3_client) } pthread_spin_lock(&client->spinlock); - if (client->image->num_servers < MAX_NUMBER_SERVERS) + if (client->image->num_servers < NUMBER_SERVERS) reply.size = client->image->num_servers * sizeof(struct in_addr); else - reply.size = MAX_NUMBER_SERVERS * sizeof(struct in_addr); + reply.size = NUMBER_SERVERS * sizeof(struct in_addr); send(client->sock, (char *) &reply, sizeof(dnbd3_reply_t), 0); - for (i = 0; i < client->image->num_servers && i < MAX_NUMBER_SERVERS; i++) + for (i = 0; i < client->image->num_servers && i < NUMBER_SERVERS; i++) { inet_aton(client->image->servers[i], &server); send(client->sock, (char *) &server, sizeof(struct in_addr), 0); diff --git a/src/server/server.c b/src/server/server.c index d6db52d..dba7cdd 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -151,7 +151,7 @@ int main(int argc, char* argv[]) unsigned int len = sizeof(client); int fd; struct timeval timeout; - timeout.tv_sec = SERVER_SOCKET_TIMEOUT; + timeout.tv_sec = SOCKET_TIMEOUT_SERVER; timeout.tv_usec = 0; // setup icp diff --git a/src/server/utils.c b/src/server/utils.c index 891d0b9..70e195e 100644 --- a/src/server/utils.c +++ b/src/server/utils.c @@ -51,8 +51,8 @@ void dnbd3_load_config(char *file) _images[i].rid = g_key_file_get_integer(gkf, groups[i], "rid", NULL); _images[i].atime = 0; - if (_images[i].num_servers > MAX_NUMBER_SERVERS) - printf("WARN: Max allowed servers %i\n", MAX_NUMBER_SERVERS); + if (_images[i].num_servers > NUMBER_SERVERS) + printf("WARN: Max allowed servers %i\n", NUMBER_SERVERS); fd = open(_images[i].file, O_RDONLY); if (fd > 0) |