nwfilter: convert the gentech driver code to use virNWFilterBindingDefPtr

Use the virNWFilterBindingDefPtr struct in the gentech driver code
directly.
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>

src/nwfilter/nwfilter_dhcpsnoop.c

@@ -497,15 +497,20 @@ virNWFilterSnoopIPLeaseInstallRule(virNWFilterSnoopIPLeasePtr ipl,
 
     /* instantiate the filters */
 
-    if (req->ifname)
+    if (req->ifname) {
+        virNWFilterBindingDef binding = {
+            .portdevname = req->ifname,
+            .linkdevname = req->linkdev,
+            .mac = req->macaddr,
+            .filter = req->filtername,
+            .filterparams = req->vars,
+            .ownername = NULL,
+            .owneruuid = {0},
+        };
         rc = virNWFilterInstantiateFilterLate(req->driver,
-                                              NULL,
-                                              req->ifname,
-                                              req->ifindex,
-                                              req->linkdev,
-                                              &req->macaddr,
-                                              req->filtername,
-                                              req->vars);
+                                              &binding,
+                                              req->ifindex);
+    }
 
  exit_snooprequnlock:
     virNWFilterSnoopReqUnlock(req);
@@ -884,14 +889,18 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReqPtr req,
         goto skip_instantiate;
 
     if (ipAddrLeft) {
+        virNWFilterBindingDef binding = {
+            .portdevname = req->ifname,
+            .linkdevname = req->linkdev,
+            .mac = req->macaddr,
+            .filter = req->filtername,
+            .filterparams = req->vars,
+            .ownername = NULL,
+            .owneruuid = {0},
+        };
         ret = virNWFilterInstantiateFilterLate(req->driver,
-                                               NULL,
-                                               req->ifname,
-                                               req->ifindex,
-                                               req->linkdev,
-                                               &req->macaddr,
-                                               req->filtername,
-                                               req->vars);
+                                               &binding,
+                                               req->ifindex);
     } else {
         virNWFilterVarValuePtr dhcpsrvrs =
             virHashLookup(req->vars, NWFILTER_VARNAME_DHCPSERVER);

src/nwfilter/nwfilter_driver.c

@@ -38,6 +38,7 @@
 #include "domain_conf.h"
 #include "domain_nwfilter.h"
 #include "nwfilter_driver.h"
+#include "virnwfilterbindingdef.h"
 #include "nwfilter_gentech_driver.h"
 #include "configmake.h"
 #include "virfile.h"
@@ -642,19 +643,36 @@ nwfilterGetXMLDesc(virNWFilterPtr nwfilter,
 
 
 static int
-nwfilterInstantiateFilter(const char *vmname ATTRIBUTE_UNUSED,
+nwfilterInstantiateFilter(const char *vmname,
                           const unsigned char *vmuuid,
                           virDomainNetDefPtr net)
 {
-    return virNWFilterInstantiateFilter(driver, vmuuid, net);
+    virNWFilterBindingDefPtr binding;
+    int ret;
+
+    if (!(binding = virNWFilterBindingDefForNet(vmname, vmuuid, net)))
+        return -1;
+    ret = virNWFilterInstantiateFilter(driver, binding);
+    virNWFilterBindingDefFree(binding);
+    return ret;
 }
 
 
 static void
 nwfilterTeardownFilter(virDomainNetDefPtr net)
 {
+    virNWFilterBindingDef binding = {
+        .portdevname = net->ifname,
+        .linkdevname = (net->type == VIR_DOMAIN_NET_TYPE_DIRECT ?
+                        net->data.direct.linkdev : NULL),
+        .mac = net->mac,
+        .filter = net->filter,
+        .filterparams = net->filterparams,
+        .ownername = NULL,
+        .owneruuid = {0},
+    };
     if ((net->ifname) && (net->filter))
-        virNWFilterTeardownFilter(net);
+        virNWFilterTeardownFilter(&binding);
 }
 
 

src/nwfilter/nwfilter_gentech_driver.h

@@ -25,6 +25,7 @@
 # define __NWFILTER_GENTECH_DRIVER_H
 
 # include "virnwfilterobj.h"
+# include "virnwfilterbindingdef.h"
 # include "nwfilter_tech_driver.h"
 
 virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name);
@@ -39,23 +40,16 @@ enum instCase {
 
 
 int virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver,
-                                 const unsigned char *vmuuid,
-                                 const virDomainNetDef *net);
+                                 virNWFilterBindingDefPtr binding);
 int virNWFilterUpdateInstantiateFilter(virNWFilterDriverStatePtr driver,
-                                       const unsigned char *vmuuid,
-                                       const virDomainNetDef *net,
+                                       virNWFilterBindingDefPtr binding,
                                        bool *skipIface);
 
 int virNWFilterInstantiateFilterLate(virNWFilterDriverStatePtr driver,
-                                     const unsigned char *vmuuid,
-                                     const char *ifname,
-                                     int ifindex,
-                                     const char *linkdev,
-                                     const virMacAddr *macaddr,
-                                     const char *filtername,
-                                     virHashTablePtr filterparams);
+                                     virNWFilterBindingDefPtr binding,
+                                     int ifindex);
 
-int virNWFilterTeardownFilter(const virDomainNetDef *net);
+int virNWFilterTeardownFilter(virNWFilterBindingDefPtr binding);
 
 virHashTablePtr virNWFilterCreateVarHashmap(const char *macaddr,
                                             const virNWFilterVarValue *value);
@@ -63,4 +57,8 @@ virHashTablePtr virNWFilterCreateVarHashmap(const char *macaddr,
 int virNWFilterDomainFWUpdateCB(virDomainObjPtr vm,
                                 void *data);
 
+virNWFilterBindingDefPtr virNWFilterBindingDefForNet(const char *vmname,
+                                                     const unsigned char *vmuuid,
+                                                     virDomainNetDefPtr net);
+
 #endif

src/nwfilter/nwfilter_learnipaddr.c

@@ -672,19 +672,23 @@ learnIPAddressThread(void *arg)
         virNWFilterUnlockIface(req->ifname);
 
         if ((inetaddr = virSocketAddrFormat(&sa)) != NULL) {
+            virNWFilterBindingDef binding = {
+                .portdevname = req->ifname,
+                .linkdevname = req->linkdev,
+                .mac = req->macaddr,
+                .filter = req->filtername,
+                .filterparams = req->filterparams,
+                .ownername = NULL,
+                .owneruuid = {0},
+            };
             if (virNWFilterIPAddrMapAddIPAddr(req->ifname, inetaddr) < 0) {
                 VIR_ERROR(_("Failed to add IP address %s to IP address "
                           "cache for interface %s"), inetaddr, req->ifname);
             }
 
             ret = virNWFilterInstantiateFilterLate(req->driver,
-                                                   NULL,
-                                                   req->ifname,
-                                                   req->ifindex,
-                                                   req->linkdev,
-                                                   &req->macaddr,
-                                                   req->filtername,
-                                                   req->filterparams);
+                                                   &binding,
+                                                   req->ifindex);
             VIR_DEBUG("Result from applying firewall rules on "
                       "%s with IP addr %s : %d", req->ifname, inetaddr, ret);
             VIR_FREE(inetaddr);