diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-03-03 18:32:04 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-03-03 18:32:30 +0100 |
commit | c36f464031c4bebf11ce109cf6edbada584981d3 (patch) | |
tree | 8019891cdcb71eddae245c988b3de12859686253 | |
parent | 22f2a119c4add6e2421472b67b041f38ed74fdb3 (diff) | |
download | gnunet-c36f464031c4bebf11ce109cf6edbada584981d3.tar.gz gnunet-c36f464031c4bebf11ce109cf6edbada584981d3.zip |
add pin zone, remove obsolete script
-rw-r--r-- | contrib/Makefile.am | 4 | ||||
-rwxr-xr-x | contrib/gnunet-gns-import.sh | 92 | ||||
-rw-r--r-- | src/gns/gns.conf.in | 3 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns.c | 3 |
4 files changed, 5 insertions, 97 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index ac8b15188..577924fab 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am | |||
@@ -22,9 +22,6 @@ noinst_SCRIPTS = \ | |||
22 | gnunet_pyexpect.py \ | 22 | gnunet_pyexpect.py \ |
23 | gnunet_janitor.py | 23 | gnunet_janitor.py |
24 | 24 | ||
25 | bin_SCRIPTS = \ | ||
26 | gnunet-gns-import.sh | ||
27 | |||
28 | dist_pkgdata_DATA = \ | 25 | dist_pkgdata_DATA = \ |
29 | gns-bcd.html \ | 26 | gns-bcd.html \ |
30 | gns-bcd.tex \ | 27 | gns-bcd.tex \ |
@@ -136,4 +133,3 @@ dist-hook: | |||
136 | fi \ | 133 | fi \ |
137 | done \ | 134 | done \ |
138 | fi | 135 | fi |
139 | |||
diff --git a/contrib/gnunet-gns-import.sh b/contrib/gnunet-gns-import.sh deleted file mode 100755 index 7b46379d6..000000000 --- a/contrib/gnunet-gns-import.sh +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # This shell-script will import some GNS authorities into your GNS | ||
3 | # namestore. | ||
4 | |||
5 | LOCATION=$(which gnunet-config) | ||
6 | if [ -z $LOCATION ] | ||
7 | then | ||
8 | LOCATION="gnunet-config" | ||
9 | fi | ||
10 | $LOCATION --version 1> /dev/null | ||
11 | if test $? != 0 | ||
12 | then | ||
13 | echo "GNUnet command line tools not found, check environmental variables PATH and GNUNET_PREFIX" | ||
14 | exit 1 | ||
15 | fi | ||
16 | |||
17 | gnunet-arm -I 1> /dev/null 2>/dev/null | ||
18 | if [ ! $? -eq 0 ] | ||
19 | then | ||
20 | echo "GNUnet is not running, please start GNUnet before running import" | ||
21 | exit 1 | ||
22 | fi | ||
23 | |||
24 | options='' | ||
25 | |||
26 | while getopts "c:" opt; do | ||
27 | case $opt in | ||
28 | c) | ||
29 | options="$options -c $OPTARG" | ||
30 | ;; | ||
31 | \?) | ||
32 | echo "Invalid option: -$OPTARG" >&2 | ||
33 | exit 1 | ||
34 | ;; | ||
35 | :) | ||
36 | echo "Option -$OPTARG requires an argument." >&2 | ||
37 | exit 1 | ||
38 | ;; | ||
39 | esac | ||
40 | done | ||
41 | |||
42 | # By default, we create two GNS zones: | ||
43 | gnunet-identity -C master-zone $options | ||
44 | gnunet-identity -C private-zone $options | ||
45 | |||
46 | # Additionally, we create the FS SKS zone | ||
47 | gnunet-identity -C sks-zone $options | ||
48 | |||
49 | #### Integrate those with the respective subsystems #### | ||
50 | |||
51 | # Default zone for 'gnunet-gns' lookups | ||
52 | gnunet-identity -e master-zone -s gns-master $options | ||
53 | |||
54 | # Default zone for 'gnunet-namestore' operations | ||
55 | gnunet-identity -e master-zone -s namestore $options | ||
56 | |||
57 | # Use master-zone for GNS proxy lookups | ||
58 | gnunet-identity -e master-zone -s gns-proxy $options | ||
59 | |||
60 | # Use master-zone for intercepted DNS queries | ||
61 | # (remove this entry to disable DNS interception by GNS service) | ||
62 | gnunet-identity -e master-zone -s gns-intercept $options | ||
63 | |||
64 | # Use master-zone for DNS2GNS proxy. | ||
65 | gnunet-identity -e master-zone -s dns2gns $options | ||
66 | |||
67 | # 'gns-private' is not yet used (!) | ||
68 | gnunet-identity -e private-zone -s gns-private $options | ||
69 | |||
70 | # 'fs-sks' default ego for gnunet-fs-gtk namespace operations | ||
71 | gnunet-identity -e sks-zone -s fs-sks $options | ||
72 | |||
73 | # Get the public keys as strings (so we can create PKEY records) | ||
74 | MASTER=`gnunet-identity -d $options | grep master-zone | awk '{print $3}'` | ||
75 | PRIVATE=`gnunet-identity -d $options | grep private-zone | awk '{print $3}'` | ||
76 | PIN=DWJASSPE33MRN8T6Q0PENRNBTQY0E6ZYGTRCDP5DGPBF2CRJMJEG | ||
77 | |||
78 | # Link private zone into master zone | ||
79 | if (gnunet-namestore -z master-zone -D -n private -t PKEY | grep "PKEY: $PRIVATE" 1>/dev/null) | ||
80 | then | ||
81 | echo "Private zone link exists, skipping" | ||
82 | else | ||
83 | gnunet-namestore -z master-zone -a -e never -n private -p -t PKEY -V $PRIVATE $options | ||
84 | fi | ||
85 | |||
86 | # Link GNUnet's FCFS zone into master zone under label "pin" | ||
87 | if (gnunet-namestore -z master-zone -D -n pin -t PKEY | grep "PKEY: $PIN" 1>/dev/null) | ||
88 | then | ||
89 | echo "Pin zone link exists, skipping" | ||
90 | else | ||
91 | gnunet-namestore -z master-zone -a -e never -n pin -p -t PKEY -V $PIN $options | ||
92 | fi | ||
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in index b34246cef..b85b1e04c 100644 --- a/src/gns/gns.conf.in +++ b/src/gns/gns.conf.in | |||
@@ -21,6 +21,9 @@ MAX_PARALLEL_BACKGROUND_QUERIES = 1000 | |||
21 | 21 | ||
22 | # PREFIX = valgrind --leak-check=full --track-origins=yes | 22 | # PREFIX = valgrind --leak-check=full --track-origins=yes |
23 | 23 | ||
24 | # Zones | ||
25 | .pin = DWJASSPE33MRN8T6Q0PENRNBTQY0E6ZYGTRCDP5DGPBF2CRJMJEG | ||
26 | |||
24 | 27 | ||
25 | [gns-proxy] | 28 | [gns-proxy] |
26 | BINARY = gnunet-gns-proxy | 29 | BINARY = gnunet-gns-proxy |
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c index e13beb889..69f1ca640 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/gns/gnunet-service-gns.c | |||
@@ -223,6 +223,7 @@ static void | |||
223 | shutdown_task (void *cls) | 223 | shutdown_task (void *cls) |
224 | { | 224 | { |
225 | struct GNS_TopLevelDomain *tld; | 225 | struct GNS_TopLevelDomain *tld; |
226 | |||
226 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 227 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
227 | "Shutting down!\n"); | 228 | "Shutting down!\n"); |
228 | GNS_interceptor_done (); | 229 | GNS_interceptor_done (); |
@@ -536,7 +537,7 @@ read_service_conf (void *cls, | |||
536 | return; | 537 | return; |
537 | } | 538 | } |
538 | tld = GNUNET_new (struct GNS_TopLevelDomain); | 539 | tld = GNUNET_new (struct GNS_TopLevelDomain); |
539 | tld->tld = GNUNET_strdup (option); | 540 | tld->tld = GNUNET_strdup (&option[1]); |
540 | tld->pkey = pk; | 541 | tld->pkey = pk; |
541 | GNUNET_CONTAINER_DLL_insert (tld_head, | 542 | GNUNET_CONTAINER_DLL_insert (tld_head, |
542 | tld_tail, | 543 | tld_tail, |