1 files changed, 3 insertions, 128 deletions

diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c b/src/peerinfo/gnunet-peerinfo-gtk.c
index 97eb459b..0838fe15 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -141,17 +141,17 @@ enum PEERINFO_ModelColumns
   /**
    * A GdkPixbuf
    */
-  PEERINFO_MC_VALIDATION_STATE_LED = 18,
+  PEERINFO_MC_VALIDATION_STATE_LED__DEAD = 18,
 
   /**
    * A gboolean
    */
-  PEERINFO_MC_VALIDATION_IS_VALID = 19,
+  PEERINFO_MC_VALIDATION_IS_VALID__DEAD = 19,
 
   /**
    * A gchararray
    */
-  PEERINFO_MC_VALIDATION_TIMEOUT_AS_STRING = 20,
+  PEERINFO_MC_VALIDATION_TIMEOUT_AS_STRING__DEAD = 20,
 
   /**
    * A GdkPixbuf
@@ -329,11 +329,6 @@ static struct GNUNET_CONTAINER_MultiPeerMap *peer2info;
 static struct GNUNET_TRANSPORT_PeerMonitoringContext *pmc;
 
 /**
- * Monitoring transport validation operations.
- */
-static struct GNUNET_TRANSPORT_ValidationMonitoringContext *vmc;
-
-/**
  * Monitoring transport plugin sessions.
  */
 struct GNUNET_TRANSPORT_PluginMonitor *pm;
@@ -404,11 +399,6 @@ static GtkTreeViewColumn *tvc_ats_connectivity;
 static GtkTreeViewColumn *tvc_plugin_connectivity;
 
 /**
- * Tree view column for validation status
- */
-static GtkTreeViewColumn *tvc_validation_status;
-
-/**
  * Tree view column for neighbour_state
  */
 static GtkTreeViewColumn *tvc_neighbour_state;
@@ -526,11 +516,6 @@ shutdown_task (void *cts)
     GNUNET_TRANSPORT_monitor_plugins_cancel (pm);
     pm = NULL;
   }
-  if (NULL != vmc)
-  {
-    GNUNET_TRANSPORT_monitor_validation_entries_cancel (vmc);
-    vmc = NULL;
-  }
   if (NULL != cm)
   {
     GNUNET_CORE_monitor_stop (cm);
@@ -1147,107 +1132,6 @@ transport_plugin_cb (void *cls,
 
 
 /**
- * Transport address validation monitor disconnected, reset
- * address validation status information for all peers.
- *
- * @param cls NULL
- * @param pid peer identity to reset
- * @param value the `struct PeerInfo` for the peer
- * @return #GNUNET_OK
- */
-static int
-reset_address_validation_status (void *cls,
-                                 const struct GNUNET_PeerIdentity *pid,
-                                 void *value)
-{
-  struct PeerInfo *info = value;
-  GtkTreeIter iter;
-  struct PeerAddress *pa;
-
-  for (pa = info->pa_head; NULL != pa; pa = pa->next)
-  {
-    get_iter_from_rr (pa->rr, &iter);
-    gtk_tree_store_set (ts, &iter,
-                        PEERINFO_MC_VALIDATION_IS_VALID, FALSE,
-                        PEERINFO_MC_VALIDATION_TIMEOUT_AS_STRING, NULL,
-                        PEERINFO_MC_VALIDATION_STATE_LED, NULL,
-                        -1);
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Function to call with validation information about a peer
- *
- * @param cts closure
- * @param address address, NULL for disconnect notification in monitor mode
- * @param last_validation when was this address last validated
- * @param valid_until when does this address expire
- * @param next_validation time of the next validation operation
- * @param state state in the validation state machine
- */
-static void
-validation_monitor_cb (void *cts,
-                       const struct GNUNET_HELLO_Address *address,
-                       struct GNUNET_TIME_Absolute last_validation,
-                       struct GNUNET_TIME_Absolute valid_until,
-                       struct GNUNET_TIME_Absolute next_validation,
-                       enum GNUNET_TRANSPORT_ValidationState state)
-{
-  struct PeerInfo *info;
-  struct PeerAddress *pa;
-  GtkTreeIter iter;
-  const char *tos;
-  gboolean valid;
-  GdkPixbuf *led;
-
-  if (NULL == address)
-  {
-    /* disconnect notification, reset all validation state */
-    GNUNET_CONTAINER_multipeermap_iterate (peer2info,
-                                           &reset_address_validation_status,
-                                           NULL);
-    return;
-  }
-  switch (state)
-  {
-  case GNUNET_TRANSPORT_VS_NONE:
-    led = led_black;
-    break;
-  case GNUNET_TRANSPORT_VS_NEW:
-    led = led_yellow;
-    break;
-  case GNUNET_TRANSPORT_VS_UPDATE:
-    led = led_blue;
-    break;
-  case GNUNET_TRANSPORT_VS_TIMEOUT:
-    led = led_red;
-    break;
-  case GNUNET_TRANSPORT_VS_REMOVE:
-    led = NULL;
-    break;
-  default:
-    GNUNET_break (0);
-    led = NULL;
-    break;
-  }
-  info = get_peer_info (&address->peer);
-  valid = (GNUNET_TIME_absolute_get_remaining (valid_until).rel_value_us > 0);
-  if (valid)
-    led = led_green; /* UGH: should this not be indicated by 'state' somehow? */
-  pa = get_address (info, address);
-  get_iter_from_rr (pa->rr, &iter);
-  tos = GNUNET_STRINGS_absolute_time_to_string (valid_until);
-  gtk_tree_store_set (ts, &iter,
-                      PEERINFO_MC_VALIDATION_IS_VALID, valid,
-                      PEERINFO_MC_VALIDATION_TIMEOUT_AS_STRING, tos,
-                      PEERINFO_MC_VALIDATION_STATE_LED, led,
-                      -1);
-}
-
-
-/**
  * Core disconnected, remove CORE KX status information for all peers.
  *
  * @param cls NULL
@@ -1538,8 +1422,6 @@ query_tooltip_cb (GtkWidget *widget,
     model_column = PEERINFO_MC_PEERINFO_ADDRESS_EXPIRATION;
   else if (tvc_transport_connectivity == column)
     model_column = PEERINFO_MC_NEIGHBOUR_CONNECTIVITY_TIMEOUT_AS_STRING;
-  else if (tvc_validation_status == column)
-    model_column = PEERINFO_MC_VALIDATION_TIMEOUT_AS_STRING;
   else if (tvc_neighbour_state == column)
     model_column = PEERINFO_MC_NEIGHBOUR_STATE_TIMEOUT_AS_STRING;
   if (-1 == model_column)
@@ -1631,19 +1513,12 @@ run (void *cts)
   pm = GNUNET_TRANSPORT_monitor_plugins (cfg,
                                          &transport_plugin_cb,
                                          NULL);
-  vmc = GNUNET_TRANSPORT_monitor_validation_entries (cfg,
-                                                     NULL,
-                                                     GNUNET_NO,
-                                                     GNUNET_TIME_UNIT_FOREVER_REL,
-                                                     &validation_monitor_cb,
-                                                     NULL);
   ats = GNUNET_ATS_performance_init (cfg,
                                      &ats_status_cb, NULL);
   tvc_core_connectivity = GTK_TREE_VIEW_COLUMN (get_object ("GNUNET_PEERINFO_GTK_main_window_core_connectivity_treeviewcolumn"));
   tvc_ats_connectivity = GTK_TREE_VIEW_COLUMN (get_object ("GNUNET_PEERINFO_GTK_main_window_ats_connectivity_treeviewcolumn"));
   tvc_plugin_connectivity = GTK_TREE_VIEW_COLUMN (get_object ("GNUNET_PEERINFO_GTK_main_window_plugin_connectivity_treeviewcolumn"));
   tvc_transport_connectivity = GTK_TREE_VIEW_COLUMN (get_object ("GNUNET_PEERINFO_GTK_main_window_transport_connectivity_treeviewcolumn"));
-  tvc_validation_status = GTK_TREE_VIEW_COLUMN (get_object ("GNUNET_PEERINFO_GTK_main_window_validation_status_treeviewcolumn"));
   tvc_neighbour_state = GTK_TREE_VIEW_COLUMN (get_object ("GNUNET_PEERINFO_GTK_main_window_neighbour_state_treeviewcolumn"));
   /* setup main window */
   main_window = GTK_WIDGET (get_object ("GNUNET_PEERINFO_GTK_main_window"));