#include "gnunet_server_lib.h"
#include "gnunet_service_lib.h"
+#define DEBUG_SERVICE GNUNET_NO
+
/* ******************* access control ******************** */
/**
* notation. The netmask must be given in CIDR notation (/16) or
* can be omitted to specify a single host.
* <p>
- * @param routeList a string specifying the forbidden networks
+ * @param routeListX a string specifying the forbidden networks
* @return the converted list, NULL if the synatx is flawed
*/
static struct IPv6NetworkSet *
_("Wrong format `%s' for network\n"),
&routeList[slash + 1]);
else
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "inet_pton");
+ GNUNET_log_strerror(GNUNET_ERROR_TYPE_ERROR, "inet_pton");
GNUNET_free (result);
GNUNET_free (routeList);
return NULL;
* Check if the given IP address is in the list of IP addresses.
*
* @param list a list of networks
- * @param ip the IP to check (in network byte order)
+ * @param add the IP to check (in network byte order)
* @return GNUNET_NO if the IP is not in the list, GNUNET_YES if it it is
*/
static int
/**
* Our configuration.
*/
- struct GNUNET_CONFIGURATION_Handle *cfg;
+ const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* Handle for the server.
struct GNUNET_SCHEDULER_Handle *sched;
/**
- * Address to bind to.
+ * NULL-terminated array of addresses to bind to.
*/
- struct sockaddr *addr;
+ struct sockaddr **addrs;
/**
* Name of our service.
int allow_shutdown;
/**
- * Length of addr.
+ * Our options.
*/
- socklen_t addrlen;
+ enum GNUNET_SERVICE_Options options;
+
+ /**
+ * Array of the lengths of the entries in addrs.
+ */
+ socklen_t * addrlens;
};
* Handler for TEST message.
*
* @param cls closure (refers to service)
- * @param server the server handling the message
* @param client identification of the client
* @param message the actual message
*/
static void
handle_test (void *cls,
- struct GNUNET_SERVER_Handle *server,
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
}
+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))
+ {
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return 0; /* client disconnected */
+ }
+ 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))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Failed to transmit shutdown ACK.\n"));
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return 0; /* client disconnected */
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Transmitting shutdown ACK.\n"));
+
+ 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.
*
* @param cls closure (refers to service)
- * @param server the server handling the message
* @param client identification of the client
* @param message the actual message
*/
static void
handle_shutdown (void *cls,
- struct GNUNET_SERVER_Handle *server,
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
struct GNUNET_SERVICE_Context *service = cls;
+
+ 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);
}
const struct sockaddr_in *i4;
const struct sockaddr_in6 *i6;
int ret;
- char buf[INET6_ADDRSTRLEN];
- uint16_t port;
switch (addr->sa_family)
{
case AF_INET:
GNUNET_assert (addrlen == sizeof (struct sockaddr_in));
i4 = (const struct sockaddr_in *) addr;
- port = ntohs (i4->sin_port);
ret = ((sctx->v4_allowed == NULL) ||
(check_ipv4_listed (sctx->v4_allowed,
&i4->sin_addr)))
&& ((sctx->v4_denied == NULL) ||
(!check_ipv4_listed (sctx->v4_denied, &i4->sin_addr)));
- if (ret != GNUNET_OK)
- inet_ntop (AF_INET, &i4->sin_addr, buf, sizeof (buf));
break;
case AF_INET6:
GNUNET_assert (addrlen == sizeof (struct sockaddr_in6));
i6 = (const struct sockaddr_in6 *) addr;
- port = ntohs (i6->sin6_port);
ret = ((sctx->v6_allowed == NULL) ||
(check_ipv6_listed (sctx->v6_allowed,
&i6->sin6_addr)))
&& ((sctx->v6_denied == NULL) ||
(!check_ipv6_listed (sctx->v6_denied, &i6->sin6_addr)));
- if (ret != GNUNET_OK)
- inet_ntop (AF_INET6, &i6->sin6_addr, buf, sizeof (buf));
break;
default:
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
if (ret != GNUNET_OK)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Access from `%s:%u' denied to service `%s'\n"),
- buf, port, sctx->serviceName);
+ _("Access from `%s' denied to service `%s'\n"),
+ GNUNET_a2s (addr, addrlen), sctx->serviceName);
}
return ret;
}
/**
- * Setup addr, addrlen, maxbuf, idle_timeout
- * based on configuration!
+ * Get the list of addresses that a server for the given service
+ * should bind to.
*
- * Configuration must specify a "PORT". It may
- * specify:
- * - TIMEOUT (after how many ms does an inactive service timeout);
- * - MAXBUF (maximum incoming message size supported)
- * - DISABLEV6 (disable support for IPv6, otherwise we use dual-stack)
- * - ALLOW_SHUTDOWN (allow clients to shutdown this service)
- * - BINDTO (hostname or IP address to bind to, otherwise we take everything)
- * - ACCEPT_FROM (only allow connections from specified IPv4 subnets)
- * - ACCEPT_FROM6 (only allow connections from specified IPv6 subnets)
- * - REJECT_FROM (disallow allow connections from specified IPv4 subnets)
- * - REJECT_FROM6 (disallow allow connections from specified IPv6 subnets)
- *
- * @return GNUNET_OK if configuration succeeded
+ * @param serviceName name of the service
+ * @param cfg configuration (which specifies the addresses)
+ * @param addrs set (call by reference) to an array of pointers to the
+ * addresses the server should bind to and listen on; the
+ * array will be NULL-terminated (on success)
+ * @param addr_lens set (call by reference) to an array of the lengths
+ * of the respective 'struct sockaddr' struct in the 'addrs'
+ * array (on success)
+ * @return number of addresses found on success,
+ * GNUNET_SYSERR if the configuration
+ * did not specify reasonable finding information or
+ * if it specified a hostname that could not be resolved;
+ * GNUNET_NO if the number of addresses configured is
+ * zero (in this case, '*addrs' and '*addr_lens' will be
+ * set to NULL).
*/
-static int
-setup_service (struct GNUNET_SERVICE_Context *sctx)
+int
+GNUNET_SERVICE_get_server_addresses (const char *serviceName,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct sockaddr ***addrs,
+ socklen_t **addr_lens)
{
- unsigned long long maxbuf;
- unsigned long long idleout;
- char *hostname;
- unsigned long long port;
int disablev6;
+ struct GNUNET_NETWORK_Handle *desc;
+ unsigned long long port;
struct addrinfo hints;
struct addrinfo *res;
struct addrinfo *pos;
+ struct addrinfo *next;
+ unsigned int i;
+ int resi;
int ret;
- int tolerant;
+ struct sockaddr **saddrs;
+ socklen_t *saddrlens;
+ char *hostname;
- if (GNUNET_CONFIGURATION_have_value (sctx->cfg,
- sctx->serviceName, "TIMEOUT"))
- {
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (sctx->cfg,
- sctx->serviceName,
- "TIMEOUT", &idleout))
- return GNUNET_SYSERR;
-
- sctx->timeout.value = idleout;
- }
- else
- sctx->timeout = GNUNET_TIME_UNIT_FOREVER_REL;
- if (GNUNET_CONFIGURATION_have_value (sctx->cfg,
- sctx->serviceName, "MAXBUF"))
- {
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (sctx->cfg,
- sctx->serviceName,
- "MAXBUF", &maxbuf))
- return GNUNET_SYSERR;
- }
- else
- maxbuf = GNUNET_SERVER_MAX_MESSAGE_SIZE;
- if (GNUNET_CONFIGURATION_have_value (sctx->cfg,
- sctx->serviceName, "DISABLEV6"))
+ *addrs = NULL;
+ *addr_lens = NULL;
+ if (GNUNET_CONFIGURATION_have_value (cfg,
+ serviceName, "DISABLEV6"))
{
if (GNUNET_SYSERR ==
- (disablev6 = GNUNET_CONFIGURATION_get_value_yesno (sctx->cfg,
- sctx->
- serviceName,
+ (disablev6 = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ serviceName,
"DISABLEV6")))
return GNUNET_SYSERR;
}
else
disablev6 = GNUNET_NO;
- if (GNUNET_CONFIGURATION_have_value (sctx->cfg,
- sctx->serviceName, "ALLOW_SHUTDOWN"))
- {
- if (GNUNET_SYSERR ==
- (sctx->allow_shutdown =
- GNUNET_CONFIGURATION_get_value_yesno (sctx->cfg, sctx->serviceName,
- "ALLOW_SHUTDOWN")))
- return GNUNET_SYSERR;
- }
- else
- sctx->allow_shutdown = GNUNET_NO;
if (!disablev6)
{
/* probe IPv6 support */
- ret = SOCKET (PF_INET6, SOCK_STREAM, 0);
- if (ret == -1)
+ desc = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
+ if (NULL == desc)
{
if ((errno == ENOBUFS) ||
(errno == ENOMEM) || (errno == ENFILE) || (errno == EACCES))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
return GNUNET_SYSERR;
}
- ret = SOCKET (PF_INET, SOCK_STREAM, 0);
- if (ret != -1)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _
- ("Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"),
- sctx->serviceName, strerror (errno));
- disablev6 = GNUNET_YES;
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _
+ ("Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"),
+ serviceName, STRERROR (errno));
+ disablev6 = GNUNET_YES;
+ }
+ else
+ {
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
}
- if (ret != -1)
- GNUNET_break (0 == CLOSE (ret));
- }
-
-
-
- if (GNUNET_CONFIGURATION_have_value (sctx->cfg,
- sctx->serviceName, "TOLERANT"))
- {
- if (GNUNET_SYSERR ==
- (tolerant = GNUNET_CONFIGURATION_get_value_yesno (sctx->cfg,
- sctx->serviceName,
- "TOLERANT")))
- return GNUNET_SYSERR;
}
- else
- tolerant = GNUNET_NO;
- sctx->require_found = tolerant ? GNUNET_NO : GNUNET_YES;
if ((GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (sctx->cfg,
- sctx->serviceName,
+ GNUNET_CONFIGURATION_get_value_number (cfg,
+ serviceName,
"PORT",
&port)) || (port > 65535))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
("Require valid port number for service `%s' in configuration!\n"),
- sctx->serviceName);
+ serviceName);
return GNUNET_SYSERR;
}
- if (GNUNET_CONFIGURATION_have_value (sctx->cfg,
- sctx->serviceName, "BINDTO"))
+ if (GNUNET_CONFIGURATION_have_value (cfg,
+ serviceName, "BINDTO"))
{
GNUNET_break (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (sctx->cfg,
- sctx->serviceName,
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ serviceName,
"BINDTO",
&hostname));
}
if (hostname != NULL)
{
+#if DEBUG_SERVICE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Resolving `%s' since that is where `%s' will bind to.\n",
+ hostname,
+ serviceName);
+#endif
memset (&hints, 0, sizeof (struct addrinfo));
if (disablev6)
hints.ai_family = AF_INET;
GNUNET_free (hostname);
return GNUNET_SYSERR;
}
- pos = res;
- while ((NULL != pos) &&
- (((disablev6) &&
- (pos->ai_family != AF_INET)) ||
- ((pos->ai_family != AF_INET) && (pos->ai_family != AF_INET6))))
- pos = pos->ai_next;
- if (pos == NULL)
+ next = res;
+ i = 0;
+ while (NULL != (pos = next))
+ {
+ next = pos->ai_next;
+ if ( (disablev6) && (pos->ai_family == AF_INET6))
+ continue;
+ i++;
+ }
+ if (0 == i)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to find IPv4 address for `%s'.\n"), hostname);
+ _("Failed to find %saddress for `%s'.\n"),
+ disablev6 ? "IPv4 " : "", hostname);
freeaddrinfo (res);
GNUNET_free (hostname);
return GNUNET_SYSERR;
}
+ resi = i;
+ saddrs = GNUNET_malloc ((i+1) * sizeof(struct sockaddr*));
+ saddrlens = GNUNET_malloc ((i+1) * sizeof (socklen_t));
+ i = 0;
+ next = res;
+ while (NULL != (pos = next))
+ {
+ next = pos->ai_next;
+ if ( (disablev6) && (pos->ai_family == AF_INET6))
+ continue;
+#if DEBUG_SERVICE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Service `%s' will bind to `%s'\n",
+ serviceName,
+ GNUNET_a2s (pos->ai_addr,
+ pos->ai_addrlen));
+#endif
+ if (pos->ai_family == AF_INET)
+ {
+ GNUNET_assert (pos->ai_addrlen == sizeof (struct sockaddr_in));
+ saddrlens[i] = pos->ai_addrlen;
+ saddrs[i] = GNUNET_malloc (saddrlens[i]);
+ memcpy (saddrs[i], pos->ai_addr, saddrlens[i]);
+ ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
+ }
+ else
+ {
+ GNUNET_assert (pos->ai_family == AF_INET6);
+ GNUNET_assert (pos->ai_addrlen == sizeof (struct sockaddr_in6));
+ saddrlens[i] = pos->ai_addrlen;
+ saddrs[i] = GNUNET_malloc (saddrlens[i]);
+ memcpy (saddrs[i], pos->ai_addr, saddrlens[i]);
+ ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port);
+ }
+ i++;
+ }
GNUNET_free (hostname);
- if (pos->ai_family == AF_INET)
- {
- GNUNET_assert (pos->ai_addrlen == sizeof (struct sockaddr_in));
- sctx->addrlen = pos->ai_addrlen;
- sctx->addr = GNUNET_malloc (sctx->addrlen);
- memcpy (sctx->addr, res->ai_addr, sctx->addrlen);
- ((struct sockaddr_in *) sctx->addr)->sin_port = htons (port);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _
- ("Configured to bind to %s address; %s connections to this service will fail!\n"),
- "IPv4", "IPv6");
- }
- else
- {
- GNUNET_assert (pos->ai_family == AF_INET6);
- GNUNET_assert (pos->ai_addrlen == sizeof (struct sockaddr_in6));
- sctx->addrlen = pos->ai_addrlen;
- sctx->addr = GNUNET_malloc (sctx->addrlen);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _
- ("Configured to bind to %s address; %s connections to this service will fail!\n"),
- "IPv6", "IPv4");
- ((struct sockaddr_in6 *) sctx->addr)->sin6_port = htons (port);
- }
freeaddrinfo (res);
}
else
if (disablev6)
{
/* V4-only */
- sctx->addrlen = sizeof (struct sockaddr_in6);
- sctx->addr = GNUNET_malloc (sctx->addrlen);
- ((struct sockaddr_in *) sctx->addr)->sin_family = AF_INET;
- ((struct sockaddr_in *) sctx->addr)->sin_port = htons (port);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _
- ("Configured to bind to %s address; %s connections to this service will fail!\n"),
- "IPv4", "IPv6");
+ resi = 1;
+ saddrs = GNUNET_malloc (2 * sizeof(struct sockaddr*));
+ saddrlens = GNUNET_malloc (2 * sizeof (socklen_t));
+ saddrlens[0] = sizeof (struct sockaddr_in);
+ saddrs[0] = GNUNET_malloc (saddrlens[0]);
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ ((struct sockaddr_in *) saddrs[0])->sin_len = saddrlens[0];
+#endif
+ ((struct sockaddr_in *) saddrs[0])->sin_family = AF_INET;
+ ((struct sockaddr_in *) saddrs[0])->sin_port = htons (port);
}
else
{
/* dual stack */
- sctx->addrlen = sizeof (struct sockaddr_in6);
- sctx->addr = GNUNET_malloc (sctx->addrlen);
- ((struct sockaddr_in6 *) sctx->addr)->sin6_family = AF_INET6;
- ((struct sockaddr_in6 *) sctx->addr)->sin6_port = htons (port);
+ resi = 2;
+ saddrs = GNUNET_malloc (3 * sizeof(struct sockaddr*));
+ saddrlens = GNUNET_malloc (3 * sizeof (socklen_t));
+
+ saddrlens[0] = sizeof (struct sockaddr_in6);
+ saddrs[0] = GNUNET_malloc (saddrlens[0]);
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ ((struct sockaddr_in6 *) saddrs[0])->sin6_len = saddrlens[0];
+#endif
+ ((struct sockaddr_in6 *) saddrs[0])->sin6_family = AF_INET6;
+ ((struct sockaddr_in6 *) saddrs[0])->sin6_port = htons (port);
+
+ saddrlens[1] = sizeof (struct sockaddr_in);
+ saddrs[1] = GNUNET_malloc (saddrlens[1]);
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ ((struct sockaddr_in *) saddrs[1])->sin_len = saddrlens[1];
+#endif
+ ((struct sockaddr_in *) saddrs[1])->sin_family = AF_INET;
+ ((struct sockaddr_in *) saddrs[1])->sin_port = htons (port);
}
}
+ *addrs = saddrs;
+ *addr_lens = saddrlens;
+ return resi;
+}
+
+
+/**
+ * Setup addr, addrlen, maxbuf, idle_timeout
+ * based on configuration!
+ *
+ * Configuration must specify a "PORT". It may
+ * specify:
+ * - TIMEOUT (after how many ms does an inactive service timeout);
+ * - MAXBUF (maximum incoming message size supported)
+ * - DISABLEV6 (disable support for IPv6, otherwise we use dual-stack)
+ * - ALLOW_SHUTDOWN (allow clients to shutdown this service)
+ * - BINDTO (hostname or IP address to bind to, otherwise we take everything)
+ * - ACCEPT_FROM (only allow connections from specified IPv4 subnets)
+ * - ACCEPT_FROM6 (only allow connections from specified IPv6 subnets)
+ * - REJECT_FROM (disallow allow connections from specified IPv4 subnets)
+ * - REJECT_FROM6 (disallow allow connections from specified IPv6 subnets)
+ *
+ * @return GNUNET_OK if configuration succeeded
+ */
+static int
+setup_service (struct GNUNET_SERVICE_Context *sctx)
+{
+ unsigned long long maxbuf;
+ struct GNUNET_TIME_Relative idleout;
+ int tolerant;
+
+ if (GNUNET_CONFIGURATION_have_value (sctx->cfg,
+ sctx->serviceName, "TIMEOUT"))
+ {
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_time (sctx->cfg,
+ sctx->serviceName,
+ "TIMEOUT", &idleout))
+ {
+ 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
+ sctx->timeout = GNUNET_TIME_UNIT_FOREVER_REL;
+ if (GNUNET_CONFIGURATION_have_value (sctx->cfg,
+ sctx->serviceName, "MAXBUF"))
+ {
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (sctx->cfg,
+ sctx->serviceName,
+ "MAXBUF", &maxbuf))
+ {
+ 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;
+ if (GNUNET_CONFIGURATION_have_value (sctx->cfg,
+ sctx->serviceName, "ALLOW_SHUTDOWN"))
+ {
+ if (GNUNET_SYSERR ==
+ (sctx->allow_shutdown =
+ GNUNET_CONFIGURATION_get_value_yesno (sctx->cfg, sctx->serviceName,
+ "ALLOW_SHUTDOWN")))
+ {
+ 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;
+
+
+ if (GNUNET_CONFIGURATION_have_value (sctx->cfg,
+ sctx->serviceName, "TOLERANT"))
+ {
+ if (GNUNET_SYSERR ==
+ (tolerant = GNUNET_CONFIGURATION_get_value_yesno (sctx->cfg,
+ sctx->serviceName,
+ "TOLERANT")))
+ {
+ 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;
+
+ if (GNUNET_SYSERR ==
+ GNUNET_SERVICE_get_server_addresses (sctx->serviceName,
+ sctx->cfg,
+ &sctx->addrs,
+ &sctx->addrlens))
+ return GNUNET_SYSERR;
+ sctx->require_found = tolerant ? GNUNET_NO : GNUNET_YES;
sctx->maxbuf = (size_t) maxbuf;
if (sctx->maxbuf != maxbuf)
{
return GNUNET_SYSERR;
}
+ process_acl4 (&sctx->v4_denied, sctx, "REJECT_FROM");
+ process_acl4 (&sctx->v4_allowed, sctx, "ACCEPT_FROM");
+ process_acl6 (&sctx->v6_denied, sctx, "REJECT_FROM6");
+ process_acl6 (&sctx->v6_allowed, sctx, "ACCEPT_FROM6");
- if ((GNUNET_OK !=
- process_acl4 (&sctx->v4_denied,
- sctx,
- "REJECT_FROM")) ||
- (GNUNET_OK !=
- process_acl4 (&sctx->v4_allowed,
- sctx,
- "ACCEPT_FROM")) ||
- (GNUNET_OK !=
- process_acl6 (&sctx->v6_denied,
- sctx,
- "REJECT_FROM6")) ||
- (GNUNET_OK != process_acl6 (&sctx->v6_allowed, sctx, "ACCEPT_FROM6")))
- return GNUNET_SYSERR;
return GNUNET_OK;
}
}
+/**
+ * Task run during shutdown.
+ *
+ * @param cls unused
+ * @param tc unused
+ */
+static void
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_SERVER_Handle *server = cls;
+
+ GNUNET_SERVER_destroy (server);
+}
+
+
/**
* Initial task for the service.
*/
sctx->server = GNUNET_SERVER_create (tc->sched,
&check_access,
sctx,
- sctx->addr,
- sctx->addrlen,
+ sctx->addrs,
+ sctx->addrlens,
sctx->maxbuf,
sctx->timeout, sctx->require_found);
if (sctx->server == NULL)
{
+ i = 0;
+ while (sctx->addrs[i] != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Failed to start `%s' at `%s'\n"),
+ sctx->serviceName,
+ GNUNET_a2s (sctx->addrs[i], sctx->addrlens[i]));
+ i++;
+ }
sctx->ret = GNUNET_SYSERR;
return;
}
+ if (0 == (sctx->options & GNUNET_SERVICE_OPTION_MANUAL_SHUTDOWN))
+ {
+ /* install a task that will kill the server
+ process if the scheduler ever gets a shutdown signal */
+ GNUNET_SCHEDULER_add_delayed (tc->sched,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task, sctx->server);
+ }
sctx->my_handlers = GNUNET_malloc (sizeof (defhandlers));
memcpy (sctx->my_handlers, defhandlers, sizeof (defhandlers));
i = 0;
sctx->ready_confirm_fd = -1;
write_pid_file (sctx, getpid ());
}
-
+ i = 0;
+ while (sctx->addrs[i] != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Service `%s' runs at %s\n"),
+ sctx->serviceName,
+ GNUNET_a2s (sctx->addrs[i], sctx->addrlens[i]));
+ i++;
+ }
sctx->task (sctx->task_cls, tc->sched, sctx->server, sctx->cfg);
}
static int
detach_terminal (struct GNUNET_SERVICE_Context *sctx)
{
+#ifndef MINGW
pid_t pid;
int nullfd;
int filedes[2];
-#ifndef MINGW
if (0 != PIPE (filedes))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "pipe");
GNUNET_break (0 == CLOSE (0));
GNUNET_break (0 == CLOSE (1));
GNUNET_break (0 == CLOSE (filedes[0]));
- nullfd = GNUNET_DISK_file_open ("/dev/null", O_RDWR | O_APPEND);
+ nullfd = OPEN ("/dev/null", O_RDWR | O_APPEND);
if (nullfd < 0)
return GNUNET_SYSERR;
/* set stdin/stdout to /dev/null */
GNUNET_free (pif);
}
+
/**
* Run a standard GNUnet service startup sequence (initialize loggers
* and configuration, parse options).
* @param argc number of command line arguments
* @param argv command line arguments
* @param serviceName our service name
+ * @param opt service options
* @param task main task of the service
* @param task_cls closure for task
- * @param term termination task of the service
- * @param term_cls closure for term
* @return GNUNET_SYSERR on error, GNUNET_OK
* if we shutdown nicely
*/
GNUNET_SERVICE_run (int argc,
char *const *argv,
const char *serviceName,
- GNUNET_SERVICE_Main task,
- void *task_cls, GNUNET_SERVICE_Term term, void *term_cls)
+ enum GNUNET_SERVICE_Options opt,
+ GNUNET_SERVICE_Main task, void *task_cls)
{
+#define HANDLE_ERROR do { err = 1; GNUNET_break (0); goto shutdown; } while (0)
+
+ int err;
char *cfg_fn;
char *loglev;
char *logfile;
int do_daemonize;
+ unsigned int i;
struct GNUNET_SERVICE_Context sctx;
+ struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_GETOPT_CommandLineOption service_options[] = {
GNUNET_GETOPT_OPTION_CFG_FILE (&cfg_fn),
{'d', "daemonize", NULL,
GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION),
GNUNET_GETOPT_OPTION_END
};
+ err = 0;
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;
sctx.ret = GNUNET_OK;
sctx.timeout = GNUNET_TIME_UNIT_FOREVER_REL;
sctx.maxbuf = GNUNET_SERVER_MAX_MESSAGE_SIZE;
sctx.task = task;
sctx.serviceName = serviceName;
- sctx.cfg = GNUNET_CONFIGURATION_create ();
+ sctx.cfg = cfg = GNUNET_CONFIGURATION_create ();
/* setup subsystems */
- if ((GNUNET_SYSERR ==
- GNUNET_GETOPT_run (serviceName,
- sctx.cfg,
- service_options,
- argc,
- argv)) ||
- (GNUNET_OK !=
- GNUNET_log_setup (serviceName, loglev, logfile)) ||
- (GNUNET_OK !=
- GNUNET_CONFIGURATION_load (sctx.cfg, cfg_fn)) ||
- (GNUNET_OK !=
- setup_service (&sctx)) ||
- ((do_daemonize == 1) &&
- (GNUNET_OK != detach_terminal (&sctx))) ||
- (GNUNET_OK != set_user_id (&sctx)))
- {
- if (sctx.ready_confirm_fd != -1)
- {
- if (1 != WRITE (sctx.ready_confirm_fd, "I", 1))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "write");
- GNUNET_break (0 == CLOSE (sctx.ready_confirm_fd));
- }
- GNUNET_CONFIGURATION_destroy (sctx.cfg);
- GNUNET_free_non_null (sctx.addr);
- GNUNET_free_non_null (logfile);
- GNUNET_free (loglev);
- GNUNET_free (cfg_fn);
- GNUNET_free_non_null (sctx.v4_denied);
- GNUNET_free_non_null (sctx.v6_denied);
- GNUNET_free_non_null (sctx.v4_allowed);
- GNUNET_free_non_null (sctx.v6_allowed);
- return GNUNET_SYSERR;
- }
-
+ if (GNUNET_SYSERR == GNUNET_GETOPT_run (serviceName, service_options, argc,
+ argv))
+ goto shutdown;
+ if (GNUNET_OK != GNUNET_log_setup (serviceName, loglev, logfile))
+ HANDLE_ERROR;
+ if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cfg_fn))
+ goto shutdown;
+ if (GNUNET_OK != setup_service (&sctx))
+ goto shutdown;
+ if ( (do_daemonize == 1) && (GNUNET_OK != detach_terminal (&sctx)))
+ HANDLE_ERROR;
+ if (GNUNET_OK != set_user_id (&sctx))
+ goto shutdown;
+#if DEBUG_SERVICE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Service `%s' runs with configuration from `%s'\n",
+ serviceName, cfg_fn);
+#endif
/* actually run service */
GNUNET_SCHEDULER_run (&service_task, &sctx);
+
+ /* shutdown */
+ if ((do_daemonize == 1) && (sctx.server != NULL))
+ pid_file_delete (&sctx);
+ GNUNET_free_non_null (sctx.my_handlers);
+
+shutdown:
if (sctx.ready_confirm_fd != -1)
{
- if (1 != WRITE (sctx.ready_confirm_fd, "S", 1))
+ if (1 != WRITE (sctx.ready_confirm_fd, err ? "I" : "S", 1))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "write");
GNUNET_break (0 == CLOSE (sctx.ready_confirm_fd));
}
- /* shutdown */
- if (term != NULL)
- term (term_cls, sctx.cfg);
- if ((do_daemonize == 1) && (sctx.server != NULL))
- pid_file_delete (&sctx);
- if (sctx.server != NULL)
- GNUNET_SERVER_destroy (sctx.server);
- GNUNET_free_non_null (sctx.my_handlers);
- GNUNET_CONFIGURATION_destroy (sctx.cfg);
- GNUNET_free_non_null (sctx.addr);
+ GNUNET_CONFIGURATION_destroy (cfg);
+ i = 0;
+ 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);
GNUNET_free (loglev);
GNUNET_free (cfg_fn);
GNUNET_free_non_null (sctx.v6_denied);
GNUNET_free_non_null (sctx.v4_allowed);
GNUNET_free_non_null (sctx.v6_allowed);
- return sctx.ret;
+
+ return err ? GNUNET_SYSERR : sctx.ret;
}
struct GNUNET_SERVICE_Context *
GNUNET_SERVICE_start (const char *serviceName,
struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_CONFIGURATION_Handle *cfg)
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
int i;
struct GNUNET_SERVICE_Context *sctx;
(NULL == (sctx->server = GNUNET_SERVER_create (sched,
&check_access,
sctx,
- sctx->addr,
- sctx->addrlen,
+ sctx->addrs,
+ sctx->addrlens,
sctx->maxbuf,
sctx->timeout,
sctx->require_found))))
while ((sctx->my_handlers[i].callback != NULL))
sctx->my_handlers[i++].callback_cls = sctx;
GNUNET_SERVER_add_handlers (sctx->server, sctx->my_handlers);
-
-
return sctx;
}
/**
* Stop a service that was started with "GNUNET_SERVICE_start".
*
- * @param ctx the service context returned from the start function
+ * @param sctx the service context returned from the start function
*/
void
GNUNET_SERVICE_stop (struct GNUNET_SERVICE_Context *sctx)
{
+ unsigned int i;
if (NULL != sctx->server)
GNUNET_SERVER_destroy (sctx->server);
GNUNET_free_non_null (sctx->my_handlers);
- GNUNET_free_non_null (sctx->addr);
+ i = 0;
+ 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 (sctx->v4_denied);
GNUNET_free_non_null (sctx->v6_denied);
GNUNET_free_non_null (sctx->v4_allowed);
projects / oweals / gnunet.git / blobdiff