From 60b2ba6ef9ed779d750958b6422f05c93a4a2d91 Mon Sep 17 00:00:00 2001
From: sr
Date: Mon, 3 Sep 2012 21:00:26 +0200
Subject: [SERVER] Check which dnbd3 devices are idle and ready to use for
 proxy mode [SERVER] Skeleton of server-to-server communication [SERVER]
 Update access-time of images in use by actual clients [*] Add dnbd3_host_t
 type to handle address+port+addrtype consistently across the project

---
 src/server/server.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/server/server.c')

diff --git a/src/server/server.c b/src/server/server.c
index 9fc5383..4b30009 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -31,7 +31,7 @@
 #include "../version.h"
 
 #include "server.h"
-#include "utils.h"
+#include "saveload.h"
 #include "net.h"
 #include "ipc.h"
 #include "memlog.h"
@@ -245,10 +245,11 @@ int main(int argc, char *argv[])
 			continue;
 		}
 		// TODO: Extend this if you ever want to add IPv6 (something like:)
-		// dnbd3_client->addrtype = AF_INET6;
-		// memcpy(dnbd3_client->ipaddr, &(client.sin6_addr), 16);
-		dnbd3_client->addrtype = AF_INET;
-		memcpy(dnbd3_client->ipaddr, &(client.sin_addr), 4);
+		// dnbd3_client->host.type = AF_INET6;
+		// memcpy(dnbd3_client->host.addr, &(client.sin6_addr), 16);
+		dnbd3_client->host.type = AF_INET;
+		memcpy(dnbd3_client->host.addr, &(client.sin_addr), 4);
+		dnbd3_client->host.port = client.sin_port;
 		dnbd3_client->sock = fd;
 		dnbd3_client->image = NULL;
 
-- 
cgit v1.2.3-55-g7522