Ticket #983: vsock-v3.patch

setup.py

@@ -127 +127 @@
 opengl_ENABLED = DEFAULT and client_ENABLED
 html5_ENABLED = DEFAULT and not WIN32 and not OSX
 
+vsock_ENABLED           = sys.platform.startswith("linux")
 bencode_ENABLED         = DEFAULT
 cython_bencode_ENABLED  = DEFAULT
 clipboard_ENABLED       = DEFAULT and not PYTHON3
@@ -201 +202 @@
             "dec_avcodec2", "csc_swscale",
             "csc_opencl", "csc_cython", "csc_opencv", "csc_libyuv",
             "memoryview",
-            "bencode", "cython_bencode",
+            "bencode", "cython_bencode", "vsock",
             "clipboard",
             "server", "client", "dbus", "x11", "gtk_x11",
             "gtk2", "gtk3", "html5",
@@ -2350 +2351 @@
                 ["xpra/net/bencode/cython_bencode.pyx", buffers_c],
                 **bencode_pkgconfig))
 
+if vsock_ENABLED:
+    vsock_pkgconfig = pkgconfig()
+    cython_add(Extension("xpra.net.vsock",
+                ["xpra/net/vsock.pyx"],
+                **vsock_pkgconfig))
 
+
 if ext_modules:
     from Cython.Build import cythonize
     #this causes Cython to fall over itself:

xpra/scripts/config.py

@@ -273 +273 @@
                     "title"             : str,
                     "username"          : str,
                     "auth"              : str,
+                    "vsock-auth"        : str,
                     "tcp-auth"          : str,
                     "wm-name"           : str,
                     "session-name"      : str,
@@ -387 +388 @@
                     "start-on-connect"          : list,
                     "start-child-on-connect"    : list,
                     "bind"              : list,
+                    "bind-vsock"        : list,
                     "bind-tcp"          : list,
                     "env"               : list,
                }
@@ -452 +454 @@
                     "title"             : "@title@ on @client-machine@",
                     "username"          : username,
                     "auth"              : "",
+                    "vsock-auth"        : "",
                     "tcp-auth"          : "",
                     "wm-name"           : DEFAULT_NET_WM_NAME,
                     "session-name"      : "",
@@ -557 +560 @@
                     "packet-encoders"   : ["all"],
                     "key-shortcut"      : get_default_key_shortcuts(),
                     "bind"              : bind_dirs,
+                    "bind-vsock"        : [],
                     "bind-tcp"          : [],
                     "start"             : [],
                     "start-child"       : [],

xpra/scripts/main.py

@@ -29 +29 @@
     make_defaults_struct, parse_bool, print_bool, print_number, validate_config, has_sound_support, name_to_field
 
 
+VSOCK_TIMEOUT = int(os.environ.get("XPRA_VSOCK_TIMEOUT", 5))
 SOCKET_TIMEOUT = int(os.environ.get("XPRA_SOCKET_TIMEOUT", 10))
 TCP_NODELAY = int(os.environ.get("XPRA_TCP_NODELAY", "1"))
 NO_ROOT_WARNING = int(os.environ.get("XPRA_NO_ROOT_WARNING", "0"))
@@ -380 +381 @@
                             + " You may specify this option multiple times with different host and port combinations")
     else:
         ignore({"bind-tcp" : []})
+    try:
+        from xpra.net import vsock
+    except:
+        vsock = None
+    if vsock:
+        group.add_option("--bind-vsock", action="append",
+                          dest="bind_vsock", default=list(defaults.bind_vsock or []),
+                          metavar="[CID]:[PORT]",
+                          help="Listen for connections over VSOCK (use --password-file to secure it)."
+                            + " You may specify this option multiple times with different CID and port combinations")
+    else:
+        ignore({"bind-vsock" : []})
     legacy_bool_parse("mdns")
     if (supports_server or supports_shadow):
         group.add_option("--mdns", action="store", metavar="yes|no",
@@ -674 +687 @@
     group.add_option("--tcp-auth", action="store",
                       dest="tcp_auth", default=defaults.tcp_auth,
                       help="The authentication module to use for TCP sockets (default: '%default')")
+    if vsock:
+        group.add_option("--vsock-auth", action="store",
+                         dest="vsock_auth", default=defaults.vsock_auth,
+                         help="The authentication module to use for vsock sockets (default: '%default')")
+    else:
+        ignore({"vsock-auth" : ""})
     if os.name=="posix":
         group.add_option("--mmap-group", action="store_true",
                           dest="mmap_group", default=defaults.mmap_group,
@@ -1009 +1028 @@
         return 128+signal.SIGINT
 
 
+def parse_vsock(vsock_str):
+    from xpra.net.vsock import STR_TO_CID, CID_ANY, PORT_ANY    #@UnresolvedImport
+    if not vsock_str.find(":")>=0:
+        raise InitException("invalid vsocket format '%s'" % vsock_str)
+    cid_str, port_str = vsock_str.split(":", 1)
+    if cid_str.lower() in ("auto", "any"):
+        cid = CID_ANY
+    else:
+        try:
+            cid = int(cid_str)
+        except ValueError:
+            cid = STR_TO_CID.get(cid_str.upper())
+            if cid is None:
+                raise InitException("invalid vsock cid '%s'" % cid_str)
+    if port_str.lower() in ("auto", "any"):
+        iport = PORT_ANY
+    else:
+        try:
+            iport = int(port_str)
+        except ValueError:
+            raise InitException("invalid vsock port '%s'" % port_str)
+    return cid, iport
+
 def parse_display_name(error_cb, opts, display_name):
     desc = {"display_name" : display_name}
     if display_name.lower().startswith("ssh:") or display_name.lower().startswith("ssh/"):
@@ -1172 +1214 @@
             host = "127.0.0.1"
         desc["host"] = host
         return desc
+    elif display_name.startswith("vsock:"):
+        #use the vsock specified:
+        vsock_str = display_name[len("vsock:"):]
+        cid, iport = parse_vsock(vsock_str)
+        desc.update({
+                "type"          : "vsock",
+                "local"         : False,
+                "display"       : display_name,
+                "vsock"         : (cid, iport),
+                })
+        opts.display = display_name
+        return desc
     elif sys.platform.startswith("win") or display_name.startswith("named-pipe:"):
         pipe_name = display_name
         if display_name.startswith("named-pipe:"):
@@ -1248 +1302 @@
     except InitException:
         raise
     except Exception as e:
-        raise
-    #    traceback.print_stack()
         raise InitException("connection failed: %s" % e)
 
 def ssh_connect_failed(message):
@@ -1391 +1443 @@
         conn = NamedPipeConnection(pipe_name, pipe_handle)
         conn.timeout = SOCKET_TIMEOUT
 
+    elif dtype == "vsock":
+        cid, iport = display_desc["vsock"]
+        from xpra.net.vsock import connect_vsocket
+        conn = connect_vsocket(cid=cid, port=iport)
+        conn.timeout = VSOCK_TIMEOUT
+
     elif dtype == "tcp":
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         sock.settimeout(SOCKET_TIMEOUT)

xpra/scripts/server.py

@@ -362 +362 @@
             tcp_sockets.add((host, iport))
     return tcp_sockets
 
+def setup_vsock_socket(cid, iport):
+    from xpra.log import Logger
+    log = Logger("network")
+    try:
+        from xpra.net.vsock import bind_vsocket     #@UnresolvedImport
+        vsock_socket = bind_vsocket(cid=cid, port=iport)
+    except Exception as e:
+        raise InitException("failed to setup vsock socket on %s:%s %s" % (cid, iport, e))
+    def cleanup_vsock_socket():
+        log.info("closing vsock socket %s:%s", cid, iport)
+        try:
+            vsock_socket.close()
+        except:
+            pass
+    _cleanups.append(cleanup_vsock_socket)
+    return "vsock", vsock_socket, (cid, iport)
 
+def parse_bind_vsock(bind_vsock):
+    vsock_sockets = set()
+    if bind_vsock:
+        from xpra.scripts.main import parse_vsock
+        for spec in bind_vsock:
+            vsock_sockets.add(parse_vsock(spec))
+    return vsock_sockets
+
+
 def normalize_local_display_name(local_display_name):
     if not local_display_name.startswith(":"):
         local_display_name = ":" + local_display_name
@@ -1046 +1071 @@
         socket = setup_tcp_socket(host, iport)
         sockets.append(socket)
         if opts.mdns:
-            mdns_recs.append(("tcp", bind_tcp))
+            rec = "tcp", [(host, iport)]
+            mdns_recs.append(rec)
 
+    bind_vsock = parse_bind_vsock(opts.bind_vsock)
+    for cid, iport in bind_vsock:
+        socket = setup_vsock_socket(cid, iport)
+        sockets.append(socket)
+        if opts.mdns:
+            rec = "vsock", [("", iport)]
+            mdns_recs.append(rec)
+
     # Do this after writing out the shell script:
     if display_name[0] != 'S':
         os.environ["DISPLAY"] = display_name

xpra/net/vsock_client_test.py

@@ +1 @@
+# This file is part of Xpra.
+# Copyright (C) 2016 Antoine Martin <antoine@devloop.org.uk>
+# Xpra is released under the terms of the GNU GPL v2, or, at your option, any
+# later version. See the file COPYING for details.
+
+
+import sys
+from xpra.net.vsock import connect_vsocket, CID_ANY, PORT_ANY       #@UnresolvedImport
+
+from xpra.log import Logger
+log = Logger("network")
+
+
+def main(args):
+    cid = CID_ANY
+    port = PORT_ANY
+    if len(args)>0:
+        cid = int(args[0])
+    if len(args)>1:
+        port = int(args[1])
+
+    vsock = connect_vsocket(cid=cid, port=port)
+    log("vsock=%s", vsock)
+    data = vsock.recv(1024)
+    log("recv()=%s", data)
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv[1:]))

xpra/net/vsock.pyx

@@ +1 @@
+# This file is part of Xpra.
+# Copyright (C) 2016 Antoine Martin <antoine@devloop.org.uk>
+# Xpra is released under the terms of the GNU GPL v2, or, at your option, any
+# later version. See the file COPYING for details.
+
+#cython: boundscheck=False, wraparound=False, cdivision=True
+
+import socket as pysocket
+import struct
+from xpra.log import Logger
+log = Logger("network")
+
+
+cdef extern from "string.h":
+    void *memset(void * ptr, int value, size_t num) nogil
+
+cdef extern from "unistd.h":
+    int close(int fd)
+
+cdef extern from "sys/socket.h":
+    int AF_VSOCK
+    int SOCK_DGRAM
+    int SOCK_STREAM
+    cdef struct sockaddr:
+        pass
+    ctypedef int socklen_t
+    int socket(int socket_family, int socket_type, int protocol)
+    int bind(int sockfd, const sockaddr *addr, socklen_t addrlen)
+    int getsockname(int sockfd, sockaddr *addr, socklen_t *addrlen)
+    int accept(int sockfd, sockaddr *addr, socklen_t *addrlen)
+    int connect(int sockfd, const sockaddr *addr, socklen_t addrlen)
+
+
+cdef extern from "linux/vm_sockets.h":
+    unsigned int VMADDR_CID_ANY
+    unsigned int VMADDR_CID_HYPERVISOR
+    unsigned int VMADDR_CID_HOST
+    unsigned int VMADDR_PORT_ANY
+
+
+    unsigned int SO_VM_SOCKETS_BUFFER_SIZE
+    unsigned int SO_VM_SOCKETS_BUFFER_MIN_SIZE
+    unsigned int SO_VM_SOCKETS_BUFFER_MAX_SIZE
+    unsigned int SO_VM_SOCKETS_PEER_HOST_VM_ID
+    unsigned int SO_VM_SOCKETS_TRUSTED
+    unsigned int SO_VM_SOCKETS_CONNECT_TIMEOUT
+    unsigned int SO_VM_SOCKETS_NONBLOCK_TXRX
+
+    ctypedef unsigned short __kernel_sa_family_t
+    cdef struct sockaddr_vm:
+        __kernel_sa_family_t svm_family
+        unsigned short svm_reserved1
+        unsigned int svm_port
+        unsigned int svm_cid
+
+CID_ANY = VMADDR_CID_ANY
+CID_HYPERVISOR = VMADDR_CID_HYPERVISOR
+CID_HOST = VMADDR_CID_HOST
+PORT_ANY = VMADDR_PORT_ANY
+
+CID_TYPES = {
+             CID_ANY        : "ANY",
+             CID_HYPERVISOR : "HYPERVISOR",
+             CID_HOST       : "HOST",
+             }
+STR_TO_CID = {
+              "ANY"         : CID_ANY,
+              "HYPERVISOR"  : CID_HYPERVISOR,
+              "HOST"        : CID_HOST,
+              }
+
+SOCK_TYPES = {
+              SOCK_STREAM   : "STREAM",
+              SOCK_DGRAM    : "DGRAM",
+              }
+
+
+def bind_vsocket(sock_type=SOCK_STREAM, cid=VMADDR_CID_HOST, port=VMADDR_PORT_ANY):
+    log("server_socket(%s)", (SOCK_TYPES.get(sock_type, sock_type), CID_TYPES.get(cid, cid), port))
+    assert sock_type in (SOCK_STREAM, SOCK_DGRAM), "invalid socket type %s" % sock_type
+    #assert cid in (VMADDR_CID_ANY, VMADDR_CID_HYPERVISOR, VMADDR_CID_HOST), "invalid cid %s" % cid
+    assert port==VMADDR_PORT_ANY or (port>0 and port<65536)
+    log("socket(AF_VSOCK, %s, 0)", SOCK_TYPES.get(sock_type, sock_type))
+    cdef int sockfd = socket(AF_VSOCK, sock_type, 0)
+    log("socket(..)=%i", sockfd)
+    if sockfd<0:
+        raise Exception("AF_VSOCK not supported")
+    cdef sockaddr_vm vmsock
+    memset(&vmsock, 0, sizeof(sockaddr_vm))
+    vmsock.svm_family = AF_VSOCK
+    vmsock.svm_cid = cid    #VMADDR_CID_HOST
+    vmsock.svm_port = port
+
+    if bind(sockfd, <sockaddr*> &vmsock, sizeof(sockaddr_vm)):
+        close(sockfd)
+        raise Exception("failed to bind to AF_VSOCK socket %i:%i", cid, port)
+
+    cdef socklen_t socklen = sizeof(sockaddr_vm)
+    if getsockname(sockfd, <sockaddr *> &vmsock, &socklen):
+        close(sockfd)
+        raise Exception("getsockname failed")
+    log("cid=%s, port=%i", CID_TYPES.get(vmsock.svm_cid, vmsock.svm_cid), vmsock.svm_port)
+    vsock = VSocket(sockfd)
+    return vsock
+
+class VSocket(object):
+    def __init__(self, sockfd):
+        self.sockfd = sockfd
+        self.sock = pysocket.fromfd(sockfd, AF_VSOCK, 0)
+        self.address = None
+
+    def __getattr__(self, attr):
+        return getattr(self.sock, attr)
+
+    def accept(self):
+        cdef sockaddr_vm vmsock
+        cdef socklen_t socklen = sizeof(sockaddr_vm)
+        memset(&vmsock, 0, socklen)
+        cdef int fd = accept(self.sockfd, <sockaddr*> &vmsock, &socklen)
+        if fd<0:
+            raise Exception("accept failed: %s" % fd)
+        conn = pysocket.fromfd(fd, AF_VSOCK, 0)
+        if getsockname(fd, <sockaddr *> &vmsock, &socklen):
+            close(fd)
+            raise Exception("getsockname failed")
+        self.address = (vmsock.svm_cid, vmsock.svm_port)
+        return VSocket(conn.fileno()), self.address
+
+    def getsockname(self):
+        return self.address
+
+    def __repr__(self):
+        return "VSocket(%s)" % self.sockfd
+
+
+def connect_vsocket(sock_type=SOCK_STREAM, cid=VMADDR_CID_ANY, port=VMADDR_PORT_ANY):
+    log("connect_vsocket(%s)", (cid, port, sock_type))
+    assert sock_type in (SOCK_STREAM, SOCK_DGRAM), "invalid socket type %s" % sock_type
+    #assert cid in (VMADDR_CID_ANY, VMADDR_CID_HYPERVISOR, VMADDR_CID_HOST), "invalid cid %s" % cid
+    assert port==VMADDR_PORT_ANY or (port>0 and port<65536)
+    log("socket(%i, %i, 0)", AF_VSOCK, sock_type)
+    cdef int sockfd = socket(AF_VSOCK, sock_type, 0)
+    log("socket(AF_VSOCK, SOCK_DGRAM, 0)=%i", sockfd)
+    if sockfd<0:
+        raise Exception("AF_VSOCK not supported")
+
+    cdef sockaddr_vm vmsock
+    memset(&vmsock, 0, sizeof(sockaddr_vm))
+    vmsock.svm_family = AF_VSOCK
+    vmsock.svm_cid = cid
+    vmsock.svm_port = port
+
+    if connect(sockfd, <sockaddr *> &vmsock, sizeof(sockaddr_vm)):
+        raise Exception("failed to connect to server vsock %i:%i" % (cid, port))
+
+    vsock = VSocket(sockfd)
+    return vsock

xpra/net/vsock_server_test.py

@@ +1 @@
+# This file is part of Xpra.
+# Copyright (C) 2016 Antoine Martin <antoine@devloop.org.uk>
+# Xpra is released under the terms of the GNU GPL v2, or, at your option, any
+# later version. See the file COPYING for details.
+
+
+import sys
+from xpra.net.vsock import bind_vsocket, CID_HOST, PORT_ANY       #@UnresolvedImport
+
+from xpra.log import Logger
+log = Logger("network")
+
+
+def main(args):
+    cid = CID_HOST
+    port = PORT_ANY
+    if len(args)>0:
+        cid = int(args[0])
+    if len(args)>1:
+        port = int(args[1])
+    #def server_vsocket(sock_type=SOCK_STREAM, cid=VMADDR_CID_HOST, port=VMADDR_PORT_ANY):
+    sock = bind_vsocket(cid=cid, port=port)
+    log("sock=%s", sock)
+    #import time
+    #time.sleep(10)
+    sock.listen(1)
+    log("listening")
+    while True:
+        connection, client_address = sock.accept()
+        log("new connection! %s", (connection, client_address))
+        data = connection.recv(1024)
+        log("got data: %s" % data)
+        connection.send("hello")
+    return 0
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv[1:]))