[GNUnet-SVN] r17326 - in gnunet: . contrib src/include

[gnunet]

Author: grothoff
Date: 2011-10-10 14:50:50 +0200 (Mon, 10 Oct 2011)
New Revision: 17326

Modified:
   gnunet/configure.ac
   gnunet/contrib/defaults.conf
   gnunet/src/include/gnunet_protocols.h
Log:
kill malicious flag, legacy protocol numbers

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2011-10-10 12:48:35 UTC (rev 17325)
+++ gnunet/configure.ac 2011-10-10 12:50:50 UTC (rev 17326)
@@ -695,21 +695,6 @@
 AC_MSG_RESULT($enable_experimental)
 AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
 
-# should malicious code be compiled (code used for testing with malicious 
peers)
-AC_MSG_CHECKING(whether to compile malicious code)
-AC_ARG_ENABLE([malicious],
-   [AS_HELP_STRING([--enable-malicious], [enable compiling malicious code 
(only for developers for testing)])],
-   [enable_malicious=${enableval}],
-   [enable_malicious=no])
-AC_MSG_RESULT($enable_malicious)
-AM_CONDITIONAL([HAVE_MALICIOUS], [test "x$enable_malicious" = "xyes"])
-if test "$enable_malicious" = "yes"
-then
- AC_DEFINE([HAVE_MALICIOUS],[1],[include malicious code])
-else
- AC_DEFINE([HAVE_MALICIOUS],[0],[disable malicious code])
-fi
-
 # should code be enabled that works around missing OS functionality on Windows?
 # used for test cases
 if test $build_target = "mingw"

Modified: gnunet/contrib/defaults.conf
===================================================================
--- gnunet/contrib/defaults.conf        2011-10-10 12:48:35 UTC (rev 17325)
+++ gnunet/contrib/defaults.conf        2011-10-10 12:50:50 UTC (rev 17326)
@@ -254,7 +254,7 @@
 HOSTNAME = localhost
 HOME = $SERVICEHOME
 CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-core
+BINARY = gnunet-service-core-new
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 # quotas are in bytes per second now!

Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2011-10-10 12:48:35 UTC (rev 
17325)
+++ gnunet/src/include/gnunet_protocols.h       2011-10-10 12:50:50 UTC (rev 
17326)
@@ -644,85 +644,7 @@
  */
 #define GNUNET_MESSAGE_TYPE_DHT_P2P_RESULT 148
 
-// LEGACY types follow (pre3)......
 
-/**
- * Local DHT route request type
- */
-#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE 142
-
-/**
- * Local generic DHT route result type
- */
-#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_RESULT 143
-
-/**
- * P2P DHT route request type
- */
-#define GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE 144
-
-/**
- * P2P DHT route result type
- */
-#define GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE_RESULT 145
-
-/**
- * Local generic DHT message stop type
- */
-#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_STOP 146
-
-/**
- * Local and P2P DHT PUT message
- * (encapsulated in DHT_ROUTE message)
- */
-#define GNUNET_MESSAGE_TYPE_DHT_PUT 147
-
-/**
- * Local and P2P DHT GET message
- * (encapsulated in DHT_ROUTE message)
- */
-#define GNUNET_MESSAGE_TYPE_DHT_GET 148
-
-/**
- * Local and P2P DHT Get result message
- */
-#define GNUNET_MESSAGE_TYPE_DHT_GET_RESULT 149
-
-/**
- * Local and P2P DHT find peer message
- */
-#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER 150
-
-/**
- * Local and P2P DHT find peer result message
- */
-#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT 151
-
-
-/**
- * DHT Control message type, for telling the
- * DHT to alter its current operation somehow.
- */
-#define GNUNET_MESSAGE_TYPE_DHT_CONTROL 153
-
-/**
- * Local control message type, tells peer to start
- * issuing malicious GET requests.
- */
-#define GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_GET 154
-
-/**
- * Local control message type, tells peer to start
- * issuing malicious PUT requests.
- */
-#define GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_PUT 155
-
-/**
- * Local control message type, tells peer to start
- * dropping all requests.
- */
-#define GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_DROP  156
-
 
/*******************************************************************************
  * HOSTLIST message types
  
******************************************************************************/