From 5fda6c04344d67ac67789c3a2b686fdf386bbc9b Mon Sep 17 00:00:00 2001
From: garden <garden@d37a7db1-d92d-0410-89df-f68f52f87b57>
Date: Thu, 3 May 2007 22:34:46 +0000
Subject: [PATCH] - moved DEBUGOPT, PACKETCOUNT, PLUGIN in
 --enable-experimental configure   option - fixed #include in vde_over_ns

git-svn-id: https://vde.svn.sourceforge.net/svnroot/vde/trunk@152 d37a7db1-d92d-0410-89df-f68f52f87b57
---
 vde-2/Makefile.am       | 14 +++++++++-----
 vde-2/configure.ac      |  8 +++++++-
 vde-2/plugin/dump.c     | 42 ++++++++++++++++++++++--------------------
 vde-2/vde_over_ns/fun.h |  2 +-
 4 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/vde-2/Makefile.am b/vde-2/Makefile.am
index b509cb8..1374a20 100644
--- a/vde-2/Makefile.am
+++ b/vde-2/Makefile.am
@@ -1,4 +1,6 @@
-SUBDIRS = libvdeplug qemu slirpvde bochs uml doc dpipe wirefilter unixterm vde_plug vde_plug2tap vde_over_ns 
+SUBDIRS = libvdeplug qemu slirpvde bochs uml doc dpipe wirefilter unixterm vde_plug vde_plug2tap 
+
+# vde_over_ns 
 
 if WANT_TUNTAP
 if CAN_MAKE_LIBVDETAP
@@ -44,10 +46,12 @@ if HAVE_BROKEN_POLL
   vde_switch_SOURCES += poll2select.c poll2select.h
 endif
 
-AM_CFLAGS = -Wall 
-AM_CXXFLAGS = -Wall
-#AM_CFLAGS = -Wall -DDEBUGOPT -DPORTCOUNTERS -DVDEPLUGIN -rdynamic
-#AM_CXXFLAGS = -Wall -DDEBUGOPT -DPORTCOUNTERS -DVDEPLUGIN -rdynamic
+AM_CFLAGS = -Wall
+
+if ENABLE_EXPERIMENTAL
+  AM_CFLAGS += -rdynamic
+  AM_CPPFLAGS = -DDEBUGOPT -DPORTCOUNTERS -DVDEPLUGIN
+endif
 
 extraclean: distclean
 	rm -rf aclocal.m4 autom4te.cache autoscan.log configure.scan config.h.in* configure depcomp install-sh Makefile.in config.guess config.sub ltmain.sh missing `find . -name Makefile.in` vde-*.tar.gz
diff --git a/vde-2/configure.ac b/vde-2/configure.ac
index 474d296..c2b5f46 100644
--- a/vde-2/configure.ac
+++ b/vde-2/configure.ac
@@ -74,6 +74,11 @@ Linux and Darwin are supported. Contributions are appreciated! :-)])
 		;;
 esac
 
+# Enable experimental features
+AC_ARG_ENABLE([experimental],
+	AS_HELP_STRING([--enable-experimental],
+		[Enable experimental features (async notifies, plugin support, packet counter)]),
+	[if test $enableval = "yes"; then enable_experimental=yes; fi])
 
 # Disable vde_cryptcab? (depends on ssl, maybe unwanted)
 AC_ARG_ENABLE([cryptcab],
@@ -137,6 +142,7 @@ AM_CONDITIONAL(ENABLE_CRYPTCAB, test "$add_cryptcab_support" = yes)
 AM_CONDITIONAL(WANT_TUNTAP, test "$add_tuntap_support" = yes)
 AM_CONDITIONAL(CAN_MAKE_LIBVDETAP, test "$can_make_libvdetap" = yes)
 AM_CONDITIONAL(HAVE_BROKEN_POLL, test "$have_broken_poll" = yes)
+AM_CONDITIONAL(ENABLE_EXPERIMENTAL, test "$enable_experimental" = yes)
 
 AC_CONFIG_FILES([Makefile]
                 [doc/Makefile]
@@ -151,7 +157,7 @@ AC_CONFIG_FILES([Makefile]
                 [dpipe/Makefile]
                 [unixterm/Makefile]
                 [wirefilter/Makefile]
-		[vde_over_ns/Makefile]
+                [vde_over_ns/Makefile]
                 [uml/Makefile])
 AC_OUTPUT
 
diff --git a/vde-2/plugin/dump.c b/vde-2/plugin/dump.c
index b1549e9..85728eb 100644
--- a/vde-2/plugin/dump.c
+++ b/vde-2/plugin/dump.c
@@ -35,26 +35,28 @@ int testevent(struct dbgcl *event,va_list v)
 {
 	struct dbgcl *this=dl;
 	switch (event->tag) {
-		case D_PACKET|D_OUT: this++;
-		case D_PACKET|D_IN: {
-													int port=va_arg(v,int);
-													unsigned char *buf=va_arg(v,char *);
-													int len=va_arg(v,int);
-													char *pktdump;
-													int dumplen;
-													FILE *out=open_memstream(&pktdump,&dumplen);
-													if (out) {
-														int i;
-														fprintf(out,"Pkt: Port %04d len=%04d ",
-																port,
-																len);
-														for (i=0;i<len;i++)
-															fprintf(out,"%02x ",buf[i]);
-														fclose(out);
-														DBGOUT(this, "%s",pktdump);
-														free(pktdump);
-													}
-												}
+		case D_PACKET|D_OUT: 
+			this++;
+		case D_PACKET|D_IN: 
+			{
+				int port=va_arg(v,int);
+				unsigned char *buf=va_arg(v,char *);
+				int len=va_arg(v,int);
+				char *pktdump;
+				int dumplen;
+				FILE *out=open_memstream(&pktdump,&dumplen);
+				if (out) {
+					int i;
+					fprintf(out,"Pkt: Port %04d len=%04d ",
+							port,
+							len);
+					for (i=0;i<len;i++)
+						fprintf(out,"%02x ",buf[i]);
+					fclose(out);
+					DBGOUT(this, "%s",pktdump);
+					free(pktdump);
+				}
+			}
 	}
 	return 0;
 }
diff --git a/vde-2/vde_over_ns/fun.h b/vde-2/vde_over_ns/fun.h
index 7908f07..e611936 100644
--- a/vde-2/vde_over_ns/fun.h
+++ b/vde-2/vde_over_ns/fun.h
@@ -22,7 +22,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
   -------------------------------------------------------------------------- */
-#include "libvdeplug.h"
+#include <libvdeplug/libvdeplug.h>
 #include "vde.h"
 #ifndef _NSTXHDR_H
 #define _NSTXHDR_H
-- 
2.11.4.GIT