[GNUnet-SVN] r15648 - / gnunet gnunet/contrib gnunet/src gnunet-setup/src libmicrohttpd monkey monkey/src monkey/src/include

[gnunet]

Author: grothoff
Date: 2011-06-16 12:14:25 +0200 (Thu, 16 Jun 2011)
New Revision: 15648

Added:
   monkey/
   monkey/src/monkey/
Removed:
   gnunet/src/monkey/
Modified:
   gnunet-setup/src/gnunet-setup-options.c
   gnunet/configure.ac
   gnunet/contrib/defaults.conf
   gnunet/src/Makefile.am
   libmicrohttpd/configure.ac
   monkey/configure.ac
   monkey/src/Makefile.am
   monkey/src/include/Makefile.am
Log:
moving monkey

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2011-06-16 10:09:47 UTC (rev 15647)
+++ gnunet/configure.ac 2011-06-16 10:14:25 UTC (rev 15648)
@@ -584,41 +584,7 @@
   AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, 0)
 fi
 
-# libesmtp
-esmtp=0
-AC_MSG_CHECKING([for libesmtp])
-AC_ARG_WITH(esmtp,
-   [  --with-esmtp=PFX        base of libesmtp installation],
-   [AC_MSG_RESULT([$with_esmtp])
-    case $with_esmtp in
-      no)
-        ;;
-      yes)
-        AC_CHECK_HEADERS(libesmtp.h,
-          AC_CHECK_LIB([esmtp], [smtp_start_session],
-            esmtp=1))
-        ;;
-      *)
-        LDFLAGS="-L$with_esmtp/lib $LDFLAGS"
-        CPPFLAGS="-I$with_esmtp/include $CPPFLAGS"
-        AC_CHECK_HEADERS(libesmtp.h,
-          AC_CHECK_LIB([esmtp], [smtp_start_session],
-            EXT_LIB_PATH="-L$with_esmtp/lib $EXT_LIB_PATH"
-              esmtp=1))
-        ;;
-    esac
-   ],
-   [AC_MSG_RESULT([--with-esmtp not specified])
-    AC_CHECK_HEADERS(libesmtp.h,
-      AC_CHECK_LIB([esmtp], [smtp_start_session],
-          esmtp=1))])
-AM_CONDITIONAL(HAVE_ESMTP, test x$esmtp = x1)
-AC_DEFINE_UNQUOTED([HAVE_ESMTP], $esmtp, [We have libesmtp])
-# restore LIBS
-LIBS=$SAVE_LIBS
 
-
-
 # check for gettext
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.16.1])
@@ -826,7 +792,6 @@
 src/include/gnunet_directories.h
 src/hostlist/Makefile
 src/mesh/Makefile
-src/monkey/Makefile
 src/nat/Makefile
 src/peerinfo/Makefile
 src/peerinfo-tool/Makefile

Modified: gnunet/contrib/defaults.conf
===================================================================
--- gnunet/contrib/defaults.conf        2011-06-16 10:09:47 UTC (rev 15647)
+++ gnunet/contrib/defaults.conf        2011-06-16 10:14:25 UTC (rev 15648)
@@ -55,8 +55,12 @@
 PORT = 2086
 ADVERTISED_PORT = 2086
 
-TIMEOUT = 300000
+# Maximum number of open TCP connections allowed
+MAX_CONNECTIONS = 128
 
+# After how long do we drop inactive connections?
+TIMEOUT = 5000
+
 # Allow use of loopback address
 USE_LOCALADDR = NO
 
@@ -416,3 +420,4 @@
 ACCEPT_FROM6 = ::1;
 UNIXPATH = /tmp/gnunet-service-dns.sock
 PROVIDE_EXIT = NO
+

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2011-06-16 10:09:47 UTC (rev 15647)
+++ gnunet/src/Makefile.am      2011-06-16 10:14:25 UTC (rev 15648)
@@ -2,15 +2,7 @@
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
-if HAVE_ESMTP
-if HAVE_OPENSSL
 if HAVE_EXPERIMENTAL
- MONKEY_DIR = monkey
-endif
-endif
-endif
-
-if HAVE_EXPERIMENTAL
  EXP_DIR = fragmentation mesh vpn chat
 endif
 
@@ -21,7 +13,6 @@
   block \
   statistics \
   arm \
-  $(MONKEY_DIR) \
   peerinfo \
   datacache \
   datastore \

Modified: gnunet-setup/src/gnunet-setup-options.c
===================================================================
--- gnunet-setup/src/gnunet-setup-options.c     2011-06-16 10:09:47 UTC (rev 
15647)
+++ gnunet-setup/src/gnunet-setup-options.c     2011-06-16 10:14:25 UTC (rev 
15648)
@@ -434,7 +434,6 @@
 }
 
 
-
 /**
  * User pressed a key in a sensitive tree view with a list store.
  * Check if it was the 'delete' key and if so remove the selected

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2011-06-16 10:09:47 UTC (rev 15647)
+++ libmicrohttpd/configure.ac  2011-06-16 10:14:25 UTC (rev 15648)
@@ -262,7 +262,7 @@
 
 # gnutls
 gnutls=0
-AC_MSG_CHECKING([for gnutls])
+AC_MSG_CHECKING(for gnutls)
 AC_ARG_WITH(gnutls,
    [  --with-gnutls=PFX   base of gnutls installation],
    [AC_MSG_RESULT([$with_gnutls])
@@ -350,11 +350,13 @@
 
 
 # gcov compilation
+AC_MSG_CHECKING(whether to compile with support for code coverage analysis)
 AC_ARG_ENABLE([coverage], 
               AS_HELP_STRING([--enable-coverage],
                              [compile the library with code coverage support]),
               [use_gcov=${enableval}], 
               [use_gcov=no])
+AC_MSG_RESULT($use_gcov)
 AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
 
 

Modified: monkey/configure.ac
===================================================================
--- gnunet-ext/configure.ac     2011-06-15 16:05:26 UTC (rev 15643)
+++ monkey/configure.ac 2011-06-16 10:14:25 UTC (rev 15648)
@@ -20,9 +20,9 @@
 # Process this file with autoconf to produce a configure script.
 #
 AC_PREREQ(2.61)
-AC_INIT([gnunet-ext],[0.0.0],address@hidden)
-AM_INIT_AUTOMAKE([gnunet-ext], [0.0.0])
-AM_CONFIG_HEADER(gnunet_ext_config.h)
+AC_INIT([monkey],[0.0.0],address@hidden)
+AM_INIT_AUTOMAKE([monkey], [0.0.0])
+AM_CONFIG_HEADER(monkey_config.h)
 
 AH_TOP([#define _GNU_SOURCE  1])
 
@@ -164,18 +164,56 @@
 
 if test "$gnunet" != 1
 then
- AC_MSG_ERROR([gnunet-ext requires GNUnet])
+ AC_MSG_ERROR([monkey requires GNUnet])
 fi
 AC_CHECK_HEADERS([gnunet/gnunet_core_service.h],,
-                 AC_MSG_ERROR([compiling gnunet-ext requires GNUnet core 
headers]))
+                 AC_MSG_ERROR([compiling monkey requires GNUnet core headers]))
 
 SAVELIBS=$LIBS
 AC_CHECK_LIB(gnunetutil,GNUNET_log,,
-             AC_MSG_ERROR([gnunet-ext requires libgnunetutil]))
+             AC_MSG_ERROR([monkey requires libgnunetutil]))
 AC_CHECK_LIB(gnunetcore,GNUNET_CORE_connect,,
-             AC_MSG_ERROR([gnunet-ext requires libgnunetcore]))
+             AC_MSG_ERROR([monkey requires libgnunetcore]))
 LIBS=$SAVELIBS
 
+
+# libesmtp
+esmtp=0
+AC_MSG_CHECKING([for libesmtp])
+AC_ARG_WITH(esmtp,
+   [  --with-esmtp=PFX        base of libesmtp installation],
+   [AC_MSG_RESULT([$with_esmtp])
+    case $with_esmtp in
+      no)
+        ;;
+      yes)
+        AC_CHECK_HEADERS(libesmtp.h,
+          AC_CHECK_LIB([esmtp], [smtp_start_session],
+            esmtp=1))
+        ;;
+      *)
+        LDFLAGS="-L$with_esmtp/lib $LDFLAGS"
+        CPPFLAGS="-I$with_esmtp/include $CPPFLAGS"
+        AC_CHECK_HEADERS(libesmtp.h,
+          AC_CHECK_LIB([esmtp], [smtp_start_session],
+            EXT_LIB_PATH="-L$with_esmtp/lib $EXT_LIB_PATH"
+              esmtp=1))
+        ;;
+    esac
+   ],
+   [AC_MSG_RESULT([--with-esmtp not specified])
+    AC_CHECK_HEADERS(libesmtp.h,
+      AC_CHECK_LIB([esmtp], [smtp_start_session],
+          esmtp=1))])
+AM_CONDITIONAL(HAVE_ESMTP, test x$esmtp = x1)
+AC_DEFINE_UNQUOTED([HAVE_ESMTP], $esmtp, [We have libesmtp])
+# restore LIBS
+LIBS=$SAVE_LIBS
+
+
+
+
+
 AC_SUBST(GNUNETEXT_CFLAGS)
 AC_SUBST(GNUNETEXT_LIBS)
 AC_DEFINE_DIR([PACKAGE_DATA], [datarootdir], [The directory for installing 
read-only architecture-independent data])
@@ -188,5 +226,5 @@
 Makefile
 src/Makefile
 src/include/Makefile
-src/ext/Makefile
+src/monkey/Makefile
 ])

Modified: monkey/src/Makefile.am
===================================================================
--- gnunet-ext/src/Makefile.am  2011-06-15 16:05:26 UTC (rev 15643)
+++ monkey/src/Makefile.am      2011-06-16 10:14:25 UTC (rev 15648)
@@ -1,2 +1,2 @@
-SUBDIRS = include ext .
+SUBDIRS = include monkey .
 

Modified: monkey/src/include/Makefile.am
===================================================================
--- gnunet-ext/src/include/Makefile.am  2011-06-15 16:05:26 UTC (rev 15643)
+++ monkey/src/include/Makefile.am      2011-06-16 10:14:25 UTC (rev 15648)
@@ -2,6 +2,6 @@
 
 gnunetincludedir = $(includedir)/gnunet
 
-gnunetinclude_HEADERS = \
-  gnunet_ext_service.h \
-  gnunet_protocols_ext.h
+#gnunetinclude_HEADERS = \
+#  gnunet_ext_service.h \
+#  gnunet_protocols_ext.h