/*
This file is part of GNUnet.
- (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2010, 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
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.
*/
/**
#define GNUNET_SERVICE_CORE_KX_H
#include "gnunet_util_lib.h"
+#include "gnunet_transport_service.h"
/**
* Information about the status of a key exchange with another peer.
*/
-struct GSC_KeyExchangeInfo
-{
-
- /**
- * SetKeyMessage to transmit, NULL if we are not currently trying
- * to send one.
- */
- struct SetKeyMessage *skm;
-
- /**
- * Non-NULL if we are currently looking up HELLOs for this peer.
- * for this peer.
- */
- struct GNUNET_PEERINFO_IteratorContext *pitr;
-
- /**
- * Public key of the neighbour, NULL if we don't have it yet.
- */
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *public_key;
-
- /**
- * We received a PING message before we got the "public_key"
- * (or the SET_KEY). We keep it here until we have a key
- * to decrypt it. NULL if no PING is pending.
- */
- struct PingMessage *pending_ping;
-
- /**
- * We received a PONG message before we got the "public_key"
- * (or the SET_KEY). We keep it here until we have a key
- * to decrypt it. NULL if no PONG is pending.
- */
- struct PongMessage *pending_pong;
-
- /**
- * Key we use to encrypt our messages for the other peer
- * (initialized by us when we do the handshake).
- */
- struct GNUNET_CRYPTO_AesSessionKey encrypt_key;
-
- /**
- * Key we use to decrypt messages from the other peer
- * (given to us by the other peer during the handshake).
- */
- struct GNUNET_CRYPTO_AesSessionKey decrypt_key;
-
- /**
- * At what time did we generate our encryption key?
- */
- struct GNUNET_TIME_Absolute encrypt_key_created;
-
- /**
- * At what time did the other peer generate the decryption key?
- */
- struct GNUNET_TIME_Absolute decrypt_key_created;
-
- /**
- * At what frequency are we currently re-trying SET_KEY messages?
- */
- struct GNUNET_TIME_Relative set_key_retry_frequency;
-
- /**
- * ID of task used for re-trying SET_KEY and PING message.
- */
- GNUNET_SCHEDULER_TaskIdentifier retry_set_key_task;
-
- /**
- * What was our PING challenge number (for this peer)?
- */
- uint32_t ping_challenge;
-
- /**
- * What is our connection status?
- */
- enum PeerStateMachine status;
-
-};
+struct GSC_KeyExchangeInfo;
/**
- * We received a SET_KEY message. Validate and update
+ * We received a EPHEMERAL_KEY message. Validate and update
* our key material and status.
*
* @param kx key exchange status for the corresponding peer
* @param msg the set key message we received
- * @param ats performance data
- * @param ats_count number of entries in ats (excluding 0-termination)
*/
void
-GSC_KX_handle_set_key (struct GSC_KeyExchangeInfo *n,
- const struct GNUNET_MessageHandler *msg,
- const struct GNUNET_TRANSPORT_ATS_Information *ats,
- uint32_t ats_count);
+GSC_KX_handle_ephemeral_key (struct GSC_KeyExchangeInfo *kx,
+ const struct GNUNET_MessageHeader *msg);
/**
*
* @param kx key exchange status for the corresponding peer
* @param msg the encrypted PING message itself
- * @param ats performance data
- * @param ats_count number of entries in ats (excluding 0-termination)
*/
void
-GSC_KX_handle_ping (struct GSC_KeyExchangeInfo *kx,
- const struct GNUNET_MessageHeader *msg,
- const struct GNUNET_TRANSPORT_ATS_Information *ats,
- uint32_t ats_count);
+GSC_KX_handle_ping (struct GSC_KeyExchangeInfo *kx,
+ const struct GNUNET_MessageHeader *msg);
/**
*
* @param kx key exchange status for the corresponding peer
* @param msg the encrypted PONG message itself
- * @param ats performance data
- * @param ats_count number of entries in ats (excluding 0-termination)
*/
void
GSC_KX_handle_pong (struct GSC_KeyExchangeInfo *kx,
- const struct GNUNET_MessageHeader *msg,
- const struct GNUNET_TRANSPORT_ATS_Information *ats,
- uint32_t ats_count);
+ const struct GNUNET_MessageHeader *msg);
/**
*/
void
GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx,
- const void *payload,
- size_t payload_size);
+ const void *payload, size_t payload_size);
/**
*
* @param kx key exchange information context
* @param msg encrypted message
- * @param ats performance data
- * @param ats_count number of entries in ats (excluding 0-termination)
*/
void
-GSC_KX_handle_encrypted_message (struct GSC_KeyExchangeInfo *kx,
- const struct GNUNET_MessageHeader *msg,
- const struct GNUNET_TRANSPORT_ATS_Information *ats,
- uint32_t ats_count);
+GSC_KX_handle_encrypted_message (struct GSC_KeyExchangeInfo *kx,
+ const struct GNUNET_MessageHeader *msg);
/**
/**
* Initialize KX subsystem.
*
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+ * @param pk private key to use for the peer
+ * @param server the server of the CORE service
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
*/
-int
-GSC_KX_init (void);
+int
+GSC_KX_init (struct GNUNET_CRYPTO_EddsaPrivateKey *pk,
+ struct GNUNET_SERVER_Handle *server);
/**
* Shutdown KX subsystem.
*/
-void
+void
GSC_KX_done (void);
+
+/**
+ * Handle #GNUNET_MESSAGE_TYPE_CORE_MONITOR_PEERS request. For this
+ * request type, the client does not have to have transmitted an INIT
+ * request. All current peers are returned, regardless of which
+ * message types they accept.
+ *
+ * @param cls unused
+ * @param client client sending the iteration request
+ * @param message iteration request message
+ */
+void
+GSC_KX_handle_client_monitor_peers (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message);
+
+
#endif
/* end of gnunet-service-core_kx.h */