Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / dht / dht.h

diff --git a/src/dht/dht.h b/src/dht/dht.h
index 524cb4bda34ab20ccf4dc3c90938eadb95cef28a..4c994f93a43225781c71302406625f5a8aedd2da 100644 (file)
--- a/src/dht/dht.h
+++ b/src/dht/dht.h
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2009, 2011 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2001, 2002, 2003, 2004, 2009, 2011 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -441,37 +441,6 @@ struct GNUNET_DHT_MonitorGetRespMessage
 
 };
 
-#if ENABLE_MALICIOUS
-
-/**
- * Message to confirming receipt of ACT MALICIOUS, sent from DHT service to clients.
- */
-struct GNUNET_DHT_ClientActMaliciousConfirmationMessage
-{
-  /**
-   * Type: #GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT_OK
-   */
-  struct GNUNET_MessageHeader header;
-};
-
-
-/**
- * Message to turn the service malicious
- */
-struct GNUNET_DHT_ActMaliciousMessage
-{
-  /**
-   * Type: #GNUNET_MESSAGE_TYPE_ACT_MALICIOUS
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * If set to 1, act maliciously
-   */
-  uint32_t action;
-};
-#endif
-
 GNUNET_NETWORK_STRUCT_END
 
 #endif