remove unused options -- these bits were always set, no need to pass them

diff --git a/src/core/core.h b/src/core/core.h
index 5c0738ee4e74423a0f4be3f37a83886c22c24e5e..71969c3e045b394c53a20625abff4d64bead1e64 100644 (file)
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -43,8 +43,6 @@
  * transmitted to the client.
  */
 #define GNUNET_CORE_OPTION_NOTHING             0
-#define GNUNET_CORE_OPTION_SEND_CONNECT        1
-#define GNUNET_CORE_OPTION_SEND_DISCONNECT     2
 #define GNUNET_CORE_OPTION_SEND_STATUS_CHANGE  4
 #define GNUNET_CORE_OPTION_SEND_FULL_INBOUND   8
 #define GNUNET_CORE_OPTION_SEND_HDR_INBOUND   16

diff --git a/src/core/core_api.c b/src/core/core_api.c
index 0de64869b1953d35c9aa0f933220b0f05f422056..b903d73bb921cd0e1c0134385ed491794f2644df 100644 (file)
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -1168,7 +1168,7 @@ reconnect (struct GNUNET_CORE_Handle *h)
   init = (struct InitMessage *) &cm[1];
   init->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT);
   init->header.size = htons (msize);
-  opt = GNUNET_CORE_OPTION_SEND_CONNECT | GNUNET_CORE_OPTION_SEND_DISCONNECT;
+  opt = 0;
   if (h->inbound_notify != NULL)
   {
     if (h->inbound_hdr_only)

diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c
index 7425223694cfa508342cc8bb7c6d3e720672fdbf..146b251be40379a90e1171eee3a0e00599b1ae6d 100644 (file)
--- a/src/core/gnunet-service-core_clients.c
+++ b/src/core/gnunet-service-core_clients.c
@@ -295,8 +295,7 @@ handle_client_init (void *cls, struct GNUNET_SERVER_Client *client,
   irm.reserved = htonl (0);
   irm.my_identity = GSC_my_identity;
   send_to_client (c, &irm.header, GNUNET_NO);
-  if (0 != (c->options & GNUNET_CORE_OPTION_SEND_CONNECT))
-    GSC_SESSIONS_notify_client_about_sessions (c);
+  GSC_SESSIONS_notify_client_about_sessions (c);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }