diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-26 18:48:59 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-26 18:48:59 +0000 |
commit | fa7d6b32530d3d8c2d7e542a15319c74c22061b6 (patch) | |
tree | 8f4c7615c89f646a66fc709b698ef81becdf1ad1 /src/arm | |
parent | d79a03493ba5d0581e828724a402a2054429e7be (diff) | |
download | gnunet-fa7d6b32530d3d8c2d7e542a15319c74c22061b6.tar.gz gnunet-fa7d6b32530d3d8c2d7e542a15319c74c22061b6.zip |
moving from abstract unix domain socket paths to normal unix domain socket paths (#2887), removing now unnecessary/dead flags argument to GNUNET_NETWORK_socket_bind
Diffstat (limited to 'src/arm')
-rw-r--r-- | src/arm/arm.conf.in | 2 | ||||
-rw-r--r-- | src/arm/gnunet-service-arm.c | 4 | ||||
-rw-r--r-- | src/arm/test_exponential_backoff.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in index b9a33242f..e9bf82e9f 100644 --- a/src/arm/arm.conf.in +++ b/src/arm/arm.conf.in | |||
@@ -7,7 +7,7 @@ BINARY = gnunet-service-arm | |||
7 | ACCEPT_FROM = 127.0.0.1; | 7 | ACCEPT_FROM = 127.0.0.1; |
8 | ACCEPT_FROM6 = ::1; | 8 | ACCEPT_FROM6 = ::1; |
9 | DEFAULTSERVICES = topology hostlist dht nse mesh fs | 9 | DEFAULTSERVICES = topology hostlist dht nse mesh fs |
10 | UNIXPATH = /tmp/gnunet-service-arm.sock | 10 | UNIXPATH = $SERVICEHOME/gnunet-service-arm.sock |
11 | UNIX_MATCH_UID = YES | 11 | UNIX_MATCH_UID = YES |
12 | UNIX_MATCH_GID = YES | 12 | UNIX_MATCH_GID = YES |
13 | 13 | ||
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index 906f0adde..ab1fe6481 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
@@ -622,8 +622,8 @@ create_listen_socket (struct sockaddr *sa, socklen_t addr_len, | |||
622 | "setsockopt"); | 622 | "setsockopt"); |
623 | #endif | 623 | #endif |
624 | 624 | ||
625 | if (GNUNET_NETWORK_socket_bind | 625 | if (GNUNET_OK != |
626 | (sock, (const struct sockaddr *) sa, addr_len, 0) != GNUNET_OK) | 626 | GNUNET_NETWORK_socket_bind (sock, (const struct sockaddr *) sa, addr_len)) |
627 | { | 627 | { |
628 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 628 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
629 | _ | 629 | _ |
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c index bb30f22c6..557e81ee5 100644 --- a/src/arm/test_exponential_backoff.c +++ b/src/arm/test_exponential_backoff.c | |||
@@ -42,7 +42,7 @@ | |||
42 | 42 | ||
43 | #define BINARY "mockup-service" | 43 | #define BINARY "mockup-service" |
44 | 44 | ||
45 | #define CFGFILENAME "test_arm_api_data.conf" | 45 | #define CFGFILENAME "test_arm_api_data_copy.conf" |
46 | 46 | ||
47 | 47 | ||
48 | static const struct GNUNET_CONFIGURATION_Handle *cfg; | 48 | static const struct GNUNET_CONFIGURATION_Handle *cfg; |