From 69ebaaf47baa159c4d82e8c512c03d004e125175 Mon Sep 17 00:00:00 2001
From: Frederic Robra
Date: Tue, 16 Jul 2019 16:53:17 +0200
Subject: discovery now connects to new slots

---
 src/kernel/core.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/src/kernel/core.c b/src/kernel/core.c
index 2664090..9d930cb 100644
--- a/src/kernel/core.c
+++ b/src/kernel/core.c
@@ -82,7 +82,7 @@ static int dnbd3_handle_cmd(struct dnbd3_cmd *cmd, int index)
 	int i;
 	int sock_alive = 0;
 
-	debug_dev(dev, "handle request at position %lu and size %d", blk_rq_pos(req), blk_rq_bytes(req));
+	debug_dev(dev, "handle request at position %lu, size %d, index %d", blk_rq_pos(req), blk_rq_bytes(req), index);
 
 //	if (index >= 1) { // TODO use next server with good rtt for this request
 //		printk(KERN_INFO "dnbd3: index is %d", index);
@@ -94,7 +94,7 @@ static int dnbd3_handle_cmd(struct dnbd3_cmd *cmd, int index)
 	for (i = 0; i < NUMBER_CONNECTIONS; i++) {
 		if (dnbd3_is_sock_alive(dev->socks[i])) {
 			if (index == sock_alive) {
-				sock = &dev->socks[index];
+				sock = &dev->socks[i];
 			}
 			sock_alive++;
 		}
@@ -260,6 +260,7 @@ static int dnbd3_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd
 			}
 			memcpy(&dev->initial_server.host, &msg->host, sizeof(msg->host));
 			dev->initial_server.failures = 0;
+			dev->initial_server.rtts[0] = dev->initial_server.rtts[1] = dev->initial_server.rtts[2] = dev->initial_server.rtts[3] = RTT_UNREACHABLE;
 //			memcpy(&dev->initial_server, &dev->cur_server, sizeof(dev->initial_server));
 			dev->imgname = imgname;
 			dev->rid = msg->rid;
-- 
cgit v1.2.3-55-g7522