[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26875 - in gnunet-gtk/src: fs peerinfo
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r26875 - in gnunet-gtk/src: fs peerinfo |
|
Date: |
Sun, 14 Apr 2013 22:45:10 +0200 |
Author: grothoff
Date: 2013-04-14 22:45:09 +0200 (Sun, 14 Apr 2013)
New Revision: 26875
Modified:
gnunet-gtk/src/fs/gnunet-fs-gtk.c
gnunet-gtk/src/fs/gnunet-fs-gtk.h
gnunet-gtk/src/fs/gnunet-fs-gtk_common.c
gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c
gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_manager.c
gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_organizer.c
gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
Log:
-make GTK work with current ARM and ATS APIs
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c 2013-04-14 20:21:41 UTC (rev 26874)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c 2013-04-14 20:45:09 UTC (rev 26875)
@@ -225,12 +225,12 @@
}
if (NULL != armon)
{
- GNUNET_ARM_monitor_disconnect (armon);
+ GNUNET_ARM_monitor_disconnect_and_free (armon);
armon = NULL;
}
if (NULL != arm)
{
- GNUNET_ARM_disconnect (arm);
+ GNUNET_ARM_disconnect_and_free (arm);
arm = NULL;
}
GNUNET_FS_GTK_close_uri_tab_ ();
@@ -447,12 +447,15 @@
return result;
}
+
static void
-service_list_callback (void *cls, struct GNUNET_ARM_Handle *arm,
- enum GNUNET_ARM_RequestStatus rs, unsigned int count,
- const char *const*list)
+service_list_callback (void *cls,
+ enum GNUNET_ARM_RequestStatus rs,
+ unsigned int count,
+ const char *const*list)
{
char *service_list;
+
if ((GNUNET_ARM_REQUEST_SENT_OK != rs) || (NULL == list))
return;
service_list = format_service_list (count, list);
@@ -462,26 +465,18 @@
static void
-arm_connection_state_change (void *cls, struct GNUNET_ARM_Handle *arm,
- unsigned char connected, unsigned char error)
+arm_connection_state_change (void *cls,
+ int connected)
{
char *service_list;
- if (GNUNET_YES == error)
- {
- /* This is really extreme, but actually only happens if your
- * configuration is b0rked.
- */
- GNUNET_break (0);
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
+
if (connected)
{
service_list = format_service_list (0, NULL);
GNUNET_FS_GTK_update_connection_indicator (cls, TRUE, service_list);
GNUNET_free_non_null (service_list);
GNUNET_ARM_request_service_list (arm, SERVICE_LIST_TIMEOUT,
- service_list_callback, cls);
+ &service_list_callback, cls);
}
else
GNUNET_FS_GTK_update_connection_indicator (cls, FALSE,
@@ -490,16 +485,18 @@
static void
-service_status_change (void *cls, struct GNUNET_ARM_MonitorHandle *armon,
- const char *service, enum GNUNET_ARM_ServiceStatus status)
+service_status_change (void *cls,
+ const char *service,
+ enum GNUNET_ARM_ServiceStatus status)
{
/* Very crude, we can probably do better.
* Maybe keep a list of running services, and modify it in response
* to service status changes, then update the indicator,
* without requesting a list from ARM every goddamned time?
*/
- GNUNET_ARM_request_service_list (arm, SERVICE_LIST_TIMEOUT,
- service_list_callback, cls);
+ GNUNET_ARM_request_service_list (arm,
+ SERVICE_LIST_TIMEOUT,
+ &service_list_callback, cls);
}
@@ -623,10 +620,8 @@
GNUNET_GTK_main_loop_quit (cls);
return;
}
- arm = GNUNET_ARM_alloc (main_context.cfg);
- GNUNET_ARM_connect (arm, arm_connection_state_change, &main_context);
- armon = GNUNET_ARM_monitor_alloc (main_context.cfg);
- GNUNET_ARM_monitor (armon, service_status_change, &main_context);
+ arm = GNUNET_ARM_connect (main_context.cfg, &arm_connection_state_change,
&main_context);
+ armon = GNUNET_ARM_monitor (main_context.cfg, service_status_change,
&main_context);
GNUNET_GTK_main_window_refresh_ns_list (&main_context);
#if HAVE_LIBUNIQUE
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.h 2013-04-14 20:21:41 UTC (rev 26874)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.h 2013-04-14 20:45:09 UTC (rev 26875)
@@ -55,7 +55,7 @@
GtkTreeRowReference *ns_selector_pushed_row;
GtkTreeRowReference *selected_ns_row;
- struct GNUNET_PSEUDONYM_DiscoveryHandle *ns_discovery_handle;
+ struct GNUNET_FS_pseudonym_DiscoveryHandle *ns_discovery_handle;
GtkWindow *ns_manager;
gulong ns_manager_delete_handler_id;
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_common.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_common.c 2013-04-14 20:21:41 UTC (rev
26874)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_common.c 2013-04-14 20:45:09 UTC (rev
26875)
@@ -322,8 +322,8 @@
GtkLabel *sel_namespace_label;
GtkTreePath *treepath;
GtkEntry *query_entry;
- struct GNUNET_PseudonymIdentifier *nsid;
- struct GNUNET_PseudonymIdentifier want;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier want;
if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))
{
@@ -366,7 +366,7 @@
while ( ( (NULL == nsid) ||
(0 != memcmp (nsid,
&want,
- sizeof (struct GNUNET_PseudonymIdentifier))) ) &&
+ sizeof (struct GNUNET_FS_PseudonymIdentifier))) ) &&
(gtk_tree_model_iter_next (namespace_treestore, &iter)) )
gtk_tree_model_get (namespace_treestore, &iter,
GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_KEY,
@@ -375,7 +375,7 @@
if ( (NULL == nsid) ||
(0 != memcmp (nsid,
&want,
- sizeof (struct GNUNET_PseudonymIdentifier))) )
+ sizeof (struct GNUNET_FS_PseudonymIdentifier))) )
{
/* namespace unknown / not in list!? */
GNUNET_break (0);
@@ -448,7 +448,7 @@
*/
static int
find_largest_namespace_rating_iterator (void *cls,
- const struct GNUNET_PseudonymIdentifier *pseudonym, const char *name,
+ const struct GNUNET_FS_PseudonymIdentifier *pseudonym, const char *name,
const char *unique_name,
const struct GNUNET_CONTAINER_MetaData *md, int32_t rating)
{
@@ -471,7 +471,7 @@
{
if (largest_namespace_rating != INT_MIN)
return largest_namespace_rating;
- (void) GNUNET_PSEUDONYM_list_all (GNUNET_FS_GTK_get_configuration (),
+ (void) GNUNET_FS_pseudonym_list_all (GNUNET_FS_GTK_get_configuration (),
find_largest_namespace_rating_iterator, &largest_namespace_rating);
return largest_namespace_rating;
}
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c 2013-04-14 20:21:41 UTC
(rev 26874)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c 2013-04-14 20:45:09 UTC
(rev 26875)
@@ -966,7 +966,7 @@
/* Called for each embedded sks. Return GNUNET_OK to continue iteration */
typedef int (*embedded_sks_callback) (void *cls, const struct GNUNET_FS_Uri
*sks_uri,
- const char *sks_uri_string, struct GNUNET_PseudonymIdentifier *nsid);
+ const char *sks_uri_string, struct GNUNET_FS_PseudonymIdentifier *nsid);
struct sks_scanner_callback_context
{
@@ -1000,7 +1000,7 @@
char *id = GNUNET_FS_uri_sks_get_content_id (sks_uri);
if (NULL != id)
{
- struct GNUNET_PseudonymIdentifier nsid;
+ struct GNUNET_FS_PseudonymIdentifier nsid;
if ((0 == strcmp (id, "/")) &&
(GNUNET_OK == GNUNET_FS_uri_sks_get_namespace (sks_uri, &nsid)))
result = ctx->cb (ctx->cls, sks_uri, data, &nsid);
@@ -1036,7 +1036,7 @@
*/
static int
populate_popup_with_sks_items (void *cls, const struct GNUNET_FS_Uri *sks_uri,
- const char *sks_uri_string, struct GNUNET_PseudonymIdentifier *nsid)
+ const char *sks_uri_string, struct GNUNET_FS_PseudonymIdentifier *nsid)
{
struct sks_population_context *ctx = cls;
GtkWidget *child;
@@ -2135,7 +2135,7 @@
static int
see_if_there_are_any_sks_uris (void *cls, const struct GNUNET_FS_Uri *sks_uri,
- const char *sks_uri_string, struct GNUNET_PseudonymIdentifier *nsid)
+ const char *sks_uri_string, struct GNUNET_FS_PseudonymIdentifier *nsid)
{
* ((gboolean *) cls) = TRUE;
return GNUNET_SYSERR;
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
2013-04-14 20:21:41 UTC (rev 26874)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
2013-04-14 20:45:09 UTC (rev 26875)
@@ -292,14 +292,14 @@
* @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
*/
static int
-add_namespace_to_ts (void *cls, const struct GNUNET_PseudonymIdentifier
*pseudonym,
+add_namespace_to_ts (void *cls, const struct GNUNET_FS_PseudonymIdentifier
*pseudonym,
const char *name, const char *unique_name,
const struct GNUNET_CONTAINER_MetaData *md, int rating)
{
GtkTreeStore *ts = cls;
char *root;
char *ns_name, *unique_ns_name;
- struct GNUNET_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
char *description;
int desc_is_a_dup;
char *uris;
@@ -310,12 +310,12 @@
if (rating < 0)
return GNUNET_OK;
- GNUNET_PSEUDONYM_get_info (GNUNET_FS_GTK_get_configuration (),
+ GNUNET_FS_pseudonym_get_info (GNUNET_FS_GTK_get_configuration (),
pseudonym, NULL, NULL, &ns_name, NULL);
- unique_ns_name = GNUNET_PSEUDONYM_name_uniquify (
+ unique_ns_name = GNUNET_FS_pseudonym_name_uniquify (
GNUNET_FS_GTK_get_configuration (), pseudonym, ns_name, NULL);
GNUNET_free (ns_name);
- nsid = GNUNET_malloc (sizeof (struct GNUNET_PseudonymIdentifier));
+ nsid = GNUNET_malloc (sizeof (struct GNUNET_FS_PseudonymIdentifier));
*nsid = *pseudonym;
root = NULL;
uris = GNUNET_CONTAINER_meta_data_get_by_type (md, EXTRACTOR_METATYPE_URI);
@@ -350,7 +350,7 @@
{
GtkTreeIter iter;
GtkTreePath *treepath;
- struct GNUNET_PseudonymIdentifier *key = NULL, *selected_ns_id;
+ struct GNUNET_FS_PseudonymIdentifier *key = NULL, *selected_ns_id;
gboolean found = FALSE;
gchar *value = NULL;
@@ -377,8 +377,8 @@
selected_ns_id = NULL;
if (key != NULL)
{
- selected_ns_id = GNUNET_malloc (sizeof (struct
GNUNET_PseudonymIdentifier));
- memcpy (selected_ns_id, key, sizeof (struct GNUNET_PseudonymIdentifier));
+ selected_ns_id = GNUNET_malloc (sizeof (struct
GNUNET_FS_PseudonymIdentifier));
+ memcpy (selected_ns_id, key, sizeof (struct
GNUNET_FS_PseudonymIdentifier));
}
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
@@ -410,8 +410,8 @@
-1);
if (NULL != main_ctx->ns_discovery_handle)
- GNUNET_PSEUDONYM_discovery_callback_unregister
(main_ctx->ns_discovery_handle);
- main_ctx->ns_discovery_handle = GNUNET_PSEUDONYM_discovery_callback_register
(main_ctx->cfg,
+ GNUNET_FS_pseudonym_discovery_callback_unregister
(main_ctx->ns_discovery_handle);
+ main_ctx->ns_discovery_handle =
GNUNET_FS_pseudonym_discovery_callback_register (main_ctx->cfg,
add_namespace_to_ts, main_ctx->search_ns_treestore);
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
@@ -427,7 +427,7 @@
-1);
if (selected_ns_id == NULL)
found = TRUE;
- else if (key != NULL && memcmp (key, selected_ns_id, sizeof (struct
GNUNET_PseudonymIdentifier)) == 0)
+ else if (key != NULL && memcmp (key, selected_ns_id, sizeof (struct
GNUNET_FS_PseudonymIdentifier)) == 0)
found = TRUE;
if (found || (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
main_ctx->search_ns_treestore), &iter)))
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c 2013-04-14
20:21:41 UTC (rev 26874)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c 2013-04-14
20:45:09 UTC (rev 26875)
@@ -39,7 +39,7 @@
guint anonymity_level;
gchar *keywords;
gchar *mime_keyword;
- struct GNUNET_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
struct GNUNET_FS_Uri *uri;
/* get anonymity level */
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_manager.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_manager.c 2013-04-14 20:21:41 UTC
(rev 26874)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_manager.c 2013-04-14 20:45:09 UTC
(rev 26875)
@@ -200,7 +200,7 @@
{
struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
GtkTreeIter iter;
- struct GNUNET_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
GtkTreeRowReference *order_row, *known_row;
struct GNUNET_CONTAINER_MetaData *md;
@@ -247,7 +247,7 @@
{
struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
GtkTreeIter known_iter, order_iter;
- struct GNUNET_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
int32_t old_rank, new_rank;
GtkTreeRowReference *order_row, *known_row;
@@ -504,13 +504,13 @@
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (ctx->known_ns_store),
&iter, tree_path))
{
- struct GNUNET_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &nsid,
GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, &order_row,
-1);
- unique_name = GNUNET_PSEUDONYM_name_uniquify (
+ unique_name = GNUNET_FS_pseudonym_name_uniquify (
GNUNET_FS_GTK_get_configuration (), nsid, new_text, NULL);
gtk_list_store_set (ctx->known_ns_store, &iter,
@@ -599,31 +599,31 @@
* @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
*/
static int
-populate_known_ns_list (void *cls, const struct GNUNET_PseudonymIdentifier
*pseudonym,
+populate_known_ns_list (void *cls, const struct GNUNET_FS_PseudonymIdentifier
*pseudonym,
const char *name, const char *unique_name,
const struct GNUNET_CONTAINER_MetaData *md, int rating)
{
struct GNUNET_GTK_NamespaceManagerContext *ctx = cls;
- struct GNUNET_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
char buf[1024];
char *ret;
GtkTreeIter known_iter, order_iter;
struct GNUNET_CONTAINER_MetaData *md_copy;
char *non_null_name, *non_null_unique_name;
- nsid = GNUNET_malloc (sizeof (struct GNUNET_PseudonymIdentifier));
+ nsid = GNUNET_malloc (sizeof (struct GNUNET_FS_PseudonymIdentifier));
*nsid = *pseudonym;
ret = GNUNET_STRINGS_data_to_string (nsid,
- sizeof (struct
GNUNET_PseudonymIdentifier),
+ sizeof (struct
GNUNET_FS_PseudonymIdentifier),
buf,
sizeof (buf));
GNUNET_assert (NULL != ret);
ret[0] = '\0';
- GNUNET_PSEUDONYM_get_info (GNUNET_FS_GTK_get_configuration (),
+ GNUNET_FS_pseudonym_get_info (GNUNET_FS_GTK_get_configuration (),
nsid, NULL, NULL, &non_null_name, NULL);
- non_null_unique_name = GNUNET_PSEUDONYM_name_uniquify (
+ non_null_unique_name = GNUNET_FS_pseudonym_name_uniquify (
GNUNET_FS_GTK_get_configuration (), nsid, non_null_name, NULL);
md_copy = GNUNET_CONTAINER_meta_data_duplicate (md);
@@ -667,7 +667,7 @@
GtkTreeIter iter;
gint i;
gint row_count;
- struct GNUNET_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
char *name;
int32_t rank;
struct GNUNET_CONTAINER_MetaData *md;
@@ -686,7 +686,7 @@
GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, &md,
GNUNET_GTK_KNOWN_NAMESPACES_RANK_COLUMN, &rank,
-1);
- GNUNET_PSEUDONYM_set_info (GNUNET_FS_GTK_get_configuration (),
+ GNUNET_FS_pseudonym_set_info (GNUNET_FS_GTK_get_configuration (),
nsid, name, md, rank);
g_free (name);
if (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
@@ -698,7 +698,7 @@
nsid = ctx->deleted_namespaces->data;
if (nsid)
{
- GNUNET_PSEUDONYM_remove (GNUNET_FS_GTK_get_configuration (), nsid);
+ GNUNET_FS_pseudonym_remove (GNUNET_FS_GTK_get_configuration (), nsid);
GNUNET_free (nsid);
}
@@ -712,7 +712,7 @@
GtkTreeIter iter;
gint i;
gint row_count;
- struct GNUNET_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
GtkTreeRowReference *order_row;
struct GNUNET_CONTAINER_MetaData *md;
@@ -796,13 +796,13 @@
mark_as_mine (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
gpointer data)
{
- const struct GNUNET_PseudonymIdentifier *mine_id = data;
- const struct GNUNET_PseudonymIdentifier *ns_id;
+ const struct GNUNET_FS_PseudonymIdentifier *mine_id = data;
+ const struct GNUNET_FS_PseudonymIdentifier *ns_id;
gtk_tree_model_get (model, iter,
GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &ns_id, -1);
- if (memcmp (ns_id, mine_id, sizeof (struct GNUNET_PseudonymIdentifier)) != 0)
+ if (memcmp (ns_id, mine_id, sizeof (struct GNUNET_FS_PseudonymIdentifier))
!= 0)
return FALSE;
gtk_list_store_set (GTK_LIST_STORE (model), iter,
@@ -821,7 +821,7 @@
*/
static void
mark_namespaces_as_mine (void *cls, const char *name,
- const struct GNUNET_PseudonymIdentifier *id)
+ const struct GNUNET_FS_PseudonymIdentifier *id)
{
struct GNUNET_GTK_NamespaceManagerContext *ctx = cls;
@@ -977,7 +977,7 @@
G_CALLBACK (ns_details_selection_changed), ctx);
/* populate namespace model */
- (void) GNUNET_PSEUDONYM_list_all (GNUNET_FS_GTK_get_configuration (),
+ (void) GNUNET_FS_pseudonym_list_all (GNUNET_FS_GTK_get_configuration (),
populate_known_ns_list, ctx);
/* mark our own namespaces as such */
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_organizer.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_organizer.c 2013-04-14
20:21:41 UTC (rev 26874)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_organizer.c 2013-04-14
20:45:09 UTC (rev 26875)
@@ -81,7 +81,7 @@
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (ctx->my_ns_store),
&iter, tree_path))
{
- struct GNUNET_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
char *old_name;
gtk_tree_model_get (GTK_TREE_MODEL (ctx->my_ns_store), &iter,
GNUNET_GTK_MY_NAMESPACES_NAME_COLUMN, &old_name,
@@ -114,7 +114,7 @@
GtkTreeIter iter;
gint i;
gint row_count;
- struct GNUNET_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
ctx->my_ns_store), NULL);
@@ -263,21 +263,21 @@
*/
static void
populate_my_ns_list (void *cls, const char *name,
- const struct GNUNET_PseudonymIdentifier *id)
+ const struct GNUNET_FS_PseudonymIdentifier *id)
{
struct GNUNET_GTK_NamespaceSelectorContext *ctx = cls;
char buf[1024];
char *ret;
GtkTreeIter my_iter;
- struct GNUNET_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
gboolean is_default;
- nsid = GNUNET_malloc (sizeof (struct GNUNET_PseudonymIdentifier));
+ nsid = GNUNET_malloc (sizeof (struct GNUNET_FS_PseudonymIdentifier));
*nsid = *id;
ret = GNUNET_STRINGS_data_to_string (nsid,
- sizeof (struct GNUNET_PseudonymIdentifier), buf, sizeof (buf));
+ sizeof (struct GNUNET_FS_PseudonymIdentifier), buf, sizeof (buf));
GNUNET_assert (NULL != ret);
ret[0] = '\0';
@@ -335,7 +335,7 @@
{
struct GNUNET_GTK_NamespaceSelectorContext *ctx = user_data;
GtkTreeIter iter;
- struct GNUNET_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
gboolean selected;
nsid = NULL;
@@ -480,7 +480,7 @@
struct GNUNET_GTK_NamespaceSelectorContext *ctx = user_data;
GtkTreeIter iter;
gchar *name;
- struct GNUNET_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
nsid = NULL;
name = NULL;
@@ -533,8 +533,8 @@
GtkTreeIter iter;
gchar *name;
gboolean selected;
- struct GNUNET_PseudonymIdentifier id;
- struct GNUNET_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier id;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
nsid = NULL;
name = NULL;
@@ -651,15 +651,15 @@
struct GNUNET_GTK_NamespaceSelectorContext *ctx = cls;
GtkTreeIter iter;
- struct GNUNET_PseudonymIdentifier *nsid;
- struct GNUNET_PseudonymIdentifier id;
+ struct GNUNET_FS_PseudonymIdentifier *nsid;
+ struct GNUNET_FS_PseudonymIdentifier id;
/* If ns was created, get its public key hash */
nsid = NULL;
if ((NULL != ns) && (GNUNET_OK == GNUNET_FS_namespace_get_public_identifier
(ns, &id)))
{
- nsid = GNUNET_malloc (sizeof (struct GNUNET_PseudonymIdentifier));
- memcpy (nsid, &id, sizeof (struct GNUNET_PseudonymIdentifier));
+ nsid = GNUNET_malloc (sizeof (struct GNUNET_FS_PseudonymIdentifier));
+ memcpy (nsid, &id, sizeof (struct GNUNET_FS_PseudonymIdentifier));
}
/* If anything of the above went wrong, or ns creation failed, we abort */
@@ -674,7 +674,7 @@
gint row_count;
ret = GNUNET_STRINGS_data_to_string (nsid,
- sizeof (struct
GNUNET_PseudonymIdentifier),
+ sizeof (struct
GNUNET_FS_PseudonymIdentifier),
buf,
sizeof (buf));
GNUNET_assert (NULL != ret);
Modified: gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
===================================================================
--- gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2013-04-14 20:21:41 UTC
(rev 26874)
+++ gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2013-04-14 20:45:09 UTC
(rev 26875)
@@ -399,6 +399,8 @@
*
* @param cls closure
* @param address the address
+ * @param address_active is this address actively used to maintain a connection
+ * to a peer
* @param bandwidth_in available amount of inbound bandwidth
* @param bandwidth_out available amount of outbound bandwidth
* @param ats performance data for the address (as far as known)
@@ -407,6 +409,7 @@
static void
status_cb (void *cls,
const struct GNUNET_HELLO_Address *address,
+ int address_active,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
const struct GNUNET_ATS_Information *ats,
@@ -415,7 +418,9 @@
struct PeerInfo *info;
GtkTreeIter iter;
GtkTreePath *path;
-
+
+ if (GNUNET_YES != address_active)
+ return;
info = GNUNET_CONTAINER_multihashmap_get (peer2info,
&address->peer.hashPubKey);
if (NULL == info)
return; /* should rarely happen... */
@@ -490,8 +495,10 @@
GNUNET_GTK_setup_nls ();
peer2info = GNUNET_CONTAINER_multihashmap_create (256, GNUNET_NO);
pnc =
- GNUNET_PEERINFO_notify (get_configuration (), &peerinfo_processor, NULL);
- if (pnc == NULL)
+ GNUNET_PEERINFO_notify (get_configuration (),
+ GNUNET_NO,
+ &peerinfo_processor, NULL);
+ if (NULL == pnc)
{
fprintf (stderr,
_("Failed to initialize communication with peerinfo service!\n"));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26875 - in gnunet-gtk/src: fs peerinfo,
gnunet <=