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/kernel/sysfs.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/kernel/sysfs.c')

diff --git a/src/kernel/sysfs.c b/src/kernel/sysfs.c
index 596e745..d219c86 100644
--- a/src/kernel/sysfs.c
+++ b/src/kernel/sysfs.c
@@ -29,10 +29,10 @@
 
 ssize_t show_cur_server_addr(char *buf, dnbd3_device_t *dev)
 {
-	if (dev->cur_server.hostaddrtype == AF_INET)
-		return MIN(snprintf(buf, PAGE_SIZE, "%pI4,%d\n", dev->cur_server.hostaddr, (int)ntohs(dev->cur_server.port)), PAGE_SIZE);
-	else if (dev->cur_server.hostaddrtype == AF_INET6)
-		return MIN(snprintf(buf, PAGE_SIZE, "%pI6,%d\n", dev->cur_server.hostaddr, (int)ntohs(dev->cur_server.port)), PAGE_SIZE);
+	if (dev->cur_server.host.type == AF_INET)
+		return MIN(snprintf(buf, PAGE_SIZE, "%pI4,%d\n", dev->cur_server.host.addr, (int)ntohs(dev->cur_server.host.port)), PAGE_SIZE);
+	else if (dev->cur_server.host.type == AF_INET6)
+		return MIN(snprintf(buf, PAGE_SIZE, "%pI6,%d\n", dev->cur_server.host.addr, (int)ntohs(dev->cur_server.host.port)), PAGE_SIZE);
 	*buf = '\0';
 	return 0;
 }
@@ -47,7 +47,7 @@ ssize_t show_alt_server_num(char *buf, dnbd3_device_t *dev)
 	int i, num = 0;
 	for (i = 0; i < NUMBER_SERVERS; ++i)
 	{
-		if (dev->alt_servers[i].hostaddrtype) ++num;
+		if (dev->alt_servers[i].host.type) ++num;
 	}
 	return MIN(snprintf(buf, PAGE_SIZE, "%d\n", num), PAGE_SIZE);
 }
@@ -57,17 +57,17 @@ ssize_t show_alt_servers(char *buf, dnbd3_device_t *dev)
 	int i, size = PAGE_SIZE, ret;
 	for (i = 0; i < NUMBER_SERVERS; ++i)
 	{
-		if (dev->alt_servers[i].hostaddrtype == AF_INET)
+		if (dev->alt_servers[i].host.type == AF_INET)
 			ret = MIN(snprintf(buf, size, "%pI4,%d,%llu,%d\n",
-			                   dev->alt_servers[i].hostaddr,
-			                   (int)ntohs(dev->alt_servers[i].port),
+			                   dev->alt_servers[i].host.addr,
+			                   (int)ntohs(dev->alt_servers[i].host.port),
 			                   (unsigned long long)((dev->alt_servers[i].rtts[0] + dev->alt_servers[i].rtts[1] + dev->alt_servers[i].rtts[2] + dev->alt_servers[i].rtts[3]) / 4),
 			                   (int)dev->alt_servers[i].failures)
 			          , size);
-		else if (dev->alt_servers[i].hostaddrtype == AF_INET6)
+		else if (dev->alt_servers[i].host.type == AF_INET6)
 			ret = MIN(snprintf(buf, size, "%pI6,%d,%llu,%d\n",
-			                   dev->alt_servers[i].hostaddr,
-			                   (int)ntohs(dev->alt_servers[i].port),
+			                   dev->alt_servers[i].host.addr,
+			                   (int)ntohs(dev->alt_servers[i].host.port),
 			                   (unsigned long long)((dev->alt_servers[i].rtts[0] + dev->alt_servers[i].rtts[1] + dev->alt_servers[i].rtts[2] + dev->alt_servers[i].rtts[3]) / 4),
 			                   (int)dev->alt_servers[i].failures)
 			          , size);
-- 
cgit v1.2.3-55-g7522