diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-03-21 14:57:09 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-03-21 14:57:09 +0000 |
commit | 2247aab396dbf4f8b5b22d36ecfbd111347677a2 (patch) | |
tree | e3db29b89ffb3b78c989fad6656d7a0320ca63db /src | |
parent | e99e3158a48afb48f7e75eac9e5eeca1e5f89b78 (diff) | |
download | gnunet-2247aab396dbf4f8b5b22d36ecfbd111347677a2.tar.gz gnunet-2247aab396dbf4f8b5b22d36ecfbd111347677a2.zip |
fix core api
Diffstat (limited to 'src')
-rw-r--r-- | src/mesh/gnunet-service-mesh-new.c | 55 | ||||
-rw-r--r-- | src/mesh/gnunet-service-mesh.c | 54 |
2 files changed, 31 insertions, 78 deletions
diff --git a/src/mesh/gnunet-service-mesh-new.c b/src/mesh/gnunet-service-mesh-new.c index 82bfc5e8d..95971b2e1 100644 --- a/src/mesh/gnunet-service-mesh-new.c +++ b/src/mesh/gnunet-service-mesh-new.c | |||
@@ -5070,9 +5070,7 @@ queue_add (void *cls, uint16_t type, size_t size, | |||
5070 | */ | 5070 | */ |
5071 | static int | 5071 | static int |
5072 | handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, | 5072 | handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, |
5073 | const struct GNUNET_MessageHeader *message, | 5073 | const struct GNUNET_MessageHeader *message) |
5074 | const struct GNUNET_ATS_Information *atsi, | ||
5075 | unsigned int atsi_count) | ||
5076 | { | 5074 | { |
5077 | unsigned int own_pos; | 5075 | unsigned int own_pos; |
5078 | uint16_t size; | 5076 | uint16_t size; |
@@ -5256,9 +5254,7 @@ handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5256 | */ | 5254 | */ |
5257 | static int | 5255 | static int |
5258 | handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, | 5256 | handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, |
5259 | const struct GNUNET_MessageHeader *message, | 5257 | const struct GNUNET_MessageHeader *message) |
5260 | const struct GNUNET_ATS_Information *atsi, | ||
5261 | unsigned int atsi_count) | ||
5262 | { | 5258 | { |
5263 | struct GNUNET_MESH_ManipulatePath *msg; | 5259 | struct GNUNET_MESH_ManipulatePath *msg; |
5264 | struct GNUNET_PeerIdentity *pi; | 5260 | struct GNUNET_PeerIdentity *pi; |
@@ -5340,9 +5336,7 @@ handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5340 | */ | 5336 | */ |
5341 | static int | 5337 | static int |
5342 | handle_mesh_path_broken (void *cls, const struct GNUNET_PeerIdentity *peer, | 5338 | handle_mesh_path_broken (void *cls, const struct GNUNET_PeerIdentity *peer, |
5343 | const struct GNUNET_MessageHeader *message, | 5339 | const struct GNUNET_MessageHeader *message) |
5344 | const struct GNUNET_ATS_Information *atsi, | ||
5345 | unsigned int atsi_count) | ||
5346 | { | 5340 | { |
5347 | struct GNUNET_MESH_PathBroken *msg; | 5341 | struct GNUNET_MESH_PathBroken *msg; |
5348 | struct MeshTunnel *t; | 5342 | struct MeshTunnel *t; |
@@ -5381,9 +5375,7 @@ handle_mesh_path_broken (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5381 | */ | 5375 | */ |
5382 | static int | 5376 | static int |
5383 | handle_mesh_tunnel_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, | 5377 | handle_mesh_tunnel_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, |
5384 | const struct GNUNET_MessageHeader *message, | 5378 | const struct GNUNET_MessageHeader *message) |
5385 | const struct GNUNET_ATS_Information *atsi, | ||
5386 | unsigned int atsi_count) | ||
5387 | { | 5379 | { |
5388 | struct GNUNET_MESH_TunnelDestroy *msg; | 5380 | struct GNUNET_MESH_TunnelDestroy *msg; |
5389 | struct MeshTunnel *t; | 5381 | struct MeshTunnel *t; |
@@ -5452,9 +5444,7 @@ handle_mesh_tunnel_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5452 | */ | 5444 | */ |
5453 | static int | 5445 | static int |
5454 | handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer, | 5446 | handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer, |
5455 | const struct GNUNET_MessageHeader *message, | 5447 | const struct GNUNET_MessageHeader *message) |
5456 | const struct GNUNET_ATS_Information *atsi, | ||
5457 | unsigned int atsi_count) | ||
5458 | { | 5448 | { |
5459 | struct GNUNET_MESH_Unicast *msg; | 5449 | struct GNUNET_MESH_Unicast *msg; |
5460 | struct GNUNET_PeerIdentity *neighbor; | 5450 | struct GNUNET_PeerIdentity *neighbor; |
@@ -5573,9 +5563,7 @@ handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5573 | */ | 5563 | */ |
5574 | static int | 5564 | static int |
5575 | handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer, | 5565 | handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer, |
5576 | const struct GNUNET_MessageHeader *message, | 5566 | const struct GNUNET_MessageHeader *message) |
5577 | const struct GNUNET_ATS_Information *atsi, | ||
5578 | unsigned int atsi_count) | ||
5579 | { | 5567 | { |
5580 | struct GNUNET_MESH_Multicast *msg; | 5568 | struct GNUNET_MESH_Multicast *msg; |
5581 | struct MeshTunnel *t; | 5569 | struct MeshTunnel *t; |
@@ -5656,9 +5644,7 @@ handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5656 | */ | 5644 | */ |
5657 | static int | 5645 | static int |
5658 | handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, | 5646 | handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, |
5659 | const struct GNUNET_MessageHeader *message, | 5647 | const struct GNUNET_MessageHeader *message) |
5660 | const struct GNUNET_ATS_Information *atsi, | ||
5661 | unsigned int atsi_count) | ||
5662 | { | 5648 | { |
5663 | struct GNUNET_MESH_ToOrigin *msg; | 5649 | struct GNUNET_MESH_ToOrigin *msg; |
5664 | struct GNUNET_PeerIdentity id; | 5650 | struct GNUNET_PeerIdentity id; |
@@ -5790,9 +5776,7 @@ handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5790 | */ | 5776 | */ |
5791 | static int | 5777 | static int |
5792 | handle_mesh_ack (void *cls, const struct GNUNET_PeerIdentity *peer, | 5778 | handle_mesh_ack (void *cls, const struct GNUNET_PeerIdentity *peer, |
5793 | const struct GNUNET_MessageHeader *message, | 5779 | const struct GNUNET_MessageHeader *message) |
5794 | const struct GNUNET_ATS_Information *atsi, | ||
5795 | unsigned int atsi_count) | ||
5796 | { | 5780 | { |
5797 | struct GNUNET_MESH_ACK *msg; | 5781 | struct GNUNET_MESH_ACK *msg; |
5798 | struct MeshTunnel *t; | 5782 | struct MeshTunnel *t; |
@@ -5856,9 +5840,7 @@ handle_mesh_ack (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5856 | */ | 5840 | */ |
5857 | static int | 5841 | static int |
5858 | handle_mesh_poll (void *cls, const struct GNUNET_PeerIdentity *peer, | 5842 | handle_mesh_poll (void *cls, const struct GNUNET_PeerIdentity *peer, |
5859 | const struct GNUNET_MessageHeader *message, | 5843 | const struct GNUNET_MessageHeader *message) |
5860 | const struct GNUNET_ATS_Information *atsi, | ||
5861 | unsigned int atsi_count) | ||
5862 | { | 5844 | { |
5863 | struct GNUNET_MESH_Poll *msg; | 5845 | struct GNUNET_MESH_Poll *msg; |
5864 | struct MeshTunnel *t; | 5846 | struct MeshTunnel *t; |
@@ -5911,9 +5893,7 @@ handle_mesh_poll (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5911 | */ | 5893 | */ |
5912 | static int | 5894 | static int |
5913 | handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer, | 5895 | handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer, |
5914 | const struct GNUNET_MessageHeader *message, | 5896 | const struct GNUNET_MessageHeader *message) |
5915 | const struct GNUNET_ATS_Information *atsi, | ||
5916 | unsigned int atsi_count) | ||
5917 | { | 5897 | { |
5918 | struct GNUNET_MESH_PathACK *msg; | 5898 | struct GNUNET_MESH_PathACK *msg; |
5919 | struct GNUNET_PeerIdentity id; | 5899 | struct GNUNET_PeerIdentity id; |
@@ -6014,9 +5994,7 @@ handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
6014 | */ | 5994 | */ |
6015 | static int | 5995 | static int |
6016 | handle_mesh_keepalive (void *cls, const struct GNUNET_PeerIdentity *peer, | 5996 | handle_mesh_keepalive (void *cls, const struct GNUNET_PeerIdentity *peer, |
6017 | const struct GNUNET_MessageHeader *message, | 5997 | const struct GNUNET_MessageHeader *message) |
6018 | const struct GNUNET_ATS_Information *atsi, | ||
6019 | unsigned int atsi_count) | ||
6020 | { | 5998 | { |
6021 | struct GNUNET_MESH_TunnelKeepAlive *msg; | 5999 | struct GNUNET_MESH_TunnelKeepAlive *msg; |
6022 | struct MeshTunnel *t; | 6000 | struct MeshTunnel *t; |
@@ -7373,7 +7351,7 @@ handle_local_unicast (void *cls, struct GNUNET_SERVER_Client *client, | |||
7373 | copy->ttl = htonl (default_ttl); | 7351 | copy->ttl = htonl (default_ttl); |
7374 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 7352 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
7375 | " calling generic handler...\n"); | 7353 | " calling generic handler...\n"); |
7376 | handle_mesh_data_unicast (NULL, &my_full_id, ©->header, NULL, 0); | 7354 | handle_mesh_data_unicast (NULL, &my_full_id, ©->header); |
7377 | } | 7355 | } |
7378 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "receive done OK\n"); | 7356 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "receive done OK\n"); |
7379 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 7357 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
@@ -7482,7 +7460,8 @@ handle_local_to_origin (void *cls, struct GNUNET_SERVER_Client *client, | |||
7482 | copy->sender = my_full_id; | 7460 | copy->sender = my_full_id; |
7483 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 7461 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
7484 | " calling generic handler...\n"); | 7462 | " calling generic handler...\n"); |
7485 | handle_mesh_data_to_orig (NULL, &my_full_id, ©->header, NULL, 0); | 7463 | handle_mesh_data_to_orig (NULL, &my_full_id, ©->header); |
7464 | |||
7486 | } | 7465 | } |
7487 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 7466 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
7488 | 7467 | ||
@@ -7573,7 +7552,7 @@ handle_local_multicast (void *cls, struct GNUNET_SERVER_Client *client, | |||
7573 | GNUNET_assert (ntohl (copy->pid) == (t->fwd_pid + 1)); | 7552 | GNUNET_assert (ntohl (copy->pid) == (t->fwd_pid + 1)); |
7574 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 7553 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
7575 | " calling generic handler...\n"); | 7554 | " calling generic handler...\n"); |
7576 | handle_mesh_data_multicast (client, &my_full_id, ©->header, NULL, 0); | 7555 | handle_mesh_data_multicast (client, &my_full_id, ©->header); |
7577 | } | 7556 | } |
7578 | 7557 | ||
7579 | GNUNET_SERVER_receive_done (t->owner->handle, GNUNET_OK); | 7558 | GNUNET_SERVER_receive_done (t->owner->handle, GNUNET_OK); |
@@ -8036,9 +8015,7 @@ core_init (void *cls, struct GNUNET_CORE_Handle *server, | |||
8036 | * @param atsi_count number of records in 'atsi' | 8015 | * @param atsi_count number of records in 'atsi' |
8037 | */ | 8016 | */ |
8038 | static void | 8017 | static void |
8039 | core_connect (void *cls, const struct GNUNET_PeerIdentity *peer, | 8018 | core_connect (void *cls, const struct GNUNET_PeerIdentity *peer) |
8040 | const struct GNUNET_ATS_Information *atsi, | ||
8041 | unsigned int atsi_count) | ||
8042 | { | 8019 | { |
8043 | struct MeshPeerInfo *peer_info; | 8020 | struct MeshPeerInfo *peer_info; |
8044 | struct MeshPeerPath *path; | 8021 | struct MeshPeerPath *path; |
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index c86da5541..454829351 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c | |||
@@ -5074,9 +5074,7 @@ queue_add (void *cls, uint16_t type, size_t size, | |||
5074 | */ | 5074 | */ |
5075 | static int | 5075 | static int |
5076 | handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, | 5076 | handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, |
5077 | const struct GNUNET_MessageHeader *message, | 5077 | const struct GNUNET_MessageHeader *message) |
5078 | const struct GNUNET_ATS_Information *atsi, | ||
5079 | unsigned int atsi_count) | ||
5080 | { | 5078 | { |
5081 | unsigned int own_pos; | 5079 | unsigned int own_pos; |
5082 | uint16_t size; | 5080 | uint16_t size; |
@@ -5260,9 +5258,7 @@ handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5260 | */ | 5258 | */ |
5261 | static int | 5259 | static int |
5262 | handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, | 5260 | handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, |
5263 | const struct GNUNET_MessageHeader *message, | 5261 | const struct GNUNET_MessageHeader *message) |
5264 | const struct GNUNET_ATS_Information *atsi, | ||
5265 | unsigned int atsi_count) | ||
5266 | { | 5262 | { |
5267 | struct GNUNET_MESH_ManipulatePath *msg; | 5263 | struct GNUNET_MESH_ManipulatePath *msg; |
5268 | struct GNUNET_PeerIdentity *pi; | 5264 | struct GNUNET_PeerIdentity *pi; |
@@ -5344,9 +5340,7 @@ handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5344 | */ | 5340 | */ |
5345 | static int | 5341 | static int |
5346 | handle_mesh_path_broken (void *cls, const struct GNUNET_PeerIdentity *peer, | 5342 | handle_mesh_path_broken (void *cls, const struct GNUNET_PeerIdentity *peer, |
5347 | const struct GNUNET_MessageHeader *message, | 5343 | const struct GNUNET_MessageHeader *message) |
5348 | const struct GNUNET_ATS_Information *atsi, | ||
5349 | unsigned int atsi_count) | ||
5350 | { | 5344 | { |
5351 | struct GNUNET_MESH_PathBroken *msg; | 5345 | struct GNUNET_MESH_PathBroken *msg; |
5352 | struct MeshTunnel *t; | 5346 | struct MeshTunnel *t; |
@@ -5385,9 +5379,7 @@ handle_mesh_path_broken (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5385 | */ | 5379 | */ |
5386 | static int | 5380 | static int |
5387 | handle_mesh_tunnel_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, | 5381 | handle_mesh_tunnel_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, |
5388 | const struct GNUNET_MessageHeader *message, | 5382 | const struct GNUNET_MessageHeader *message) |
5389 | const struct GNUNET_ATS_Information *atsi, | ||
5390 | unsigned int atsi_count) | ||
5391 | { | 5383 | { |
5392 | struct GNUNET_MESH_TunnelDestroy *msg; | 5384 | struct GNUNET_MESH_TunnelDestroy *msg; |
5393 | struct MeshTunnel *t; | 5385 | struct MeshTunnel *t; |
@@ -5456,9 +5448,7 @@ handle_mesh_tunnel_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5456 | */ | 5448 | */ |
5457 | static int | 5449 | static int |
5458 | handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer, | 5450 | handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer, |
5459 | const struct GNUNET_MessageHeader *message, | 5451 | const struct GNUNET_MessageHeader *message) |
5460 | const struct GNUNET_ATS_Information *atsi, | ||
5461 | unsigned int atsi_count) | ||
5462 | { | 5452 | { |
5463 | struct GNUNET_MESH_Unicast *msg; | 5453 | struct GNUNET_MESH_Unicast *msg; |
5464 | struct GNUNET_PeerIdentity *neighbor; | 5454 | struct GNUNET_PeerIdentity *neighbor; |
@@ -5577,9 +5567,7 @@ handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5577 | */ | 5567 | */ |
5578 | static int | 5568 | static int |
5579 | handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer, | 5569 | handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer, |
5580 | const struct GNUNET_MessageHeader *message, | 5570 | const struct GNUNET_MessageHeader *message) |
5581 | const struct GNUNET_ATS_Information *atsi, | ||
5582 | unsigned int atsi_count) | ||
5583 | { | 5571 | { |
5584 | struct GNUNET_MESH_Multicast *msg; | 5572 | struct GNUNET_MESH_Multicast *msg; |
5585 | struct MeshTunnel *t; | 5573 | struct MeshTunnel *t; |
@@ -5660,9 +5648,7 @@ handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5660 | */ | 5648 | */ |
5661 | static int | 5649 | static int |
5662 | handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, | 5650 | handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, |
5663 | const struct GNUNET_MessageHeader *message, | 5651 | const struct GNUNET_MessageHeader *message) |
5664 | const struct GNUNET_ATS_Information *atsi, | ||
5665 | unsigned int atsi_count) | ||
5666 | { | 5652 | { |
5667 | struct GNUNET_MESH_ToOrigin *msg; | 5653 | struct GNUNET_MESH_ToOrigin *msg; |
5668 | struct GNUNET_PeerIdentity id; | 5654 | struct GNUNET_PeerIdentity id; |
@@ -5794,9 +5780,7 @@ handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5794 | */ | 5780 | */ |
5795 | static int | 5781 | static int |
5796 | handle_mesh_ack (void *cls, const struct GNUNET_PeerIdentity *peer, | 5782 | handle_mesh_ack (void *cls, const struct GNUNET_PeerIdentity *peer, |
5797 | const struct GNUNET_MessageHeader *message, | 5783 | const struct GNUNET_MessageHeader *message) |
5798 | const struct GNUNET_ATS_Information *atsi, | ||
5799 | unsigned int atsi_count) | ||
5800 | { | 5784 | { |
5801 | struct GNUNET_MESH_ACK *msg; | 5785 | struct GNUNET_MESH_ACK *msg; |
5802 | struct MeshTunnel *t; | 5786 | struct MeshTunnel *t; |
@@ -5860,9 +5844,7 @@ handle_mesh_ack (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5860 | */ | 5844 | */ |
5861 | static int | 5845 | static int |
5862 | handle_mesh_poll (void *cls, const struct GNUNET_PeerIdentity *peer, | 5846 | handle_mesh_poll (void *cls, const struct GNUNET_PeerIdentity *peer, |
5863 | const struct GNUNET_MessageHeader *message, | 5847 | const struct GNUNET_MessageHeader *message) |
5864 | const struct GNUNET_ATS_Information *atsi, | ||
5865 | unsigned int atsi_count) | ||
5866 | { | 5848 | { |
5867 | struct GNUNET_MESH_Poll *msg; | 5849 | struct GNUNET_MESH_Poll *msg; |
5868 | struct MeshTunnel *t; | 5850 | struct MeshTunnel *t; |
@@ -5915,9 +5897,7 @@ handle_mesh_poll (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
5915 | */ | 5897 | */ |
5916 | static int | 5898 | static int |
5917 | handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer, | 5899 | handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer, |
5918 | const struct GNUNET_MessageHeader *message, | 5900 | const struct GNUNET_MessageHeader *message) |
5919 | const struct GNUNET_ATS_Information *atsi, | ||
5920 | unsigned int atsi_count) | ||
5921 | { | 5901 | { |
5922 | struct GNUNET_MESH_PathACK *msg; | 5902 | struct GNUNET_MESH_PathACK *msg; |
5923 | struct GNUNET_PeerIdentity id; | 5903 | struct GNUNET_PeerIdentity id; |
@@ -6017,9 +5997,7 @@ handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
6017 | */ | 5997 | */ |
6018 | static int | 5998 | static int |
6019 | handle_mesh_keepalive (void *cls, const struct GNUNET_PeerIdentity *peer, | 5999 | handle_mesh_keepalive (void *cls, const struct GNUNET_PeerIdentity *peer, |
6020 | const struct GNUNET_MessageHeader *message, | 6000 | const struct GNUNET_MessageHeader *message) |
6021 | const struct GNUNET_ATS_Information *atsi, | ||
6022 | unsigned int atsi_count) | ||
6023 | { | 6001 | { |
6024 | struct GNUNET_MESH_TunnelKeepAlive *msg; | 6002 | struct GNUNET_MESH_TunnelKeepAlive *msg; |
6025 | struct MeshTunnel *t; | 6003 | struct MeshTunnel *t; |
@@ -7369,7 +7347,7 @@ handle_local_unicast (void *cls, struct GNUNET_SERVER_Client *client, | |||
7369 | copy->ttl = htonl (default_ttl); | 7347 | copy->ttl = htonl (default_ttl); |
7370 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 7348 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
7371 | " calling generic handler...\n"); | 7349 | " calling generic handler...\n"); |
7372 | handle_mesh_data_unicast (NULL, &my_full_id, ©->header, NULL, 0); | 7350 | handle_mesh_data_unicast (NULL, &my_full_id, ©->header); |
7373 | } | 7351 | } |
7374 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "receive done OK\n"); | 7352 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "receive done OK\n"); |
7375 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 7353 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
@@ -7478,7 +7456,7 @@ handle_local_to_origin (void *cls, struct GNUNET_SERVER_Client *client, | |||
7478 | copy->sender = my_full_id; | 7456 | copy->sender = my_full_id; |
7479 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 7457 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
7480 | " calling generic handler...\n"); | 7458 | " calling generic handler...\n"); |
7481 | handle_mesh_data_to_orig (NULL, &my_full_id, ©->header, NULL, 0); | 7459 | handle_mesh_data_to_orig (NULL, &my_full_id, ©->header); |
7482 | } | 7460 | } |
7483 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 7461 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
7484 | 7462 | ||
@@ -7569,7 +7547,7 @@ handle_local_multicast (void *cls, struct GNUNET_SERVER_Client *client, | |||
7569 | GNUNET_assert (ntohl (copy->pid) == (t->fwd_pid + 1)); | 7547 | GNUNET_assert (ntohl (copy->pid) == (t->fwd_pid + 1)); |
7570 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 7548 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
7571 | " calling generic handler...\n"); | 7549 | " calling generic handler...\n"); |
7572 | handle_mesh_data_multicast (client, &my_full_id, ©->header, NULL, 0); | 7550 | handle_mesh_data_multicast (client, &my_full_id, ©->header); |
7573 | } | 7551 | } |
7574 | 7552 | ||
7575 | GNUNET_SERVER_receive_done (t->owner->handle, GNUNET_OK); | 7553 | GNUNET_SERVER_receive_done (t->owner->handle, GNUNET_OK); |
@@ -8031,9 +8009,7 @@ core_init (void *cls, struct GNUNET_CORE_Handle *server, | |||
8031 | * @param atsi_count number of records in 'atsi' | 8009 | * @param atsi_count number of records in 'atsi' |
8032 | */ | 8010 | */ |
8033 | static void | 8011 | static void |
8034 | core_connect (void *cls, const struct GNUNET_PeerIdentity *peer, | 8012 | core_connect (void *cls, const struct GNUNET_PeerIdentity *peer) |
8035 | const struct GNUNET_ATS_Information *atsi, | ||
8036 | unsigned int atsi_count) | ||
8037 | { | 8013 | { |
8038 | struct MeshPeerInfo *peer_info; | 8014 | struct MeshPeerInfo *peer_info; |
8039 | struct MeshPeerPath *path; | 8015 | struct MeshPeerPath *path; |