-align core message, do not run psycstore here

4 files changed, 10 insertions, 0 deletions

diff --git a/src/core/core.h b/src/core/core.h
index cb5caca1c..4cfc83611 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -111,6 +111,11 @@ struct ConnectNotifyMessage
   struct GNUNET_MessageHeader header;
 
   /**
+   * Always zero.
+   */
+  uint32_t reserved GNUNET_PACKED;
+
+  /**
    * Identity of the connecting peer.
    */
   struct GNUNET_PeerIdentity peer;
diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c
index 7813a97c1..7514da8a2 100644
--- a/src/core/gnunet-service-core_clients.c
+++ b/src/core/gnunet-service-core_clients.c
@@ -721,6 +721,7 @@ GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client,
     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;
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c
index 1deb3efc6..f1a53bee8 100644
--- a/src/core/gnunet-service-core_sessions.c
+++ b/src/core/gnunet-service-core_sessions.c
@@ -661,6 +661,7 @@ queue_connect_message (void *cls, const struct GNUNET_HashCode * key, void *valu
   /* 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;
diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf
index e7271b913..d0bfa52f6 100644
--- a/src/core/test_core_defaults.conf
+++ b/src/core/test_core_defaults.conf
@@ -77,3 +77,6 @@ AUTOSTART = NO
 
 [identity]
 AUTOSTART = NO
+
+[psycstore]
+AUTOSTART = NO