diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-11-13 20:37:37 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-11-13 20:37:37 +0000 |
commit | db6c313c75a36bc4a27971d7bd8da3e938c7c02a (patch) | |
tree | ea4dac1648edb33ccafb1b12652236261f538abd /src/topology/gnunet-daemon-topology.c | |
parent | 56f7c4934c0d9c18370fdcff5e5a3cd29363d474 (diff) | |
download | gnunet-db6c313c75a36bc4a27971d7bd8da3e938c7c02a.tar.gz gnunet-db6c313c75a36bc4a27971d7bd8da3e938c7c02a.zip |
the big core API/protocol change, breaks all testcases using core, since the code is still buggy
Diffstat (limited to 'src/topology/gnunet-daemon-topology.c')
-rw-r--r-- | src/topology/gnunet-daemon-topology.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index 49f460658..ef6a81882 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c | |||
@@ -413,7 +413,7 @@ attempt_connect (struct Peer *pos) | |||
413 | gettext_noop ("# connect requests issued to core"), | 413 | gettext_noop ("# connect requests issued to core"), |
414 | 1, | 414 | 1, |
415 | GNUNET_NO); | 415 | GNUNET_NO); |
416 | pos->connect_req = GNUNET_CORE_peer_request_connect (cfg, | 416 | pos->connect_req = GNUNET_CORE_peer_request_connect (handle, |
417 | GNUNET_TIME_UNIT_MINUTES, | 417 | GNUNET_TIME_UNIT_MINUTES, |
418 | &pos->pid, | 418 | &pos->pid, |
419 | &connect_completed_callback, | 419 | &connect_completed_callback, |
@@ -689,15 +689,13 @@ reschedule_hellos (void *cls, | |||
689 | * | 689 | * |
690 | * @param cls closure | 690 | * @param cls closure |
691 | * @param peer peer identity this notification is about | 691 | * @param peer peer identity this notification is about |
692 | * @param latency reported latency of the connection with 'other' | 692 | * @param atsi performance data |
693 | * @param distance reported distance (DV) to 'other' | ||
694 | */ | 693 | */ |
695 | static void | 694 | static void |
696 | connect_notify (void *cls, | 695 | connect_notify (void *cls, |
697 | const struct | 696 | const struct |
698 | GNUNET_PeerIdentity * peer, | 697 | GNUNET_PeerIdentity * peer, |
699 | struct GNUNET_TIME_Relative latency, | 698 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) |
700 | uint32_t distance) | ||
701 | { | 699 | { |
702 | struct Peer *pos; | 700 | struct Peer *pos; |
703 | 701 | ||
@@ -1167,8 +1165,7 @@ read_friends_file (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
1167 | * @param other the other peer involved (sender or receiver, NULL | 1165 | * @param other the other peer involved (sender or receiver, NULL |
1168 | * for loopback messages where we are both sender and receiver) | 1166 | * for loopback messages where we are both sender and receiver) |
1169 | * @param message the actual HELLO message | 1167 | * @param message the actual HELLO message |
1170 | * @param latency reported latency of the connection with 'other' | 1168 | * @param atsi performance data |
1171 | * @param distance reported distance (DV) to 'other' | ||
1172 | * @return GNUNET_OK to keep the connection open, | 1169 | * @return GNUNET_OK to keep the connection open, |
1173 | * GNUNET_SYSERR to close it (signal serious error) | 1170 | * GNUNET_SYSERR to close it (signal serious error) |
1174 | */ | 1171 | */ |
@@ -1177,8 +1174,7 @@ handle_encrypted_hello (void *cls, | |||
1177 | const struct GNUNET_PeerIdentity * other, | 1174 | const struct GNUNET_PeerIdentity * other, |
1178 | const struct GNUNET_MessageHeader * | 1175 | const struct GNUNET_MessageHeader * |
1179 | message, | 1176 | message, |
1180 | struct GNUNET_TIME_Relative latency, | 1177 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) |
1181 | uint32_t distance) | ||
1182 | { | 1178 | { |
1183 | struct Peer *peer; | 1179 | struct Peer *peer; |
1184 | struct GNUNET_PeerIdentity pid; | 1180 | struct GNUNET_PeerIdentity pid; |
@@ -1379,7 +1375,6 @@ run (void *cls, | |||
1379 | NULL); | 1375 | NULL); |
1380 | handle = GNUNET_CORE_connect (cfg, | 1376 | handle = GNUNET_CORE_connect (cfg, |
1381 | 1, | 1377 | 1, |
1382 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
1383 | NULL, | 1378 | NULL, |
1384 | &core_init, | 1379 | &core_init, |
1385 | &connect_notify, | 1380 | &connect_notify, |