From 7967fed20086cb4d46292890b15ab8942fa959f0 Mon Sep 17 00:00:00 2001
From: Matthias Wachs <wachs@net.in.tum.de>
Date: Thu, 8 Sep 2011 08:39:26 +0000
Subject: [PATCH] renaming and fixing

---
 src/transport/Makefile.am                     |  8 ++---
 ... gnunet-transport-connect-running-peers.c} | 30 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)
 rename src/transport/{util_connect_running_peers.c => gnunet-transport-connect-running-peers.c} (97%)

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index ba1d47363..260704259 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -65,7 +65,7 @@ endif
 
 noinst_PROGRAMS = \
  $(WLAN_BIN_DUMMY) \
- util_connect_running_peers
+ gnunet-transport-connect-running-peers
 
 lib_LTLIBRARIES = \
   libgnunettransport.la \
@@ -350,9 +350,9 @@ test_transport_testing_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
-util_connect_running_peers_SOURCES = \
- util_connect_running_peers.c
-util_connect_running_peers_LDADD = \
+gnunet_transport_connect_running_peers_SOURCES = \
+ gnunet-transport-connect-running-peers.c
+gnunet_transport_connect_running_peers_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
diff --git a/src/transport/util_connect_running_peers.c b/src/transport/gnunet-transport-connect-running-peers.c
similarity index 97%
rename from src/transport/util_connect_running_peers.c
rename to src/transport/gnunet-transport-connect-running-peers.c
index 91eb67004..ac4c9cf34 100644
--- a/src/transport/util_connect_running_peers.c
+++ b/src/transport/gnunet-transport-connect-running-peers.c
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file transport/util_connect_running_peers.c
+ * @file transport/gnunet-transport-connect-running-peers.c
  * @brief utility to connect running peers
  *
  * This utility connects to running peers with each other
@@ -78,7 +78,18 @@ char *cfg_file_p2;
 #define OKPP do { ok++; } while (0)
 #endif
 
+void
+disconnect_from_peer (struct PeerContext *p)
+{
+  GNUNET_assert (p != NULL);
+  if (p->th != NULL)
+    GNUNET_TRANSPORT_disconnect (p->th);
 
+  if (p->cfg != NULL)
+    GNUNET_CONFIGURATION_destroy (p->cfg);
+  GNUNET_free (p);
+  p = NULL;
+}
 
 static void
 end ()
@@ -193,18 +204,7 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
 }
 
 
-void
-disconnect_from_peer (struct PeerContext *p)
-{
-  GNUNET_assert (p != NULL);
-  if (p->th != NULL)
-    GNUNET_TRANSPORT_disconnect (p->th);
 
-  if (p->cfg != NULL)
-    GNUNET_CONFIGURATION_destroy (p->cfg);
-  GNUNET_free (p);
-  p = NULL;
-}
 
 struct PeerContext *
 connect_to_peer (const char *cfgname, GNUNET_TRANSPORT_ReceiveCallback rec,
@@ -340,7 +340,7 @@ main (int argc, char *argv[])
 {
   int ret;
 
-  GNUNET_log_setup ("util_connect_running_peers",
+  GNUNET_log_setup ("gnunet-transport-connect-running-peers",
 #if VERBOSE
                     "DEBUG",
 #else
@@ -352,7 +352,7 @@ main (int argc, char *argv[])
   if (argc < 3)
   {
     fprintf (stderr,
-             "usage ./util_connect_running_peers <cfg_peer1> <cfg_peer2>\n");
+             "usage gnunet-transport-connect-running-peers <cfg_peer1> <cfg_peer2>\n");
     return -1;
   }
   else
@@ -388,4 +388,4 @@ main (int argc, char *argv[])
   return ret;
 }
 
-/* end of test_transport_api.c */
+/* end of gnunet-transport-connect-running-peers.c */
-- 
2.25.1