1 files changed, 44 insertions, 46 deletions

diff --git a/src/plugins/peers/peers.c b/src/plugins/peers/peers.c
index b0cccd88..1bfa2985 100644
--- a/src/plugins/peers/peers.c
+++ b/src/plugins/peers/peers.c
@@ -29,14 +29,12 @@
 #include <GNUnet/gnunet_directories.h>
 #include <GNUnet/gnunet_getoption_lib.h>
 #include <GNUnet/gnunet_identity_lib.h>
-#include <GNUnet/gnunet_util_config_impl.h>
-#include <GNUnet/gnunet_util_cron.h>
-#include <GNUnet/gnunet_util_network_client.h>
+#include <GNUnet/gnunet_util.h>
 #include <gtk/gtk.h>
 
-#define REFRESH_RATE (15 * cronSECONDS)
+#define REFRESH_RATE (15 * GNUNET_CRON_SECONDS)
 
-static struct CronManager *cron;
+static struct GNUNET_CronManager *cron;
 
 static struct GE_Context *ectx;
 
@@ -60,14 +58,14 @@ static struct Flags * flags;
 
 static int
 collector (void *data,
-           const PeerIdentity * identity,
+           const GNUNET_PeerIdentity * identity,
            const void *address,
            unsigned int addr_len,
-           cron_t last_message, unsigned int trust, unsigned int bpmFromPeer)
+           GNUNET_CronTime last_message, unsigned int trust, unsigned int bpmFromPeer)
 {
   GtkListStore *model = data;
   GtkTreeIter iter;
-  EncName enc;
+  GNUNET_EncName enc;
   GdkPixbuf *ledBuf;
   GdkPixbuf *flagBuf;
   char *cc;
@@ -77,14 +75,14 @@ collector (void *data,
   char *have;
   char *haddress;
   char *hostname;
-  cron_t now;
+  GNUNET_CronTime now;
   int i;
   int found;
   struct Flags * pos;
 
-  hash2enc (&identity->hashPubKey, &enc);
+  GNUNET_hash_to_enc (&identity->hashPubKey, &enc);
   /* check if same peer is already in model! */
-  found = NO;
+  found = GNUNET_NO;
   if (TRUE == gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter))
     {
       do
@@ -97,29 +95,29 @@ collector (void *data,
                 {
                   if (strlen (haddress) > 0)
                     {
-                      FREE (have);
-                      FREE (haddress);
-                      return OK;
+                      GNUNET_free (have);
+                      GNUNET_free (haddress);
+                      return GNUNET_OK;
                     }
-                  found = YES;
+                  found = GNUNET_YES;
                 }
-              FREENONNULL (haddress);
-              FREE (have);
+              GNUNET_free_non_null (haddress);
+              GNUNET_free (have);
             }
         }
-      while ((found == NO) &&
+      while ((found == GNUNET_NO) &&
              (TRUE == gtk_tree_model_iter_next (GTK_TREE_MODEL (model),
                                                 &iter)));
     }
 
-  hostname = network_get_ip_as_string (address, addr_len, YES);
+  hostname = GNUNET_get_ip_as_string (address, addr_len, GNUNET_YES);
   if (hostname == NULL)
-    hostname = STRDUP ("NAT");
+    hostname = GNUNET_strdup ("NAT");
   /* get flag */
   flagBuf = NULL;
   ledBuf = NULL;
   cc = NULL;
-  prefix = STRDUP (hostname);
+  prefix = GNUNET_strdup (hostname);
   if (strstr (prefix, " ") != NULL)
     *strstr (prefix, " ") = '\0';
   cc = prefix;
@@ -148,11 +146,11 @@ collector (void *data,
         pos = pos->next;
       }
       if (pos == NULL) {      
-        cc = STRDUP (cc);
+        cc = GNUNET_strdup (cc);
         for (i = 0; i < strlen (cc); i++)
           cc[i] = tolower (cc[i]);
-        dir = os_get_installation_path (IPK_DATADIR);
-        fn = MALLOC (strlen (dir) + 32);
+        dir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
+        fn = GNUNET_malloc (strlen (dir) + 32);
         strcpy (fn, dir);
         strcat (fn,
                 DIR_SEPARATOR_STR ".."
@@ -160,10 +158,10 @@ collector (void *data,
                 DIR_SEPARATOR_STR "flags" DIR_SEPARATOR_STR);
         strcat (fn, cc);
         strcat (fn, ".png");
-        FREE (dir);
+        GNUNET_free (dir);
         flagBuf = gdk_pixbuf_new_from_file (fn, NULL);
-        FREE (fn);
-        pos = MALLOC(sizeof(struct Flags));
+        GNUNET_free (fn);
+        pos = GNUNET_malloc(sizeof(struct Flags));
         pos->cc = cc;
         pos->flag = flagBuf;
         pos->next = flags;
@@ -172,10 +170,10 @@ collector (void *data,
     }
 
   /* get LED */
-  now = get_time ();
-  if (last_message + 150 * cronSECONDS > now)
+  now = GNUNET_get_time ();
+  if (last_message + 150 * GNUNET_CRON_SECONDS > now)
     ledBuf = green;
-  else if (last_message + 5 * cronMINUTES > now)
+  else if (last_message + 5 * GNUNET_CRON_MINUTES > now)
     ledBuf = yellow;
   else if (bpmFromPeer > 0)
     ledBuf = red;
@@ -183,7 +181,7 @@ collector (void *data,
     ledBuf = black;
 
   /* add to model */
-  if (found == NO)
+  if (found == GNUNET_NO)
     gtk_list_store_append (model, &iter);
   gtk_list_store_set (model,
                       &iter,
@@ -192,9 +190,9 @@ collector (void *data,
                       2, bpmFromPeer,
                       3, (const char *) &enc,
                       4, ledBuf, 5, flagBuf, 6, cc, 7, last_message, -1);
-  FREE (prefix);
-  FREE (hostname);
-  return OK;
+  GNUNET_free (prefix);
+  GNUNET_free (hostname);
+  return GNUNET_OK;
 }
 
 
@@ -205,7 +203,7 @@ collector (void *data,
 static GtkListStore *
 getPeerModel ()
 {
-  struct ClientServerConnection *sock;
+  struct GNUNET_ClientServerConnection *sock;
   GtkListStore *model;
 
   model = gtk_list_store_new (8, G_TYPE_STRING, /* address */
@@ -216,11 +214,11 @@ getPeerModel ()
                               GDK_TYPE_PIXBUF,  /* flag */
                               G_TYPE_STRING,    /* country name */
                               G_TYPE_UINT64);   /* last time seen */
-  sock = client_connection_create (ectx, cfg);
+  sock = GNUNET_client_connection_create (ectx, cfg);
   if (sock != NULL)
     {
-      gnunet_identity_request_peer_infos (sock, &collector, model);
-      connection_destroy (sock);
+      GNUNET_IDENTITY_request_peer_infos (sock, &collector, model);
+      GNUNET_client_connection_destroy (sock);
     }
   return model;
 }
@@ -353,8 +351,8 @@ init_peers (struct GE_Context *e, struct GC_Configuration *c)
   gtk_tree_view_column_set_sort_column_id (column, 3);
 
 
-  dir = os_get_installation_path (IPK_DATADIR);
-  fn = MALLOC (strlen (dir) + 32);
+  dir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
+  fn = GNUNET_malloc (strlen (dir) + 32);
   strcpy (fn, dir);
   strcat (fn,
           DIR_SEPARATOR_STR ".."
@@ -378,13 +376,13 @@ init_peers (struct GE_Context *e, struct GC_Configuration *c)
           DIR_SEPARATOR_STR ".."
           DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR "black.png");
   black = gdk_pixbuf_new_from_file (fn, NULL);
-  FREE (fn);
-  FREE (dir);
+  GNUNET_free (fn);
+  GNUNET_free (dir);
 
   tab = glade_xml_get_widget (getMainXML (), "peersScrolledWindow");
   gtk_widget_show (tab);
   cron = gnunet_gtk_get_cron ();
-  cron_add_job (cron, &updatePeerInfo, REFRESH_RATE, REFRESH_RATE, NULL);
+  GNUNET_cron_add_job (cron, &updatePeerInfo, REFRESH_RATE, REFRESH_RATE, NULL);
 }
 
 void
@@ -393,7 +391,7 @@ done_peers ()
   GtkWidget *w;
   struct Flags * pos;
 
-  cron_del_job (cron, &updatePeerInfo, REFRESH_RATE, NULL);
+  GNUNET_cron_del_job (cron, &updatePeerInfo, REFRESH_RATE, NULL);
   if (red != NULL)
     g_object_unref (red);
   if (green != NULL)
@@ -409,8 +407,8 @@ done_peers ()
     pos = flags->next;    
     if (flags->flag != NULL)
       g_object_unref(flags->flag);
-    FREE (flags->cc);
-    FREE(flags);
+    GNUNET_free (flags->cc);
+    GNUNET_free(flags);
     flags = pos;
   }
 }