From 0de54378aff9348e45c9ccdd4310887a753acfab Mon Sep 17 00:00:00 2001 From: Frederic Robra Date: Fri, 5 Jul 2019 17:30:02 +0200 Subject: added first support for connection with more than one server --- src/kernel/sysfs.c | 58 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'src/kernel/sysfs.c') diff --git a/src/kernel/sysfs.c b/src/kernel/sysfs.c index 4406072..118cbca 100644 --- a/src/kernel/sysfs.c +++ b/src/kernel/sysfs.c @@ -27,20 +27,20 @@ #define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif -ssize_t show_cur_server_addr(char *buf, dnbd3_device_t *dev) -{ - 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 == 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; -} - -ssize_t show_cur_server_rtt(char *buf, dnbd3_device_t *dev) -{ - return MIN(snprintf(buf, PAGE_SIZE, "%llu\n", (unsigned long long)dev->cur_rtt), PAGE_SIZE); -} +//ssize_t show_cur_server_addr(char *buf, dnbd3_device_t *dev) +//{ +// 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 == 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; +//} +// +//ssize_t show_cur_server_rtt(char *buf, dnbd3_device_t *dev) +//{ +// return MIN(snprintf(buf, PAGE_SIZE, "%llu\n", (unsigned long long)dev->cur_rtt), PAGE_SIZE); +//} ssize_t show_alt_server_num(char *buf, dnbd3_device_t *dev) { @@ -100,19 +100,19 @@ ssize_t show_update_available(char *buf, dnbd3_device_t *dev) return MIN(snprintf(buf, PAGE_SIZE, "%d\n", dev->update_available), PAGE_SIZE); } -device_attr_t cur_server_addr = -{ - .attr = {.name = "cur_server_addr", .mode = 0444 }, - .show = show_cur_server_addr, - .store = NULL, -}; - -device_attr_t cur_server_rtt = -{ - .attr = {.name = "cur_server_rtt", .mode = 0444 }, - .show = show_cur_server_rtt, - .store = NULL, -}; +//device_attr_t cur_server_addr = +//{ +// .attr = {.name = "cur_server_addr", .mode = 0444 }, +// .show = show_cur_server_addr, +// .store = NULL, +//}; +// +//device_attr_t cur_server_rtt = +//{ +// .attr = {.name = "cur_server_rtt", .mode = 0444 }, +// .show = show_cur_server_rtt, +// .store = NULL, +//}; device_attr_t alt_server_num = { @@ -158,8 +158,8 @@ ssize_t device_show(struct kobject *kobj, struct attribute *attr, char *buf) struct attribute *device_attrs[] = { - &cur_server_addr.attr, - &cur_server_rtt.attr, +// &cur_server_addr.attr, +// &cur_server_rtt.attr, &alt_server_num.attr, &alt_servers.attr, &image_name.attr, -- cgit v1.2.3-55-g7522