diff options
| author | Simon Rettberg | 2017-10-28 14:56:58 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-10-28 14:56:58 +0200 |
| commit | c8c62246f84b5d9d4a496097f043696e2d9ba0bb (patch) | |
| tree | 27a896f6677791ef8087fa44b1aab7cb2071d774 /src/kernel/sysfs.c | |
| parent | [SERVER] Add function to parse x-www-form-urlencoded strings (diff) | |
| download | dnbd3-c8c62246f84b5d9d4a496097f043696e2d9ba0bb.tar.gz dnbd3-c8c62246f84b5d9d4a496097f043696e2d9ba0bb.tar.xz dnbd3-c8c62246f84b5d9d4a496097f043696e2d9ba0bb.zip | |
[*] Introduce constants for IPv4/6 in dnbd3_host_t
AF_INET luckily was "2" on all platforms checked, so no problems
there with interoperation, but AF_INET6 is different between
Linux, BSD, Windows and possibly others, so map back and forth
between AF_INET/AF_INET6 and HOST_IP4/HOST_IP6 to fix this.
Diffstat (limited to 'src/kernel/sysfs.c')
| -rw-r--r-- | src/kernel/sysfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/sysfs.c b/src/kernel/sysfs.c index efe1cad..4406072 100644 --- a/src/kernel/sysfs.c +++ b/src/kernel/sysfs.c @@ -29,9 +29,9 @@ ssize_t show_cur_server_addr(char *buf, dnbd3_device_t *dev) { - if (dev->cur_server.host.type == AF_INET) + if (dev->cur_server.host.type == HOST_IP4) 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) + else if (dev->cur_server.host.type == HOST_IP6) 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; @@ -57,14 +57,14 @@ 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].host.type == AF_INET) + if (dev->alt_servers[i].host.type == HOST_IP4) ret = MIN(snprintf(buf, size, "%pI4,%d,%llu,%d\n", 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].host.type == AF_INET6) + else if (dev->alt_servers[i].host.type == HOST_IP6) ret = MIN(snprintf(buf, size, "%pI6,%d,%llu,%d\n", dev->alt_servers[i].host.addr, (int)ntohs(dev->alt_servers[i].host.port), |