vici: Support non-Unix sockets for vici connections using Python

src/libcharon/plugins/vici/python/vici/protocol.py

@@ -11,10 +11,8 @@ class Transport(object):
     HEADER_LENGTH = 4
     MAX_SEGMENT = 512 * 1024
 
-    def __init__(self, address="/var/run/charon.vici"):
+    def __init__(self, sock):
-        self.address = address
+        self.socket = sock
-        self.socket = socket.socket(socket.AF_UNIX)
-        self.socket.connect(address)
 
     def send(self, packet):
         self.socket.sendall(struct.pack("!I", len(packet)) + packet)
@@ -191,4 +189,4 @@ class FiniteStream(io.BytesIO):
         return len(self.getvalue())
 
     def has_more(self):
-        return self.tell() < len(self)
+        return self.tell() < len(self)

src/libcharon/plugins/vici/python/vici/session.py

@@ -1,4 +1,5 @@
 import collections
+import socket
 
 from .exception import SessionException
 from .protocol import Transport, Packet, Message
@@ -11,8 +12,11 @@ CommandResult = collections.namedtuple(
 
 
 class Session(object):
-    def __init__(self, address="/var/run/charon.vici"):
+    def __init__(self, sock=None):
-        self.handler = SessionHandler(Transport(address))
+        if sock is None:
+            sock = socket.socket(socket.AF_UNIX)
+            sock.connect("/var/run/charon.vici")
+        self.handler = SessionHandler(Transport(sock))
 
     def version(self):
         """Retrieve daemon and system specific version information.