1 files changed, 23 insertions, 54 deletions

diff --git a/src/conversation/conversation.h b/src/conversation/conversation.h
index 69f868e6c..0a9e2b5fb 100644
--- a/src/conversation/conversation.h
+++ b/src/conversation/conversation.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file conversation/conversation.h
@@ -30,13 +30,13 @@
 #ifdef __cplusplus
 extern "C"
 {
-#if 0                           /* keep Emacsens' auto-indent happy */
+#if 0                           /* keep Emacsens' auto-indent happy */
 }
 #endif
 #endif
 
 
-#define MAX_TRANSMIT_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define MAX_TRANSMIT_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60)
 
 
 /**
@@ -44,7 +44,7 @@ extern "C"
  * bit set if we are making an outgoing call,
  * bit unset for local lines.
  */
-#define HIGH_BIT ((uint32_t) (1LL << 31))
+#define HIGH_BIT ((uint32_t)(1LL << 31))
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
@@ -52,23 +52,20 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * Message to transmit the audio (between client and helpers).
  */
-struct AudioMessage
-{
+struct AudioMessage {
   /**
    * Type is #GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO
    */
   struct GNUNET_MessageHeader header;
 
   /* followed by audio data */
-
 };
 
 
 /**
  * Client -> Service message to register a phone.
  */
-struct ClientPhoneRegisterMessage
-{
+struct ClientPhoneRegisterMessage {
   /**
    * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_REGISTER
    */
@@ -89,8 +86,7 @@ struct ClientPhoneRegisterMessage
 /**
  * Service -> Client message for phone is ringing.
  */
-struct ClientPhoneRingMessage
-{
+struct ClientPhoneRingMessage {
   /**
    * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING
    */
@@ -106,15 +102,13 @@ struct ClientPhoneRingMessage
    * Who is calling us?
    */
   struct GNUNET_CRYPTO_EcdsaPublicKey caller_id;
-
 };
 
 
 /**
  * Service <-> Client message for phone was suspended.
  */
-struct ClientPhoneSuspendMessage
-{
+struct ClientPhoneSuspendMessage {
   /**
    * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND
    */
@@ -125,15 +119,13 @@ struct ClientPhoneSuspendMessage
    * talking about.
    */
   uint32_t cid GNUNET_PACKED;
-
 };
 
 
 /**
  * Service <-> Client message for phone was resumed.
  */
-struct ClientPhoneResumeMessage
-{
+struct ClientPhoneResumeMessage {
   /**
    * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RESUME
    */
@@ -144,15 +136,13 @@ struct ClientPhoneResumeMessage
    * talking about.
    */
   uint32_t cid GNUNET_PACKED;
-
 };
 
 
 /**
  * Client -> Service pick up phone that is ringing.
  */
-struct ClientPhonePickupMessage
-{
+struct ClientPhonePickupMessage {
   /**
    * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICK_UP
    */
@@ -163,7 +153,6 @@ struct ClientPhonePickupMessage
    * talking about.
    */
   uint32_t cid GNUNET_PACKED;
-
 };
 
 
@@ -171,8 +160,7 @@ struct ClientPhonePickupMessage
  * Client <-> Service hang up phone that may or may not be ringing.
  * Also sent in response to a (failed) `struct ClientCallMessage`.
  */
-struct ClientPhoneHangupMessage
-{
+struct ClientPhoneHangupMessage {
   /**
    * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP
    */
@@ -183,15 +171,13 @@ struct ClientPhoneHangupMessage
    * talking about.
    */
   uint32_t cid GNUNET_PACKED;
-
 };
 
 
 /**
  * Message Client <-> Service to transmit the audio.
  */
-struct ClientAudioMessage
-{
+struct ClientAudioMessage {
   /**
    * Type is #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO
    */
@@ -204,15 +190,13 @@ struct ClientAudioMessage
   uint32_t cid GNUNET_PACKED;
 
   /* followed by audio data */
-
 };
 
 
 /**
  * Client -> Service message to call a phone.
  */
-struct ClientCallMessage
-{
+struct ClientCallMessage {
   /**
    * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_CALL
    */
@@ -244,8 +228,7 @@ struct ClientCallMessage
  * Service -> Client: other peer has picked up the phone, we are
  * now talking.
  */
-struct ClientPhonePickedupMessage
-{
+struct ClientPhonePickedupMessage {
   /**
    * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICKED_UP
    */
@@ -256,7 +239,6 @@ struct ClientPhonePickedupMessage
    * #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_CALL
    */
   uint32_t cid GNUNET_PACKED;
-
 };
 
 
@@ -264,8 +246,7 @@ struct ClientPhonePickedupMessage
  * Information signed in a `struct CadetPhoneRingMessage`
  * whereby the caller self-identifies to the receiver.
  */
-struct CadetPhoneRingInfoPS
-{
+struct CadetPhoneRingInfoPS {
   /**
    * Purpose for the signature, must be
    * #GNUNET_SIGNATURE_PURPOSE_CONVERSATION_RING.
@@ -293,8 +274,7 @@ struct CadetPhoneRingInfoPS
  * Cadet message to make a phone ring.  Sent to the port
  * of the respective phone.
  */
-struct CadetPhoneRingMessage
-{
+struct CadetPhoneRingMessage {
   /**
    * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_RING
    */
@@ -319,81 +299,70 @@ struct CadetPhoneRingMessage
    * Signature over a `struct CadetPhoneRingInfoPS`
    */
   struct GNUNET_CRYPTO_EcdsaSignature signature;
-
 };
 
 
 /**
  * Cadet message for hanging up.
  */
-struct CadetPhoneHangupMessage
-{
+struct CadetPhoneHangupMessage {
   /**
    * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_HANG_UP
    */
   struct GNUNET_MessageHeader header;
-
 };
 
 
 /**
  * Cadet message for picking up.
  */
-struct CadetPhonePickupMessage
-{
+struct CadetPhonePickupMessage {
   /**
    * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_PICK_UP
    */
   struct GNUNET_MessageHeader header;
-
 };
 
 
 /**
  * Cadet message for phone suspended.
  */
-struct CadetPhoneSuspendMessage
-{
+struct CadetPhoneSuspendMessage {
   /**
    * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_SUSPEND
    */
   struct GNUNET_MessageHeader header;
-
 };
 
 
 /**
  * Cadet message for phone resumed.
  */
-struct CadetPhoneResumeMessage
-{
+struct CadetPhoneResumeMessage {
   /**
    * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_RESUME
    */
   struct GNUNET_MessageHeader header;
-
 };
 
 
 /**
  * Cadet message to transmit the audio.
  */
-struct CadetAudioMessage
-{
+struct CadetAudioMessage {
   /**
    * Type is #GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_AUDIO
    */
   struct GNUNET_MessageHeader header;
 
   /* followed by audio data */
-
 };
 
 
 GNUNET_NETWORK_STRUCT_END
 
 
-#if 0                           /* keep Emacsens' auto-indent happy */
+#if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif
 #ifdef __cplusplus