aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-10-22 21:15:19 +0000
committerChristian Grothoff <christian@grothoff.org>2011-10-22 21:15:19 +0000
commitb57631e1030c15b2cebb0c1450fd883934477d8d (patch)
tree5e0f8f50d7b923e65812f245d9776f30f8c9bb3f /src/core
parent20c50963ee33c2f4bce9ef5fafe7ed3ecb89c70b (diff)
downloadgnunet-b57631e1030c15b2cebb0c1450fd883934477d8d.tar.gz
gnunet-b57631e1030c15b2cebb0c1450fd883934477d8d.zip
remove unused options -- these bits were always set, no need to pass them
Diffstat (limited to 'src/core')
-rw-r--r--src/core/core.h2
-rw-r--r--src/core/core_api.c2
-rw-r--r--src/core/gnunet-service-core_clients.c3
3 files changed, 2 insertions, 5 deletions
diff --git a/src/core/core.h b/src/core/core.h
index 5c0738ee4..71969c3e0 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -43,8 +43,6 @@
43 * transmitted to the client. 43 * transmitted to the client.
44 */ 44 */
45#define GNUNET_CORE_OPTION_NOTHING 0 45#define GNUNET_CORE_OPTION_NOTHING 0
46#define GNUNET_CORE_OPTION_SEND_CONNECT 1
47#define GNUNET_CORE_OPTION_SEND_DISCONNECT 2
48#define GNUNET_CORE_OPTION_SEND_STATUS_CHANGE 4 46#define GNUNET_CORE_OPTION_SEND_STATUS_CHANGE 4
49#define GNUNET_CORE_OPTION_SEND_FULL_INBOUND 8 47#define GNUNET_CORE_OPTION_SEND_FULL_INBOUND 8
50#define GNUNET_CORE_OPTION_SEND_HDR_INBOUND 16 48#define GNUNET_CORE_OPTION_SEND_HDR_INBOUND 16
diff --git a/src/core/core_api.c b/src/core/core_api.c
index 0de64869b..b903d73bb 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -1168,7 +1168,7 @@ reconnect (struct GNUNET_CORE_Handle *h)
1168 init = (struct InitMessage *) &cm[1]; 1168 init = (struct InitMessage *) &cm[1];
1169 init->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT); 1169 init->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT);
1170 init->header.size = htons (msize); 1170 init->header.size = htons (msize);
1171 opt = GNUNET_CORE_OPTION_SEND_CONNECT | GNUNET_CORE_OPTION_SEND_DISCONNECT; 1171 opt = 0;
1172 if (h->inbound_notify != NULL) 1172 if (h->inbound_notify != NULL)
1173 { 1173 {
1174 if (h->inbound_hdr_only) 1174 if (h->inbound_hdr_only)
diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c
index 742522369..146b251be 100644
--- 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,
295 irm.reserved = htonl (0); 295 irm.reserved = htonl (0);
296 irm.my_identity = GSC_my_identity; 296 irm.my_identity = GSC_my_identity;
297 send_to_client (c, &irm.header, GNUNET_NO); 297 send_to_client (c, &irm.header, GNUNET_NO);
298 if (0 != (c->options & GNUNET_CORE_OPTION_SEND_CONNECT)) 298 GSC_SESSIONS_notify_client_about_sessions (c);
299 GSC_SESSIONS_notify_client_about_sessions (c);
300 GNUNET_SERVER_receive_done (client, GNUNET_OK); 299 GNUNET_SERVER_receive_done (client, GNUNET_OK);
301} 300}
302 301