-cleaning up message format and code related to recent transport address stringification code

1 files changed, 9 insertions, 13 deletions

diff --git a/src/transport/transport.h b/src/transport/transport.h
index 97620a9b6..bfcf9fe6e 100644
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -295,17 +295,17 @@ struct AddressLookupMessage
    * Should the conversion use numeric IP addresses (otherwise
    * a reverse DNS lookup is OK -- if applicable).
    */
-  int32_t numeric_only GNUNET_PACKED;
+  int16_t numeric_only GNUNET_PACKED;
 
   /**
-   * timeout to give up.
+   * Length of the (binary) address in bytes, in big-endian.
    */
-  struct GNUNET_TIME_RelativeNBO timeout;
+  uint16_t addrlen GNUNET_PACKED;
 
   /**
-   * Length of the (binary) address in bytes, in big-endian.
+   * timeout to give up.
    */
-  uint32_t addrlen GNUNET_PACKED;
+  struct GNUNET_TIME_RelativeNBO timeout;
 
   /* followed by 'addrlen' bytes of the actual address, then
    * followed by the 0-terminated name of the transport */
@@ -352,9 +352,9 @@ struct AddressIterateMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * For alignment.
+   * One shot call or continous replies?
    */
-  uint32_t reserved;
+  uint32_t one_shot;
 
   /**
    * timeout to give up.  FIXME: remove in the future
@@ -366,13 +366,9 @@ struct AddressIterateMessage
    */
   struct GNUNET_PeerIdentity peer;
 
-  /**
-   * One shot call or continous replies?
-   */
-  uint32_t one_shot;
-
 };
 
+
 /**
  * Message from the transport service to the library
  * containing binary addresses known for a peer.
@@ -382,7 +378,7 @@ struct AddressIterateMessage
 struct AddressIterateResponseMessage
 {
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY
+   * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE_RESPONSE
    */
   struct GNUNET_MessageHeader header;