aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2011-03-11 17:03:44 +0000
committerBart Polot <bart@net.in.tum.de>2011-03-11 17:03:44 +0000
commit041be853a623878090aa6f29e531b76fc87d2a25 (patch)
tree94c63f0fdc3c8e21afa51dcab6ebcb9cae8016e3
parentb65e5b414fdfbf53f989c77aa4c5b27a658fada2 (diff)
downloadgnunet-041be853a623878090aa6f29e531b76fc87d2a25.tar.gz
gnunet-041be853a623878090aa6f29e531b76fc87d2a25.zip
Resolved some weird conflicts
-rw-r--r--src/mesh/gnunet-service-mesh.c29
1 files changed, 26 insertions, 3 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index 449b8984c..e63b1ba40 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -211,6 +211,26 @@ handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
211} 211}
212 212
213/** 213/**
214 * Core handler for path creation
215 *
216 * @param cls closure
217 * @param message message
218 * @param peer peer identity this notification is about
219 * @param atsi performance data
220 *
221 */
222static int
223handle_mesh_path_create (void *cls,
224 const struct GNUNET_PeerIdentity *peer,
225 const struct GNUNET_MessageHeader *message,
226 const struct GNUNET_TRANSPORT_ATS_Information
227 *atsi)
228{
229 /* Extract path */
230 return GNUNET_OK;
231}
232
233/**
214 * Core handler for mesh network traffic 234 * Core handler for mesh network traffic
215 * 235 *
216 * @param cls closure 236 * @param cls closure
@@ -228,10 +248,10 @@ handle_mesh_network_traffic (void *cls,
228{ 248{
229 if(GNUNET_MESSAGE_TYPE_MESH_DATA_GO == ntohs(message->type)) { 249 if(GNUNET_MESSAGE_TYPE_MESH_DATA_GO == ntohs(message->type)) {
230 /* Retransmit to next in path of tunnel identified by message */ 250 /* Retransmit to next in path of tunnel identified by message */
231 return 0; 251 return GNUNET_OK;
232 } else { /* GNUNET_MESSAGE_TYPE_MESH_DATA_BACK */ 252 } else { /* GNUNET_MESSAGE_TYPE_MESH_DATA_BACK */
233 /* Retransmit to previous in path of tunnel identified by message */ 253 /* Retransmit to previous in path of tunnel identified by message */
234 return 0; 254 return GNUNET_OK;
235 } 255 }
236} 256}
237 257
@@ -239,6 +259,7 @@ handle_mesh_network_traffic (void *cls,
239 * Functions to handle messages from core 259 * Functions to handle messages from core
240 */ 260 */
241static struct GNUNET_CORE_MessageHandler core_handlers[] = { 261static struct GNUNET_CORE_MessageHandler core_handlers[] = {
262 {&handle_mesh_path_create, NULL, GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE, 0},
242 {&handle_mesh_network_traffic, GNUNET_MESSAGE_TYPE_MESH_DATA_GO, 0}, 263 {&handle_mesh_network_traffic, GNUNET_MESSAGE_TYPE_MESH_DATA_GO, 0},
243 {&handle_mesh_network_traffic, GNUNET_MESSAGE_TYPE_MESH_DATA_BACK, 0}, 264 {&handle_mesh_network_traffic, GNUNET_MESSAGE_TYPE_MESH_DATA_BACK, 0},
244 {NULL, 0, 0} 265 {NULL, 0, 0}
@@ -248,7 +269,9 @@ static struct GNUNET_CORE_MessageHandler core_handlers[] = {
248 * Functions to handle messages from clients 269 * Functions to handle messages from clients
249 */ 270 */
250static struct GNUNET_SERVER_MessageHandler plugin_handlers[] = { 271static struct GNUNET_SERVER_MessageHandler plugin_handlers[] = {
251 {&handle_mesh_path_create, NULL, GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE, 0}, 272 {&handle_local_path_create, NULL, GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE, 0},
273 {&handle_local_network_traffic, GNUNET_MESSAGE_TYPE_MESH_DATA_GO, 0},
274 {&handle_local_network_traffic, GNUNET_MESSAGE_TYPE_MESH_DATA_BACK, 0},
252 {NULL, NULL, 0, 0} 275 {NULL, NULL, 0, 0}
253}; 276};
254 277