diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-05-15 13:39:46 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-05-15 13:39:46 +0000 |
commit | 5cce50f3c8b2d0c54230238de5dd19ab8bd2de3b (patch) | |
tree | 060af466361ac4102f2fe24c2d840b1ed6d22ea1 /src/set/set.h | |
parent | 80417c48637b498d62f2c6eefb5e1a6fc8d5ed50 (diff) | |
download | gnunet-5cce50f3c8b2d0c54230238de5dd19ab8bd2de3b.tar.gz gnunet-5cce50f3c8b2d0c54230238de5dd19ab8bd2de3b.zip |
-comments for Florian
Diffstat (limited to 'src/set/set.h')
-rw-r--r-- | src/set/set.h | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/set/set.h b/src/set/set.h index 33e0aafdd..ad2200de9 100644 --- a/src/set/set.h +++ b/src/set/set.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | (C) 2012 Christian Grothoff (and other contributing authors) | 3 | (C) 2012, 2013 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -49,6 +49,7 @@ struct SetCreateMessage | |||
49 | /** | 49 | /** |
50 | * Operation type, values of enum GNUNET_SET_OperationType | 50 | * Operation type, values of enum GNUNET_SET_OperationType |
51 | */ | 51 | */ |
52 | // FIXME: use 32_t for 'enum'. | ||
52 | uint16_t operation GNUNET_PACKED; | 53 | uint16_t operation GNUNET_PACKED; |
53 | }; | 54 | }; |
54 | 55 | ||
@@ -61,14 +62,15 @@ struct ListenMessage | |||
61 | struct GNUNET_MessageHeader header; | 62 | struct GNUNET_MessageHeader header; |
62 | 63 | ||
63 | /** | 64 | /** |
64 | * application id | 65 | * Operation type, values of enum GNUNET_SET_OperationType |
65 | */ | 66 | */ |
66 | struct GNUNET_HashCode app_id; | 67 | uint16_t operation GNUNET_PACKED; |
67 | 68 | ||
68 | /** | 69 | /** |
69 | * Operation type, values of enum GNUNET_SET_OperationType | 70 | * application id |
70 | */ | 71 | */ |
71 | uint16_t operation GNUNET_PACKED; | 72 | struct GNUNET_HashCode app_id; |
73 | |||
72 | }; | 74 | }; |
73 | 75 | ||
74 | 76 | ||
@@ -105,16 +107,16 @@ struct RequestMessage | |||
105 | struct GNUNET_MessageHeader header; | 107 | struct GNUNET_MessageHeader header; |
106 | 108 | ||
107 | /** | 109 | /** |
108 | * Identity of the requesting peer. | ||
109 | */ | ||
110 | struct GNUNET_PeerIdentity peer_id; | ||
111 | |||
112 | /** | ||
113 | * ID of the request we want to accept, | 110 | * ID of the request we want to accept, |
114 | * chosen by the service. | 111 | * chosen by the service. |
115 | */ | 112 | */ |
116 | uint32_t accept_id GNUNET_PACKED; | 113 | uint32_t accept_id GNUNET_PACKED; |
117 | 114 | ||
115 | /** | ||
116 | * Identity of the requesting peer. | ||
117 | */ | ||
118 | struct GNUNET_PeerIdentity peer_id; | ||
119 | |||
118 | /* rest: nested context message */ | 120 | /* rest: nested context message */ |
119 | }; | 121 | }; |
120 | 122 | ||
@@ -127,6 +129,11 @@ struct EvaluateMessage | |||
127 | struct GNUNET_MessageHeader header; | 129 | struct GNUNET_MessageHeader header; |
128 | 130 | ||
129 | /** | 131 | /** |
132 | * id of our evaluate, chosen by the client | ||
133 | */ | ||
134 | uint32_t request_id GNUNET_PACKED; | ||
135 | |||
136 | /** | ||
130 | * Peer to evaluate the operation with | 137 | * Peer to evaluate the operation with |
131 | */ | 138 | */ |
132 | struct GNUNET_PeerIdentity peer; | 139 | struct GNUNET_PeerIdentity peer; |
@@ -137,11 +144,6 @@ struct EvaluateMessage | |||
137 | struct GNUNET_HashCode app_id; | 144 | struct GNUNET_HashCode app_id; |
138 | 145 | ||
139 | /** | 146 | /** |
140 | * id of our evaluate, chosen by the client | ||
141 | */ | ||
142 | uint32_t request_id GNUNET_PACKED; | ||
143 | |||
144 | /** | ||
145 | * Salt to use for the operation | 147 | * Salt to use for the operation |
146 | */ | 148 | */ |
147 | uint16_t salt GNUNET_PACKED; | 149 | uint16_t salt GNUNET_PACKED; |