[GNUnet-SVN] r3298 - GNUnet/src/server

[grothoff]

Author: grothoff
Date: 2006-08-24 17:16:08 -0700 (Thu, 24 Aug 2006)
New Revision: 3298

Modified:
   GNUnet/src/server/core.c
Log:
order

Modified: GNUnet/src/server/core.c
===================================================================
--- GNUnet/src/server/core.c    2006-08-24 23:10:58 UTC (rev 3297)
+++ GNUnet/src/server/core.c    2006-08-25 00:16:08 UTC (rev 3298)
@@ -482,20 +482,13 @@
 int initCore(struct GE_Context * ectx,
             struct GC_Configuration * cfg,
             struct CronManager * cron,
-            struct LoadMonitor * monitor) {
-  identity = requestService("identity");
-  if (identity == NULL)
-    return SYSERR;
-  identity->getPeerIdentity(identity->getPublicPrivateKey(),
-                           &myIdentity);
-  initTCPServer(ectx,
-               cfg);
+            struct LoadMonitor * monitor) {  
   applicationCore.ectx = ectx;
   applicationCore.cfg = cfg;
   applicationCore.load_monitor = monitor;
   applicationCore.cron = cron;
   applicationCore.version = 0;
-  applicationCore.myIdentity = &myIdentity; /* core.c */
+  applicationCore.myIdentity = NULL; /* for now */
   applicationCore.loadApplicationModule = &loadApplicationModule; /* core.c */
   applicationCore.unloadApplicationModule = &unloadApplicationModule; /* 
core.c */
   applicationCore.requestService = &requestService; /* core.c */
@@ -538,6 +531,15 @@
   applicationCore.getSlotCount = &getSlotCount; /* connection.c */
   applicationCore.isSlotUsed = &isSlotUsed; /* connection.c */
   applicationCore.getLastActivityOf = &getLastActivityOf; /* connection.c */
+
+  identity = requestService("identity");
+  if (identity == NULL)
+    return SYSERR;
+  identity->getPeerIdentity(identity->getPublicPrivateKey(),
+                           &myIdentity);
+  applicationCore.myIdentity = &myIdentity; /* core.c */
+  initTCPServer(ectx,
+               cfg);
   initHandler(ectx);
   return OK;
 }