diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-01-09 10:33:43 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-01-09 10:33:43 +0000 |
commit | 88248030d46441376f49ccaa25a2f2d11d2f07c7 (patch) | |
tree | bf6316f7ded702dd42877c552ae541a2bbae0118 | |
parent | 871466b6fd5d6c0c8f4ef48b41b06873b9de0b2f (diff) | |
download | gnunet-gtk-88248030d46441376f49ccaa25a2f2d11d2f07c7.tar.gz gnunet-gtk-88248030d46441376f49ccaa25a2f2d11d2f07c7.zip |
-fix signature, API change in NAT
-rw-r--r-- | src/peerinfo/gnunet-peerinfo-gtk.c | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c b/src/peerinfo/gnunet-peerinfo-gtk.c index f07e2784..80e7d743 100644 --- a/src/peerinfo/gnunet-peerinfo-gtk.c +++ b/src/peerinfo/gnunet-peerinfo-gtk.c | |||
@@ -177,12 +177,12 @@ struct PeerAddress | |||
177 | 177 | ||
178 | /** | 178 | /** |
179 | * DLL. | 179 | * DLL. |
180 | */ | 180 | */ |
181 | struct PeerAddress *next; | 181 | struct PeerAddress *next; |
182 | 182 | ||
183 | /** | 183 | /** |
184 | * DLL. | 184 | * DLL. |
185 | */ | 185 | */ |
186 | struct PeerAddress *prev; | 186 | struct PeerAddress *prev; |
187 | 187 | ||
188 | /** | 188 | /** |
@@ -230,12 +230,12 @@ struct PeerInfo | |||
230 | 230 | ||
231 | /** | 231 | /** |
232 | * Head of DLL with addresses of this peer. | 232 | * Head of DLL with addresses of this peer. |
233 | */ | 233 | */ |
234 | struct PeerAddress *pa_head; | 234 | struct PeerAddress *pa_head; |
235 | 235 | ||
236 | /** | 236 | /** |
237 | * Tail of DLL with addresses of this peer. | 237 | * Tail of DLL with addresses of this peer. |
238 | */ | 238 | */ |
239 | struct PeerAddress *pa_tail; | 239 | struct PeerAddress *pa_tail; |
240 | 240 | ||
241 | }; | 241 | }; |
@@ -347,11 +347,6 @@ free_paths (void *cls, | |||
347 | struct PeerInfo *info = value; | 347 | struct PeerInfo *info = value; |
348 | struct PeerAddress *pa; | 348 | struct PeerAddress *pa; |
349 | 349 | ||
350 | if (NULL != info->palc) | ||
351 | { | ||
352 | GNUNET_TRANSPORT_peer_get_active_addresses_cancel (info->palc); | ||
353 | info->palc = NULL; | ||
354 | } | ||
355 | while (NULL != (pa = info->pa_head)) | 350 | while (NULL != (pa = info->pa_head)) |
356 | { | 351 | { |
357 | GNUNET_CONTAINER_DLL_remove (info->pa_head, | 352 | GNUNET_CONTAINER_DLL_remove (info->pa_head, |
@@ -361,7 +356,7 @@ free_paths (void *cls, | |||
361 | { | 356 | { |
362 | GNUNET_TRANSPORT_address_to_string_cancel (pa->tos); | 357 | GNUNET_TRANSPORT_address_to_string_cancel (pa->tos); |
363 | pa->tos = NULL; | 358 | pa->tos = NULL; |
364 | } | 359 | } |
365 | gtk_tree_row_reference_free (pa->rr); | 360 | gtk_tree_row_reference_free (pa->rr); |
366 | GNUNET_free (pa); | 361 | GNUNET_free (pa); |
367 | } | 362 | } |
@@ -378,7 +373,7 @@ free_paths (void *cls, | |||
378 | * @param tc scheduler context, unused | 373 | * @param tc scheduler context, unused |
379 | */ | 374 | */ |
380 | static void | 375 | static void |
381 | shutdown_task (void *cls, | 376 | shutdown_task (void *cls, |
382 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 377 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
383 | { | 378 | { |
384 | GNUNET_GTK_tray_icon_destroy (); | 379 | GNUNET_GTK_tray_icon_destroy (); |
@@ -548,14 +543,6 @@ peerinfo_processor (void *cls, | |||
548 | GNUNET_CONTAINER_multipeermap_put (peer2info, peer, info, | 543 | GNUNET_CONTAINER_multipeermap_put (peer2info, peer, info, |
549 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); | 544 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); |
550 | } | 545 | } |
551 | if (NULL == info->palc) | ||
552 | { | ||
553 | info->palc = | ||
554 | GNUNET_TRANSPORT_peer_get_active_addresses (get_configuration (), peer, | ||
555 | GNUNET_NO, | ||
556 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
557 | &peer_address_cb, info); | ||
558 | } | ||
559 | } | 546 | } |
560 | 547 | ||
561 | 548 | ||