diff options
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/gnunet-service-fs_mesh_client.c | 6 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_mesh_server.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/fs/gnunet-service-fs_mesh_client.c b/src/fs/gnunet-service-fs_mesh_client.c index 7bf6fb115..95e370274 100644 --- a/src/fs/gnunet-service-fs_mesh_client.c +++ b/src/fs/gnunet-service-fs_mesh_client.c | |||
@@ -228,8 +228,7 @@ reset_mesh (struct MeshHandle *mh) | |||
228 | mh, | 228 | mh, |
229 | &mh->target, | 229 | &mh->target, |
230 | GNUNET_APPLICATION_TYPE_FS_BLOCK_TRANSFER, | 230 | GNUNET_APPLICATION_TYPE_FS_BLOCK_TRANSFER, |
231 | GNUNET_NO, | 231 | GNUNET_MESH_OPTION_RELIABLE); |
232 | GNUNET_YES); | ||
233 | transmit_pending (mh); | 232 | transmit_pending (mh); |
234 | } | 233 | } |
235 | 234 | ||
@@ -543,8 +542,7 @@ get_mesh (const struct GNUNET_PeerIdentity *target) | |||
543 | mh, | 542 | mh, |
544 | &mh->target, | 543 | &mh->target, |
545 | GNUNET_APPLICATION_TYPE_FS_BLOCK_TRANSFER, | 544 | GNUNET_APPLICATION_TYPE_FS_BLOCK_TRANSFER, |
546 | GNUNET_NO, | 545 | GNUNET_MESH_OPTION_RELIABLE); |
547 | GNUNET_YES); | ||
548 | GNUNET_assert (mh == | 546 | GNUNET_assert (mh == |
549 | GNUNET_CONTAINER_multipeermap_get (mesh_map, | 547 | GNUNET_CONTAINER_multipeermap_get (mesh_map, |
550 | target)); | 548 | target)); |
diff --git a/src/fs/gnunet-service-fs_mesh_server.c b/src/fs/gnunet-service-fs_mesh_server.c index 4e11221e4..fe2d43135 100644 --- a/src/fs/gnunet-service-fs_mesh_server.c +++ b/src/fs/gnunet-service-fs_mesh_server.c | |||
@@ -458,13 +458,14 @@ request_cb (void *cls, | |||
458 | * @param initiator the identity of the peer who wants to establish a mesh | 458 | * @param initiator the identity of the peer who wants to establish a mesh |
459 | * with us; NULL on binding error | 459 | * with us; NULL on binding error |
460 | * @param port mesh port used for the incoming connection | 460 | * @param port mesh port used for the incoming connection |
461 | * @param options channel option flags | ||
461 | * @return initial channel context (our 'struct MeshClient') | 462 | * @return initial channel context (our 'struct MeshClient') |
462 | */ | 463 | */ |
463 | static void * | 464 | static void * |
464 | accept_cb (void *cls, | 465 | accept_cb (void *cls, |
465 | struct GNUNET_MESH_Channel *channel, | 466 | struct GNUNET_MESH_Channel *channel, |
466 | const struct GNUNET_PeerIdentity *initiator, | 467 | const struct GNUNET_PeerIdentity *initiator, |
467 | uint32_t port) | 468 | uint32_t port, enum MeshOption options) |
468 | { | 469 | { |
469 | struct MeshClient *sc; | 470 | struct MeshClient *sc; |
470 | 471 | ||