/*
This file is part of GNUnet.
- (C) 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2013-2016 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 MAX_TRANSMIT_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+/**
+ * Highest bit in a 32-bit unsigned integer,
+ * bit set if we are making an outgoing call,
+ * bit unset for local lines.
+ */
+#define HIGH_BIT ((uint32_t) (1LL << 31))
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+
/**
* Message to transmit the audio (between client and helpers).
*/
struct GNUNET_MessageHeader header;
/**
- * Phone line to register.
+ * Always zero.
+ */
+ uint32_t reserved GNUNET_PACKED;
+
+ /**
+ * Phone line / CADET port to register.
*/
- uint32_t line GNUNET_PACKED;
+ struct GNUNET_HashCode line_port;
};
struct GNUNET_MessageHeader header;
/**
- * CID, internal caller ID to identify which active call we are
- * talking about.
+ * CID, internal caller ID number used in the future to identify
+ * which active call we are talking about.
*/
uint32_t cid GNUNET_PACKED;
/**
- * Message Client <->Service to transmit the audio.
+ * Message Client <-> Service to transmit the audio.
*/
struct ClientAudioMessage
{
struct GNUNET_MessageHeader header;
/**
- * Which phone line to call at the peer?
+ * Always zero.
*/
- uint32_t line GNUNET_PACKED;
+ uint32_t reserved GNUNET_PACKED;
/**
* Which peer is hosting the line?
*/
struct GNUNET_PeerIdentity target;
+ /**
+ * Which phone line to call at the peer?
+ */
+ struct GNUNET_HashCode line_port;
+
/**
* Identity of the caller.
*/
*/
struct GNUNET_MessageHeader header;
+ /**
+ * Call ID of the corresponding
+ * #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_CALL
+ */
+ uint32_t cid GNUNET_PACKED;
+
};
/**
- * Mesh message for phone is ringing.
+ * Information signed in a `struct CadetPhoneRingMessage`
+ * whereby the caller self-identifies to the receiver.
*/
-struct MeshPhoneRingMessage
+struct CadetPhoneRingInfoPS
{
/**
- * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_RING
+ * Purpose for the signature, must be
+ * #GNUNET_SIGNATURE_PURPOSE_CONVERSATION_RING.
*/
- struct GNUNET_MessageHeader header;
+ struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
/**
- * Desired target line.
+ * Which port did the call go to?
*/
- uint32_t remote_line GNUNET_PACKED;
+ struct GNUNET_HashCode line_port;
/**
- * Purpose for the signature.
+ * Which peer is the call for?
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_PeerIdentity target_peer;
/**
- * Who is calling us? (also who is signing).
+ * When does the signature expire?
*/
- struct GNUNET_CRYPTO_EcdsaPublicKey caller_id;
+ struct GNUNET_TIME_AbsoluteNBO expiration_time;
+};
+
+/**
+ * Cadet message to make a phone ring. Sent to the port
+ * of the respective phone.
+ */
+struct CadetPhoneRingMessage
+{
/**
- * Who are we calling?
+ * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_RING
*/
- struct GNUNET_PeerIdentity target;
+ struct GNUNET_MessageHeader header;
/**
- * From where are we calling?
+ * Always zero.
*/
- struct GNUNET_PeerIdentity source;
+ uint32_t reserved GNUNET_PACKED;
/**
- * When does the signature expire?
+ * Who is calling us? (also who is signing).
*/
- struct GNUNET_TIME_AbsoluteNBO expiration_time;
+ struct GNUNET_CRYPTO_EcdsaPublicKey caller_id;
/**
- * Signature on the above.
+ * When does the signature expire?
*/
- struct GNUNET_CRYPTO_EcdsaSignature signature;
+ struct GNUNET_TIME_AbsoluteNBO expiration_time;
/**
- * Source line for audio data in the other direction.
+ * Signature over a `struct CadetPhoneRingInfoPS`
*/
- uint32_t source_line GNUNET_PACKED;
+ struct GNUNET_CRYPTO_EcdsaSignature signature;
};
/**
- * Mesh message for hanging up.
+ * Cadet message for hanging up.
*/
-struct MeshPhoneHangupMessage
+struct CadetPhoneHangupMessage
{
/**
- * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_HANG_UP
+ * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_HANG_UP
*/
struct GNUNET_MessageHeader header;
/**
- * Mesh message for picking up.
+ * Cadet message for picking up.
*/
-struct MeshPhonePickupMessage
+struct CadetPhonePickupMessage
{
/**
- * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_PICK_UP
+ * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_PICK_UP
*/
struct GNUNET_MessageHeader header;
/**
- * Mesh message for phone suspended.
+ * Cadet message for phone suspended.
*/
-struct MeshPhoneSuspendMessage
+struct CadetPhoneSuspendMessage
{
/**
- * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_SUSPEND
+ * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_SUSPEND
*/
struct GNUNET_MessageHeader header;
/**
- * Mesh message for phone resumed.
+ * Cadet message for phone resumed.
*/
-struct MeshPhoneResumeMessage
+struct CadetPhoneResumeMessage
{
/**
- * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_RESUME
+ * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_RESUME
*/
struct GNUNET_MessageHeader header;
/**
- * Mesh message to transmit the audio.
+ * Cadet message to transmit the audio.
*/
-struct MeshAudioMessage
+struct CadetAudioMessage
{
/**
- * Type is #GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_AUDIO
+ * Type is #GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_AUDIO
*/
struct GNUNET_MessageHeader header;
- /**
- * Target line on the receiving end.
- */
- uint32_t remote_line GNUNET_PACKED;
-
- /**
- * The source line sending this data
- */
- uint32_t source_line GNUNET_PACKED;
-
/* followed by audio data */
};
+GNUNET_NETWORK_STRUCT_END
+
#if 0 /* keep Emacsens' auto-indent happy */
{
projects / oweals / gnunet.git / blobdiff