remote: use a separate connection for nwfilter APIs

Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/remote/remote_daemon.h b/src/remote/remote_daemon.h
index 517eec1fc210b80da06f3acb4378ea22d85a2027..1b906401d39b393e4de5ea13fb148bb929961a11 100644 (file)
--- a/src/remote/remote_daemon.h
+++ b/src/remote/remote_daemon.h
@@ -77,6 +77,7 @@ struct daemonClientPrivate {
     virConnectPtr interfaceConn;
     virConnectPtr networkConn;
     virConnectPtr nodedevConn;
+    virConnectPtr nwfilterConn;
 
     daemonClientStreamPtr streams;
 };

diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
index 668f67cca80abab2979a8b2412fb47539e3ca4a2..36190de8f2eb07d0819fe0402a73527633b03188 100644 (file)
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -1751,6 +1751,8 @@ void remoteClientFree(void *data)
         virConnectClose(priv->networkConn);
     if (priv->nodedevConn)
         virConnectClose(priv->nodedevConn);
+    if (priv->nwfilterConn)
+        virConnectClose(priv->nwfilterConn);
 
     VIR_FREE(priv);
 }
@@ -1826,6 +1828,7 @@ remoteDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED,
     priv->interfaceConn = virObjectRef(priv->conn);
     priv->networkConn = virObjectRef(priv->conn);
     priv->nodedevConn = virObjectRef(priv->conn);
+    priv->nwfilterConn = virObjectRef(priv->conn);
 
     /* force update the @readonly attribute which was inherited from the
      * virNetServerService object - this is important for sockets that are RW

diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index af29d88b9929c72ef00983ca3c9f23949c4d2f0f..cccfcab743bd7f936dfd3dac7e22dfa3f1cb04d5 100755 (executable)
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -134,6 +134,9 @@ sub get_conn_arg {
         if ($type =~ /remote_nonnull_node_device/) {
             return "priv->nodedevConn";
         }
+        if ($type =~ /remote_nonnull_nwfilter/) {
+            return "priv->nwfilterConn";
+        }
     }
 
     # This is for the few virConnect APIs that
@@ -148,6 +151,9 @@ sub get_conn_arg {
     if ($proc =~ /Node.*Device/) {
         return "priv->nodedevConn";
     }
+    if ($proc =~ /Connect.*NWFilter/) {
+        return "priv->nwfilterConn";
+    }
 
     return "priv->conn";
 }