diff options
| author | Simon Rettberg | 2013-07-31 21:45:00 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-07-31 21:45:00 +0200 |
| commit | e7b3781c3e5c105fcd80a75546b9ab75eae8a2c9 (patch) | |
| tree | 90e523671bb2ea349639b744b5bc3ee81f512fb7 /src/server/server.c | |
| parent | [SERVER] Still working on the uplink... Almost there (diff) | |
| download | dnbd3-e7b3781c3e5c105fcd80a75546b9ab75eae8a2c9.tar.gz dnbd3-e7b3781c3e5c105fcd80a75546b9ab75eae8a2c9.tar.xz dnbd3-e7b3781c3e5c105fcd80a75546b9ab75eae8a2c9.zip | |
[SERVER] Uplink handing complete (untested, as alt servers can't be defined yet, so prepare for lots of fixes ;))
Diffstat (limited to 'src/server/server.c')
| -rw-r--r-- | src/server/server.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/server.c b/src/server/server.c index cc7a76a..dc374a0 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -39,6 +39,7 @@ #include "image.h" #include "uplink.h" #include "net.h" +#include "altservers.h" #include "memlog.h" #define MAX_SERVER_SOCKETS 50 // Assume there will be no more than 50 sockets the server will listen on @@ -189,9 +190,9 @@ int main(int argc, char *argv[]) case 'crc4': return image_generate_crc_file( optarg ) ? 0 : EXIT_FAILURE; case 'asrt': - printf("Testing a failing assertion:\n"); + printf( "Testing a failing assertion:\n" ); assert( 4 == 5 ); - printf("Assertion 4 == 5 seems to hold. ;-)\n"); + printf( "Assertion 4 == 5 seems to hold. ;-)\n" ); return EXIT_SUCCESS; } opt = getopt_long( argc, argv, optString, longOpts, &longIndex ); @@ -204,7 +205,7 @@ int main(int argc, char *argv[]) spin_init( &_clients_lock, PTHREAD_PROCESS_PRIVATE ); spin_init( &_images_lock, PTHREAD_PROCESS_PRIVATE ); - spin_init( &_alts_lock, PTHREAD_PROCESS_PRIVATE ); + altserver_init(); #ifdef _DEBUG debug_locks_start_watchdog(); |