diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/dns/dnsstub.c | 5 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy-setup-ca | 8 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_resolver.c | 3 | ||||
-rw-r--r-- | src/namestore/gnunet-zoneimport.c | 10 |
4 files changed, 17 insertions, 9 deletions
diff --git a/src/dns/dnsstub.c b/src/dns/dnsstub.c index f9dc7a696..6aa2d7b8f 100644 --- a/src/dns/dnsstub.c +++ b/src/dns/dnsstub.c | |||
@@ -621,6 +621,11 @@ void | |||
621 | GNUNET_DNSSTUB_resolve_cancel (struct GNUNET_DNSSTUB_RequestSocket *rs) | 621 | GNUNET_DNSSTUB_resolve_cancel (struct GNUNET_DNSSTUB_RequestSocket *rs) |
622 | { | 622 | { |
623 | rs->rc = NULL; | 623 | rs->rc = NULL; |
624 | if (NULL != rs->retry_task) | ||
625 | { | ||
626 | GNUNET_SCHEDULER_cancel (rs->retry_task); | ||
627 | rs->retry_task = NULL; | ||
628 | } | ||
624 | } | 629 | } |
625 | 630 | ||
626 | 631 | ||
diff --git a/src/gns/gnunet-gns-proxy-setup-ca b/src/gns/gnunet-gns-proxy-setup-ca index 692cca974..72d478a50 100644 --- a/src/gns/gnunet-gns-proxy-setup-ca +++ b/src/gns/gnunet-gns-proxy-setup-ca | |||
@@ -2,9 +2,9 @@ | |||
2 | # This shell script will generate an X509 certificate for your gnunet-gns-proxy | 2 | # This shell script will generate an X509 certificate for your gnunet-gns-proxy |
3 | # and install it (for both GNUnet and your browser). | 3 | # and install it (for both GNUnet and your browser). |
4 | # | 4 | # |
5 | if ! which certtool > /dev/null | 5 | if ! which certutil > /dev/null |
6 | then | 6 | then |
7 | echo "'certtool' command not found. Please install it." | 7 | echo "'certutil' command not found. Please install it." |
8 | exit 1 | 8 | exit 1 |
9 | fi | 9 | fi |
10 | 10 | ||
@@ -41,10 +41,10 @@ echo "Making private key available to gnunet-gns-proxy" | |||
41 | cat $GNSCERT $GNSCANO > $GNS_CA_CERT_PEM | 41 | cat $GNSCERT $GNSCANO > $GNS_CA_CERT_PEM |
42 | 42 | ||
43 | echo "Importing CA into browsers" | 43 | echo "Importing CA into browsers" |
44 | for f in ~/.mozilla/firefox/*.default/ | 44 | for f in ~/.mozilla/firefox/*.*/ |
45 | do | 45 | do |
46 | if [ -d $f ]; then | 46 | if [ -d $f ]; then |
47 | echo "Importing CA info Firefox at $f/" | 47 | echo "Importing CA info Firefox at $f" |
48 | # delete old certificate (if any) | 48 | # delete old certificate (if any) |
49 | certutil -D -n "GNS Proxy CA" -d "$f" >/dev/null 2>/dev/null | 49 | certutil -D -n "GNS Proxy CA" -d "$f" >/dev/null 2>/dev/null |
50 | # add new certificate | 50 | # add new certificate |
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index d0edb82e5..94819b040 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c | |||
@@ -1940,6 +1940,9 @@ handle_gns_resolution_result (void *cls, | |||
1940 | return; | 1940 | return; |
1941 | case GNUNET_GNSRECORD_TYPE_GNS2DNS: | 1941 | case GNUNET_GNSRECORD_TYPE_GNS2DNS: |
1942 | { | 1942 | { |
1943 | /* TODO: Right now we only foward the request to ONE DNS resolver, | ||
1944 | even if we get multiple IP addresses back; a correct implementation | ||
1945 | should try all DNS resolvers. */ | ||
1943 | /* resolution continues within DNS */ | 1946 | /* resolution continues within DNS */ |
1944 | struct Gns2DnsContext *g2dc; | 1947 | struct Gns2DnsContext *g2dc; |
1945 | char *ip; | 1948 | char *ip; |
diff --git a/src/namestore/gnunet-zoneimport.c b/src/namestore/gnunet-zoneimport.c index 0148f42a7..4f4151c94 100644 --- a/src/namestore/gnunet-zoneimport.c +++ b/src/namestore/gnunet-zoneimport.c | |||
@@ -165,9 +165,9 @@ struct Request | |||
165 | 165 | ||
166 | /** | 166 | /** |
167 | * Namestore operation pending for this record. | 167 | * Namestore operation pending for this record. |
168 | */ | 168 | */ |
169 | struct GNUNET_NAMESTORE_QueueEntry *qe; | 169 | struct GNUNET_NAMESTORE_QueueEntry *qe; |
170 | 170 | ||
171 | /** | 171 | /** |
172 | * Zone responsible for this request. | 172 | * Zone responsible for this request. |
173 | */ | 173 | */ |
@@ -476,7 +476,7 @@ check_for_glue (void *cls, | |||
476 | } | 476 | } |
477 | if (NULL == | 477 | if (NULL == |
478 | inet_ntop (AF_INET, | 478 | inet_ntop (AF_INET, |
479 | &rec->data.raw.data, | 479 | rec->data.raw.data, |
480 | ip, | 480 | ip, |
481 | ip_size)) | 481 | ip_size)) |
482 | { | 482 | { |
@@ -510,7 +510,7 @@ check_for_glue (void *cls, | |||
510 | } | 510 | } |
511 | if (NULL == | 511 | if (NULL == |
512 | inet_ntop (AF_INET6, | 512 | inet_ntop (AF_INET6, |
513 | &rec->data.raw.data, | 513 | rec->data.raw.data, |
514 | ip, | 514 | ip, |
515 | ip_size)) | 515 | ip_size)) |
516 | { | 516 | { |
@@ -1135,7 +1135,7 @@ ns_lookup_result_cb (void *cls, | |||
1135 | const struct GNUNET_GNSRECORD_Data *rd) | 1135 | const struct GNUNET_GNSRECORD_Data *rd) |
1136 | { | 1136 | { |
1137 | struct Request *req = cls; | 1137 | struct Request *req = cls; |
1138 | 1138 | ||
1139 | req->qe = NULL; | 1139 | req->qe = NULL; |
1140 | GNUNET_break (0 == memcmp (zone, | 1140 | GNUNET_break (0 == memcmp (zone, |
1141 | &req->zone->key, | 1141 | &req->zone->key, |