diff options
author | Bart Polot <bart@net.in.tum.de> | 2011-04-07 16:29:58 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2011-04-07 16:29:58 +0000 |
commit | e5ecc9359f0c3d48dec74f21a324fb696297a807 (patch) | |
tree | 283e308f838bf16751d04596ab016584fdcf943f /src/mesh | |
parent | cb421d076cc32abcf73b54bfdeb4dcfabb54e8d0 (diff) | |
download | gnunet-e5ecc9359f0c3d48dec74f21a324fb696297a807.tar.gz gnunet-e5ecc9359f0c3d48dec74f21a324fb696297a807.zip |
Simplified notification messages
Diffstat (limited to 'src/mesh')
-rw-r--r-- | src/mesh/mesh.h | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/src/mesh/mesh.h b/src/mesh/mesh.h index 32d9c4ee5..551694c27 100644 --- a/src/mesh/mesh.h +++ b/src/mesh/mesh.h | |||
@@ -49,14 +49,14 @@ | |||
49 | * peer_request_connect_del GNUNET_MESH_PeerControl | 49 | * peer_request_connect_del GNUNET_MESH_PeerControl |
50 | * peer_request_connect_by_type GNUNET_MESH_ConnectPeerByType | 50 | * peer_request_connect_by_type GNUNET_MESH_ConnectPeerByType |
51 | * | 51 | * |
52 | * notify_transmit_ready GNUNET_MESH_RequestTransmitReady | 52 | * notify_transmit_ready GNUNET_MESH_TransmitReady |
53 | * notify_transmit_ready_cancel None (clear of internal data structures) | 53 | * notify_transmit_ready_cancel None (clear of internal data structures) |
54 | * | 54 | * |
55 | * | 55 | * |
56 | * | 56 | * |
57 | * EVENT MESSAGE USED | 57 | * EVENT MESSAGE USED |
58 | * ----- ------------ | 58 | * ----- ------------ |
59 | * notify_transmit_ready reply GNUNET_MESH_NotifyTransmitReady | 59 | * notify_transmit_ready reply GNUNET_MESH_TransmitReady |
60 | * notify_transmit_ready data GNUNET_MESH_Data or | 60 | * notify_transmit_ready data GNUNET_MESH_Data or |
61 | * GNUNET_MESH_DataBroadcast | 61 | * GNUNET_MESH_DataBroadcast |
62 | * new incoming tunnel GNUNET_MESH_PeerControl | 62 | * new incoming tunnel GNUNET_MESH_PeerControl |
@@ -157,11 +157,13 @@ struct GNUNET_MESH_ConnectPeerByType { | |||
157 | 157 | ||
158 | 158 | ||
159 | /** | 159 | /** |
160 | * Message for notifying the service that the client wants to send data. | 160 | * Message for notifying the service that the client wants to send data or |
161 | * notifying a client that the service is ready to accept data. | ||
161 | */ | 162 | */ |
162 | struct GNUNET_MESH_RequestTransmitReady { | 163 | struct GNUNET_MESH_TransmitReady { |
163 | /** | 164 | /** |
164 | * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_REQUEST_TRANSMIT_READY | 165 | * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_REQUEST_TRANSMIT_READY |
166 | * GNUNET_MESSAGE_TYPE_MESH_LOCAL_NOTIFY_TRANSMIT_READY | ||
165 | */ | 167 | */ |
166 | struct GNUNET_MessageHeader header; | 168 | struct GNUNET_MessageHeader header; |
167 | 169 | ||
@@ -178,33 +180,12 @@ struct GNUNET_MESH_RequestTransmitReady { | |||
178 | 180 | ||
179 | 181 | ||
180 | /** | 182 | /** |
181 | * Message for letting a client know that the service is ready to accept data | ||
182 | * for transmission. | ||
183 | */ | ||
184 | struct GNUNET_MESH_NotifyTransmitReady { | ||
185 | /** | ||
186 | * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_NOTIFY_TRANSMIT_READY | ||
187 | */ | ||
188 | struct GNUNET_MessageHeader header; | ||
189 | |||
190 | /** | ||
191 | * ID of a tunnel controlled by this client. | ||
192 | */ | ||
193 | MESH_TunnelID tunnel_id GNUNET_PACKED; | ||
194 | |||
195 | /** | ||
196 | * Size of message we can now transmit to this tunnel | ||
197 | */ | ||
198 | uint32_t msg_size GNUNET_PACKED; | ||
199 | }; | ||
200 | |||
201 | |||
202 | /** | ||
203 | * Message to encapsulate data transmitted to/from the service | 183 | * Message to encapsulate data transmitted to/from the service |
204 | */ | 184 | */ |
205 | struct GNUNET_MESH_Data { | 185 | struct GNUNET_MESH_Data { |
206 | /** | 186 | /** |
207 | * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA (client to service, or service to client) | 187 | * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA |
188 | * (client to service, or service to client) | ||
208 | * Size: sizeof(struct GNUNET_MESH_Data) + sizeof (data) | 189 | * Size: sizeof(struct GNUNET_MESH_Data) + sizeof (data) |
209 | */ | 190 | */ |
210 | struct GNUNET_MessageHeader header; | 191 | struct GNUNET_MessageHeader header; |
@@ -227,7 +208,8 @@ struct GNUNET_MESH_Data { | |||
227 | */ | 208 | */ |
228 | struct GNUNET_MESH_DataBroadcast { | 209 | struct GNUNET_MESH_DataBroadcast { |
229 | /** | 210 | /** |
230 | * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA_BROADCAST (client to service only, client created tunnel) | 211 | * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA_BROADCAST |
212 | * (client to service only, client created tunnel) | ||
231 | * Size: sizeof(struct GNUNET_MESH_DataBroadcast) + sizeof (data) | 213 | * Size: sizeof(struct GNUNET_MESH_DataBroadcast) + sizeof (data) |
232 | */ | 214 | */ |
233 | struct GNUNET_MessageHeader header; | 215 | struct GNUNET_MessageHeader header; |