X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Fservice.c;h=8f8cca36daaa8e06228e5b5f2f4b20a0b77993be;hb=fdbe690beeec04066f18302401096eb5212c3f6a;hp=b8975f41828652caff0a0231c8da208565525608;hpb=25e37143ca6ddc3ea7d3c2e3fd7c66002a45e060;p=oweals%2Fgnunet.git
diff --git a/src/util/service.c b/src/util/service.c
index b8975f418..8f8cca36d 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -44,40 +44,6 @@
/* ******************* access control ******************** */
-/**
- * @brief IPV4 network in CIDR notation.
- */
-struct IPv4NetworkSet
-{
- /**
- * IPv4 address.
- */
- struct in_addr network;
-
- /**
- * IPv4 netmask.
- */
- struct in_addr netmask;
-};
-
-/**
-
- * @brief network in CIDR notation for IPV6.
- */
-struct IPv6NetworkSet
-{
- /**
- * IPv6 address.
- */
- struct in6_addr network;
-
- /**
- * IPv6 netmask.
- */
- struct in6_addr netmask;
-};
-
-
/**
* Start task that may speed up our system clock artificially
*
@@ -94,286 +60,16 @@ void
GNUNET_SPEEDUP_stop_ (void);
-/**
- * Parse a network specification. The argument specifies
- * a list of networks. The format is
- * [network/netmask;]* (no whitespace, must be terminated
- * with a semicolon). The network must be given in dotted-decimal
- * notation. The netmask can be given in CIDR notation (/16) or
- * in dotted-decimal (/255.255.0.0).
- *
- * @param routeList a string specifying the forbidden networks
- * @return the converted list, NULL if the synatx is flawed
- */
-static struct IPv4NetworkSet *
-parse_ipv4_specification (const char *routeList)
-{
- unsigned int count;
- unsigned int i;
- unsigned int j;
- unsigned int len;
- int cnt;
- unsigned int pos;
- unsigned int temps[8];
- int slash;
- struct IPv4NetworkSet *result;
-
- if (NULL == routeList)
- return NULL;
- len = strlen (routeList);
- if (0 == len)
- return NULL;
- count = 0;
- for (i = 0; i < len; i++)
- if (routeList[i] == ';')
- count++;
- result = GNUNET_malloc (sizeof (struct IPv4NetworkSet) * (count + 1));
- i = 0;
- pos = 0;
- while (i < count)
- {
- cnt =
- SSCANF (&routeList[pos], "%u.%u.%u.%u/%u.%u.%u.%u;", &temps[0],
- &temps[1], &temps[2], &temps[3], &temps[4], &temps[5],
- &temps[6], &temps[7]);
- if (8 == cnt)
- {
- for (j = 0; j < 8; j++)
- if (temps[j] > 0xFF)
- {
- LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid format for IP: `%s'\n"),
- &routeList[pos]);
- GNUNET_free (result);
- return NULL;
- }
- result[i].network.s_addr =
- htonl ((temps[0] << 24) + (temps[1] << 16) + (temps[2] << 8) +
- temps[3]);
- result[i].netmask.s_addr =
- htonl ((temps[4] << 24) + (temps[5] << 16) + (temps[6] << 8) +
- temps[7]);
- while (routeList[pos] != ';')
- pos++;
- pos++;
- i++;
- continue;
- }
- /* try second notation */
- cnt =
- SSCANF (&routeList[pos], "%u.%u.%u.%u/%u;", &temps[0], &temps[1],
- &temps[2], &temps[3], &slash);
- if (5 == cnt)
- {
- for (j = 0; j < 4; j++)
- if (temps[j] > 0xFF)
- {
- LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid format for IP: `%s'\n"),
- &routeList[pos]);
- GNUNET_free (result);
- return NULL;
- }
- result[i].network.s_addr =
- htonl ((temps[0] << 24) + (temps[1] << 16) + (temps[2] << 8) +
- temps[3]);
- if ((slash <= 32) && (slash >= 0))
- {
- result[i].netmask.s_addr = 0;
- while (slash > 0)
- {
- result[i].netmask.s_addr =
- (result[i].netmask.s_addr >> 1) + 0x80000000;
- slash--;
- }
- result[i].netmask.s_addr = htonl (result[i].netmask.s_addr);
- while (';' != routeList[pos])
- pos++;
- pos++;
- i++;
- continue;
- }
- else
- {
- LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Invalid network notation ('/%d' is not legal in IPv4 CIDR)."),
- slash);
- GNUNET_free (result);
- return NULL; /* error */
- }
- }
- /* try third notation */
- slash = 32;
- cnt =
- SSCANF (&routeList[pos], "%u.%u.%u.%u;", &temps[0], &temps[1],
- &temps[2], &temps[3]);
- if (4 == cnt)
- {
- for (j = 0; j < 4; j++)
- if (temps[j] > 0xFF)
- {
- LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid format for IP: `%s'\n"),
- &routeList[pos]);
- GNUNET_free (result);
- return NULL;
- }
- result[i].network.s_addr =
- htonl ((temps[0] << 24) + (temps[1] << 16) + (temps[2] << 8) +
- temps[3]);
- result[i].netmask.s_addr = 0;
- while (slash > 0)
- {
- result[i].netmask.s_addr = (result[i].netmask.s_addr >> 1) + 0x80000000;
- slash--;
- }
- result[i].netmask.s_addr = htonl (result[i].netmask.s_addr);
- while (routeList[pos] != ';')
- pos++;
- pos++;
- i++;
- continue;
- }
- LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid format for IP: `%s'\n"),
- &routeList[pos]);
- GNUNET_free (result);
- return NULL; /* error */
- }
- if (pos < strlen (routeList))
- {
- LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid format for IP: `%s'\n"),
- &routeList[pos]);
- GNUNET_free (result);
- return NULL; /* oops */
- }
- return result; /* ok */
-}
-
-
-/**
- * Parse a network specification. The argument specifies
- * a list of networks. The format is
- * [network/netmask;]* (no whitespace, must be terminated
- * with a semicolon). The network must be given in colon-hex
- * notation. The netmask must be given in CIDR notation (/16) or
- * can be omitted to specify a single host.
- *
- * @param routeListX a string specifying the forbidden networks
- * @return the converted list, NULL if the synatx is flawed
- */
-static struct IPv6NetworkSet *
-parse_ipv6_specification (const char *routeListX)
-{
- unsigned int count;
- unsigned int i;
- unsigned int len;
- unsigned int pos;
- int start;
- int slash;
- int ret;
- char *routeList;
- struct IPv6NetworkSet *result;
- unsigned int bits;
- unsigned int off;
- int save;
-
- if (NULL == routeListX)
- return NULL;
- len = strlen (routeListX);
- if (0 == len)
- return NULL;
- routeList = GNUNET_strdup (routeListX);
- count = 0;
- for (i = 0; i < len; i++)
- if (';' == routeList[i])
- count++;
- if (';' != routeList[len - 1])
- {
- LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Invalid network notation (does not end with ';': `%s')\n"),
- routeList);
- GNUNET_free (routeList);
- return NULL;
- }
-
- result = GNUNET_malloc (sizeof (struct IPv6NetworkSet) * (count + 1));
- i = 0;
- pos = 0;
- while (i < count)
- {
- start = pos;
- while (';' != routeList[pos])
- pos++;
- slash = pos;
- while ((slash >= start) && (routeList[slash] != '/'))
- slash--;
- if (slash < start)
- {
- memset (&result[i].netmask, 0xFF, sizeof (struct in6_addr));
- slash = pos;
- }
- else
- {
- routeList[pos] = '\0';
- ret = inet_pton (AF_INET6, &routeList[slash + 1], &result[i].netmask);
- if (ret <= 0)
- {
- save = errno;
- if ((1 != SSCANF (&routeList[slash + 1], "%u", &bits)) || (bits >= 128))
- {
- if (0 == ret)
- LOG (GNUNET_ERROR_TYPE_ERROR, _("Wrong format `%s' for netmask\n"),
- &routeList[slash + 1]);
- else
- {
- errno = save;
- LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "inet_pton");
- }
- GNUNET_free (result);
- GNUNET_free (routeList);
- return NULL;
- }
- off = 0;
- while (bits > 8)
- {
- result[i].netmask.s6_addr[off++] = 0xFF;
- bits -= 8;
- }
- while (bits > 0)
- {
- result[i].netmask.s6_addr[off] =
- (result[i].netmask.s6_addr[off] >> 1) + 0x80;
- bits--;
- }
- }
- }
- routeList[slash] = '\0';
- ret = inet_pton (AF_INET6, &routeList[start], &result[i].network);
- if (ret <= 0)
- {
- if (0 == ret)
- LOG (GNUNET_ERROR_TYPE_ERROR, _("Wrong format `%s' for network\n"),
- &routeList[slash + 1]);
- else
- LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "inet_pton");
- GNUNET_free (result);
- GNUNET_free (routeList);
- return NULL;
- }
- pos++;
- i++;
- }
- GNUNET_free (routeList);
- return result;
-}
-
-
/**
* Check if the given IP address is in the list of IP addresses.
*
* @param list a list of networks
* @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
+ * @return #GNUNET_NO if the IP is not in the list, #GNUNET_YES if it it is
*/
static int
-check_ipv4_listed (const struct IPv4NetworkSet *list, const struct in_addr *add)
+check_ipv4_listed (const struct GNUNET_STRINGS_IPv4NetworkPolicy *list,
+ const struct in_addr *add)
{
unsigned int i;
@@ -396,10 +92,11 @@ check_ipv4_listed (const struct IPv4NetworkSet *list, const struct in_addr *add)
*
* @param list a list of networks
* @param ip 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
+ * @return #GNUNET_NO if the IP is not in the list, #GNUNET_YES if it it is
*/
static int
-check_ipv6_listed (const struct IPv6NetworkSet *list, const struct in6_addr *ip)
+check_ipv6_listed (const struct GNUNET_STRINGS_IPv6NetworkPolicy *list,
+ const struct in6_addr *ip)
{
unsigned int i;
unsigned int j;
@@ -467,24 +164,24 @@ struct GNUNET_SERVICE_Context
/**
* IPv4 addresses that are not allowed to connect.
*/
- struct IPv4NetworkSet *v4_denied;
+ struct GNUNET_STRINGS_IPv4NetworkPolicy *v4_denied;
/**
* IPv6 addresses that are not allowed to connect.
*/
- struct IPv6NetworkSet *v6_denied;
+ struct GNUNET_STRINGS_IPv6NetworkPolicy *v6_denied;
/**
* IPv4 addresses that are allowed to connect (if not
* set, all are allowed).
*/
- struct IPv4NetworkSet *v4_allowed;
+ struct GNUNET_STRINGS_IPv4NetworkPolicy *v4_allowed;
/**
* IPv6 addresses that are allowed to connect (if not
* set, all are allowed).
*/
- struct IPv6NetworkSet *v6_allowed;
+ struct GNUNET_STRINGS_IPv6NetworkPolicy *v6_allowed;
/**
* My (default) message handlers. Adjusted copy
@@ -532,17 +229,17 @@ struct GNUNET_SERVICE_Context
/**
* Do we require a matching UID for UNIX domain socket connections?
- * GNUNET_NO means that the UID does not have to match (however,
- * "match_gid" may still impose other access control checks).
+ * #GNUNET_NO means that the UID does not have to match (however,
+ * @e match_gid may still impose other access control checks).
*/
int match_uid;
/**
* Do we require a matching GID for UNIX domain socket connections?
- * Ignored if "match_uid" is GNUNET_YES. Note that this is about
+ * Ignored if @e match_uid is #GNUNET_YES. Note that this is about
* checking that the client's UID is in our group OR that the
- * client's GID is our GID. If both "match_gid" and "match_uid" are
- * "GNUNET_NO", all users on the local system have access.
+ * client's GID is our GID. If both "match_gid" and @e match_uid are
+ * #GNUNET_NO, all users on the local system have access.
*/
int match_gid;
@@ -626,7 +323,7 @@ static const struct GNUNET_SERVER_MessageHandler defhandlers[] = {
* @param uc credentials, if available, otherwise NULL
* @param addr address
* @param addrlen length of address
- * @return GNUNET_YES to allow, GNUNET_NO to deny, GNUNET_SYSERR
+ * @return #GNUNET_YES to allow, #GNUNET_NO to deny, #GNUNET_SYSERR
* for unknown address family (will be denied).
*/
static int
@@ -658,56 +355,7 @@ check_access (void *cls, const struct GNUNET_CONNECTION_Credentials *uc,
break;
#ifndef WINDOWS
case AF_UNIX:
- ret = GNUNET_OK; /* always OK for now */
- if (GNUNET_YES == sctx->match_uid)
- {
- /* UID match required */
- ret = (NULL != uc) && ( (0 == uc->uid) || (uc->uid == geteuid ()) );
- }
- else if ( (GNUNET_YES == sctx->match_gid) &&
- ( (NULL == uc) ||
- ( (0 != uc->uid) &&
- (uc->uid != geteuid ()) ) ) )
- {
- /* group match required and UID does not match */
- if (NULL == uc)
- {
- /* no credentials, group match not possible */
- ret = GNUNET_NO;
- }
- else
- {
- struct group *grp;
- unsigned int i;
-
- if (uc->gid != getegid())
- {
- /* default group did not match, but maybe the user is in our group, let's check */
- grp = getgrgid (getegid ());
- if (NULL == grp)
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "getgrgid");
- return GNUNET_NO;
- }
- ret = GNUNET_NO;
- for (i=0; NULL != grp->gr_mem[i]; i++)
- {
- struct passwd *nam = getpwnam (grp->gr_mem[i]);
- if (NULL == nam)
- continue; /* name in group that is not in user DB !? */
- if (nam->pw_uid == uc->uid)
- {
- /* yes, uid is in our group, allow! */
- ret = GNUNET_YES;
- break;
- }
- }
- }
- }
- }
- if (GNUNET_NO == ret)
- LOG (GNUNET_ERROR_TYPE_WARNING, _("Access denied to UID %d / GID %d\n"),
- (NULL == uc) ? -1 : uc->uid, (NULL == uc) ? -1 : uc->gid);
+ ret = GNUNET_OK; /* controlled using file-system ACL now */
break;
#endif
default:
@@ -752,11 +400,11 @@ get_pid_file_name (struct GNUNET_SERVICE_Context *sctx)
* @param ret location where to write the ACL (set)
* @param sctx service context to use to get the configuration
* @param option name of the ACL option to parse
- * @return GNUNET_SYSERR on parse error, GNUNET_OK on success (including
+ * @return #GNUNET_SYSERR on parse error, #GNUNET_OK on success (including
* no ACL configured)
*/
static int
-process_acl4 (struct IPv4NetworkSet **ret, struct GNUNET_SERVICE_Context *sctx,
+process_acl4 (struct GNUNET_STRINGS_IPv4NetworkPolicy **ret, struct GNUNET_SERVICE_Context *sctx,
const char *option)
{
char *opt;
@@ -770,7 +418,7 @@ process_acl4 (struct IPv4NetworkSet **ret, struct GNUNET_SERVICE_Context *sctx,
GNUNET_CONFIGURATION_get_value_string (sctx->cfg,
sctx->service_name,
option, &opt));
- if (NULL == (*ret = parse_ipv4_specification (opt)))
+ if (NULL == (*ret = GNUNET_STRINGS_parse_ipv4_policy (opt)))
{
LOG (GNUNET_ERROR_TYPE_WARNING,
_("Could not parse IPv4 network specification `%s' for `%s:%s'\n"),
@@ -789,11 +437,11 @@ process_acl4 (struct IPv4NetworkSet **ret, struct GNUNET_SERVICE_Context *sctx,
* @param ret location where to write the ACL (set)
* @param sctx service context to use to get the configuration
* @param option name of the ACL option to parse
- * @return GNUNET_SYSERR on parse error, GNUNET_OK on success (including
+ * @return #GNUNET_SYSERR on parse error, #GNUNET_OK on success (including
* no ACL configured)
*/
static int
-process_acl6 (struct IPv6NetworkSet **ret, struct GNUNET_SERVICE_Context *sctx,
+process_acl6 (struct GNUNET_STRINGS_IPv6NetworkPolicy **ret, struct GNUNET_SERVICE_Context *sctx,
const char *option)
{
char *opt;
@@ -807,7 +455,7 @@ process_acl6 (struct IPv6NetworkSet **ret, struct GNUNET_SERVICE_Context *sctx,
GNUNET_CONFIGURATION_get_value_string (sctx->cfg,
sctx->service_name,
option, &opt));
- if (NULL == (*ret = parse_ipv6_specification (opt)))
+ if (NULL == (*ret = GNUNET_STRINGS_parse_ipv6_policy (opt)))
{
LOG (GNUNET_ERROR_TYPE_WARNING,
_("Could not parse IPv6 network specification `%s' for `%s:%s'\n"),
@@ -835,7 +483,7 @@ add_unixpath (struct sockaddr **saddrs, socklen_t * saddrlens,
#ifdef AF_UNIX
struct sockaddr_un *un;
- un = GNUNET_malloc (sizeof (struct sockaddr_un));
+ un = GNUNET_new (struct sockaddr_un);
un->sun_family = AF_UNIX;
strncpy (un->sun_path, unixpath, sizeof (un->sun_path) - 1);
#if HAVE_SOCKADDR_IN_SIN_LEN
@@ -864,11 +512,11 @@ add_unixpath (struct sockaddr **saddrs, socklen_t * saddrlens,
* of the respective 'struct sockaddr' struct in the 'addrs'
* array (on success)
* @return number of addresses found on success,
- * GNUNET_SYSERR if the configuration
+ * #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
+ * #GNUNET_NO if the number of addresses configured is
+ * zero (in this case, `*addrs` and `*addr_lens` will be
* set to NULL).
*/
int
@@ -1000,8 +648,7 @@ GNUNET_SERVICE_get_server_addresses (const char *service_name,
return GNUNET_SYSERR;
}
LOG (GNUNET_ERROR_TYPE_INFO,
- _
- ("Disabling UNIX domain socket support for service `%s', failed to create UNIX domain socket: %s\n"),
+ _("Disabling UNIX domain socket support for service `%s', failed to create UNIX domain socket: %s\n"),
service_name, STRERROR (errno));
GNUNET_free (unixpath);
unixpath = NULL;
@@ -1017,8 +664,7 @@ GNUNET_SERVICE_get_server_addresses (const char *service_name,
if ((0 == port) && (NULL == unixpath))
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- _
- ("Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
+ _("Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
service_name);
GNUNET_free_non_null (hostname);
return GNUNET_SYSERR;
@@ -1185,8 +831,8 @@ GNUNET_SERVICE_get_server_addresses (const char *service_name,
* Read listen sockets from the parent process (ARM).
*
* @param sctx service context to initialize
- * @return GNUNET_YES if ok, GNUNET_NO if not ok (must bind yourself),
- * and GNUNET_SYSERR on error.
+ * @return #GNUNET_YES if ok, #GNUNET_NO if not ok (must bind yourself),
+ * and #GNUNET_SYSERR on error.
*/
static int
receive_sockets_from_parent (struct GNUNET_SERVICE_Context *sctx)
@@ -1280,7 +926,7 @@ receive_sockets_from_parent (struct GNUNET_SERVICE_Context *sctx)
* - REJECT_FROM6 (disallow allow connections from specified IPv6 subnets)
*
* @param sctx service context to initialize
- * @return GNUNET_OK if configuration succeeded
+ * @return #GNUNET_OK if configuration succeeded
*/
static int
setup_service (struct GNUNET_SERVICE_Context *sctx)
@@ -1404,12 +1050,13 @@ get_user_name (struct GNUNET_SERVICE_Context *sctx)
return un;
}
+
/**
* Write PID file.
*
* @param sctx service context
* @param pid PID to write (should be equal to 'getpid()'
- * @return GNUNET_OK on success (including no work to be done)
+ * @return #GNUNET_OK on success (including no work to be done)
*/
static int
write_pid_file (struct GNUNET_SERVICE_Context *sctx, pid_t pid)
@@ -1467,7 +1114,7 @@ write_pid_file (struct GNUNET_SERVICE_Context *sctx, pid_t pid)
/**
* Task run during shutdown. Stops the server/service.
*
- * @param cls the 'struct GNUNET_SERVICE_Context'
+ * @param cls the `struct GNUNET_SERVICE_Context`
* @param tc unused
*/
static void
@@ -1501,33 +1148,39 @@ service_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
(void) GNUNET_SPEEDUP_start_ (sctx->cfg);
GNUNET_RESOLVER_connect (sctx->cfg);
if (NULL != sctx->lsocks)
- sctx->server =
- GNUNET_SERVER_create_with_sockets (&check_access, sctx, sctx->lsocks,
+ sctx->server
+ = GNUNET_SERVER_create_with_sockets (&check_access, sctx, sctx->lsocks,
sctx->timeout, sctx->require_found);
else
- sctx->server =
- GNUNET_SERVER_create (&check_access, sctx, sctx->addrs, sctx->addrlens,
+ sctx->server
+ = GNUNET_SERVER_create (&check_access, sctx, sctx->addrs, sctx->addrlens,
sctx->timeout, sctx->require_found);
if (NULL == sctx->server)
{
if (NULL != sctx->addrs)
- {
- i = 0;
- while (NULL != sctx->addrs[i])
- {
- LOG (GNUNET_ERROR_TYPE_INFO, _("Failed to start `%s' at `%s'\n"),
+ for (i = 0; NULL != sctx->addrs[i]; i++)
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ _("Failed to start `%s' at `%s'\n"),
sctx->service_name, GNUNET_a2s (sctx->addrs[i], sctx->addrlens[i]));
- i++;
- }
- }
sctx->ret = GNUNET_SYSERR;
return;
}
+#ifndef WINDOWS
+ if (NULL != sctx->addrs)
+ for (i = 0; NULL != sctx->addrs[i]; i++)
+ if (AF_UNIX == sctx->addrs[i]->sa_family)
+ GNUNET_DISK_fix_permissions (((const struct sockaddr_un *)sctx->addrs[i])->sun_path,
+ sctx->match_uid,
+ sctx->match_gid);
+#endif
+
+
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 */
- sctx->shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+ sctx->shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task,
sctx);
}
sctx->my_handlers = GNUNET_malloc (sizeof (defhandlers));
@@ -1642,7 +1295,7 @@ detach_terminal (struct GNUNET_SERVICE_Context *sctx)
* Set user ID.
*
* @param sctx service context
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
static int
set_user_id (struct GNUNET_SERVICE_Context *sctx)
@@ -1717,8 +1370,10 @@ pid_file_delete (struct GNUNET_SERVICE_Context *sctx)
* if we shutdown nicely
*/
int
-GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name,
- enum GNUNET_SERVICE_Options options, GNUNET_SERVICE_Main task,
+GNUNET_SERVICE_run (int argc, char *const *argv,
+ const char *service_name,
+ enum GNUNET_SERVICE_Options options,
+ GNUNET_SERVICE_Main task,
void *task_cls)
{
#define HANDLE_ERROR do { GNUNET_break (0); goto shutdown; } while (0)
@@ -1760,7 +1415,7 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name,
"%s%s%s",
xdg,
DIR_SEPARATOR_STR,
- "gnunet.config");
+ "gnunet.conf");
else
cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
memset (&sctx, 0, sizeof (sctx));
@@ -1891,7 +1546,7 @@ GNUNET_SERVICE_start (const char *service_name,
int i;
struct GNUNET_SERVICE_Context *sctx;
- sctx = GNUNET_malloc (sizeof (struct GNUNET_SERVICE_Context));
+ sctx = GNUNET_new (struct GNUNET_SERVICE_Context);
sctx->ready_confirm_fd = -1; /* no daemonizing */
sctx->ret = GNUNET_OK;
sctx->timeout = GNUNET_TIME_UNIT_FOREVER_REL;
@@ -1919,6 +1574,14 @@ GNUNET_SERVICE_start (const char *service_name,
GNUNET_SERVICE_stop (sctx);
return NULL;
}
+#ifndef WINDOWS
+ if (NULL != sctx->addrs)
+ for (i = 0; NULL != sctx->addrs[i]; i++)
+ if (AF_UNIX == sctx->addrs[i]->sa_family)
+ GNUNET_DISK_fix_permissions (((const struct sockaddr_un *)sctx->addrs[i])->sun_path,
+ sctx->match_uid,
+ sctx->match_gid);
+#endif
sctx->my_handlers = GNUNET_malloc (sizeof (defhandlers));
memcpy (sctx->my_handlers, defhandlers, sizeof (defhandlers));
i = 0;