diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-01-18 09:00:05 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-01-18 09:00:05 +0000 |
commit | 53840e9a81994acd8dc4c0cb1c54a0d4764667c3 (patch) | |
tree | 317eb98e7e6ab6472d5700c0db2de84913489bce /src/topology | |
parent | e67ade17fc2bf555af625863dab525f909b310f2 (diff) | |
download | gnunet-53840e9a81994acd8dc4c0cb1c54a0d4764667c3.tar.gz gnunet-53840e9a81994acd8dc4c0cb1c54a0d4764667c3.zip |
making peer_configure API cancellable
Diffstat (limited to 'src/topology')
-rw-r--r-- | src/topology/gnunet-daemon-topology.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index 880f8603c..157e270ab 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c | |||
@@ -238,14 +238,15 @@ static struct GNUNET_PEERINFO_IteratorContext *pitr_more; | |||
238 | static void | 238 | static void |
239 | force_disconnect (const struct GNUNET_PeerIdentity *peer) | 239 | force_disconnect (const struct GNUNET_PeerIdentity *peer) |
240 | { | 240 | { |
241 | GNUNET_CORE_peer_configure (handle, | 241 | // FIXME: do something with return value! |
242 | peer, | 242 | GNUNET_CORE_peer_get_info (sched, cfg, |
243 | GNUNET_TIME_UNIT_FOREVER_REL, | 243 | peer, |
244 | 0, | 244 | GNUNET_TIME_UNIT_FOREVER_REL, |
245 | 0, | 245 | 0, |
246 | 0, | 246 | 0, |
247 | NULL, | 247 | 0, |
248 | NULL); | 248 | NULL, |
249 | NULL); | ||
249 | } | 250 | } |
250 | 251 | ||
251 | 252 | ||
@@ -1057,6 +1058,7 @@ gather_hello_callback (void *cls, | |||
1057 | } | 1058 | } |
1058 | 1059 | ||
1059 | 1060 | ||
1061 | // FIXME: this no longer works (no solicitation!) | ||
1060 | /** | 1062 | /** |
1061 | * Function to fill send buffer with HELLO. | 1063 | * Function to fill send buffer with HELLO. |
1062 | * | 1064 | * |
@@ -1069,7 +1071,7 @@ gather_hello_callback (void *cls, | |||
1069 | * @return the number of bytes written to | 1071 | * @return the number of bytes written to |
1070 | * that buffer (must be a positive number). | 1072 | * that buffer (must be a positive number). |
1071 | */ | 1073 | */ |
1072 | static unsigned int | 1074 | /* static */ unsigned int |
1073 | hello_advertising (void *cls, | 1075 | hello_advertising (void *cls, |
1074 | const struct GNUNET_PeerIdentity * | 1076 | const struct GNUNET_PeerIdentity * |
1075 | receiver, | 1077 | receiver, |
@@ -1275,7 +1277,6 @@ run (void *cls, | |||
1275 | &core_init, | 1277 | &core_init, |
1276 | &connect_notify, | 1278 | &connect_notify, |
1277 | &disconnect_notify, | 1279 | &disconnect_notify, |
1278 | &hello_advertising, | ||
1279 | NULL, GNUNET_NO, | 1280 | NULL, GNUNET_NO, |
1280 | NULL, GNUNET_NO, | 1281 | NULL, GNUNET_NO, |
1281 | handlers); | 1282 | handlers); |