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

[gnunet]

Author: grothoff
Date: 2011-10-22 23:15:19 +0200 (Sat, 22 Oct 2011)
New Revision: 17674

Modified:
   gnunet/src/core/core.h
   gnunet/src/core/core_api.c
   gnunet/src/core/gnunet-service-core_clients.c
Log:
remove unused options -- these bits were always set, no need to pass them

Modified: gnunet/src/core/core.h
===================================================================
--- gnunet/src/core/core.h      2011-10-22 21:10:29 UTC (rev 17673)
+++ gnunet/src/core/core.h      2011-10-22 21:15:19 UTC (rev 17674)
@@ -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

Modified: gnunet/src/core/core_api.c
===================================================================
--- gnunet/src/core/core_api.c  2011-10-22 21:10:29 UTC (rev 17673)
+++ gnunet/src/core/core_api.c  2011-10-22 21:15:19 UTC (rev 17674)
@@ -1168,7 +1168,7 @@
   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)

Modified: gnunet/src/core/gnunet-service-core_clients.c
===================================================================
--- gnunet/src/core/gnunet-service-core_clients.c       2011-10-22 21:10:29 UTC 
(rev 17673)
+++ gnunet/src/core/gnunet-service-core_clients.c       2011-10-22 21:15:19 UTC 
(rev 17674)
@@ -295,8 +295,7 @@
   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);
 }