diff options
-rw-r--r-- | doc/structure.dot | 3 | ||||
-rw-r--r-- | src/core/gnunet-core.c | 2 | ||||
-rw-r--r-- | src/core/gnunet-service-core_clients.c | 2 | ||||
-rw-r--r-- | src/core/gnunet-service-core_clients.h | 2 | ||||
-rw-r--r-- | src/core/gnunet-service-core_kx.c | 2 | ||||
-rw-r--r-- | src/core/gnunet-service-core_kx.h | 2 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht_neighbours.c | 9 | ||||
-rw-r--r-- | src/dv/gnunet-service-dv.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs.c | 6 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_cp.h | 2 | ||||
-rw-r--r-- | src/hostlist/hostlist-client.c | 4 | ||||
-rw-r--r-- | src/hostlist/hostlist-server.c | 2 | ||||
-rw-r--r-- | src/nse/gnunet-service-nse.c | 4 | ||||
-rw-r--r-- | src/testbed/gnunet-service-testbed_cache.c | 2 | ||||
-rw-r--r-- | src/topology/gnunet-daemon-topology.c | 4 |
15 files changed, 3 insertions, 47 deletions
diff --git a/doc/structure.dot b/doc/structure.dot index 0d99a32c6..657b91a38 100644 --- a/doc/structure.dot +++ b/doc/structure.dot | |||
@@ -69,6 +69,9 @@ splines = true; | |||
69 | dv [style=dashed,shape=egg,layer=core]; | 69 | dv [style=dashed,shape=egg,layer=core]; |
70 | dv -> transport [style=dashed,color=blue]; | 70 | dv -> transport [style=dashed,color=blue]; |
71 | dv -> core [style=dashed]; | 71 | dv -> core [style=dashed]; |
72 | dv -> consensus; | ||
73 | consensus -> dv [style=invis]; // force dv below consensus | ||
74 | consensus -> mesh; | ||
72 | core -> dv [style=invis]; // force dv below core | 75 | core -> dv [style=invis]; // force dv below core |
73 | peerinfo -> hello; | 76 | peerinfo -> hello; |
74 | fragmentation [shape=diamond]; | 77 | fragmentation [shape=diamond]; |
diff --git a/src/core/gnunet-core.c b/src/core/gnunet-core.c index 87a372f30..37f1caec2 100644 --- a/src/core/gnunet-core.c +++ b/src/core/gnunet-core.c | |||
@@ -70,8 +70,6 @@ shutdown_task (void *cls, | |||
70 | * | 70 | * |
71 | * @param cls closure (unused) | 71 | * @param cls closure (unused) |
72 | * @param peer peer identity this notification is about | 72 | * @param peer peer identity this notification is about |
73 | * @param atsi performance data for the connection | ||
74 | * @param atsi_count number of records in 'atsi' | ||
75 | */ | 73 | */ |
76 | static void | 74 | static void |
77 | connected_peer_callback (void *cls, const struct GNUNET_PeerIdentity *peer) | 75 | connected_peer_callback (void *cls, const struct GNUNET_PeerIdentity *peer) |
diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c index 9ad23ed0b..db72f147a 100644 --- a/src/core/gnunet-service-core_clients.c +++ b/src/core/gnunet-service-core_clients.c | |||
@@ -789,8 +789,6 @@ GSC_CLIENTS_notify_clients_about_neighbour (const struct GNUNET_PeerIdentity | |||
789 | * of its types. | 789 | * of its types. |
790 | * | 790 | * |
791 | * @param sender peer who sent us the message | 791 | * @param sender peer who sent us the message |
792 | * @param atsi performance information about neighbour | ||
793 | * @param atsi_count number of entries in 'ats' array | ||
794 | * @param msg the message | 792 | * @param msg the message |
795 | * @param msize number of bytes to transmit | 793 | * @param msize number of bytes to transmit |
796 | * @param options options for checking which clients should | 794 | * @param options options for checking which clients should |
diff --git a/src/core/gnunet-service-core_clients.h b/src/core/gnunet-service-core_clients.h index d3f9e6e8e..fd06c1fc7 100644 --- a/src/core/gnunet-service-core_clients.h +++ b/src/core/gnunet-service-core_clients.h | |||
@@ -93,8 +93,6 @@ GSC_CLIENTS_notify_clients_about_neighbour (const struct GNUNET_PeerIdentity | |||
93 | * of its types. | 93 | * of its types. |
94 | * | 94 | * |
95 | * @param sender peer who sent us the message | 95 | * @param sender peer who sent us the message |
96 | * @param atsi performance information about neighbour | ||
97 | * @param atsi_count number of entries in 'ats' array | ||
98 | * @param msg the message | 96 | * @param msg the message |
99 | * @param msize number of bytes to transmit | 97 | * @param msize number of bytes to transmit |
100 | * @param options options for checking which clients should | 98 | * @param options options for checking which clients should |
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index 545cccaa6..14b509e8f 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c | |||
@@ -1268,8 +1268,6 @@ struct DeliverMessageContext | |||
1268 | * | 1268 | * |
1269 | * @param kx key exchange context for encrypting the message | 1269 | * @param kx key exchange context for encrypting the message |
1270 | * @param msg encrypted message | 1270 | * @param msg encrypted message |
1271 | * @param atsi performance data | ||
1272 | * @param atsi_count number of entries in ats (excluding 0-termination) | ||
1273 | */ | 1271 | */ |
1274 | void | 1272 | void |
1275 | GSC_KX_handle_encrypted_message (struct GSC_KeyExchangeInfo *kx, | 1273 | GSC_KX_handle_encrypted_message (struct GSC_KeyExchangeInfo *kx, |
diff --git a/src/core/gnunet-service-core_kx.h b/src/core/gnunet-service-core_kx.h index 5d4d638b5..e1b860919 100644 --- a/src/core/gnunet-service-core_kx.h +++ b/src/core/gnunet-service-core_kx.h | |||
@@ -89,8 +89,6 @@ GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx, | |||
89 | * | 89 | * |
90 | * @param kx key exchange information context | 90 | * @param kx key exchange information context |
91 | * @param msg encrypted message | 91 | * @param msg encrypted message |
92 | * @param atsi performance data | ||
93 | * @param atsi_count number of entries in ats (excluding 0-termination) | ||
94 | */ | 92 | */ |
95 | void | 93 | void |
96 | GSC_KX_handle_encrypted_message (struct GSC_KeyExchangeInfo *kx, | 94 | GSC_KX_handle_encrypted_message (struct GSC_KeyExchangeInfo *kx, |
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index 6c52ab342..06e13d0b1 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c | |||
@@ -622,8 +622,6 @@ send_find_peer_message (void *cls, | |||
622 | * | 622 | * |
623 | * @param cls closure | 623 | * @param cls closure |
624 | * @param peer peer identity this notification is about | 624 | * @param peer peer identity this notification is about |
625 | * @param atsi performance data | ||
626 | * @param atsi_count number of records in 'atsi' | ||
627 | */ | 625 | */ |
628 | static void | 626 | static void |
629 | handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer) | 627 | handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer) |
@@ -1539,8 +1537,6 @@ core_init (void *cls, struct GNUNET_CORE_Handle *server, | |||
1539 | * @param peer sender of the request | 1537 | * @param peer sender of the request |
1540 | * @param message message | 1538 | * @param message message |
1541 | * @param peer peer identity this notification is about | 1539 | * @param peer peer identity this notification is about |
1542 | * @param atsi performance data | ||
1543 | * @param atsi_count number of records in 'atsi' | ||
1544 | * @return GNUNET_OK to keep the connection open, | 1540 | * @return GNUNET_OK to keep the connection open, |
1545 | * GNUNET_SYSERR to close it (signal serious error) | 1541 | * GNUNET_SYSERR to close it (signal serious error) |
1546 | */ | 1542 | */ |
@@ -1789,9 +1785,6 @@ handle_find_peer (const struct GNUNET_PeerIdentity *sender, | |||
1789 | * @param cls closure | 1785 | * @param cls closure |
1790 | * @param peer sender of the request | 1786 | * @param peer sender of the request |
1791 | * @param message message | 1787 | * @param message message |
1792 | * @param peer peer identity this notification is about | ||
1793 | * @param atsi performance data | ||
1794 | * @param atsi_count number of records in 'atsi' | ||
1795 | * @return GNUNET_OK to keep the connection open, | 1788 | * @return GNUNET_OK to keep the connection open, |
1796 | * GNUNET_SYSERR to close it (signal serious error) | 1789 | * GNUNET_SYSERR to close it (signal serious error) |
1797 | */ | 1790 | */ |
@@ -1931,8 +1924,6 @@ handle_dht_p2p_get (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
1931 | * @param cls closure | 1924 | * @param cls closure |
1932 | * @param message message | 1925 | * @param message message |
1933 | * @param peer peer identity this notification is about | 1926 | * @param peer peer identity this notification is about |
1934 | * @param atsi performance data | ||
1935 | * @param atsi_count number of records in 'atsi' | ||
1936 | * @return GNUNET_YES (do not cut p2p connection) | 1927 | * @return GNUNET_YES (do not cut p2p connection) |
1937 | */ | 1928 | */ |
1938 | static int | 1929 | static int |
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index d3da3bbfd..e1a4e2199 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c | |||
@@ -712,8 +712,6 @@ start_consensus (void *cls, | |||
712 | * | 712 | * |
713 | * @param cls closure | 713 | * @param cls closure |
714 | * @param peer peer identity this notification is about | 714 | * @param peer peer identity this notification is about |
715 | * @param atsi performance data | ||
716 | * @param atsi_count number of entries in atsi | ||
717 | */ | 715 | */ |
718 | static void | 716 | static void |
719 | handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer) | 717 | handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer) |
@@ -1162,8 +1160,6 @@ start_consensus (void *cls, | |||
1162 | * @param cls closure | 1160 | * @param cls closure |
1163 | * @param peer peer which sent the message (immediate sender) | 1161 | * @param peer peer which sent the message (immediate sender) |
1164 | * @param message the message | 1162 | * @param message the message |
1165 | * @param atsi transport ATS information (latency, distance, etc.) | ||
1166 | * @param atsi_count number of entries in atsi | ||
1167 | * @return GNUNET_OK on success, GNUNET_SYSERR if the other peer violated the protocol | 1163 | * @return GNUNET_OK on success, GNUNET_SYSERR if the other peer violated the protocol |
1168 | */ | 1164 | */ |
1169 | static int | 1165 | static int |
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 300aac45a..4a0a14f58 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -260,8 +260,6 @@ update_latencies (const struct GNUNET_ATS_Information *atsi, | |||
260 | * @param other the other peer involved (sender or receiver, NULL | 260 | * @param other the other peer involved (sender or receiver, NULL |
261 | * for loopback messages where we are both sender and receiver) | 261 | * for loopback messages where we are both sender and receiver) |
262 | * @param message the actual message | 262 | * @param message the actual message |
263 | * @param atsi performance information | ||
264 | * @param atsi_count number of records in 'atsi' | ||
265 | * @return GNUNET_OK to keep the connection open, | 263 | * @return GNUNET_OK to keep the connection open, |
266 | * GNUNET_SYSERR to close it (signal serious error) | 264 | * GNUNET_SYSERR to close it (signal serious error) |
267 | */ | 265 | */ |
@@ -341,8 +339,6 @@ consider_forwarding (void *cls, struct GSF_PendingRequest *pr, | |||
341 | * @param other the other peer involved (sender or receiver, NULL | 339 | * @param other the other peer involved (sender or receiver, NULL |
342 | * for loopback messages where we are both sender and receiver) | 340 | * for loopback messages where we are both sender and receiver) |
343 | * @param message the actual message | 341 | * @param message the actual message |
344 | * @param atsi performance information | ||
345 | * @param atsi_count number of records in 'atsi' | ||
346 | * @return GNUNET_OK to keep the connection open, | 342 | * @return GNUNET_OK to keep the connection open, |
347 | * GNUNET_SYSERR to close it (signal serious error) | 343 | * GNUNET_SYSERR to close it (signal serious error) |
348 | */ | 344 | */ |
@@ -530,8 +526,6 @@ consider_peer_for_forwarding (void *cls, const struct GNUNET_HashCode * key, | |||
530 | * | 526 | * |
531 | * @param cls closure, not used | 527 | * @param cls closure, not used |
532 | * @param peer peer identity this notification is about | 528 | * @param peer peer identity this notification is about |
533 | * @param atsi performance information | ||
534 | * @param atsi_count number of records in 'atsi' | ||
535 | */ | 529 | */ |
536 | static void | 530 | static void |
537 | peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer) | 531 | peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer) |
diff --git a/src/fs/gnunet-service-fs_cp.h b/src/fs/gnunet-service-fs_cp.h index fae07b4cf..365548665 100644 --- a/src/fs/gnunet-service-fs_cp.h +++ b/src/fs/gnunet-service-fs_cp.h | |||
@@ -294,8 +294,6 @@ GSF_peer_update_responder_peer_ (struct GSF_ConnectedPeer *cp, | |||
294 | * @param other the other peer involved (sender or receiver, NULL | 294 | * @param other the other peer involved (sender or receiver, NULL |
295 | * for loopback messages where we are both sender and receiver) | 295 | * for loopback messages where we are both sender and receiver) |
296 | * @param message the actual message | 296 | * @param message the actual message |
297 | * @param atsi performance information | ||
298 | * @param atsi_count number of records in 'atsi' | ||
299 | * @return GNUNET_OK to keep the connection open, | 297 | * @return GNUNET_OK to keep the connection open, |
300 | * GNUNET_SYSERR to close it (signal serious error) | 298 | * GNUNET_SYSERR to close it (signal serious error) |
301 | */ | 299 | */ |
diff --git a/src/hostlist/hostlist-client.c b/src/hostlist/hostlist-client.c index c5b3f05e0..ad9b2b0b5 100644 --- a/src/hostlist/hostlist-client.c +++ b/src/hostlist/hostlist-client.c | |||
@@ -1096,8 +1096,6 @@ task_hostlist_saving (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1096 | * | 1096 | * |
1097 | * @param cls closure | 1097 | * @param cls closure |
1098 | * @param peer peer identity this notification is about | 1098 | * @param peer peer identity this notification is about |
1099 | * @param atsi performance data | ||
1100 | * @param atsi_count number of records in 'atsi' | ||
1101 | */ | 1099 | */ |
1102 | static void | 1100 | static void |
1103 | handler_connect (void *cls, const struct GNUNET_PeerIdentity *peer) | 1101 | handler_connect (void *cls, const struct GNUNET_PeerIdentity *peer) |
@@ -1131,8 +1129,6 @@ handler_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) | |||
1131 | * @param cls closure (always NULL) | 1129 | * @param cls closure (always NULL) |
1132 | * @param peer the peer sending the message | 1130 | * @param peer the peer sending the message |
1133 | * @param message the actual message | 1131 | * @param message the actual message |
1134 | * @param atsi performance data | ||
1135 | * @param atsi_count number of records in 'atsi' | ||
1136 | * @return GNUNET_OK to keep the connection open, | 1132 | * @return GNUNET_OK to keep the connection open, |
1137 | * GNUNET_SYSERR to close it (signal serious error) | 1133 | * GNUNET_SYSERR to close it (signal serious error) |
1138 | */ | 1134 | */ |
diff --git a/src/hostlist/hostlist-server.c b/src/hostlist/hostlist-server.c index 54a325d77..2e94083f5 100644 --- a/src/hostlist/hostlist-server.c +++ b/src/hostlist/hostlist-server.c | |||
@@ -349,8 +349,6 @@ adv_transmit_ready (void *cls, size_t size, void *buf) | |||
349 | * | 349 | * |
350 | * @param cls closure | 350 | * @param cls closure |
351 | * @param peer peer identity this notification is about | 351 | * @param peer peer identity this notification is about |
352 | * @param atsi performance data | ||
353 | * @param atsi_count number of records in 'atsi' | ||
354 | */ | 352 | */ |
355 | static void | 353 | static void |
356 | connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer) | 354 | connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer) |
diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c index 3047860b8..9ba4063da 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/nse/gnunet-service-nse.c | |||
@@ -1028,8 +1028,6 @@ update_flood_times (void *cls, const struct GNUNET_HashCode * key, void *value) | |||
1028 | * @param cls closure unused | 1028 | * @param cls closure unused |
1029 | * @param message message | 1029 | * @param message message |
1030 | * @param peer peer identity this message is from (ignored) | 1030 | * @param peer peer identity this message is from (ignored) |
1031 | * @param atsi performance data (ignored) | ||
1032 | * @param atsi_count number of records in 'atsi' | ||
1033 | */ | 1031 | */ |
1034 | static int | 1032 | static int |
1035 | handle_p2p_size_estimate (void *cls, const struct GNUNET_PeerIdentity *peer, | 1033 | handle_p2p_size_estimate (void *cls, const struct GNUNET_PeerIdentity *peer, |
@@ -1211,8 +1209,6 @@ handle_p2p_size_estimate (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
1211 | * | 1209 | * |
1212 | * @param cls closure | 1210 | * @param cls closure |
1213 | * @param peer peer identity this notification is about | 1211 | * @param peer peer identity this notification is about |
1214 | * @param atsi performance data | ||
1215 | * @param atsi_count number of records in 'atsi' | ||
1216 | */ | 1212 | */ |
1217 | static void | 1213 | static void |
1218 | handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer) | 1214 | handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer) |
diff --git a/src/testbed/gnunet-service-testbed_cache.c b/src/testbed/gnunet-service-testbed_cache.c index 397e2aad4..5e93da1f5 100644 --- a/src/testbed/gnunet-service-testbed_cache.c +++ b/src/testbed/gnunet-service-testbed_cache.c | |||
@@ -643,8 +643,6 @@ core_startup_cb (void *cls, struct GNUNET_CORE_Handle *server, | |||
643 | * | 643 | * |
644 | * @param cls closure | 644 | * @param cls closure |
645 | * @param peer peer identity this notification is about | 645 | * @param peer peer identity this notification is about |
646 | * @param atsi performance data for the connection | ||
647 | * @param atsi_count number of records in 'atsi' | ||
648 | */ | 646 | */ |
649 | static void | 647 | static void |
650 | core_peer_connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer) | 648 | core_peer_connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer) |
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index 5ca5468c7..c36108823 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c | |||
@@ -684,8 +684,6 @@ reschedule_hellos (void *cls, const struct GNUNET_HashCode * pid, void *value) | |||
684 | * | 684 | * |
685 | * @param cls closure | 685 | * @param cls closure |
686 | * @param peer peer identity this notification is about | 686 | * @param peer peer identity this notification is about |
687 | * @param atsi performance data | ||
688 | * @param atsi_count number of records in 'atsi' | ||
689 | */ | 687 | */ |
690 | static void | 688 | static void |
691 | connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) | 689 | connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) |
@@ -1137,8 +1135,6 @@ read_friends_file (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
1137 | * @param other the other peer involved (sender or receiver, NULL | 1135 | * @param other the other peer involved (sender or receiver, NULL |
1138 | * for loopback messages where we are both sender and receiver) | 1136 | * for loopback messages where we are both sender and receiver) |
1139 | * @param message the actual HELLO message | 1137 | * @param message the actual HELLO message |
1140 | * @param atsi performance data | ||
1141 | * @param atsi_count number of records in 'atsi' | ||
1142 | * @return GNUNET_OK to keep the connection open, | 1138 | * @return GNUNET_OK to keep the connection open, |
1143 | * GNUNET_SYSERR to close it (signal serious error) | 1139 | * GNUNET_SYSERR to close it (signal serious error) |
1144 | */ | 1140 | */ |