diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-12-04 19:37:05 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-12-04 19:37:05 +0000 |
commit | 03cd2a43b97d5514b237261607a3f09aab4f250b (patch) | |
tree | 21a72501c16615b752f01d94dbc6522973424745 /src/gns | |
parent | 0f271cc42ea9e3029219fbb3a02862beacc08afa (diff) | |
download | gnunet-03cd2a43b97d5514b237261607a3f09aab4f250b.tar.gz gnunet-03cd2a43b97d5514b237261607a3f09aab4f250b.zip |
-fix align
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/gns.conf.in | 32 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns.c | 11 |
2 files changed, 38 insertions, 5 deletions
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in index 9746c07af..e865efd21 100644 --- a/src/gns/gns.conf.in +++ b/src/gns/gns.conf.in | |||
@@ -5,25 +5,57 @@ HOME = $SERVICEHOME | |||
5 | BINARY = gnunet-service-gns | 5 | BINARY = gnunet-service-gns |
6 | UNIXPATH = /tmp/gnunet-service-gns.sock | 6 | UNIXPATH = /tmp/gnunet-service-gns.sock |
7 | @UNIXONLY@PORT = 2102 | 7 | @UNIXONLY@PORT = 2102 |
8 | |||
9 | # Where to store the key for the Master zone | ||
8 | ZONEKEY = $SERVICEHOME/gns/zonekey.zkey | 10 | ZONEKEY = $SERVICEHOME/gns/zonekey.zkey |
11 | |||
12 | # Where to store the key for the Private zone | ||
9 | PRIVATE_ZONEKEY = $SERVICEHOME/gns/zonekey_priv.zkey | 13 | PRIVATE_ZONEKEY = $SERVICEHOME/gns/zonekey_priv.zkey |
14 | |||
15 | # Where to store the key for the Shorten zone | ||
10 | SHORTEN_ZONEKEY = $SERVICEHOME/gns/zonekey_short.zkey | 16 | SHORTEN_ZONEKEY = $SERVICEHOME/gns/zonekey_short.zkey |
17 | |||
18 | # Should we hijack DNS queries using the Linux firewall? | ||
19 | # (this only works on GNU/Linux systems) | ||
11 | HIJACK_DNS = NO | 20 | HIJACK_DNS = NO |
21 | |||
22 | # Automatically import PKEYs we learn into the shorten zone? | ||
12 | AUTO_IMPORT_PKEY = YES | 23 | AUTO_IMPORT_PKEY = YES |
24 | |||
25 | # When we automatically import PKEYs into shorten zone, require confirmation | ||
26 | # before they become active? (Not useful right now as the GUI to confirm | ||
27 | # doesn't exist) | ||
13 | AUTO_IMPORT_CONFIRMATION_REQ = NO | 28 | AUTO_IMPORT_CONFIRMATION_REQ = NO |
29 | |||
30 | # How many queries is GADS allowed to perform in the background at the same time? | ||
14 | MAX_PARALLEL_BACKGROUND_QUERIES = 25 | 31 | MAX_PARALLEL_BACKGROUND_QUERIES = 25 |
32 | |||
33 | # When do queries fail with timeout? | ||
15 | DEFAULT_LOOKUP_TIMEOUT = 10 s | 34 | DEFAULT_LOOKUP_TIMEOUT = 10 s |
35 | |||
36 | # How frequently do we try to publish our full zone? | ||
16 | ZONE_PUBLISH_TIME_WINDOW = 4 h | 37 | ZONE_PUBLISH_TIME_WINDOW = 4 h |
38 | |||
17 | # PREFIX = valgrind --leak-check=full --track-origins=yes | 39 | # PREFIX = valgrind --leak-check=full --track-origins=yes |
18 | 40 | ||
19 | [gns-proxy] | 41 | [gns-proxy] |
42 | # Where is the certificate for the GNS proxy stored? | ||
20 | PROXY_CACERT = $SERVICEHOME/gns/gnsCAcert.pem | 43 | PROXY_CACERT = $SERVICEHOME/gns/gnsCAcert.pem |
21 | PROXY_UNIXPATH = /tmp/gnunet-gns-proxy.sock | 44 | PROXY_UNIXPATH = /tmp/gnunet-gns-proxy.sock |
22 | 45 | ||
23 | [fcfsd] | 46 | [fcfsd] |
47 | # On what port does the FCFS daemon listen for HTTP clients? | ||
24 | HTTPPORT = 18080 | 48 | HTTPPORT = 18080 |
49 | |||
50 | # Where is the zone key for the FCFS zone stored? | ||
25 | ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey | 51 | ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey |
52 | |||
53 | # For ARM, not very useful. FIXME: Dead option? | ||
26 | HOSTNAME = localhost | 54 | HOSTNAME = localhost |
55 | |||
56 | # FIXME: Dead option? | ||
27 | HOME = $SERVICEHOME | 57 | HOME = $SERVICEHOME |
58 | |||
59 | # Name of the fcfs binary (for ARM) | ||
28 | BINARY = gnunet-gns-fcfsd | 60 | BINARY = gnunet-gns-fcfsd |
29 | 61 | ||
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c index ccb1b8e3d..5ce089080 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/gns/gnunet-service-gns.c | |||
@@ -1142,7 +1142,7 @@ handle_lookup (void *cls, | |||
1142 | } | 1142 | } |
1143 | 1143 | ||
1144 | if (1 == ntohl (sh_msg->use_default_zone)) | 1144 | if (1 == ntohl (sh_msg->use_default_zone)) |
1145 | clh->zone = zone_hash; //Default zone | 1145 | clh->zone = zone_hash; /* Default zone */ |
1146 | else | 1146 | else |
1147 | clh->zone = sh_msg->zone; | 1147 | clh->zone = sh_msg->zone; |
1148 | 1148 | ||
@@ -1293,13 +1293,14 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
1293 | if (GNUNET_YES == | 1293 | if (GNUNET_YES == |
1294 | GNUNET_CONFIGURATION_get_value_yesno (c, "gns", "HIJACK_DNS")) | 1294 | GNUNET_CONFIGURATION_get_value_yesno (c, "gns", "HIJACK_DNS")) |
1295 | { | 1295 | { |
1296 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, | 1296 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
1297 | "DNS hijacking enabled... connecting to service.\n"); | 1297 | "DNS hijacking enabled. Connecting to DNS service.\n"); |
1298 | 1298 | ||
1299 | if (gns_interceptor_init(zone_hash, zone_key, c) == GNUNET_SYSERR) | 1299 | if (GNUNET_SYSERR == |
1300 | gns_interceptor_init (zone_hash, zone_key, c)) | ||
1300 | { | 1301 | { |
1301 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, | 1302 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, |
1302 | "Failed to enable the dns interceptor!\n"); | 1303 | "Failed to enable the DNS interceptor!\n"); |
1303 | } | 1304 | } |
1304 | } | 1305 | } |
1305 | 1306 | ||