create hyper events for new vsock connections

Set up control channel and message channel if unset yet.

Signed-off-by: Peng Tao <bergwolf@gmail.com>

Author: bergwolf

src/init.c

@@ -1262,8 +1262,22 @@ static struct hyper_event_ops hyper_ttyfd_ops = {
 	.wbuf_size	= 10240,
 };
 
-static struct hyper_event_ops hyper_vsock_listen_ops = {
-	.read		= hyper_vsock_accept,
+static int hyper_vsock_ctl_accept(struct hyper_event *he, int efd, int events)
+{
+	return hyper_vsock_accept(he, efd, &hyper_epoll.ctl, &hyper_ctlfd_ops);
+}
+
+static int hyper_vsock_msg_accept(struct hyper_event *he, int efd, int events)
+{
+	return hyper_vsock_accept(he, efd, &hyper_epoll.tty, &hyper_ttyfd_ops);
+}
+
+static struct hyper_event_ops hyper_vsock_ctl_listen_ops = {
+	.read		= hyper_vsock_ctl_accept,
+};
+
+static struct hyper_event_ops hyper_vsock_msg_listen_ops = {
+	.read		= hyper_vsock_msg_accept,
 };
 
 static int hyper_loop(void)
@@ -1340,14 +1354,14 @@ static int hyper_loop(void)
 
 	if (hyper_epoll.vsock_ctl_listener.fd > 0) {
 		fprintf(stdout, "hyper_init_event hyper vsock control channel listener event %p, ops %p, fd %d\n",
-			&hyper_epoll.vsock_ctl_listener, &hyper_vsock_listen_ops, hyper_epoll.vsock_ctl_listener.fd);
-		if (hyper_init_event(&hyper_epoll.vsock_ctl_listener, &hyper_vsock_listen_ops, pod) < 0 ||
+			&hyper_epoll.vsock_ctl_listener, &hyper_vsock_ctl_listen_ops, hyper_epoll.vsock_ctl_listener.fd);
+		if (hyper_init_event(&hyper_epoll.vsock_ctl_listener, &hyper_vsock_ctl_listen_ops, pod) < 0 ||
 		    hyper_add_event(hyper_epoll.efd, &hyper_epoll.vsock_ctl_listener, EPOLLIN) < 0) {
 			return -1;
 		}
 		fprintf(stdout, "hyper_init_event hyper vsock message channel listener event %p, ops %p, fd %d\n",
-			&hyper_epoll.vsock_msg_listener, &hyper_vsock_listen_ops, hyper_epoll.vsock_msg_listener.fd);
-		if (hyper_init_event(&hyper_epoll.vsock_msg_listener, &hyper_vsock_listen_ops, pod) < 0 ||
+			&hyper_epoll.vsock_msg_listener, &hyper_vsock_msg_listen_ops, hyper_epoll.vsock_msg_listener.fd);
+		if (hyper_init_event(&hyper_epoll.vsock_msg_listener, &hyper_vsock_msg_listen_ops, pod) < 0 ||
 		    hyper_add_event(hyper_epoll.efd, &hyper_epoll.vsock_msg_listener, EPOLLIN) < 0) {
 			return -1;
 		}

src/vsock.c

@@ -12,7 +12,7 @@
 #include <linux/virtio_ids.h>
 #include <linux/vm_sockets.h>
 
-#include "event.h"
+#include "vsock.h"
 
 /* for pre-vsock kernels. */
 #ifndef VIRTIO_ID_VSOCK
@@ -115,7 +115,8 @@ int hyper_create_vsock_listener(unsigned short port)
 	return fd;
 }
 
-int hyper_vsock_accept(struct hyper_event *he, int efd, int events)
+int hyper_vsock_accept(struct hyper_event *he, int efd,
+		       struct hyper_event *ne, struct hyper_event_ops *ops)
 {
 	int ret = 0;
 
@@ -137,7 +138,25 @@ int hyper_vsock_accept(struct hyper_event *he, int efd, int events)
 		}
 		fprintf(stdout, "vsock connection from cid %u port %u\n",
 			sa_client.svm_cid, sa_client.svm_port);
-		close(fd);
+
+		/* only accept host vsock connections */
+		if (sa_client.svm_cid != VMADDR_CID_HOST) {
+			close(fd);
+			continue;
+		}
+
+		/* oh, we already have it! */
+		if (ne->fd > 0) {
+			close(fd);
+			continue;
+		}
+
+		ne->fd = fd;
+		if (hyper_init_event(ne, ops, he->ptr) < 0 ||
+		    hyper_add_event(efd, ne, EPOLLIN) < 0) {
+			hyper_reset_event(ne);
+			return -1;
+		}
 	}
 
 	return ret;

src/vsock.h

@@ -1,8 +1,11 @@
 #ifndef _VSOCK_H_
 #define _VSOCK_H_
 
+#include "event.h"
+
 int probe_vsock_device(void);
 int hyper_create_vsock_listener(unsigned short port);
-int hyper_vsock_accept(struct hyper_event *he, int efd, int events);
+int hyper_vsock_accept(struct hyper_event *he, int efd,
+		       struct hyper_event *ne, struct hyper_event_ops *ops);
 
 #endif