1 files changed, 163 insertions, 188 deletions

diff --git a/src/kernel/block.c b/src/kernel/block.c
index ade02f0..4295418 100644
--- a/src/kernel/block.c
+++ b/src/kernel/block.c
@@ -22,241 +22,211 @@ void dnbd3_blk_fail_all_requests(dnbd3_device_t *dev)
 }
 
 
-
-int dnbd3_net_connect(dnbd3_device_t *dev)
+int dnbd3_socket_connect(dnbd3_device_t *dev, dnbd3_sock *sock)
 {
+	int result = -EIO;
 	struct request *req1 = NULL;
 	struct timeval timeout;
-
-	printk(KERN_DEBUG "dnbd3: net connect device %i\n", dev->minor);
-
-	if (dev->disconnecting) {
-		printk(KERN_DEBUG "dnbd3: device still disconnecting\n");
-		while (dev->disconnecting)
+	struct dnbd3_server_t *server = sock->server;
+	dnbd3_request_t dnbd3_request;
+	dnbd3_reply_t dnbd3_reply;
+	struct msghdr msg;
+	struct kvec iov[2];
+	uint16_t rid;
+	uint64_t reported_size;
+	char *name;
+	int mlen;
+	serialized_buffer_t payload_buffer;
+
+	printk(KERN_DEBUG "dnbd3: socket connect device %i\n", dev->minor);
+
+	mutex_init(&sock->lock);
+	mutex_lock(&sock->lock);
+	if (sock->pending) {
+		printk(KERN_DEBUG "dnbd3: socket still in request\n");
+		while (sock->pending)
 			schedule();
 	}
-	if (dev->pending) {
-		printk(KERN_DEBUG "dnbd3: device still in request\n");
-		while (dev->disconnecting)
-			schedule();
+	if (server->host.port == 0 || server->host.type == 0) {
+		printk(KERN_ERR "dnbd3: host or port not set\n");
+		goto error;
+	}
+	if (sock->sock) {
+		printk(KERN_WARNING "dnbd3: socket already connected\n");
+		goto error;
 	}
 
 	timeout.tv_sec = SOCKET_TIMEOUT_CLIENT_DATA;
 	timeout.tv_usec = 0;
 
-	// do some checks before connecting
-
 	req1 = kmalloc(sizeof(*req1), GFP_ATOMIC );
 	if (!req1) {
 		printk(KERN_ERR "dnbd3: kmalloc failed\n");
 		goto error;
 	}
-	if (dev->cur_server.host.port == 0 || dev->cur_server.host.type == 0 || dev->imgname == NULL ) {
-		printk(KERN_ERR "dnbd3: host, port or image name not set\n");
-		goto error;
-	}
-	if (dev->sock) {
-		printk(KERN_WARNING "dnbd3: already connected\n");
-		goto error;
-	}
 
-	if (dev->cur_server.host.type != HOST_IP4 && dev->cur_server.host.type != HOST_IP6) {
-		printk(KERN_ERR "dnbd3: unknown address type %d\n", (int)dev->cur_server.host.type);
+	init_msghdr(msg);
+
+	if (dnbd3_sock_create(server->host.type, SOCK_STREAM, IPPROTO_TCP, &sock->sock) < 0) {
+		printk(KERN_ERR "dnbd3: could not create socket\n");
 		goto error;
 	}
 
-	if (dev->better_sock == NULL ) {
-		//  no established connection yet from discovery thread, start new one
-		dnbd3_request_t dnbd3_request;
-		dnbd3_reply_t dnbd3_reply;
-		struct msghdr msg;
-		struct kvec iov[2];
-		uint16_t rid;
-		char *name;
-		int mlen;
-		init_msghdr(msg);
-
-		if (dnbd3_sock_create(dev->cur_server.host.type, SOCK_STREAM, IPPROTO_TCP, &dev->sock) < 0) {
-			printk(KERN_ERR "dnbd3: could not create socket\n");
+	kernel_setsockopt(sock->sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout, sizeof(timeout));
+	kernel_setsockopt(sock->sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout));
+	sock->sock->sk->sk_allocation = GFP_NOIO;
+	if (server->host.type == HOST_IP4) {
+		struct sockaddr_in sin;
+		memset(&sin, 0, sizeof(sin));
+		sin.sin_family = AF_INET;
+		memcpy(&(sin.sin_addr), server->host.addr, 4);
+		sin.sin_port = server->host.port;
+		if (kernel_connect(sock->sock, (struct sockaddr *)&sin, sizeof(sin), 0) != 0) {
+			printk(KERN_ERR "dnbd3: connection to host failed (ipv4)\n");
 			goto error;
 		}
-
-		kernel_setsockopt(dev->sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout, sizeof(timeout));
-		kernel_setsockopt(dev->sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout));
-		dev->sock->sk->sk_allocation = GFP_NOIO;
-		if (dev->cur_server.host.type == HOST_IP4) {
-			struct sockaddr_in sin;
-			memset(&sin, 0, sizeof(sin));
-			sin.sin_family = AF_INET;
-			memcpy(&(sin.sin_addr), dev->cur_server.host.addr, 4);
-			sin.sin_port = dev->cur_server.host.port;
-			if (kernel_connect(dev->sock, (struct sockaddr *)&sin, sizeof(sin), 0) != 0) {
-				printk(KERN_ERR "dnbd3: connection to host failed (ipv4)\n");
-				goto error;
-			}
-		} else {
-			struct sockaddr_in6 sin;
-			memset(&sin, 0, sizeof(sin));
-			sin.sin6_family = AF_INET6;
-			memcpy(&(sin.sin6_addr), dev->cur_server.host.addr, 16);
-			sin.sin6_port = dev->cur_server.host.port;
-			if (kernel_connect(dev->sock, (struct sockaddr *)&sin, sizeof(sin), 0) != 0){
-				printk(KERN_ERR "dnbd3: connection to host failed (ipv6)\n");
-				goto error;
-			}
-		}
-		// Request filesize
-		dnbd3_request.magic = dnbd3_packet_magic;
-		dnbd3_request.cmd = CMD_SELECT_IMAGE;
-		iov[0].iov_base = &dnbd3_request;
-		iov[0].iov_len = sizeof(dnbd3_request);
-		serializer_reset_write(&dev->payload_buffer);
-		serializer_put_uint16(&dev->payload_buffer, PROTOCOL_VERSION);
-		serializer_put_string(&dev->payload_buffer, dev->imgname);
-		serializer_put_uint16(&dev->payload_buffer, dev->rid);
-		serializer_put_uint8(&dev->payload_buffer, 0); // is_server = false
-		iov[1].iov_base = &dev->payload_buffer;
-		dnbd3_request.size = iov[1].iov_len = serializer_get_written_length(&dev->payload_buffer);
-		fixup_request(dnbd3_request);
-		mlen = sizeof(dnbd3_request) + iov[1].iov_len;
-		if (kernel_sendmsg(dev->sock, &msg, iov, 2, mlen) != mlen) {
-			printk(KERN_ERR "dnbd3: could not send CMD_SIZE_REQUEST\n");
-			goto error;
-		}
-		// receive reply header
-		iov[0].iov_base = &dnbd3_reply;
-		iov[0].iov_len = sizeof(dnbd3_reply);
-		if (kernel_recvmsg(dev->sock, &msg, iov, 1, sizeof(dnbd3_reply), msg.msg_flags) != sizeof(dnbd3_reply)) {
-			printk(KERN_ERR "dnbd3: received corrupted reply header after CMD_SIZE_REQUEST\n");
-			goto error;
-		}
-
-		// check reply header
-		fixup_reply(dnbd3_reply);
-		if (dnbd3_reply.cmd != CMD_SELECT_IMAGE ||
-				dnbd3_reply.size < 3 ||
-				dnbd3_reply.size > MAX_PAYLOAD ||
-				dnbd3_reply.magic != dnbd3_packet_magic) {
-			printk(KERN_ERR "dnbd3: received invalid reply to CMD_SIZE_REQUEST image does not exist on server\n");
+	} else {
+		struct sockaddr_in6 sin;
+		memset(&sin, 0, sizeof(sin));
+		sin.sin6_family = AF_INET6;
+		memcpy(&(sin.sin6_addr), server->host.addr, 16);
+		sin.sin6_port = server->host.port;
+		if (kernel_connect(sock->sock, (struct sockaddr *)&sin, sizeof(sin), 0) != 0){
+			printk(KERN_ERR "dnbd3: connection to host failed (ipv6)\n");
 			goto error;
 		}
+	}
+	// Request filesize
+	dnbd3_request.magic = dnbd3_packet_magic;
+	dnbd3_request.cmd = CMD_SELECT_IMAGE;
+	iov[0].iov_base = &dnbd3_request;
+	iov[0].iov_len = sizeof(dnbd3_request);
+	serializer_reset_write(&payload_buffer);
+	serializer_put_uint16(&payload_buffer, PROTOCOL_VERSION);
+	serializer_put_string(&payload_buffer, dev->imgname);
+	serializer_put_uint16(&payload_buffer, dev->rid);
+	serializer_put_uint8(&payload_buffer, 0); // is_server = false
+	iov[1].iov_base = &payload_buffer;
+	dnbd3_request.size = iov[1].iov_len = serializer_get_written_length(&payload_buffer);
+	fixup_request(dnbd3_request);
+	mlen = sizeof(dnbd3_request) + iov[1].iov_len;
+	if (kernel_sendmsg(sock->sock, &msg, iov, 2, mlen) != mlen) {
+		printk(KERN_ERR "dnbd3: could not send CMD_SIZE_REQUEST\n");
+		goto error;
+	}
+	// receive reply header
+	iov[0].iov_base = &dnbd3_reply;
+	iov[0].iov_len = sizeof(dnbd3_reply);
+	if (kernel_recvmsg(sock->sock, &msg, iov, 1, sizeof(dnbd3_reply), msg.msg_flags) != sizeof(dnbd3_reply)) {
+		printk(KERN_ERR "dnbd3: received corrupted reply header after CMD_SIZE_REQUEST\n");
+		goto error;
+	}
 
-		// receive reply payload
-		iov[0].iov_base = &dev->payload_buffer;
-		iov[0].iov_len = dnbd3_reply.size;
-		if (kernel_recvmsg(dev->sock, &msg, iov, 1, dnbd3_reply.size, msg.msg_flags) != dnbd3_reply.size) {
-			printk(KERN_ERR "dnbd3: could not read CMD_SELECT_IMAGE payload on handshake\n");
-			goto error;
-		}
+	// check reply header
+	fixup_reply(dnbd3_reply);
+	if (dnbd3_reply.cmd != CMD_SELECT_IMAGE ||
+			dnbd3_reply.size < 3 ||
+			dnbd3_reply.size > MAX_PAYLOAD ||
+			dnbd3_reply.magic != dnbd3_packet_magic) {
+		printk(KERN_ERR "dnbd3: received invalid reply to CMD_SIZE_REQUEST image does not exist on server\n");
+		goto error;
+	}
 
-		// handle/check reply payload
-		serializer_reset_read(&dev->payload_buffer, dnbd3_reply.size);
-		dev->cur_server.protocol_version = serializer_get_uint16(&dev->payload_buffer);
-		if (dev->cur_server.protocol_version < MIN_SUPPORTED_SERVER) {
-			printk(KERN_ERR "dnbd3: server version is lower than min supported version\n");
-			goto error;
-		}
+	// receive reply payload
+	iov[0].iov_base = &payload_buffer;
+	iov[0].iov_len = dnbd3_reply.size;
+	if (kernel_recvmsg(sock->sock, &msg, iov, 1, dnbd3_reply.size, msg.msg_flags) != dnbd3_reply.size) {
+		printk(KERN_ERR "dnbd3: could not read CMD_SELECT_IMAGE payload on handshake\n");
+		goto error;
+	}
 
-		name = serializer_get_string(&dev->payload_buffer);
-		if (dev->rid != 0 && strcmp(name, dev->imgname) != 0) {
-			printk(KERN_ERR "dnbd3: server offers image '%s', requested '%s'\n", name, dev->imgname);
-			goto error;
-		}
+	// handle/check reply payload
+	serializer_reset_read(&payload_buffer, dnbd3_reply.size);
+	server->protocol_version = serializer_get_uint16(&payload_buffer);
+	if (server->protocol_version < MIN_SUPPORTED_SERVER) {
+		printk(KERN_ERR "dnbd3: server version is lower than min supported version\n");
+		goto error;
+	}
 
-		if (strlen(dev->imgname) < strlen(name)) {
-			dev->imgname = krealloc(dev->imgname, strlen(name) + 1, GFP_ATOMIC );
-			if (dev->imgname == NULL ) {
-				printk(KERN_ERR "dnbd3: reallocating buffer for new image name failed\n");
-				goto error;
-			}
-		}
-		strcpy(dev->imgname, name);
-		rid = serializer_get_uint16(&dev->payload_buffer);
-		if (dev->rid != 0 && dev->rid != rid) {
-			printk(KERN_ERR "dnbd3: server provides rid %d, requested was %d\n", (int)rid, (int)dev->rid);
-			goto error;
-		}
+	name = serializer_get_string(&payload_buffer);
+	rid = serializer_get_uint16(&payload_buffer);
+	if (dev->rid != rid && strcmp(name, dev->imgname) != 0) {
+		printk(KERN_ERR "dnbd3: server offers image '%s', requested '%s'\n", name, dev->imgname);
+		goto error;
+	}
 
-		dev->rid = rid;
-		dev->reported_size = serializer_get_uint64(&dev->payload_buffer);
-		if (dev->reported_size < 4096) {
+	reported_size = serializer_get_uint64(&payload_buffer);
+	if (dev->reported_size == NULL) {
+		if (reported_size < 4096) {
 			printk(KERN_ERR "dnbd3: reported size by server is < 4096\n");
 			goto error;
 		}
-
-		// store image information
+		dev->reported_size = reported_size;
 		set_capacity(dev->disk, dev->reported_size >> 9); /* 512 Byte blocks */
-		printk(KERN_DEBUG "dnbd3: connected to image %s, filesize %llu\n", dev->imgname, dev->reported_size);
-		dev->update_available = 0;
-	} else { // Switching server, connection is already established and size request was executed
-
-		printk(KERN_DEBUG "dnbd3: changing server\n");
-		dev->sock = dev->better_sock;
-		dev->better_sock = NULL;
-		kernel_setsockopt(dev->sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout, sizeof(timeout));
-		kernel_setsockopt(dev->sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout));
+	} else if (dev->reported_size != reported_size) {
+		printk(KERN_ERR "dnbd3: reported size by server is %llu but should be %llu\n", reported_size, dev->reported_size);
 	}
 
-	dev->panic = 0;
-	dev->panic_count = 0;
+	printk(KERN_DEBUG "dnbd3: connected to image %s, filesize %llu\n", dev->imgname, dev->reported_size);
+
+	mutex_unlock(&sock->lock);
 
-	refcount_inc(&dev->config_refs);
-	mutex_init(&dev->socket_lock);
-	// Enqueue request to request_queue_send for a fresh list of alt servers
-	//TODO refresh alt server list
+//	TODO add heartbeat
+	//	timer_setup(&dev->hb_timer, dnbd3_net_heartbeat, 0);
+	//	dev->hb_timer.expires = jiffies + HZ;
+	//	add_timer(&dev->hb_timer);
 
-	// add heartbeat timer
-	//TODO needed anymore=
-//	dev->heartbeat_count = 0;
-//	timer_setup(&dev->hb_timer, dnbd3_net_heartbeat, 0);
-//	dev->hb_timer.expires = jiffies + HZ;
-//	add_timer(&dev->hb_timer);
 	return 0;
 error:
-	if (dev->sock) {
-		sock_release(dev->sock);
-		dev->sock = NULL;
+	if (sock->sock) {
+		sock_release(sock->sock);
+		sock->sock = NULL;
 	}
-	dev->cur_server.host.type = 0;
-	dev->cur_server.host.port = 0;
 	if (req1) {
 		kfree(req1);
 	}
-	return -1;
+	mutex_unlock(&sock->lock);
+	return result;
 }
 
-
-int dnbd3_net_disconnect(dnbd3_device_t *dev)
+int dnbd3_socket_disconnect(dnbd3_device_t *dev, dnbd3_sock *sock)
 {
-	printk(KERN_DEBUG "dnbd3: net disconnect device %i\n", dev->minor);
-	if (dev->disconnecting)  {
-		return 0;
-	}
-
-	dev->disconnecting = 1;
+	printk(KERN_DEBUG "dnbd3: socket disconnect device %i\n", dev->minor);
+	mutex_lock(&sock->lock);
 
 	// clear heartbeat timer
 //	del_timer(&dev->hb_timer);
 
-	dev->discover = 0;
 
-	if (dev->sock) {
-		kernel_sock_shutdown(dev->sock, SHUT_RDWR);
+	if (sock->sock) {
+		kernel_sock_shutdown(sock->sock, SHUT_RDWR);
 	}
 
 	// clear socket
-	if (dev->sock) {
-		sock_release(dev->sock);
-		dev->sock = NULL;
+	if (sock->sock) {
+		sock_release(sock->sock);
+		sock->sock = NULL;
 	}
-	dev->cur_server.host.type = 0;
-	dev->cur_server.host.port = 0;
-
-	dev->disconnecting = 0;
 
+	mutex_unlock(&sock->lock);
+	mutex_destroy(&sock->lock);
 	return 0;
 }
 
+int dnbd3_net_disconnect(struct dnbd3_device_t *dev) {
+	int i;
+	int result;
+	for (i = 0; i < NUMBER_CONNECTIONS; i++) {
+		if (dev->socks[i].sock) {
+			if (dnbd3_socket_disconnect(dev, &dev->socks[i])) {
+				result = -EIO;
+			}
+		}
+	}
+	return result;
+}
+
+
 static void printHost(struct dnbd3_host_t *host, char *msg)
 {
 	if (host->type == HOST_IP4) {
@@ -269,7 +239,7 @@ static void printHost(struct dnbd3_host_t *host, char *msg)
 static void printServerList(struct dnbd3_device_t *dev)
 {
 	int i;
-	printHost(&dev->cur_server.host, "current server is");
+	printHost(&dev->initial_server.host, "initial server is");
 	for (i = 0; i < NUMBER_SERVERS; i++) {
 		if (dev->alt_servers[i].host.addr[0] != 0) {
 			printHost(&dev->alt_servers[i].host, "alternative server is");
@@ -283,13 +253,14 @@ static int dnbd3_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd
 	dnbd3_device_t *dev = bdev->bd_disk->private_data;
 	char *imgname = NULL;
 	dnbd3_ioctl_t *msg = NULL;
+	int i;
 
 	printk(KERN_DEBUG "dnbd3: ioctl device %i, cmd %i, arg %lu\n", dev->minor, cmd, arg);
 	//unsigned long irqflags;
 
-	while (dev->disconnecting) {
-		// do nothing
-	}
+//	while (dev->disconnecting) {
+//		// do nothing
+//	}
 
 	if (arg != 0) {
 		msg = kmalloc(sizeof(*msg), GFP_KERNEL);
@@ -328,12 +299,12 @@ static int dnbd3_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd
 		} else if (msg == NULL) {
 			result = -EINVAL;
 		} else {
-			if (sizeof(msg->host) != sizeof(dev->cur_server.host)) {
+			if (sizeof(msg->host) != sizeof(dev->initial_server.host)) {
 				printk(KERN_INFO "dnbd3: odd size bug#1 triggered in ioctl\n");
 			}
-			memcpy(&dev->cur_server.host, &msg->host, sizeof(msg->host));
-			dev->cur_server.failures = 0;
-			memcpy(&dev->initial_server, &dev->cur_server, sizeof(dev->initial_server));
+			memcpy(&dev->initial_server.host, &msg->host, sizeof(msg->host));
+			dev->initial_server.failures = 0;
+//			memcpy(&dev->initial_server, &dev->cur_server, sizeof(dev->initial_server));
 			dev->imgname = imgname;
 			dev->rid = msg->rid;
 			dev->use_server_provided_alts = msg->use_server_provided_alts;
@@ -348,22 +319,26 @@ static int dnbd3_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd
 //			blk_queue->backing_dev_info.ra_pages = (msg->read_ahead_kb * 1024) / PAGE_SIZE;
 //#endif
 
-			printServerList(dev);
 
-			if (dnbd3_net_connect(dev) == 0) {
+			dev->socks[0].server = &dev->initial_server;
+			if (dnbd3_socket_connect(dev, &dev->socks[0]) == 0) {
+				printServerList(dev);
 				result = 0;
 				imgname = NULL; // Prevent kfree at the end
 			} else {
+				printk(KERN_ERR "dnbd3: failed to connect to initial server\n");
 				result = -ENOENT;
 				dev->imgname = NULL;
+				dev->socks[0].server = NULL;
 			}
+
 		}
 		break;
 
 	case IOCTL_CLOSE:
 		printk(KERN_DEBUG "dnbd3: ioctl close\n");
 		dnbd3_blk_fail_all_requests(dev);
-		result = dnbd3_net_disconnect(dev);
+		dnbd3_net_disconnect(dev);
 		dnbd3_blk_fail_all_requests(dev);
 		set_capacity(dev->disk, 0);
 		if (dev->imgname) {