[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17397 - in gnunet-gtk/src: peerinfo setup
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17397 - in gnunet-gtk/src: peerinfo setup |
Date: |
Wed, 12 Oct 2011 10:37:58 +0200 |
Author: grothoff
Date: 2011-10-12 10:37:58 +0200 (Wed, 12 Oct 2011)
New Revision: 17397
Modified:
gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
gnunet-gtk/src/setup/gnunet-setup-options.c
Log:
fix compilation (hack for now)
Modified: gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
===================================================================
--- gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2011-10-12 08:32:11 UTC
(rev 17396)
+++ gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2011-10-12 08:37:58 UTC
(rev 17397)
@@ -26,7 +26,7 @@
#include "gnunet_gtk.h"
#include <gnunet/gnunet_peerinfo_service.h>
#include <gnunet/gnunet_transport_service.h>
-#include <gnunet/gnunet_core_service.h>
+#include <gnunet/gnunet_ats_service.h>
#include "gnunet-peerinfo-gtk-flags.h"
@@ -69,9 +69,9 @@
static struct GNUNET_PEERINFO_NotifyContext *pnc;
/**
- * Handle to core service.
+ * Handle to ATS service.
*/
-static struct GNUNET_CORE_Handle *core;
+// static struct GNUNET_ATS_Handle *ats;
/**
* Map of peer identities to the respective PeerInfo for our view.
@@ -145,11 +145,13 @@
{
GNUNET_PEERINFO_notify_cancel (pnc);
pnc = NULL;
- if (NULL != core)
+#if FIXME
+ if (NULL != ats)
{
- GNUNET_CORE_disconnect (core);
- core = NULL;
+ GNUNET_ATS_disconnect (ats);
+ ats = NULL;
}
+#endif
GNUNET_CONTAINER_multihashmap_iterate (peer2info, &free_paths, NULL);
GNUNET_CONTAINER_multihashmap_destroy (peer2info);
peer2info = NULL;
@@ -275,29 +277,8 @@
}
+#if FIXME
/**
- * Function called after GNUNET_CORE_connect has succeeded
- * (or failed for good). Note that the private key of the
- * peer is intentionally not exposed here; if you need it,
- * your process should try to read the private key file
- * directly (which should work if you are authorized...).
- *
- * @param cls closure
- * @param server handle to the server, NULL if we failed
- * @param my_identity ID of this peer, NULL if we failed
- * @param publicKey public key of this peer, NULL if we failed
- */
-static void
-init_cb (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
-{
- /* FIXME: should probably do something to my 'own' entry
- * in the peerinfo list to make it stand out */
-}
-
-
-/**
* Method called whenever a given peer has a status change.
*
* @param cls closure
@@ -333,6 +314,7 @@
gtk_list_store_set (ls, &iter, 4, (guint64) ntohl (bandwidth_in.value__), 5,
(guint64) ntohl (bandwidth_out.value__), -1);
}
+#endif
/**
@@ -369,10 +351,11 @@
_("Failed to initialize communication with peerinfo service!\n"));
exit (1);
}
- core =
- GNUNET_CORE_connect (get_configuration (), 1, NULL, &init_cb, NULL, NULL,
- &status_cb, NULL, GNUNET_NO, NULL, GNUNET_NO, NULL);
-
+#if FIXME
+ ats =
+ GNUNET_ATS_connect (get_configuration (),
+ &status_cb, NULL);
+#endif
/* setup main window */
main_window = GTK_WIDGET (get_object ("GNUNET_PEERINFO_GTK_main_window"));
gtk_window_maximize (GTK_WINDOW (main_window));
Modified: gnunet-gtk/src/setup/gnunet-setup-options.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-options.c 2011-10-12 08:32:11 UTC (rev
17396)
+++ gnunet-gtk/src/setup/gnunet-setup-options.c 2011-10-12 08:37:58 UTC (rev
17397)
@@ -545,7 +545,7 @@
{
gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, "", 1,
(guint) 80, 2, (guint) 8080, 3,
- "localhost", 4, "tcp", -1);
+ "localhost4", 4, "tcp", -1);
return;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17397 - in gnunet-gtk/src: peerinfo setup,
gnunet <=