On Tue, Oct 13, 2009 at 12:57:19PM +0200, Gerhard Stenzel wrote: > This patch adds build support for the ebtables wrapper. > > Signed-off-by: Gerhard Stenzel <gerhard.stenzel@xxxxxxxxxx> > --- > > configure.in | 3 +++ > src/Makefile.am | 1 + > src/libvirt_private.syms | 27 +++++++++++++++++++++++++++ > 3 files changed, 31 insertions(+), 0 deletions(-) > > diff --git a/configure.in b/configure.in > index 518859d..90c42cc 100644 > --- a/configure.in > +++ b/configure.in > @@ -287,6 +287,9 @@ fi > AC_PATH_PROG([IPTABLES_PATH], [iptables], /sbin/iptables, [/usr/sbin:$PATH]) > AC_DEFINE_UNQUOTED([IPTABLES_PATH], "$IPTABLES_PATH", [path to iptables binary]) > > +AC_PATH_PROG([EBTABLES_PATH], [ebtables], /sbin/ebtables, [/usr/sbin:$PATH]) > +AC_DEFINE_UNQUOTED([EBTABLES_PATH], "$EBTABLES_PATH", [path to ebtables binary]) > + > if test "$with_openvz" = "yes"; then > AC_DEFINE_UNQUOTED([WITH_OPENVZ], 1, [whether OpenVZ driver is enabled]) > fi > diff --git a/src/Makefile.am b/src/Makefile.am > index d0ef7d1..d9ed610 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -51,6 +51,7 @@ UTIL_SOURCES = \ > util/event.c util/event.h \ > util/hash.c util/hash.h \ > util/iptables.c util/iptables.h \ > + util/ebtables.c util/ebtables.h \ > util/logging.c util/logging.h \ > util/memory.c util/memory.h \ > util/pci.c util/pci.h \ > diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms > index 37395ab..6db2a57 100644 > --- a/src/libvirt_private.syms > +++ b/src/libvirt_private.syms > @@ -230,6 +230,33 @@ iptablesRemoveUdpInput; > iptablesSaveRules; > > > +# ebtables.h > +ebtablesAddForwardAllowCross; > +ebtablesAddForwardAllowIn; > +ebtablesAddForwardAllowOut; > +ebtablesAddForwardAllowRelatedIn; > +ebtablesAddForwardMasquerade; > +ebtablesAddForwardRejectIn; > +ebtablesAddForwardRejectOut; > +ebtablesAddTcpInput; > +ebtablesAddUdpInput; > +ebtablesContextFree; > +ebtablesContextNew; > +ebtablesReloadRules; > +ebtablesRemoveForwardAllowCross; > +ebtablesRemoveForwardAllowIn; > +ebtablesRemoveForwardAllowOut; > +ebtablesRemoveForwardAllowRelatedIn; > +ebtablesRemoveForwardMasquerade; > +ebtablesRemoveForwardRejectIn; > +ebtablesRemoveForwardRejectOut; > +ebtablesRemoveTcpInput; > +ebtablesRemoveUdpInput; > +ebtablesSaveRules; > +ebtablesAddForwardPolicyReject; > +ebtablesRemoveForwardPolicyReject; > +ebtablesForwardPolicyReject; > + > # libvirt_internal.h > virStateInitialize; > virStateCleanup; ACK, I'd actually recommend merging this patch with the first one - there isn't a compelling reason for them to be separate. Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :| -- Libvir-list mailing list Libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list