}
+static size_t
+transmit_shutdown_deny (void *cls, size_t size, void *buf)
+{
+ struct GNUNET_SERVER_Client *client = cls;
+ struct GNUNET_MessageHeader *msg;
+
+ if (size < sizeof (struct GNUNET_MessageHeader))
+ {
+ return 0; /* client disconnected */
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ }
+ msg = (struct GNUNET_MessageHeader *) buf;
+ msg->type = htons (GNUNET_MESSAGE_TYPE_SHUTDOWN_REFUSE);
+ msg->size = htons (sizeof (struct GNUNET_MessageHeader));
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_client_drop(client);
+ return sizeof (struct GNUNET_MessageHeader);
+}
+
+static size_t
+transmit_shutdown_ack (void *cls, size_t size, void *buf)
+{
+ struct GNUNET_SERVER_Client *client = cls;
+ struct GNUNET_MessageHeader *msg;
+
+ if (size < sizeof (struct GNUNET_MessageHeader))
+ {
+ return 0; /* client disconnected */
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ }
+
+ msg = (struct GNUNET_MessageHeader *) buf;
+ msg->type = htons (GNUNET_MESSAGE_TYPE_SHUTDOWN_ACK);
+ msg->size = htons (sizeof (struct GNUNET_MessageHeader));
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_client_drop(client);
+ return sizeof (struct GNUNET_MessageHeader);
+}
+
/**
* Handler for SHUTDOWN message.
*
const struct GNUNET_MessageHeader *message)
{
struct GNUNET_SERVICE_Context *service = cls;
+
+ /* FIXME: why is this call necessary???? */
+ GNUNET_SERVER_client_keep(client);
if (!service->allow_shutdown)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_
("Received shutdown request, but configured to ignore!\n"));
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_notify_transmit_ready (client,
+ sizeof(struct GNUNET_MessageHeader),
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &transmit_shutdown_deny, client);
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Initiating shutdown as requested by client.\n"));
+
+ GNUNET_SERVER_notify_transmit_ready (client,
+ sizeof(struct GNUNET_MessageHeader),
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &transmit_shutdown_ack, client);
+
GNUNET_assert (service->sched != NULL);
+ GNUNET_SERVER_client_persist_ (client);
GNUNET_SCHEDULER_shutdown (service->sched);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
*addrs = NULL;
*addr_lens = NULL;
- resi = 0;
if (GNUNET_CONFIGURATION_have_value (cfg,
serviceName, "DISABLEV6"))
{
GNUNET_CONFIGURATION_get_value_time (sctx->cfg,
sctx->serviceName,
"TIMEOUT", &idleout))
- return GNUNET_SYSERR;
-
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Specified value for `%s' of service `%s' is invalid\n"),
+ "TIMEOUT",
+ sctx->serviceName);
+ return GNUNET_SYSERR;
+ }
sctx->timeout = idleout;
}
else
GNUNET_CONFIGURATION_get_value_number (sctx->cfg,
sctx->serviceName,
"MAXBUF", &maxbuf))
- return GNUNET_SYSERR;
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Specified value for `%s' of service `%s' is invalid\n"),
+ "MAXBUF",
+ sctx->serviceName);
+ return GNUNET_SYSERR;
+ }
}
else
maxbuf = GNUNET_SERVER_MAX_MESSAGE_SIZE;
(sctx->allow_shutdown =
GNUNET_CONFIGURATION_get_value_yesno (sctx->cfg, sctx->serviceName,
"ALLOW_SHUTDOWN")))
- return GNUNET_SYSERR;
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Specified value for `%s' of service `%s' is invalid\n"),
+ "ALLOW_SHUTDOWN",
+ sctx->serviceName);
+ return GNUNET_SYSERR;
+ }
}
else
sctx->allow_shutdown = GNUNET_NO;
(tolerant = GNUNET_CONFIGURATION_get_value_yesno (sctx->cfg,
sctx->serviceName,
"TOLERANT")))
- return GNUNET_SYSERR;
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Specified value for `%s' of service `%s' is invalid\n"),
+ "TOLERANT",
+ sctx->serviceName);
+ return GNUNET_SYSERR;
+ }
}
else
tolerant = GNUNET_NO;
do_daemonize = 0;
logfile = NULL;
loglev = GNUNET_strdup ("WARNING");
- cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_DAEMON_CONFIG_FILE);
+ cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
memset (&sctx, 0, sizeof (sctx));
sctx.options = opt;
sctx.ready_confirm_fd = -1;
/* setup subsystems */
if (GNUNET_SYSERR == GNUNET_GETOPT_run (serviceName, service_options, argc,
argv))
- HANDLE_ERROR;
+ goto shutdown;
if (GNUNET_OK != GNUNET_log_setup (serviceName, loglev, logfile))
HANDLE_ERROR;
if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cfg_fn))
- HANDLE_ERROR;
+ goto shutdown;
if (GNUNET_OK != setup_service (&sctx))
- HANDLE_ERROR;
+ goto shutdown;
if ( (do_daemonize == 1) && (GNUNET_OK != detach_terminal (&sctx)))
HANDLE_ERROR;
if (GNUNET_OK != set_user_id (&sctx))
- HANDLE_ERROR;
+ goto shutdown;
#if DEBUG_SERVICE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Service `%s' runs with configuration from `%s'\n",
GNUNET_CONFIGURATION_destroy (cfg);
i = 0;
- while (sctx.addrs[i] != NULL)
- GNUNET_free (sctx.addrs[i++]);
+ if (sctx.addrs != NULL)
+ while (sctx.addrs[i] != NULL)
+ GNUNET_free (sctx.addrs[i++]);
GNUNET_free_non_null (sctx.addrs);
GNUNET_free_non_null (sctx.addrlens);
GNUNET_free_non_null (logfile);