X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fset%2Fgnunet-service-set_protocol.h;h=748da15fc0468f6d5b656ea8b94bf5e6419abc93;hb=5b32752cd7b02adcb8e6fec7798637638c6f63a0;hp=eee0dc5ae0aa1276c298763740f348eed60018ca;hpb=9aceae8a9f91642665fa28730c961c9f90360bc1;p=oweals%2Fgnunet.git diff --git a/src/set/gnunet-service-set_protocol.h b/src/set/gnunet-service-set_protocol.h index eee0dc5ae..748da15fc 100644 --- a/src/set/gnunet-service-set_protocol.h +++ b/src/set/gnunet-service-set_protocol.h @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - Copyright (C) 2013, 2014 Christian Grothoff (and other contributing authors) + Copyright (C) 2013, 2014 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 @@ -52,7 +52,7 @@ struct OperationRequestMessage /** * Application-specific identifier of the request. */ - struct GNUNET_HashCode app_id; + struct GNUNET_HashCode app_idX; /* rest: optional message */ }; @@ -80,12 +80,17 @@ struct IBFMessage /** * Padding, must be 0. */ - uint8_t reserved; + uint8_t reserved1; + + /** + * Padding, must be 0. + */ + uint16_t reserved2 GNUNET_PACKED; /** * Offset of the strata in the rest of the message */ - uint16_t offset GNUNET_PACKED; + uint32_t offset GNUNET_PACKED; /** * Salt used when hashing elements for this IBF. @@ -96,6 +101,27 @@ struct IBFMessage }; +struct InquiryMessage +{ + /** + * Type: #GNUNET_MESSAGE_TYPE_SET_UNION_P2P_IBF + */ + struct GNUNET_MessageHeader header; + + /** + * Salt used when hashing elements for this inquiry. + */ + uint32_t salt GNUNET_PACKED; + + /** + * Reserved, set to 0. + */ + uint32_t reserved GNUNET_PACKED; + + /* rest: inquiry IBF keys */ +}; + + /** * During intersection, the first (and possibly second) message * send it the number of elements in the set, to allow the peers