summaryrefslogtreecommitdiffstats
path: root/src/server/server.c
diff options
context:
space:
mode:
authorSimon Rettberg2013-08-28 17:54:19 +0200
committerSimon Rettberg2013-08-28 17:54:19 +0200
commitbfdac5b274d8ca371307d2b4b417092ba25f11ab (patch)
treec62b57b0d56995057f152f1e1273dc3383a709a1 /src/server/server.c
parent[SERVER] On-the-fly transparent proxying (diff)
downloaddnbd3-bfdac5b274d8ca371307d2b4b417092ba25f11ab.tar.gz
dnbd3-bfdac5b274d8ca371307d2b4b417092ba25f11ab.tar.xz
dnbd3-bfdac5b274d8ca371307d2b4b417092ba25f11ab.zip
[SERVER] Copy CRC-32 list from uplink server if available
Split up helper.c, move file/disk related functions to fileutil.c Uplink: Make sure relayed requests are at least 1MiB
Diffstat (limited to 'src/server/server.c')
-rw-r--r--src/server/server.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/server/server.c b/src/server/server.c
index 8252054..57e9b94 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -55,8 +55,10 @@ dnbd3_client_t *_clients[SERVER_MAX_CLIENTS];
int _num_clients = 0;
pthread_spinlock_t _clients_lock;
-char *_rpc_password = NULL;
-char *_cache_dir = NULL;
+/**
+ * Time the server was started
+ */
+static time_t _startupTime = 0;
static int dnbd3_add_client(dnbd3_client_t *client);
static void dnbd3_load_config();
@@ -301,6 +303,8 @@ int main(int argc, char *argv[])
return EXIT_FAILURE;
}
+ _startupTime = time( NULL );
+
// setup network
sockets[socket_count] = sock_listen_any( PF_INET, PORT );
if ( sockets[socket_count] != -1 ) ++socket_count;
@@ -484,3 +488,8 @@ void dnbd3_handle_sigusr1(int signum)
memlogf( "INFO: SIGUSR1 (%s) received, re-scanning image directory", strsignal( signum ) );
image_loadAll( NULL );
}
+
+int dnbd3_serverUptime()
+{
+ return (int)(time( NULL ) - _startupTime);
+}