[GNUnet-SVN] r25245 - in gnunet/src: dns gns

[gnunet]

Author: grothoff
Date: 2012-12-04 20:37:05 +0100 (Tue, 04 Dec 2012)
New Revision: 25245

Modified:
   gnunet/src/dns/dnsparser.h
   gnunet/src/gns/gns.conf.in
   gnunet/src/gns/gnunet-service-gns.c
Log:
-fix align

Modified: gnunet/src/dns/dnsparser.h
===================================================================
--- gnunet/src/dns/dnsparser.h  2012-12-04 19:36:41 UTC (rev 25244)
+++ gnunet/src/dns/dnsparser.h  2012-12-04 19:37:05 UTC (rev 25245)
@@ -172,21 +172,23 @@
   /* followed by 'target' name */
 };
 
+
 /**
  * Payload of GNS VPN record
  */
 struct vpn_data
 {
   /**
-   * The protocol to use
+   * The peer to contact
    */
-  uint16_t proto;
+  struct GNUNET_HashCode peer;
 
   /**
-   * The peer to contact
+   * The protocol to use
    */
-  struct GNUNET_HashCode peer;
+  uint16_t proto GNUNET_PACKED;
 
+
   /* followed by the servicename / identifier / password (0-terminated) */
 };
 

Modified: gnunet/src/gns/gns.conf.in
===================================================================
--- gnunet/src/gns/gns.conf.in  2012-12-04 19:36:41 UTC (rev 25244)
+++ gnunet/src/gns/gns.conf.in  2012-12-04 19:37:05 UTC (rev 25245)
@@ -5,25 +5,57 @@
 BINARY = gnunet-service-gns
 UNIXPATH = /tmp/gnunet-service-gns.sock
 @address@hidden = 2102
+
+# Where to store the key for the Master zone
 ZONEKEY = $SERVICEHOME/gns/zonekey.zkey
+
+# Where to store the key for the Private zone
 PRIVATE_ZONEKEY = $SERVICEHOME/gns/zonekey_priv.zkey
+
+# Where to store the key for the Shorten zone
 SHORTEN_ZONEKEY = $SERVICEHOME/gns/zonekey_short.zkey
+
+# Should we hijack DNS queries using the Linux firewall? 
+# (this only works on GNU/Linux systems)
 HIJACK_DNS = NO
+
+# Automatically import PKEYs we learn into the shorten zone?
 AUTO_IMPORT_PKEY = YES
+
+# When we automatically import PKEYs into shorten zone, require confirmation
+# before they become active? (Not useful right now as the GUI to confirm
+# doesn't exist)
 AUTO_IMPORT_CONFIRMATION_REQ = NO
+
+# How many queries is GADS allowed to perform in the background at the same 
time?
 MAX_PARALLEL_BACKGROUND_QUERIES = 25
+
+# When do queries fail with timeout?
 DEFAULT_LOOKUP_TIMEOUT = 10 s
+
+# How frequently do we try to publish our full zone?
 ZONE_PUBLISH_TIME_WINDOW = 4 h
+
 # PREFIX = valgrind --leak-check=full --track-origins=yes
 
 [gns-proxy]
+# Where is the certificate for the GNS proxy stored?
 PROXY_CACERT = $SERVICEHOME/gns/gnsCAcert.pem
 PROXY_UNIXPATH = /tmp/gnunet-gns-proxy.sock
 
 [fcfsd]
+# On what port does the FCFS daemon listen for HTTP clients?
 HTTPPORT = 18080
+
+# Where is the zone key for the FCFS zone stored?
 ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey
+
+# For ARM, not very useful.  FIXME: Dead option?
 HOSTNAME = localhost
+
+# FIXME: Dead option?
 HOME = $SERVICEHOME
+
+# Name of the fcfs binary (for ARM)
 BINARY = gnunet-gns-fcfsd
 

Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2012-12-04 19:36:41 UTC (rev 25244)
+++ gnunet/src/gns/gnunet-service-gns.c 2012-12-04 19:37:05 UTC (rev 25245)
@@ -1142,7 +1142,7 @@
   }
   
   if (1 == ntohl (sh_msg->use_default_zone))
-    clh->zone = zone_hash; //Default zone
+    clh->zone = zone_hash;  /* Default zone */
   else
     clh->zone = sh_msg->zone;
   
@@ -1293,13 +1293,14 @@
   if (GNUNET_YES ==
       GNUNET_CONFIGURATION_get_value_yesno (c, "gns", "HIJACK_DNS"))
   {
-    GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-               "DNS hijacking enabled... connecting to service.\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+               "DNS hijacking enabled. Connecting to DNS service.\n");
 
-    if (gns_interceptor_init(zone_hash, zone_key, c) == GNUNET_SYSERR)
+    if (GNUNET_SYSERR ==
+       gns_interceptor_init (zone_hash, zone_key, c))
     {
       GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-               "Failed to enable the dns interceptor!\n");
+               "Failed to enable the DNS interceptor!\n");
     }
   }