[GNUnet-SVN] r28892 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2013-08-28 20:42:55 +0200 (Wed, 28 Aug 2013)
New Revision: 28892

Modified:
   gnunet/src/core/core.h
   gnunet/src/core/gnunet-service-core_clients.c
   gnunet/src/core/gnunet-service-core_sessions.c
   gnunet/src/core/test_core_defaults.conf
Log:
-align core message, do not run psycstore here

Modified: gnunet/src/core/core.h
===================================================================
--- gnunet/src/core/core.h      2013-08-28 18:25:17 UTC (rev 28891)
+++ gnunet/src/core/core.h      2013-08-28 18:42:55 UTC (rev 28892)
@@ -111,6 +111,11 @@
   struct GNUNET_MessageHeader header;
 
   /**
+   * Always zero.
+   */
+  uint32_t reserved GNUNET_PACKED;
+
+  /**
    * Identity of the connecting peer.
    */
   struct GNUNET_PeerIdentity peer;

Modified: gnunet/src/core/gnunet-service-core_clients.c
===================================================================
--- gnunet/src/core/gnunet-service-core_clients.c       2013-08-28 18:25:17 UTC 
(rev 28891)
+++ gnunet/src/core/gnunet-service-core_clients.c       2013-08-28 18:42:55 UTC 
(rev 28892)
@@ -721,6 +721,7 @@
     cnm = (struct ConnectNotifyMessage *) buf;
     cnm->header.size = htons (size);
     cnm->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT);
+    cnm->reserved = htonl (0);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message to client.\n",
                 "NOTIFY_CONNECT");
     cnm->peer = *neighbour;

Modified: gnunet/src/core/gnunet-service-core_sessions.c
===================================================================
--- gnunet/src/core/gnunet-service-core_sessions.c      2013-08-28 18:25:17 UTC 
(rev 28891)
+++ gnunet/src/core/gnunet-service-core_sessions.c      2013-08-28 18:42:55 UTC 
(rev 28892)
@@ -661,6 +661,7 @@
   /* FIXME: code duplication with clients... */
   cnm.header.size = htons (sizeof (struct ConnectNotifyMessage));
   cnm.header.type = htons (GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT);
+  cnm.reserved = htonl (0);
   cnm.peer = session->peer;
   GNUNET_SERVER_transmit_context_append_message (tc, &cnm.header);
   return GNUNET_OK;

Modified: gnunet/src/core/test_core_defaults.conf
===================================================================
--- gnunet/src/core/test_core_defaults.conf     2013-08-28 18:25:17 UTC (rev 
28891)
+++ gnunet/src/core/test_core_defaults.conf     2013-08-28 18:42:55 UTC (rev 
28892)
@@ -77,3 +77,6 @@
 
 [identity]
 AUTOSTART = NO
+
+[psycstore]
+AUTOSTART = NO