On 05/15/2018 01:43 PM, Daniel P. Berrangé wrote:
Use the virNWFilterBindingDefPtr struct in the DHCP address snooping code directly.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/nwfilter/nwfilter_dhcpsnoop.c | 150 ++++++++++--------------- src/nwfilter/nwfilter_dhcpsnoop.h | 7 +- src/nwfilter/nwfilter_gentech_driver.c | 7 +- 3 files changed, 61 insertions(+), 103 deletions(-)
Similar to the last one, there's an #else build issue, but otherwise, Reviewed-by: John Ferlan <jferlan@redhat.com> John [I am stopping here for the day - going to kill a few brain cells] [...]
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index f24fec1638..f6bcc3bcc7 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c
[...]
@@ -1611,12 +1594,7 @@ virNWFilterSnoopIFKeyFMT(char *ifkey, const unsigned char *vmuuid,
int virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver, - const char *ifname, - const char *linkdev, - const unsigned char *vmuuid, - const virMacAddr *macaddr, - const char *filtername, - virHashTablePtr filterparams, + virNWFilterBindingDefPtr binding, virNWFilterDriverStatePtr driver)
There's a HAVE_LIBPCAP #else that needs adjustment too
{ virNWFilterSnoopReqPtr req;
[...]