rename new core

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index f4a38134bc63d10314a3a1a4fc981503a1de8ed7..5e4f19fccb49ac55cddcc8d65e0784dda9a1cab8 100644 (file)
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -29,7 +29,7 @@ bin_PROGRAMS = \
  gnunet-core-list-connections
 
 gnunet_service_core_SOURCES = \
- gnunet-service-core-new.c gnunet-service-core.h \
+ gnunet-service-core.c gnunet-service-core.h \
  gnunet-service-core_clients.c gnunet-service-core_clients.h \
  gnunet-service-core_neighbours.c gnunet-service-core_neighbours.h \
  gnunet-service-core_kx.c gnunet-service-core_kx.h \

diff --git a/src/core/gnunet-service-core-new.c b/src/core/gnunet-service-core-new.c
deleted file mode 100644 (file)
index 25cabde..0000000
--- a/src/core/gnunet-service-core-new.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file core/gnunet-service-core.c
- * @brief high-level P2P messaging
- * @author Christian Grothoff
- *
- * Not implemented:
- * - peer status changes (PeerStatusNotifyMessage) [needed?]
- * - ATS integration / bw allocation / preferences
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet-service-core.h"
-#include "gnunet-service-core_clients.h"
-#include "gnunet-service-core_kx.h"
-#include "gnunet-service-core_neighbours.h"
-#include "gnunet-service-core_sessions.h"
-#include "gnunet-service-core_typemap.h"
-
-
-/**
- * Our identity.
- */
-struct GNUNET_PeerIdentity GSC_my_identity;
-
-/**
- * Our configuration.
- */
-const struct GNUNET_CONFIGURATION_Handle *GSC_cfg;
-
-/**
- * For creating statistics.
- */
-struct GNUNET_STATISTICS_Handle *GSC_stats;
-
-
-/**
- * Last task run during shutdown.  Disconnects us from
- * the transport.
- */
-static void
-cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-#if DEBUG_CORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-             "Core service shutting down.\n");
-#endif
-  GSC_CLIENTS_done ();
-  GSC_SESSIONS_done ();
-  GSC_NEIGHBOURS_done ();
-  GSC_KX_done ();
-  GSC_TYPEMAP_done ();
-  if (GSC_stats != NULL)
-  {
-    GNUNET_STATISTICS_destroy (GSC_stats, GNUNET_NO);
-    GSC_stats = NULL;
-  }
-  GSC_cfg = NULL;
-}
-
-
-/**
- * Initiate core service.
- *
- * @param cls closure
- * @param server the initialized server
- * @param c configuration to use
- */
-static void
-run (void *cls, struct GNUNET_SERVER_Handle *server,
-     const struct GNUNET_CONFIGURATION_Handle *c)
-{
-  GSC_cfg = c;  
-  GSC_stats = GNUNET_STATISTICS_create ("core", GSC_cfg);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleaning_task,
-                                NULL);
-  GSC_TYPEMAP_init ();
-  if ( (GNUNET_OK != GSC_KX_init ()) ||
-       (GNUNET_OK != GSC_NEIGHBOURS_init ()) )
-  {
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  GSC_SESSIONS_init ();
-  GSC_CLIENTS_init (server);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Core service of `%4s' ready.\n"),
-              GNUNET_i2s (&GSC_my_identity));
-}
-
-
-
-/**
- * The main function for the transport service.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char *const *argv)
-{
-  return (GNUNET_OK ==
-          GNUNET_SERVICE_run (argc, argv, "core", GNUNET_SERVICE_OPTION_NONE,
-                              &run, NULL)) ? 0 : 1;
-}
-
-/* end of gnunet-service-core.c */

diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
new file mode 100644 (file)
index 0000000..25cabde
--- /dev/null
+++ b/src/core/gnunet-service-core.c
@@ -0,0 +1,126 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file core/gnunet-service-core.c
+ * @brief high-level P2P messaging
+ * @author Christian Grothoff
+ *
+ * Not implemented:
+ * - peer status changes (PeerStatusNotifyMessage) [needed?]
+ * - ATS integration / bw allocation / preferences
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet-service-core.h"
+#include "gnunet-service-core_clients.h"
+#include "gnunet-service-core_kx.h"
+#include "gnunet-service-core_neighbours.h"
+#include "gnunet-service-core_sessions.h"
+#include "gnunet-service-core_typemap.h"
+
+
+/**
+ * Our identity.
+ */
+struct GNUNET_PeerIdentity GSC_my_identity;
+
+/**
+ * Our configuration.
+ */
+const struct GNUNET_CONFIGURATION_Handle *GSC_cfg;
+
+/**
+ * For creating statistics.
+ */
+struct GNUNET_STATISTICS_Handle *GSC_stats;
+
+
+/**
+ * Last task run during shutdown.  Disconnects us from
+ * the transport.
+ */
+static void
+cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+#if DEBUG_CORE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+             "Core service shutting down.\n");
+#endif
+  GSC_CLIENTS_done ();
+  GSC_SESSIONS_done ();
+  GSC_NEIGHBOURS_done ();
+  GSC_KX_done ();
+  GSC_TYPEMAP_done ();
+  if (GSC_stats != NULL)
+  {
+    GNUNET_STATISTICS_destroy (GSC_stats, GNUNET_NO);
+    GSC_stats = NULL;
+  }
+  GSC_cfg = NULL;
+}
+
+
+/**
+ * Initiate core service.
+ *
+ * @param cls closure
+ * @param server the initialized server
+ * @param c configuration to use
+ */
+static void
+run (void *cls, struct GNUNET_SERVER_Handle *server,
+     const struct GNUNET_CONFIGURATION_Handle *c)
+{
+  GSC_cfg = c;  
+  GSC_stats = GNUNET_STATISTICS_create ("core", GSC_cfg);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleaning_task,
+                                NULL);
+  GSC_TYPEMAP_init ();
+  if ( (GNUNET_OK != GSC_KX_init ()) ||
+       (GNUNET_OK != GSC_NEIGHBOURS_init ()) )
+  {
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  GSC_SESSIONS_init ();
+  GSC_CLIENTS_init (server);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Core service of `%4s' ready.\n"),
+              GNUNET_i2s (&GSC_my_identity));
+}
+
+
+
+/**
+ * The main function for the transport service.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc, char *const *argv)
+{
+  return (GNUNET_OK ==
+          GNUNET_SERVICE_run (argc, argv, "core", GNUNET_SERVICE_OPTION_NONE,
+                              &run, NULL)) ? 0 : 1;
+}
+
+/* end of gnunet-service-core.c */