diff options
| author | sr | 2012-09-03 21:00:26 +0200 |
|---|---|---|
| committer | sr | 2012-09-03 21:00:26 +0200 |
| commit | 60b2ba6ef9ed779d750958b6422f05c93a4a2d91 (patch) | |
| tree | 46fdacf6a9439947e91af4c3d9de3006d41e5380 /src/kernel/sysfs.c | |
| parent | [*] Fixed and unified formatting (diff) | |
| download | dnbd3-60b2ba6ef9ed779d750958b6422f05c93a4a2d91.tar.gz dnbd3-60b2ba6ef9ed779d750958b6422f05c93a4a2d91.tar.xz dnbd3-60b2ba6ef9ed779d750958b6422f05c93a4a2d91.zip | |
[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
Diffstat (limited to 'src/kernel/sysfs.c')
| -rw-r--r-- | src/kernel/sysfs.c | 22 |
1 files changed, 11 insertions, 11 deletions
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); |