[GNUnet-SVN] r8092 - in GNUnet: . contrib src/include

[gnunet]

Author: holindho
Date: 2009-01-08 05:59:24 -0700 (Thu, 08 Jan 2009)
New Revision: 8092

Added:
   GNUnet/contrib/config-client.scm.in
   GNUnet/contrib/config-daemon.scm.in
   GNUnet/src/include/gnunet_directories.h.in
Removed:
   GNUnet/contrib/config-client.scm
   GNUnet/contrib/config-daemon.scm
   GNUnet/src/include/gnunet_directories.h
Modified:
   GNUnet/configure.ac
   GNUnet/contrib/Makefile.am
   GNUnet/src/include/Makefile.am
Log:
make default paths configurable


Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2009-01-07 13:26:34 UTC (rev 8091)
+++ GNUnet/configure.ac 2009-01-08 12:59:24 UTC (rev 8092)
@@ -931,6 +931,35 @@
 fi
 AM_CONDITIONAL(HAVE_QT, test x$qt != x0)
 
+gn_user_home_dir="~/.gnunet"
+AC_ARG_WITH(user-home-dir,
+        AC_HELP_STRING(
+                [--with-user-home-dir=DIR],
+                [default user home directory (~/.gnunet)]),
+        [gn_user_home_dir=$withval])
+AC_SUBST(GN_USER_HOME_DIR, $gn_user_home_dir)
+gn_daemon_home_dir="/var/lib/gnunet"
+AC_ARG_WITH(daemon-home-dir,
+        AC_HELP_STRING(
+                [--with-daemon-home-dir=DIR],
+                [default daemon home directory (/var/lib/gnunet)]),
+        [gn_daemon_home_dir=$withval])
+AC_SUBST(GN_DAEMON_HOME_DIR, $gn_daemon_home_dir)
+gn_daemon_config_dir="/etc"
+AC_ARG_WITH(daemon-config-dir,
+        AC_HELP_STRING(
+                [--with-daemon-config-dir=DIR],
+                [default daemon config directory (/etc)]),
+        [gn_daemon_config_dir=$withval])
+AC_SUBST(GN_DAEMON_CONFIG_DIR, $gn_daemon_config_dir)
+gn_daemon_pidfile="/var/run/gnunetd/pid"
+AC_ARG_WITH(daemon-pidfile,
+        AC_HELP_STRING(
+                [--with-daemon-pidfile=FILE],
+                [default daemon pidfile (/var/run/gnunetd/pid)]),
+        [gn_daemon_pidfile=$withval])
+AC_SUBST(GN_DAEMON_PIDFILE, $gn_daemon_pidfile)
+
 GN_INTLINCL=""
 GN_LIBINTL="$LTLIBINTL"
 AC_ARG_ENABLE(framework, [  --enable-framework      enable Mac OS X framework 
build helpers],enable_framework_build=$enableval)
@@ -988,11 +1017,14 @@
 AC_CONFIG_FILES([ po/Makefile.in m4/Makefile
 Makefile
 contrib/Makefile
+contrib/config-client.scm
+contrib/config-daemon.scm
 contrib/macosx/Info.plist
 doc/Makefile
 doc/man/Makefile
 src/Makefile
 src/include/Makefile
+src/include/gnunet_directories.h
 src/intlemu/Makefile
 src/applications/Makefile
 src/applications/advertising/Makefile

Modified: GNUnet/contrib/Makefile.am
===================================================================
--- GNUnet/contrib/Makefile.am  2009-01-07 13:26:34 UTC (rev 8091)
+++ GNUnet/contrib/Makefile.am  2009-01-08 12:59:24 UTC (rev 8092)
@@ -1,8 +1,10 @@
-pkgdata_DATA = \
- config-daemon.scm \
- config-client.scm \
+dist_pkgdata_DATA = \
  gnunet-logo-color.png
 
+nodist_pkgdata_DATA = \
+ config-daemon.scm \
+ config-client.scm
+
 EXTRA_DIST = \
  gnunet.conf \
  gnunetd.conf \
@@ -14,5 +16,4 @@
  junkinsert.sh \
  junklookup.sh \
  namespacehelper.sh \
- report.sh \
- $(pkgdata_DATA)
+ report.sh

Deleted: GNUnet/contrib/config-client.scm
===================================================================
--- GNUnet/contrib/config-client.scm    2009-01-07 13:26:34 UTC (rev 8091)
+++ GNUnet/contrib/config-client.scm    2009-01-08 12:59:24 UTC (rev 8092)
@@ -1,466 +0,0 @@
-;; This is not a stand-alone guile application.
-;; It can only be executed from within gnunet-setup.
-;;
-;; GNUnet setup defines a function "build-tree-node"
-;; (with arguments section, option, description, help,
-;;  children, visible, value and range) which is
-;;  used by the script to create the configuration tree.
-;;
-;; GNUnet setup defines a function "change-visible"
-;; (with arguments context, section, option, yesno) which
-;;  can be used by the script to dynamically change the
-;;  visibility of options.
-;;
-;; GNUnet setup defines a function "get-option"
-;; (with arguments context, section, option) which
-;;  can be used to query the current value of an option.
-;;
-;; GNUnet setup defines a function "set-option"
-;; (with arguments context, section, option, value) which
-;;  can be used to set the value of an option.
-;;
-;;
-;; GNUnet setup requires two functions from this script.
-;; First, a function "gnunet-config-setup" which constructs the
-;; configuration tree.
-;;
-;; Second, a function "gnunet-config-change" which is notified whenever
-;; configuration options are changed; the script can then
-;; change the visibility of other options.
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; for GNU gettext
-(define (_ msg) msg)
-
-;; common string
-(define (nohelp) 
-  (_ "No help available.") )
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; menu definitions
-
-;; meta-menu
-
-(define (meta-exp builder) 
- (builder
-   "Meta-client"
-   "EXPERIMENTAL"
-   (_ "Prompt for development and/or incomplete code")
-   (_
-"If EXPERIMENTAL is set to NO, options for experimental code are not shown.  
If in doubt, use NO.
-
-Some options apply to experimental code that maybe in a state of development 
where the functionality, stability, or the level of testing is not yet high 
enough for general use.  These features are said to be of \"alpha\" quality.  
If a feature is currently in alpha, uninformed use is discouraged (since the 
developers then do not fancy \"Why doesn't this work?\" type messages).
-
-However, active testing and qualified feedback of these features is always 
welcome.  Users should just be aware that alpha features may not meet the 
normal level of reliability or it may fail to work in some special cases.  Bug 
reports are usually welcomed by the developers, but please read the documents 
<file://README> and <http://gnunet.org/faq.php3> and use 
<https://gnunet.org/mantis/> for how to report problems." )
-   '()
-   #t
-   #f
-   #f
-   'advanced) )
-
-(define (meta-adv builder) 
- (builder
-   "Meta-client"
-   "ADVANCED"
-   (_ "Show options for advanced users")
-   (_
-"These are options that maybe difficult to understand for the beginner. These 
options typically refer to features that allow tweaking of the installation.  
If in a hurry, say NO." )
-   '()
-   #t
-   #t
-   #f
-   'always) )
-
-(define (meta-rare builder) 
- (builder
-   "Meta-client"
-   "RARE"
-   (_ "Show rarely used options")
-   (_
-"These are options that hardly anyone actually needs.  If you plan on doing 
development on GNUnet, you may want to look into these.  If in doubt or in a 
hurry, say NO." )
-   '()
-   #t
-   #t
-   #f
-   'advanced) )
-
-(define (meta builder)
- (builder
-   "Meta-client"
-   "" 
-   (_ "Meta-configuration") 
-   (_ "Which level of configuration should be available")
-   (list 
-     (meta-adv builder) 
-     (meta-rare builder)
-     (meta-exp builder)
-   )
-   #t
-   #f
-   #f
-   'always) )
-
-
-;; logging options
-
-(define (log-level description option builder)
- (builder
-   "LOGGING"
-   option
-   description
-   (nohelp)
-   '()
-   #t
-   "WARNING"
-   (list "SC" "NOTHING" "FATAL" "ERROR" "WARNING" "INFO" "STATUS" "DEBUG")
-   'always))
-
-;; option not supported / used at the moment (useful?)
-;(define (log-conf-date builder)
-; (builder
-;   "LOGGING"
-;   "DATE"
-;   (_ "Log the date of the event")
-;   (nohelp)
-;   '()
-;   #t
-;   #t
-;   #t
-;   'advanced))
-
-(define (log-keeplog builder)
- (builder
-  "GNUNETD"
-  "KEEPLOG"
-  (_ "How long should logs be kept?")
-  (_ 
-"How long should logs be kept? If you specify a value greater than zero, a log 
is created each day with the date appended to its filename. These logs are 
deleted after $KEEPLOG days. To keep logs forever, set this value to 0." )
-  '()
-  #t
-  3
-  (cons 0 36500)
-  'advanced) )
-
-(define (log-logfile builder)
- (builder
-  "GNUNETD"
-  "LOGFILE"
-  (_ "Where should gnunet-clients write their logs?")
-  (nohelp)
-  '()
-  #f
-  "$GNUNET_HOME/logs"
-  '()
-  'rare) )
-
-(define (logging builder)
- (builder
-   "LOGGING"
-   "" 
-   (_ "Logging") 
-   (_ "Specify which system messages should be logged how")
-   (list 
-     (log-keeplog builder)
-     (log-logfile builder)
-     (log-level (_ "Logging of events for users") "USER-LEVEL" builder) 
-     (log-level (_ "Logging of events for the system administrator") 
"ADMIN-LEVEL" builder) 
-   )
-   #t
-   #f
-   #f
-   'advanced) )
-
-;; general options
-
-
-(define (network-host builder)
- (builder
- "NETWORK"
- "HOST"
- (_ "On which machine and port is gnunetd running (for clients)?")
- (_ "This is equivalent to the -H option.  The format is IP:PORT.")
- '()
- #t
- "localhost:2087"
- '()
- 'advanced) )
-
-(define (daemon-config builder)
- (builder
- "DAEMON"
- "CONFIGFILE"
- (_ "What is the path to the configuration file for gnunetd?")
- (_ "This option is used when clients need to start gnunetd.")
- '()
- #t
- "/etc/gnunetd.conf"
- '()
- 'always) )
-
-
-(define (general builder)
- (builder
-   ""
-   "" 
-   (_ "General options")
-   (nohelp)
-   (list 
-     (daemon-config builder)
-     (network-host builder)
-   )
-   #t
-   #f
-   #f
-   'always) )
-
-;; file-sharing options
-
-(define (fs-disable-creation-time builder) 
- (builder
-   "FS"
-   "DISABLE-CREATION-TIME"
-   (_ "Do not add metadata listing the creation time for inserted content")
-   (nohelp)
-   '()
-   #t
-   #t
-   #f
-   'advanced) )
-
-(define (fs-extractors builder)
- (builder
-  "FS"
-  "EXTRACTORS"
-  (_ "Which non-default extractors should GNUnet use for keyword extractors")
-  (_ "Specify which additional extractor libraries should be used.  
gnunet-insert uses libextractor to extract keywords from files. libextractor 
can be dynamically extended to handle additional file formats. If you want to 
use more than the default set of extractors, specify additional extractor 
libraries here.  The format is [[-]LIBRARYNAME[:[-]LIBRARYNAME]*].
-
-The default is to use filenames and to break larger words at spaces (and 
underscores, etc.).  This should be just fine for most people. The '-' before a 
library name indicates that this should be executed last and makes only sense 
for the split-library.")
-  '()
-  #t
-  "libextractor_filename:-libextractor_split:-libextractor_split(0123456789._ 
,address@hidden;/):-libextractor_lower:-libextractor_thumbnail"
-  '()
-  'advanced) )
-
-(define (fs-uri-db-size builder)
- (builder
-  "FS"
-  "URI_DB_SIZE"
-  (_ "How many entries should the URI DB table have?")
-  (_ "GNUnet uses two bytes per entry on the disk.  This database is used to 
keep track of how a particular URI has been used in the past.  For example, 
GNUnet may remember that a particular URI has been found in a search previously 
or corresponds to a file uploaded by the user.  This information can then be 
used by user-interfaces to filter URI lists, such as search results.  If the 
database is full, older entries will be discarded.  The default value should be 
sufficient without causing undue disk utilization." )
-  '()
-  #t
-  1048576
-  (cons 1 1073741824)
-  'rare) )
-
-(define (gnunet-fs-autoshare-metadata builder)
- (builder
-  "GNUNET-AUTO-SHARE"
-  "METADATA"
-  (_ "Location of the file specifying metadata for the auto-share directory")
-  (nohelp)
-  '()
-  #t
-  "$GNUNET_HOME/metadata.conf"
-  '()
-  'fs-loaded) )
-
-(define (gnunet-fs-autoshare-pidfile builder)
- (builder
-  "GNUNET-AUTO-SHARE"
-  "PIDFILE"
-  (_ "Location of the file with the PID of any running gnunet-auto-share 
daemon process")
-  (nohelp)
-  '()
-  #t
-  "$GNUNET_HOME/gnunet-auto-share.pid"
-  '()
-  'fs-loaded) )
-
-(define (gnunet-fs-autoshare-log builder)
- (builder
-  "GNUNET-AUTO-SHARE"
-  "LOGFILE"
-  (_ "Location of the log file for gnunet-auto-share")
-  (nohelp)
-  '()
-  #t
-  "$GNUNET_HOME/gnunet-auto-share.log"
-  '()
-  'fs-loaded) )
-
-(define (fs builder)
- (builder 
-  "File-Sharing"
-  ""
-  (_ "File-Sharing options")
-  (nohelp)
-  (list 
-    (fs-extractors builder)
-    (fs-disable-creation-time builder)
-    (fs-uri-db-size builder)
-    (gnunet-fs-autoshare-metadata builder)
-    (gnunet-fs-autoshare-log builder)
-  )
-  #t 
-  #f 
-  #f 
-  'advanced) )
-
-(define (gnunet-gtk-plugins builder)
- (builder 
-  "GNUNET-GTK"
-  "PLUGINS"
-  (_ "Which plugins should be loaded by gnunet-gtk?")
-  (_ "Load the about plugin for the about dialog.  The daemon plugin allows 
starting and stopping of gnunetd and displays information about gnunetd.  The 
fs plugin provides the file-sharing functionality.  The stats plugin displays 
various statistics about gnunetd.")
-  '()
-  #t 
-  "about daemon fs peers stats" 
-  (list "MC" "about" "daemon" "fs" "peers" "stats")
-  'advanced) )
-
-(define (gnunet-gtk-stats-interval builder)
- (builder 
-  "GNUNET-GTK"
-  "STATS-INTERVAL"
-  (_ "How frequently (in milli-seconds) should the statistics update?")
-  (_ "Each pixel in the stats dialog corresponds to the time interval 
specified here.")
-  '()
-  #t 
-  30000
-  (cons 1 999999999)
-  'stats-loaded) )
-
-
-(define (gnunet-gtk-previews builder) 
- (builder
-   "GNUNET-GTK"
-   "DISABLE-PREVIEWS"
-   (_ "Do not show thumbnail previews from meta-data in search results")
-   (_ "This option is useful for people who maybe offended by some previews or 
use gnunet-gtk at work and would like to avoid bad surprises.")
-   '()
-   #t
-   #f
-   #f
-   'fs-loaded) )
-
-(define (gnunet-gtk-own builder) 
- (builder
-   "GNUNET-GTK"
-   "DISABLE-OWN"
-   (_ "Do not show search results for files that were uploaded by us")
-   (_ "This option is useful to eliminate files that the user already has from 
the search.  Naturally, enabling this option maybe confusing because some 
obviously expected search results would no longer show up.  This option only 
works if the URI_DB_SIZE option under FS is not zero (since the URI DB is used 
to determine which files the user is sharing)")
-   '()
-   #t
-   #f
-   #f
-   'fs-loaded) )
-
-
-(define (gnunet-gtk-incomingdir builder)
- (builder
-  "FS"
-  "INCOMINGDIR"
-  (_ "To which directory should gnunet-gtk save downloads to?")
-  (nohelp)
-  '()
-  #t
-  "$HOME/gnunet-downloads"
-  '()
-  'fs-loaded) )
-
-(define (gnunet-gtk builder)
- (builder 
-  "gnunet-gtk"
-  ""
-  (_ "Options related to gnunet-gtk")
-  (nohelp)
-  (list 
-    (gnunet-gtk-plugins builder)
-    (gnunet-gtk-previews builder)
-    (gnunet-gtk-own builder)
-    (gnunet-gtk-incomingdir builder)
-    (gnunet-gtk-stats-interval builder)
-  )
-  #t 
-  #f 
-  #f 
-  'always) )
-
-;; main-menu
-
-(define (paths-home builder)
- (builder
-  "PATHS"
-  "GNUNET_HOME"
-  (_ "Full pathname of GNUnet client HOME directory")
-  (_ "The directory for GNUnet files that belong to the user.")
-  '()
-  #t
-  "~/.gnunet"
-  '()
-  'always) )
-
-(define (main builder)
- (builder 
-  "Root"
-  ""
-  (_ "Root node")
-  (nohelp)
-  (list 
-    (paths-home builder)
-    (meta builder)
-    (logging builder)
-    (general builder)
-    (fs builder)
-    (gnunet-gtk builder)
-  )
-  #t 
-  #f 
-  #f 
-  'always) )
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; first main method: build tree using build-tree-node
-;; The lambda expression is used to throw away the last argument,
-;; which we use internally and which is not used by build-tree-node!
-(define (gnunet-config-setup) 
- (main 
-  (lambda (a b c d e f g h i) (build-tree-node a b c d e f g h) ) ) )
-
-
-;; second main method: update visibility (and values)
-;; "change" uses again the tree builder but this time
-;; scans the "i" tags to determine how the visibility needs to change
-
-(define (gnunet-config-change ctx)
- (let 
-   ( 
-     (advanced (get-option ctx "Meta-client" "ADVANCED"))
-     (rare (get-option ctx "Meta-client" "RARE"))
-     (experimental (get-option ctx "Meta-client" "EXPERIMENTAL"))
-     (stats-loaded (list? (member "stats" (string-split (get-option ctx 
"GNUNET-GTK" "PLUGINS") #\  ) ) ) )
-     (fs-loaded (list? (member "fs" (string-split (get-option ctx "GNUNET-GTK" 
"PLUGINS") #\  ) ) ) )
-   )
-  (begin 
-    (main
-     (lambda (a b c d e f g h i) 
-        (begin 
-          (cond
-            ((eq? i 'advanced)     (change-visible ctx a b advanced))
-            ((eq? i 'rare)         (change-visible ctx a b rare))
-            ((eq? i 'experimental) (change-visible ctx a b experimental))
-            ((eq? i 'fs-loaded) (change-visible ctx a b fs-loaded))
-            ((eq? i 'stats-loaded) (change-visible ctx a b stats-loaded))
-            (else 'nothing)
-          )
-   ) ) ) )
-) )
-

Added: GNUnet/contrib/config-client.scm.in
===================================================================
--- GNUnet/contrib/config-client.scm.in                         (rev 0)
+++ GNUnet/contrib/config-client.scm.in 2009-01-08 12:59:24 UTC (rev 8092)
@@ -0,0 +1,466 @@
+;; This is not a stand-alone guile application.
+;; It can only be executed from within gnunet-setup.
+;;
+;; GNUnet setup defines a function "build-tree-node"
+;; (with arguments section, option, description, help,
+;;  children, visible, value and range) which is
+;;  used by the script to create the configuration tree.
+;;
+;; GNUnet setup defines a function "change-visible"
+;; (with arguments context, section, option, yesno) which
+;;  can be used by the script to dynamically change the
+;;  visibility of options.
+;;
+;; GNUnet setup defines a function "get-option"
+;; (with arguments context, section, option) which
+;;  can be used to query the current value of an option.
+;;
+;; GNUnet setup defines a function "set-option"
+;; (with arguments context, section, option, value) which
+;;  can be used to set the value of an option.
+;;
+;;
+;; GNUnet setup requires two functions from this script.
+;; First, a function "gnunet-config-setup" which constructs the
+;; configuration tree.
+;;
+;; Second, a function "gnunet-config-change" which is notified whenever
+;; configuration options are changed; the script can then
+;; change the visibility of other options.
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; for GNU gettext
+(define (_ msg) msg)
+
+;; common string
+(define (nohelp) 
+  (_ "No help available.") )
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; menu definitions
+
+;; meta-menu
+
+(define (meta-exp builder) 
+ (builder
+   "Meta-client"
+   "EXPERIMENTAL"
+   (_ "Prompt for development and/or incomplete code")
+   (_
+"If EXPERIMENTAL is set to NO, options for experimental code are not shown.  
If in doubt, use NO.
+
+Some options apply to experimental code that maybe in a state of development 
where the functionality, stability, or the level of testing is not yet high 
enough for general use.  These features are said to be of \"alpha\" quality.  
If a feature is currently in alpha, uninformed use is discouraged (since the 
developers then do not fancy \"Why doesn't this work?\" type messages).
+
+However, active testing and qualified feedback of these features is always 
welcome.  Users should just be aware that alpha features may not meet the 
normal level of reliability or it may fail to work in some special cases.  Bug 
reports are usually welcomed by the developers, but please read the documents 
<file://README> and <http://gnunet.org/faq.php3> and use 
<https://gnunet.org/mantis/> for how to report problems." )
+   '()
+   #t
+   #f
+   #f
+   'advanced) )
+
+(define (meta-adv builder) 
+ (builder
+   "Meta-client"
+   "ADVANCED"
+   (_ "Show options for advanced users")
+   (_
+"These are options that maybe difficult to understand for the beginner. These 
options typically refer to features that allow tweaking of the installation.  
If in a hurry, say NO." )
+   '()
+   #t
+   #t
+   #f
+   'always) )
+
+(define (meta-rare builder) 
+ (builder
+   "Meta-client"
+   "RARE"
+   (_ "Show rarely used options")
+   (_
+"These are options that hardly anyone actually needs.  If you plan on doing 
development on GNUnet, you may want to look into these.  If in doubt or in a 
hurry, say NO." )
+   '()
+   #t
+   #t
+   #f
+   'advanced) )
+
+(define (meta builder)
+ (builder
+   "Meta-client"
+   "" 
+   (_ "Meta-configuration") 
+   (_ "Which level of configuration should be available")
+   (list 
+     (meta-adv builder) 
+     (meta-rare builder)
+     (meta-exp builder)
+   )
+   #t
+   #f
+   #f
+   'always) )
+
+
+;; logging options
+
+(define (log-level description option builder)
+ (builder
+   "LOGGING"
+   option
+   description
+   (nohelp)
+   '()
+   #t
+   "WARNING"
+   (list "SC" "NOTHING" "FATAL" "ERROR" "WARNING" "INFO" "STATUS" "DEBUG")
+   'always))
+
+;; option not supported / used at the moment (useful?)
+;(define (log-conf-date builder)
+; (builder
+;   "LOGGING"
+;   "DATE"
+;   (_ "Log the date of the event")
+;   (nohelp)
+;   '()
+;   #t
+;   #t
+;   #t
+;   'advanced))
+
+(define (log-keeplog builder)
+ (builder
+  "GNUNETD"
+  "KEEPLOG"
+  (_ "How long should logs be kept?")
+  (_ 
+"How long should logs be kept? If you specify a value greater than zero, a log 
is created each day with the date appended to its filename. These logs are 
deleted after $KEEPLOG days. To keep logs forever, set this value to 0." )
+  '()
+  #t
+  3
+  (cons 0 36500)
+  'advanced) )
+
+(define (log-logfile builder)
+ (builder
+  "GNUNETD"
+  "LOGFILE"
+  (_ "Where should gnunet-clients write their logs?")
+  (nohelp)
+  '()
+  #f
+  "$GNUNET_HOME/logs"
+  '()
+  'rare) )
+
+(define (logging builder)
+ (builder
+   "LOGGING"
+   "" 
+   (_ "Logging") 
+   (_ "Specify which system messages should be logged how")
+   (list 
+     (log-keeplog builder)
+     (log-logfile builder)
+     (log-level (_ "Logging of events for users") "USER-LEVEL" builder) 
+     (log-level (_ "Logging of events for the system administrator") 
"ADMIN-LEVEL" builder) 
+   )
+   #t
+   #f
+   #f
+   'advanced) )
+
+;; general options
+
+
+(define (network-host builder)
+ (builder
+ "NETWORK"
+ "HOST"
+ (_ "On which machine and port is gnunetd running (for clients)?")
+ (_ "This is equivalent to the -H option.  The format is IP:PORT.")
+ '()
+ #t
+ "localhost:2087"
+ '()
+ 'advanced) )
+
+(define (daemon-config builder)
+ (builder
+ "DAEMON"
+ "CONFIGFILE"
+ (_ "What is the path to the configuration file for gnunetd?")
+ (_ "This option is used when clients need to start gnunetd.")
+ '()
+ #t
+ "@GN_DAEMON_CONFIG_DIR@/gnunetd.conf"
+ '()
+ 'always) )
+
+
+(define (general builder)
+ (builder
+   ""
+   "" 
+   (_ "General options")
+   (nohelp)
+   (list 
+     (daemon-config builder)
+     (network-host builder)
+   )
+   #t
+   #f
+   #f
+   'always) )
+
+;; file-sharing options
+
+(define (fs-disable-creation-time builder) 
+ (builder
+   "FS"
+   "DISABLE-CREATION-TIME"
+   (_ "Do not add metadata listing the creation time for inserted content")
+   (nohelp)
+   '()
+   #t
+   #t
+   #f
+   'advanced) )
+
+(define (fs-extractors builder)
+ (builder
+  "FS"
+  "EXTRACTORS"
+  (_ "Which non-default extractors should GNUnet use for keyword extractors")
+  (_ "Specify which additional extractor libraries should be used.  
gnunet-insert uses libextractor to extract keywords from files. libextractor 
can be dynamically extended to handle additional file formats. If you want to 
use more than the default set of extractors, specify additional extractor 
libraries here.  The format is [[-]LIBRARYNAME[:[-]LIBRARYNAME]*].
+
+The default is to use filenames and to break larger words at spaces (and 
underscores, etc.).  This should be just fine for most people. The '-' before a 
library name indicates that this should be executed last and makes only sense 
for the split-library.")
+  '()
+  #t
+  "libextractor_filename:-libextractor_split:-libextractor_split(0123456789._ 
,address@hidden;/):-libextractor_lower:-libextractor_thumbnail"
+  '()
+  'advanced) )
+
+(define (fs-uri-db-size builder)
+ (builder
+  "FS"
+  "URI_DB_SIZE"
+  (_ "How many entries should the URI DB table have?")
+  (_ "GNUnet uses two bytes per entry on the disk.  This database is used to 
keep track of how a particular URI has been used in the past.  For example, 
GNUnet may remember that a particular URI has been found in a search previously 
or corresponds to a file uploaded by the user.  This information can then be 
used by user-interfaces to filter URI lists, such as search results.  If the 
database is full, older entries will be discarded.  The default value should be 
sufficient without causing undue disk utilization." )
+  '()
+  #t
+  1048576
+  (cons 1 1073741824)
+  'rare) )
+
+(define (gnunet-fs-autoshare-metadata builder)
+ (builder
+  "GNUNET-AUTO-SHARE"
+  "METADATA"
+  (_ "Location of the file specifying metadata for the auto-share directory")
+  (nohelp)
+  '()
+  #t
+  "$GNUNET_HOME/metadata.conf"
+  '()
+  'fs-loaded) )
+
+(define (gnunet-fs-autoshare-pidfile builder)
+ (builder
+  "GNUNET-AUTO-SHARE"
+  "PIDFILE"
+  (_ "Location of the file with the PID of any running gnunet-auto-share 
daemon process")
+  (nohelp)
+  '()
+  #t
+  "$GNUNET_HOME/gnunet-auto-share.pid"
+  '()
+  'fs-loaded) )
+
+(define (gnunet-fs-autoshare-log builder)
+ (builder
+  "GNUNET-AUTO-SHARE"
+  "LOGFILE"
+  (_ "Location of the log file for gnunet-auto-share")
+  (nohelp)
+  '()
+  #t
+  "$GNUNET_HOME/gnunet-auto-share.log"
+  '()
+  'fs-loaded) )
+
+(define (fs builder)
+ (builder 
+  "File-Sharing"
+  ""
+  (_ "File-Sharing options")
+  (nohelp)
+  (list 
+    (fs-extractors builder)
+    (fs-disable-creation-time builder)
+    (fs-uri-db-size builder)
+    (gnunet-fs-autoshare-metadata builder)
+    (gnunet-fs-autoshare-log builder)
+  )
+  #t 
+  #f 
+  #f 
+  'advanced) )
+
+(define (gnunet-gtk-plugins builder)
+ (builder 
+  "GNUNET-GTK"
+  "PLUGINS"
+  (_ "Which plugins should be loaded by gnunet-gtk?")
+  (_ "Load the about plugin for the about dialog.  The daemon plugin allows 
starting and stopping of gnunetd and displays information about gnunetd.  The 
fs plugin provides the file-sharing functionality.  The stats plugin displays 
various statistics about gnunetd.")
+  '()
+  #t 
+  "about daemon fs peers stats" 
+  (list "MC" "about" "daemon" "fs" "peers" "stats")
+  'advanced) )
+
+(define (gnunet-gtk-stats-interval builder)
+ (builder 
+  "GNUNET-GTK"
+  "STATS-INTERVAL"
+  (_ "How frequently (in milli-seconds) should the statistics update?")
+  (_ "Each pixel in the stats dialog corresponds to the time interval 
specified here.")
+  '()
+  #t 
+  30000
+  (cons 1 999999999)
+  'stats-loaded) )
+
+
+(define (gnunet-gtk-previews builder) 
+ (builder
+   "GNUNET-GTK"
+   "DISABLE-PREVIEWS"
+   (_ "Do not show thumbnail previews from meta-data in search results")
+   (_ "This option is useful for people who maybe offended by some previews or 
use gnunet-gtk at work and would like to avoid bad surprises.")
+   '()
+   #t
+   #f
+   #f
+   'fs-loaded) )
+
+(define (gnunet-gtk-own builder) 
+ (builder
+   "GNUNET-GTK"
+   "DISABLE-OWN"
+   (_ "Do not show search results for files that were uploaded by us")
+   (_ "This option is useful to eliminate files that the user already has from 
the search.  Naturally, enabling this option maybe confusing because some 
obviously expected search results would no longer show up.  This option only 
works if the URI_DB_SIZE option under FS is not zero (since the URI DB is used 
to determine which files the user is sharing)")
+   '()
+   #t
+   #f
+   #f
+   'fs-loaded) )
+
+
+(define (gnunet-gtk-incomingdir builder)
+ (builder
+  "FS"
+  "INCOMINGDIR"
+  (_ "To which directory should gnunet-gtk save downloads to?")
+  (nohelp)
+  '()
+  #t
+  "$HOME/gnunet-downloads"
+  '()
+  'fs-loaded) )
+
+(define (gnunet-gtk builder)
+ (builder 
+  "gnunet-gtk"
+  ""
+  (_ "Options related to gnunet-gtk")
+  (nohelp)
+  (list 
+    (gnunet-gtk-plugins builder)
+    (gnunet-gtk-previews builder)
+    (gnunet-gtk-own builder)
+    (gnunet-gtk-incomingdir builder)
+    (gnunet-gtk-stats-interval builder)
+  )
+  #t 
+  #f 
+  #f 
+  'always) )
+
+;; main-menu
+
+(define (paths-home builder)
+ (builder
+  "PATHS"
+  "GNUNET_HOME"
+  (_ "Full pathname of GNUnet client HOME directory")
+  (_ "The directory for GNUnet files that belong to the user.")
+  '()
+  #t
+  "@GN_USER_HOME_DIR@"
+  '()
+  'always) )
+
+(define (main builder)
+ (builder 
+  "Root"
+  ""
+  (_ "Root node")
+  (nohelp)
+  (list 
+    (paths-home builder)
+    (meta builder)
+    (logging builder)
+    (general builder)
+    (fs builder)
+    (gnunet-gtk builder)
+  )
+  #t 
+  #f 
+  #f 
+  'always) )
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; first main method: build tree using build-tree-node
+;; The lambda expression is used to throw away the last argument,
+;; which we use internally and which is not used by build-tree-node!
+(define (gnunet-config-setup) 
+ (main 
+  (lambda (a b c d e f g h i) (build-tree-node a b c d e f g h) ) ) )
+
+
+;; second main method: update visibility (and values)
+;; "change" uses again the tree builder but this time
+;; scans the "i" tags to determine how the visibility needs to change
+
+(define (gnunet-config-change ctx)
+ (let 
+   ( 
+     (advanced (get-option ctx "Meta-client" "ADVANCED"))
+     (rare (get-option ctx "Meta-client" "RARE"))
+     (experimental (get-option ctx "Meta-client" "EXPERIMENTAL"))
+     (stats-loaded (list? (member "stats" (string-split (get-option ctx 
"GNUNET-GTK" "PLUGINS") #\  ) ) ) )
+     (fs-loaded (list? (member "fs" (string-split (get-option ctx "GNUNET-GTK" 
"PLUGINS") #\  ) ) ) )
+   )
+  (begin 
+    (main
+     (lambda (a b c d e f g h i) 
+        (begin 
+          (cond
+            ((eq? i 'advanced)     (change-visible ctx a b advanced))
+            ((eq? i 'rare)         (change-visible ctx a b rare))
+            ((eq? i 'experimental) (change-visible ctx a b experimental))
+            ((eq? i 'fs-loaded) (change-visible ctx a b fs-loaded))
+            ((eq? i 'stats-loaded) (change-visible ctx a b stats-loaded))
+            (else 'nothing)
+          )
+   ) ) ) )
+) )
+

Deleted: GNUnet/contrib/config-daemon.scm
===================================================================
--- GNUnet/contrib/config-daemon.scm    2009-01-07 13:26:34 UTC (rev 8091)
+++ GNUnet/contrib/config-daemon.scm    2009-01-08 12:59:24 UTC (rev 8092)
@@ -1,1568 +0,0 @@
-;; This is not a stand-alone guile application.
-;; It can only be executed from within gnunet-setup.
-;;
-;; GNUnet setup defines a function "build-tree-node"
-;; (with arguments section, option, description, help,
-;;  children, visible, value and range) which is
-;;  used by the script to create the configuration tree.
-;;
-;; GNUnet setup defines a function "change-visible"
-;; (with arguments context, section, option, yesno) which
-;;  can be used by the script to dynamically change the
-;;  visibility of options.
-;;
-;; GNUnet setup defines a function "get-option"
-;; (with arguments context, section, option) which
-;;  can be used to query the current value of an option.
-;;
-;; GNUnet setup defines a function "set-option"
-;; (with arguments context, section, option, value) which
-;;  can be used to set the value of an option.
-;;
-;;
-;; GNUnet setup requires two functions from this script.
-;; First, a function "gnunet-config-setup" which constructs the
-;; configuration tree.
-;;
-;; Second, a function "gnunet-config-change" which is notified whenever
-;; configuration options are changed; the script can then
-;; change the visibility of other options.
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; for GNU gettext
-(define (_ msg) msg)
-
-;; common string
-(define (nohelp) 
-  (_ "No help available.") )
-
-(define (nathelp)
-  (_ "You can use 'make check' in src/transports/upnp/ to find out if your NAT 
supports UPnP.  You should disable this option if you are sure that you are not 
behind a NAT.  If your NAT box does not support UPnP, having this on will not 
do much harm (only cost a small amount of resources).") )
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; menu definitions
-
-;; meta-menu
-
-(define (meta-exp builder) 
- (builder
-   "Meta"
-   "EXPERIMENTAL"
-   (_ "Prompt for development and/or incomplete code")
-   (_
-"If EXPERIMENTAL is set to NO, options for experimental code are not shown.  
If in doubt, use NO.
-
-Some options apply to experimental code that maybe in a state of development 
where the functionality, stability, or the level of testing is not yet high 
enough for general use.  These features are said to be of \"alpha\" quality.  
If a feature is currently in alpha, uninformed use is discouraged (since the 
developers then do not fancy \"Why doesn't this work?\" type messages).
-
-However, active testing and qualified feedback of these features is always 
welcome.  Users should just be aware that alpha features may not meet the 
normal level of reliability or it may fail to work in some special cases.  Bug 
reports are usually welcomed by the developers, but please read the documents 
<file://README> and <http://gnunet.org/faq.php3> and use 
<https://gnunet.org/mantis/> for how to report problems." )
-   '()
-   #t
-   #f
-   #f
-   'advanced) )
-
-(define (meta-adv builder) 
- (builder
-   "Meta"
-   "ADVANCED"
-   (_ "Show options for advanced users")
-   (_
-"These are options that maybe difficult to understand for the beginner. These 
options typically refer to features that allow tweaking of the installation.  
If in a hurry, say NO." )
-   '()
-   #t
-   #t
-   #f
-   'always) )
-
-(define (meta-rare builder) 
- (builder
-  "Meta"
-   "RARE"
-   (_ "Show rarely used options")
-   (_
-"These are options that hardly anyone actually needs.  If you plan on doing 
development on GNUnet, you may want to look into these.  If in doubt or in a 
hurry, say NO." )
-   '()
-   #t
-   #t
-   #f
-   'advanced) )
-
-(define (meta builder)
- (builder
-   "Meta"
-   "" 
-   (_ "Meta-configuration") 
-   (_ "Which level of configuration should be available")
-   (list 
-     (meta-adv builder) 
-     (meta-rare builder)
-     (meta-exp builder)
-   )
-   #t
-   #f
-   #f
-   'always) )
-
-;; fundamentals
-
-(define (paths-home builder)
- (builder
-  "PATHS"
-  "GNUNETD_HOME"
-  (_ "Full pathname of GNUnet HOME directory")
-  (_ 
-"This gives the root-directory of the GNUnet installation. Make sure there is 
some space left in that directory. :-)  Users inserting or indexing files will 
be able to store data in this directory up to the (global) quota specified 
below.  Having a few gigabytes of free space is recommended." ) 
-  '()
-  #t
-  "/var/lib/gnunet"
-  '()
-  'always) )
-
-;; General menu
-
-(define (fs-path builder)
- (builder
-  "FS"
-  "DIR"
-  (_ "Full pathname of GNUnet directory for file-sharing data")
-  (nohelp) 
-  '()
-  #t
-  "$GNUNETD_HOME/data/fs"
-  '()
-  'always) )
-
-(define (kv-path builder)
- (builder
-  "KEYVALUE_DATABASE"
-  "DIR"
-  (_ "Full pathname to the directory with the key-value database")
-  (_ "Note that the kvstore is currently not used.") 
-  '()
-  #f
-  "$GNUNETD_HOME/kvstore/"
-  '()
-  'never) )
-
-(define (index-path builder)
- (builder
-  "FS"
-  "INDEX-DIRECTORY"
-  (_ "Full pathname of GNUnet directory for indexed files symbolic links")
-  (nohelp) 
-  '()
-  #t
-  "$GNUNETD_HOME/data/shared"
-  '()
-  'always) )
-
-(define (general-helloexpires builder)
- (builder
-  "GNUNETD"
-  "HELLOEXPIRES"
-  (_ "How many minutes should peer advertisements last?")
-  (_ 
-"How many minutes is the current IP valid?  (GNUnet will sign HELLO messages 
with this expiration timeline. If you are on dialup, 60 (for 1 hour) is 
suggested. If you have a static IP address, you may want to set this to a large 
value (say 14400).  The default is 1440 (1 day). If your IP changes 
periodically, you will want to choose an expiry period smaller than the 
frequency with which your IP changes." )
-  '()
-  #t
-  1440
-  (cons 1 14400)
-  'advanced) )
-
-(define (general-hostlisturl builder)
- (builder
-  "GNUNETD"
-  "HOSTLISTURL"
-  (_ "Where can GNUnet find an initial list of peers?")
-  (_ 
-"GNUnet can automatically update the hostlist from the web. While GNUnet 
internally communicates which hosts are online, it is typically a good idea to 
get a fresh hostlist whenever gnunetd starts from the WEB. By setting this 
option, you can specify from which server gnunetd should try to download the 
hostlist. The default should be fine for now.
-               
-The general format is a list of space-separated URLs.  Each URL must have the 
format http://HOSTNAME/FILENAME
-               
-If you want to setup an alternate hostlist server, you must run a permanent 
node and \"cat data/hosts/* > hostlist\" every few minutes to keep the list 
up-to-date.
-               
-If you do not specify a HOSTLISTURL, you must copy valid hostkeys to 
data/hosts manually.")
-  '()
-  #t
-  "http://gnunet.org/hostlist.php http://gnunet.mine.nu:8081/hostlist 
http://vserver1236.vserver-on.de/hostlist-074";
-  '()
-  'always) )
-
-(define (general-http-proxy builder)
- (builder
-  "GNUNETD"
-  "HTTP-PROXY"
-  (_ "HTTP Proxy Server")
-  (_ 
-"If you have to use a proxy for outbound HTTP connections, specify the proxy 
configuration here.  Default is no proxy." )
-  '()
-  #t
-  ""
-  '()
-  'advanced) )
-
-
-(define (general-hosts builder)
- (builder
-  "GNUNETD"
-  "HOSTS"
-  (_ "Name of the directory where gnunetd should store contact information 
about peers")
-  (_ 
-"Unless you want to share the directory directly using a webserver, the 
default is most likely just fine." )
-  '()
-  #t
-  "$GNUNETD_HOME/data/hosts/"
-  '()
-  'rare) )
-
-
-;; logging options
-
-(define (log-level description option builder)
- (builder
-   "LOGGING"
-   option
-   description
-   (nohelp)
-   '()
-   #t
-   "WARNING"
-   (list "SC" "NOTHING" "FATAL" "ERROR" "WARNING" "INFO" "STATUS" "DEBUG")
-   'always))
-
-(define (log-keeplog builder)
- (builder
-  "GNUNETD"
-  "KEEPLOG"
-  (_ "How long should logs be kept?")
-  (_ 
-"How long should logs be kept? If you specify a value greater than zero, a log 
is created each day with the date appended to its filename. These logs are 
deleted after $KEEPLOG days. To keep logs forever, set this value to 0." )
-  '()
-  #t
-  3
-  (cons 0 36500)
-  'advanced) )
-
-(define (daemon-fdlimit builder)
- (builder
-  "GNUNETD"
-  "FDLIMIT"
-  (_ "What maximum number of open file descriptors should be requested from 
the OS?")
-  (_ 
-"The default of 1024 should be fine for most systems.  If your system can 
support more, increasing the number might help support additional clients on 
machines with plenty of bandwidth.  For embedded systems, a smaller number 
might be acceptable.  A value of 0 will leave the descriptor limit untouched.  
This option is mostly for OS X systems where the default is too low.  Note that 
if gnunetd cannot obtain the desired number of file descriptors from the 
operating system, it will print a warning and try to run with what it is 
given." )
-  '()
-  #t
-  1024
-  (cons 64 65536)
-  'rare) )
-
-(define (log-logfile builder)
- (builder
-  "GNUNETD"
-  "LOGFILE"
-  (_ "Where should gnunetd write the logs?")
-  (nohelp)
-  '()
-  #f
-  "$GNUNETD_HOME/daemon-logs"
-  '()
-  'rare) )
-
-(define (log-devel builder)
- (builder
-  "LOGGING"
-  "DEVELOPER"
-  (_ "Enable for extra-verbose logging.")
-  (nohelp)
-  '()
-  #f
-  #f
-  #f
-  'rare) )
-
-(define (logging builder)
- (builder
-   "LOGGING"
-   "" 
-   (_ "Logging") 
-   (_ "Specify which system messages should be logged how")
-   (list 
-     (log-keeplog builder)
-     (log-logfile builder)
-     (log-devel builder)
-     (log-level (_ "Logging of events for users") "USER-LEVEL" builder) 
-     (log-level (_ "Logging of events for the system administrator") 
"ADMIN-LEVEL" builder) 
-   )
-   #t
-   #f
-   #f
-   'advanced) )
-
- 
-(define (general-pidfile builder)
- (builder
-  "GNUNETD"
-  "PIDFILE"
-  (_ "Where should gnunetd write the PID?")
-  (_ "The default is no longer /var/run/gnunetd.pid since we could not delete 
the file on shutdown at that location." )
-  '()
-  #f
-  "/var/run/gnunetd/pid"
-  '()
-  'rare) )
-
-
-(define (general-username builder)
- (builder
-  "GNUNETD"
-  "USER"
-  (_ "As which user should gnunetd run?")
-  (_ 
-"Empty means \"current user\". On computer startup, it is root/SYSTEM.  Under 
Windows, this setting affects the creation of a new system service only.")
-  '()
-  #f
-  ""
-  '()
-  'advanced) )
- 
-
-
-(define (general-autostart builder)
- (builder
- "GNUNETD"
- "AUTOSTART"
- (_ "Should gnunetd be automatically started when the system boots?")
- (_ "Set to YES if gnunetd should be automatically started on boot.  If this 
option is set, gnunet-setup will install a script to start the daemon upon 
completion.  This option may not work on all systems.")
- '()
- #t
- #f
- #f
- 'rare) )
-
-
-(define (general-transports builder)
- (builder
-  "GNUNETD"
-  "TRANSPORTS"
-  (_ "Which transport mechanisms should GNUnet use?")
-  (_ 
-"Use a space-separated list of modules, e.g.  \"udp smtp tcp\".  The available 
transports are udp, tcp, http, smtp and nat.
-               
-Loading the 'nat' and 'tcp' modules is required for peers behind NAT boxes 
that cannot directly be reached from the outside.  Peers that are NOT behind a 
NAT box and that want to *allow* peers that ARE behind a NAT box to connect 
must ALSO load the 'nat' module.  Note that the actual transfer will always be 
via tcp initiated by the peer behind the NAT box.  The nat transport requires 
the use of tcp, http and/or smtp in addition to nat itself.")
-  '()
-  #t
-  "udp tcp http nat"
-  (list "MC" "udp" "tcp" "nat" "http" "smtp")
-  'always) )
- 
-
-(define (general-applications builder)
- (builder
-  "GNUNETD"
-  "APPLICATIONS"
-  (_ "Which applications should gnunetd support?")
-  (_ 
-"Whenever this option is changed, you MUST run gnunet-update. Currently, the 
available applications are:
-
-advertising: advertises your peer to other peers. Without it, your peer will 
not participate in informing peers about other peers.  You should always load 
this module.
-
-getoption:  allows clients to query gnunetd about the values of various 
configuration options.  Many tools need this.  You should always load this 
module.
-
-stats: allows tools like gnunet-stats and gnunet-gtk to query gnunetd about 
various statistics.  This information is usually quite useful to diagnose 
errors, hence it is recommended that you load this module.
-
-traffic: keeps track of how many messages were recently received and 
transmitted.  This information can then be used to establish how much cover 
traffic is currently available.  The amount of cover traffic becomes important 
if you want to make anonymous requests with an anonymity level that is greater 
than one.  It is recommended that you load this module.
-
-fs: needed for anonymous file sharing. You should always load this module.
-
-hostlist: integrated hostlist HTTP server.  Useful if you want to offer a 
hostlist and running Apache would be overkill.
-
-chat: broadcast chat (demo-application, ALPHA quality).        Required for 
gnunet-chat.  Note that the current implementation of chat is not considered to 
be secure.
-
-tbench: benchmark transport performance.  Required for gnunet-tbench.  Note 
that tbench allows other users to abuse your resources.
-
-tracekit: topology visualization toolkit.  Required for gnunet-tracekit. Note 
that loading tracekit will make it slightly easier for an adversary to 
compromise your anonymity." )
-  '()
-  #t
-  "advertising getoption fs stats traffic"
-  (list "MC" "advertising" "getoption" "fs" "hostlist" "stats" "traffic" "dht" 
"tracekit" "tbench" "vpn" "chat")
-  'always) )
- 
-
-
-(define (tcpserver-disable builder)
- (builder
- "TCPSERVER"
- "DISABLE"
- (_ "Disable client-server connections")
- (_ "This option can be used to tell gnunetd not to open the client port.  
When run like this, gnunetd will participate as a peer in the network but not 
support any user interfaces.  This may be useful for headless systems that are 
never expected to have end-user interactions.  Note that this will also prevent 
you from running diagnostic tools like gnunet-stats!")
- '()
- #t
- #f
- #f
- 'rare) )
-
-
-(define (gnunetd-disable-ipv6 builder)
- (builder
- "GNUNETD"
- "DISABLE-IPV6"
- (_ "YES disables IPv6 support, NO enables IPv6 support")
- (_ "This option may be useful on peers where the kernel does not support 
IPv6.  You might also want to set this option if you do not have an IPv6 
network connection.")
- '()
- #t
- #t
- #t
- 'advanced) )
-
-
-(define (gnunetd-private-network builder)
- (builder
- "GNUNETD"
- "PRIVATE-NETWORK"
- (_ "Disable peer discovery")
- (_ "The option 'PRIVATE-NETWORK' can be used to limit the connections of this 
peer to peers of which the hostkey has been copied by hand to data/hosts;  if 
this option is given, GNUnet will not accept advertisements of peers that the 
local node does not already know about.  Note that in order for this option to 
work, HOSTLISTURL should either not be set at all or be set to a trusted peer 
that only advertises the private network. Also, the option does NOT work at the 
moment if the NAT transport is loaded; for that, a couple of lines above would 
need some minor editing :-).")
- '()
- #t
- #f
- #f
- 'rare) )
-
-(define (network-disable-advertising builder)
- (builder
- "NETWORK"
- "DISABLE-ADVERTISEMENTS"
- (_ "Disable advertising this peer to other peers")
- (nohelp)
- '()
- #t
- #f
- #f
- 'rare) )
-
-(define (network-disable-autoconnect builder)
- (builder
- "NETWORK"
- "DISABLE-AUTOCONNECT"
- (_ "Disable automatic establishment of connections")
- (_ "If this option is enabled, GNUnet will not automatically establish 
connections to other peers, but instead wait for applications to specifically 
request connections to other peers (or for other peers to connect to us).")
- '()
- #t
- #f
- #f
- 'experimental) )
-
-(define (network-disable-helloexchange builder)
- (builder
- "NETWORK"
- "HELLOEXCHANGE"
- (_ "Enable advertising of other peers by this peer")
- (_ "This option may be useful during testing, but turning it off is 
dangerous! If in any doubt, set it to YES (which is the default).")
- '()
- #t
- #t
- #t
- 'experimental) )
-
-(define (network-port builder)
- (builder
- "NETWORK"
- "PORT"
- (_ "Port for communication with GNUnet user interfaces")
- (_ "Which is the client-server port that is used between gnunetd and the 
clients (TCP only).  You may firewall this port for non-local machines (but you 
do not have to since GNUnet will perform access control and only allow 
connections from machines that are listed under TRUSTED).")
- '()
- #t
- 2087
- (cons 1 65535)
- 'advanced) )
-
-(define (hostlist-port builder)
- (builder
- "HOSTLIST"
- "PORT"
- (_ "Port for the integrated hostlist HTTP server")
- (nohelp)
- '()
- #t
- 8080
- (cons 1 65535)
- 'hostlist-loaded) )
-
-(define (network-trusted builder)
- (builder
- "NETWORK"
- "TRUSTED"
- (_ "IPv4 networks allowed to use gnunetd server")
- (_ "This option specifies which hosts are trusted enough to connect as 
clients (to the TCP port).  This is useful if you run gnunetd on one host of 
your network and want to allow all other hosts to use this node as their 
server.  By default, this is set to 'loopback only'.  The format is IP/NETMASK 
where the IP is specified in dotted-decimal and the netmask either in CIDR 
notation (/16) or in dotted decimal (255.255.0.0). Several entries must be 
separated by a semicolon, spaces are not allowed.")
- '()
- #t
- "127.0.0.0/8;"
- '()
- 'advanced) )
-
-(define (network-trusted6 builder)
- (builder
- "NETWORK"
- "TRUSTED6"
- (_ "IPv6 networks allowed to use gnunetd server")
- (_ "This option specifies which hosts are trusted enough to connect as 
clients (to the TCP port).  This is useful if you run gnunetd on one host of 
your network and want to allow all other hosts to use this node as their 
server.  By default, this is set to 'loopback only'.  The format is IP/NETMASK 
where the IP is specified in dotted-decimal and the netmask either in CIDR 
notation (/16) or in dotted decimal (255.255.0.0). Several entries must be 
separated by a semicolon, spaces are not allowed.")
- '()
- #t
- "::1;"
- '()
- 'ipv6) )
-
-
-(define (limit-allow builder)
- (builder
- "GNUNETD"
- "LIMIT-ALLOW"
- (_ "Limit connections to the specfied set of peers.")
- (_ "If this option is not set, any peer is allowed to connect.  If it is set, 
only the specified peers are allowed. Specify the list of peer IDs (not IPs!)")
- '()
- #t
- ""
- '()
- 'rare))
-
-(define (general-groupname builder)
- (builder
- "GNUNETD"
- "GROUP"
- (_ "Run gnunetd as this group.")
- (_ "When started as root, gnunetd will change permissions to the given 
group.")
- '()
- #t
- "gnunetd"
- '()
- 'advanced))
-
-(define (limit-deny builder)
- (builder
- "GNUNETD"
- "LIMIT-DENY"
- (_ "Prevent the specfied set of peers from connecting.")
- (_ "If this option is not set, any peer is allowed to connect.  If the ID of 
a peer is listed here, connections from that peer will be refused.  Specify the 
list of peer IDs (not IPs!)")
- '()
- #t
- ""
- '()
- 'rare))
-
-(define (advertising builder)
- (builder
-  "ADVERTISING"
-  ""
- (_ "Topology Maintenance")
- (_ "Rarely used settings for peer advertisements and connections")
- (list
-    (general-helloexpires builder) 
-    (tcpserver-disable builder) 
-    (gnunetd-private-network builder) 
-    (network-disable-advertising builder) 
-    (network-disable-helloexchange builder) 
-    (network-disable-autoconnect builder) 
-    (limit-allow builder) 
-    (limit-deny builder) 
- )
-  #t
-  #f
-  #f
-  'rare) )
-
-(define (general builder)
- (builder
-  "GNUNETD"
-  ""
-  (_ "General settings")
-  (_ "Settings that change the behavior of GNUnet in general")
-  (list 
-    (network-port builder) 
-    (hostlist-port builder)
-    (network-trusted builder) 
-    (general-hostlisturl builder)
-    (general-hosts builder)
-    (general-http-proxy builder)
-    (f2f builder) 
-    (fs-path builder) 
-    (index-path builder) 
-    (daemon-fdlimit builder) 
-    (gnunetd-disable-ipv6 builder) 
-    (general-username builder) 
-    (general-groupname builder) 
-    (general-pidfile builder) 
-    (general-autostart builder) 
-  )
-  #t
-  #f
-  #f
-  'always) )
-
-(define (modules builder)
- (builder
-  "MODULES"
-  ""
-  (_ "Modules")
-  (_ "Settings that select specific implementations for GNUnet modules")
-  (list 
-    (modules-sqstore builder) 
-    (modules-dstore builder) 
-    (modules-topology builder) 
-  )
-  #t
-  #f
-  #f
-  'advanced) )
-
-
-
-
-(define (fundamentals builder)
- (builder
-  "PATHS"
-  ""
-  (_ "Fundamentals")
-  ""
-  (list 
-    (paths-home builder) 
-    (general-applications builder) 
-    (general-transports builder) 
-    (modules builder) 
-  )
-  #t
-  #f
-  #f
-  'always) )
-
-
-;; modules menu
-
-(define (modules-sqstore builder)
- (builder
-  "MODULES"
-  "sqstore"
-  (_ "Which database should be used?")
-  (_ 
-"Which database should be used?  The options are \"sqstore_sqlite\", 
\"sqstore_postgres\" and \"sqstore_mysql\".  You must run gnunet-update after 
changing this value!
-                       
-In order to use MySQL or Postgres, you must configure the respective database, 
which is relatively simple.  Read the file doc/README.mysql or 
doc/README.postgres for how to setup the respective database." )
-  '()
-  #t
-  "sqstore_sqlite"
-  (list "SC" "sqstore_sqlite" "sqstore_postgres" "sqstore_mysql")
-  'fs-loaded) )
-
-(define (modules-dstore builder)
- (builder
-  "MODULES"
-  "dstore"
-  (_ "Which topology should be used?")
-  (_ "Which database should be used for the temporary datastore of the DHT?" )
-  '()
-  #t
-  "dstore_sqlite"
-  (list "SC" "dstore_sqlite" "dstore_mysql")
-  'advanced) )
-
-
-(define (modules-topology builder)
- (builder
-  "MODULES"
-  "topology"
-  (_ "Which topology should be used?")
-  (_ 
-"Which topology should be used?  The only option at the moment is 
\"topology_default\"" )
-  '()
-  #t
-  "topology_default"
-  (list "SC" "topology_default")
-  'rare) )
-
-
-;; f2f menu
-
-(define (f2f-minimum builder)
- (builder
- "F2F"
- "MINIMUM"
- (_ "The minimum number of connected friends before this peer is allowed to 
connect to peers that are not listed as friends")
- (_ "Note that this option does not guarantee that the peer will be able to 
connect to the specified number of friends.  Also, if the peer had connected to 
a sufficient number of friends and then established non-friend connections, 
some of the friends may drop out of the network, temporarily resulting in 
having fewer than the specified number of friends connected while being 
connected to non-friends.  However, it is guaranteed that the peer itself will 
never choose to drop a friend's connection if this would result in dropping 
below the specified number of friends (unless that number is higher than the 
overall connection target).")
- '()
- #t
- 0
- (cons 0 1024)
- 'f2fr) )
-
-(define (f2f-restrict builder)
- (builder
- "F2F"
- "FRIENDS-ONLY"
- (_ "If set to YES, the peer is only allowed to connect to other peers that 
are explicitly specified as friends")
- (_ "Use YES only if you have (trustworthy) friends that use GNUnet and are 
afraid of establishing (direct) connections to unknown peers")
- '()
- #t
- #f
- #f
- 'advanced) )
-
-(define (f2f-friends builder)
- (builder
-  "F2F"
-  "FRIENDS"
-  (_ "List of friends for friend-to-friend topology")
-  (_ "Specifies the name of a file which contains a list of GNUnet peer IDs 
that are friends.  If used with the friend-to-friend topology, this will ensure 
that GNUnet only connects to these peers (via any available transport).")
-  '()
-  #f
-  "$GNUNETD_HOME/friends"
-  '()
-  'f2f) )
-
-(define (f2f builder)
- (builder
-  "F2F"
-  ""
- (_ "Friend-to-Friend Topology Specification")
- (_ "Settings for restricting connections to friends")
- (list
-    (f2f-restrict builder) 
-    (f2f-minimum builder) 
-    (f2f-friends builder) 
- )
-  #t
-  #f
-  #f
-  'advanced) )
-
-;; mysql menu
-
-(define (mysql-database builder)
- (builder
-  "MYSQL"
-  "DATABASE"
-  (_ "Name of the MySQL database GNUnet should use")
-  (nohelp) 
-  '()
-  #t
-  "gnunet"
-  '()
-  'mysql) )
-
-(define (mysql-config builder)
- (builder
-  "MYSQL"
-  "CONFIG"
-  (_ "Configuration file that specifies the MySQL username and password")
-  (nohelp) 
-  '()
-  #t
-  "/etc/my.cnf"
-  '()
-  'mysql) )
-
-(define (mysql builder)
- (builder
-  "MYSQL"
-  ""
-  (_ "Configuration of the MySQL database")
-  (nohelp)
-  (list
-    (mysql-config builder)
-    (mysql-database builder)
-  )
-  #t
-  #f
-  #f
-  'mysql) )
- 
-
-
-;; applications menu
-
-(define (fs-quota builder)
- (builder
-  "FS"
-  "QUOTA"
-  (_ "MB of diskspace GNUnet can use for anonymous file sharing")
-  (_
-"How much disk space (MB) is GNUnet allowed to use for anonymous file sharing? 
 This does not take indexed files into account, only the space directly used by 
GNUnet is accounted for.  GNUnet will gather content from the network if the 
current space-consumption is below the number given here (and if content 
migration is allowed below).
-
-Note that if you change the quota, you need to run gnunet-update afterwards.")
-  '()
-  #t
-  1024
-  (cons 1 1000000)
-  'always))
-
-
-(define (fs-migration-buffer builder)
- (builder
-  "FS"
-  "MIGRATIONBUFFERSIZE"
-  (_ "Number of entries in the migration buffer")
-  (_ "Each entry uses about 32k of memory.  More entries can reduce disk IO 
and CPU usage at the expense of having gnunetd use more memory. Very large 
values may again increase CPU usage.  A value of 0 will prevent your peer from 
sending unsolicited responses.")
-  '()
-  #t
-  64
-  (cons 0 1048576)
-  'always))
-
-
-(define (fs-gap-tablesize builder)
- (builder
-  "GAP"
-  "TABLESIZE"
-  (_ "Size of the routing table for anonymous routing.")
-  (nohelp)
-  '()
-  #t
-  65536
-  (cons 1024 1048576)
-  'rare))
-
-(define (fs-dht-tablesize builder)
- (builder
-  "DHT"
-  "TABLESIZE"
-  (_ "Size of the routing table for DHT routing.")
-  (nohelp)
-  '()
-  #t
-  1024
-  (cons 128 1048576)
-  'rare))
-
-
-(define (fs-activemigration builder)
- (builder
-  "FS"
-  "ACTIVEMIGRATION"
-  (_ "Allow migrating content to this peer.")
-  (_ 
-"If you say yes here, GNUnet will migrate content to your server, and you will 
not be able to control what data is stored on your machine. 
-                       
-If you activate it, you can claim for *all* the non-indexed (-n to 
gnunet-insert) content that you did not know what it was even if an adversary 
takes control of your machine.  If you do not activate it, it is obvious that 
you have knowledge of all the content that is hosted on your machine and thus 
can be considered liable for it.")
-  '()
-  #t
-  #f
-  #f
-  'advanced))
-
-
-(define (dstore-quota builder)
- (builder
-  "DSTORE"
-  "QUOTA"
-  (_ "MB of diskspace GNUnet can use for caching DHT index data (the data will 
be stored in /tmp)")
-  (_ "DHT index data is inherently small and expires comparatively quickly.  
It is deleted whenever gnunetd is shut down.
-
-The size of the DSTORE QUOTA is specified in MB.")
-  '()
-  #t
-  1
-  (cons 1 1024)
-  'rare))
- 
-
-(define (fs builder)
- (builder
-  "FS"
-  ""
-  (_ "Options for anonymous file sharing")
-  (nohelp)
-  (list
-    (fs-quota builder)
-    (fs-activemigration builder)
-    (fs-gap-tablesize builder)
-    (fs-dht-tablesize builder)
-    (dstore-quota builder)
-    (mysql builder)
-  )
-  #t
-  #t
-  #f
-  'fs-loaded))
-
-(define (applications builder)
- (builder
-  ""
-  ""
-  (_ "Applications")
-  (nohelp)
-  (list 
-    (fs builder)
-  )
-  #t
-  #f
-  #f
-  'always) )
-
-;; transport menus
-
-(define (nat builder)
- (builder
- "NAT"
- "LIMITED"
- (_ "Is this machine unreachable behind a NAT?")
- (_ "Set to YES if this machine is behind a NAT that limits connections from 
the outside to the GNUnet port and that cannot be traversed using UPnP. Note 
that if you have configured your NAT box to allow direct connections from other 
machines to the GNUnet ports or if GNUnet can open ports using UPnP, you should 
set the option to NO. Set this only to YES if other peers cannot contact you 
directly. You can use 'make check' in src/transports/upnp/ to find out if your 
NAT supports UPnP. You can also use gnunet-transport-check with the '-p' option 
in order to determine which setting results in more connections.  Use YES only 
if you get no connections otherwise. Set to AUTO to use YES if the local IP is 
belongs to a private IP network and NO otherwise.")
- '()
- #t
- "AUTO"
- (list "SC" "YES" "AUTO" "NO")
- 'nat-loaded) )
-
-(define (tcp-port builder)
- (builder
- "TCP"
- "PORT"
- (_ "Which port should be used by the TCP IPv4 transport?")
- (nohelp)
- '()
- #t
- 2086
- (cons 0 65535)
- 'advanced))
-
-(define (tcp-upnp builder)
- (builder
- "TCP"
- "UPNP"
- (_ "Should we try to determine our external IP using UPnP?")
- (nathelp)
- '()
- #t
- #t
- #f
- 'tcp-loaded))
-
-(define (tcp-blacklist builder)
- (builder
- "TCP"
- "BLACKLISTV4"
- (_ "Which IP(v4)s are not allowed to connect?")
- (nohelp)
- '()
- #t
- "127.0.0.1;"
- '()
- 'advanced))
-
-(define (tcp-whitelist builder)
- (builder
- "TCP"
- "WHITELISTV4"
- (_ "Which IP(v4)s are allowed to connect? Leave empty to use the IP of your 
primary network interface.")
- (nohelp)
- '()
- #t
- ""
- '()
- 'advanced))
-
-(define (tcp6-blacklist builder)
- (builder
- "TCP"
- "BLACKLISTV6"
- (_ "Which IPv6s are not allowed to connect?")
- (nohelp)
- '()
- #t
- ""
- '()
- 'ipv6))
-
-(define (tcp6-whitelist builder)
- (builder
- "TCP"
- "WHITELISTV6"
- (_ "Which IPv6s are allowed to connect? Leave empty to allow any IP to 
connect.")
- (nohelp)
- '()
- #t
- ""
- '()
- 'ipv6))
-
-
-(define (tcp builder)
- (builder
- "TCP"
- ""
- (_ "TCP transport")
- (nohelp)
- (list 
-   (tcp-port builder)
-   (tcp-upnp builder)
-   (tcp-blacklist builder)
-   (tcp-whitelist builder)
-   (tcp6-blacklist builder)
-   (tcp6-whitelist builder)
- )
- #t
- #f
- #f
- 'tcp-loaded) )
-
-
-(define (http-port builder)
- (builder
- "HTTP"
- "PORT"
- (_ "Which port should be used by the HTTP transport?")
- (nohelp)
- '()
- #t
- 1080
- (cons 0 65535)
- 'advanced))
-
-(define (http-upnp builder)
- (builder
- "HTTP"
- "UPNP"
- (_ "Should we try to determine our external IP using UPnP?")
- (nathelp)
- '()
- #t
- #t
- #f
- 'http-port-nz))
-
-(define (http-advertised-port builder)
- (builder
- "HTTP"
- "ADVERTISED-PORT"
- (_ "Which is the external port of the HTTP transport?")
- (_ "Use this option if your firewall maps, say, port 80 to your real HTTP 
port.  This can be useful in making the HTTP messages appear even more legit 
(without needing to run gnunetd as root due to the use of a privileged port).")
- '()
- #t
- 80
- (cons 0 65535)
- 'advanced))
-
-(define (http builder)
- (builder
- "HTTP"
- ""
- (_ "HTTP transport")
- (nohelp)
- (list 
-   (http-port builder)
-   (http-advertised-port builder)
-   (http-upnp builder)
- )
- #t
- #f
- #f
- 'http-loaded) )
-
-
-
-
-(define (smtp-mtu builder)
- (builder
- "SMTP"
- "MTU"
- (_ "What is the maximum transfer unit for SMTP?")
- (nohelp)
- '()
- #t
- 65528
- (cons 1200 65528)
- 'smtp-loaded))
-
-(define (smtp-ratelimit builder)
- (builder
- "SMTP"
- "RATELIMIT"
- (_ "What is the maximum number of e-mails that gnunetd would be allowed to 
send per hour?")
- (_ "Use 0 for unlimited")
- '()
- #t
- 0
- (cons 0 1048576)
- 'smtp-loaded))
-
-(define (smtp-email builder)
- (builder
- "SMTP"
- "EMAIL"
- (_ "Which e-mail address should be used to send e-mail to this peer?")
- (_ "You must make sure that e-mail received at this address is forwarded to 
the PIPE which is read by gnunetd.  Use the FILTER option to filter e-mail with 
procmail and the PIPE option to set the name of the pipe.")
- '()
- #t
- "address@hidden"
- '()
- 'smtp-loaded))
-
-(define (smtp-filter builder)
- (builder
- "SMTP"
- "FILTER"
- (_ "Which header line should other peers include in e-mails to enable 
filtering?")
- (_ "You can specify a header line here which can then be used by procmail to 
filter GNUnet e-mail from your inbox and forward it to gnunetd.")
- '()
- #t
- "X-mailer: GNUnet"
- '()
- 'smtp-loaded))
-
-(define (smtp-pipe builder)
- (builder
- "SMTP"
- "PIPE"
- (_ "What is the filename of the pipe where gnunetd can read its e-mail?")
- (_ "Have a look at contrib/dot-procmailrc for an example .procmailrc file.")
- '()
- #t
- "$GNUNETD_HOME/smtp-pipe"
- '()
- 'smtp-loaded))
-
-(define (smtp-server builder)
- (builder
- "SMTP"
- "SERVER"
- (_ "What is the name and port of the server for outgoing e-mail?")
- (_ "The basic format is HOSTNAME:PORT.")
- '()
- #t
- "localhost:25"
- '()
- 'smtp-loaded))
-
-(define (smtp builder)
- (builder
- "SMTP"
- ""
- (_ "SMTP transport")
- (nohelp)
- (list 
-   (smtp-email builder)
-   (smtp-ratelimit builder)
-   (smtp-filter builder)
-   (smtp-pipe builder)
-   (smtp-server builder)
-   (smtp-mtu builder)
- )
- #t
- #f
- #f
- 'smtp-loaded) )
-
-
-
-
-
-(define (udp-port builder)
- (builder
- "UDP"
- "PORT"
- (_ "Which port should be used by the UDP IPv4 transport?")
- (nohelp)
- '()
- #t
- 2086
- (cons 0 65535)
- 'advanced))
-
-(define (udp-upnp builder)
- (builder
- "UDP"
- "UPNP"
- (_ "Should we try to determine our external IP using UPnP?")
- (nathelp)
- '()
- #t
- #t
- #f
- 'udp-port-nz))
-
-(define (udp-mtu builder)
- (builder
- "UDP"
- "MTU"
- (_ "What is the maximum transfer unit for UDP?")
- (nohelp)
- '()
- #t
- 1472
- (cons 1200 65500)
- 'rare))
-
-(define (udp-blacklist builder)
- (builder
- "UDP"
- "BLACKLISTV4"
- (_ "Which IPs are not allowed to connect?")
- (nohelp)
- '()
- #t
- "127.0.0.1;"
- '()
- 'advanced))
-
-(define (udp-whitelist builder)
- (builder
- "UDP"
- "WHITELISTV4"
- (_ "Which IPs are allowed to connect? Leave empty to allow connections from 
any IP.")
- (nohelp)
- '()
- #t
- ""
- '()
- 'advanced))
-
-(define (udp6-blacklist builder)
- (builder
- "UDP"
- "BLACKLISTV6"
- (_ "Which IPv6s are not allowed to connect?")
- (nohelp)
- '()
- #t
- ""
- '()
- 'ipv6))
-
-(define (udp6-whitelist builder)
- (builder
- "UDP6"
- "WHITELISTV6"
- (_ "Which IPv6s are allowed to connect? Leave empty to allow any IP to 
connect.")
- (nohelp)
- '()
- #t
- ""
- '()
- 'ipv6))
-
-(define (udp builder)
- (builder
- "UDP"
- ""
- (_ "UDP transport")
- (nohelp)
- (list 
-   (udp-port builder)
-   (udp-upnp builder)
-   (udp-mtu builder)
-   (udp-blacklist builder)
-   (udp-whitelist builder)
-   (udp6-blacklist builder)
-   (udp6-whitelist builder)
- )
- #t
- #f
- #f
- 'udp-loaded) )
-
-
-
-(define (network-interface builder)
- (builder
- "NETWORK"
- "INTERFACE"
- (_ "Network interface")
- (nohelp)
- '()
- #t
- "eth0"
- '()
- 'advanced) )
-
-(define (network-ip builder)
- (builder
- "NETWORK"
- "IP"
- (_ "External IP address (leave empty to try auto-detection)")
- (nohelp)
- '()
- #t
- ""
- '()
- 'advanced) )
-
-(define (network-ip6 builder)
- (builder
- "NETWORK"
- "IP6"
- (_ "External IPv6 address (leave empty to try auto-detection)")
- (nohelp)
- '()
- #t
- ""
- '()
- 'ipv6) )
-
-(define (transports builder)
- (builder
-  ""
-  ""
-  (_ "Transports")
-  (nohelp)
-  (list 
-    (nat builder)
-    (network-interface builder)
-    (network-ip builder)
-    (tcp builder)
-    (udp builder)
-    (http builder)
-    (smtp builder)
-  )
-  #t
-  #f
-  #f
-  'always) )
-
-
-
-(define (load-maxdown builder)
- (builder
- "LOAD"
- "MAXNETDOWNBPSTOTAL"
- (_ "What is the maximum number of bytes per second that we may receive?")
- (nohelp)
- '()
- #t
- 50000
- (cons 1 999999999)
- 'always))
-
-(define (load-maxup builder)
- (builder
- "LOAD"
- "MAXNETUPBPSTOTAL"
- (_ "What is the maximum number of bytes per second that we may send?")
- (nohelp)
- '()
- #t
- 50000
- (cons 1 999999999)
- 'always))
-
-(define (load-cpu builder)
- (builder
- "LOAD"
- "MAXCPULOAD"
- (_ "What is the maximum CPU load (percentage)?")
- (_ "The highest tolerable CPU load. Load here always refers to the total 
system load, that is it includes CPU utilization by other processes.  A value 
of 50 means that once your 1 minute-load average goes over 50% non-idle, GNUnet 
will try to reduce CPU consumption until the load goes under the threshold.  
Reasonable values are typically between 50 and 100.  Multiprocessors may use 
values above 100." )
- '()
- #t
- 100
- (cons 0 10000)
- 'always))
-
-(define (load-io builder)
- (builder
- "LOAD"
- "MAXIOLOAD"
- (_ "What is the maximum IO load (permille)?")
- (_ 
-"The highest tolerable IO load.  Load here refers to the percentage of CPU 
cycles wasted waiting for IO for the entire system, that is it includes disk 
utilization by other processes.  A value of 10 means that once the average 
number of cycles wasted waiting for IO is more than 10% non-idle, GNUnet will 
try to reduce IO until the load goes under the threshold.  Reasonable values 
are typically between 10 and 75." )
- '()
- #t
- 50
- (cons 0 10000)
- 'advanced))
-
-(define (load-cpu-hard builder)
- (builder
- "LOAD"
- "HARDCPULIMIT"
- (_ "What is the maximum CPU load (hard limit)?")
- (_ "The highest tolerable CPU load.  This is the hard limit, so once it is 
reached, gnunetd will start to massively drop data to reduce the load.  Use 
with caution.")
- '()
- #t
- 0
- (cons 0 99999)
- 'rare))
-
-(define (load-hard-up-limit builder)
- (builder
- "LOAD"
- "HARDUPLIMIT"
- (_ "What is the maximum upstream bandwidth (hard limit)?")
- (_ "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to 
have MAXNETUPBPS be the hard limit.  Use zero for no limit.")
- '()
- #t
- 0
- (cons 0 999999999)
- 'rare))
-
-
-(define (load-priority builder)
- (builder
- "LOAD"
- "PRIORITY"
- (_ "What priority should gnunetd use to run?")
- (_ "You can specify priorities like NORMAL, ABOVE NORMAL, BELOW NORMAL, HIGH 
and IDLE or a numerical integer value (man nice).  The default is IDLE, which 
should result in gnunetd only using resources that would otherwise be idle.")
- '()
- #t
- "IDLE"
- '()
- 'always))
-
-
-(define (load-padding builder)
- (builder
- "GNUNETD-EXPERIMENTAL"
- "PADDING"
- (_ "Should we disable random padding (experimental option)?")
- (nohelp)
- '()
- #t
- #f
- #f
- 'experimental))
-
-(define (load-basiclimiting builder)
- (builder
- "LOAD"
- "BASICLIMITING"
- (_ "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES.")
- (_ 
-"Basic bandwidth limitation (YES) means simply that the bandwidth limits 
specified apply to GNUnet and only to GNUnet.  If set to YES, you simply 
specify the maximum bandwidth (upstream and downstream) that GNUnet is allowed 
to use and GNUnet will stick to those limitations.  This is useful if your 
overall bandwidth is so large that the limit is mostly used to ensure that 
enough capacity is left for other applications.  Even if you want to dedicate 
your entire connection to GNUnet you should not set the limits to values higher 
than what you have since GNUnet uses those limits to determine for example the 
number of connections to establish (and it would be inefficient if that 
computation yields a number that is far too high).  
-
-While basic bandwidth limitation is simple and always works, there are some 
situations where it is not perfect.  Suppose you are running another 
application which performs a larger download. During that particular time, it 
would be nice if GNUnet would throttle its bandwidth consumption 
(automatically) and resume using more bandwidth after the download is complete. 
 This is obviously advanced magic since GNUnet will have to monitor the 
behavior of other applications. Another scenario is a monthly cap on bandwidth 
imposed by your ISP, which you would want to ensure is obeyed.  Here, you may 
want GNUnet to monitor the traffic from other applications to ensure that the 
combined long-term traffic is within the pre-set bounds.  Note that you should 
probably not set the bounds tightly since GNUnet may observe that the bounds 
are about to be broken but would be unable to stop other applications from 
continuing to use bandwidth.
-
-If either of these two scenarios applies, set BASICLIMITING to NO. Then set 
the bandwidth limits to the COMBINED amount of traffic that is acceptable for 
both GNUnet and other applications.  GNUnet will then immediately throttle 
bandwidth consumption if the short-term average is above the limit, and it will 
also try to ensure that the long-term average is below the limit.  Note however 
that using NO can have the effect of GNUnet (almost) ceasing operations after 
other applications perform high-volume downloads that are beyond the defined 
limits.  GNUnet would reduce consumption until the long-term limits are again 
within bounds.
-
-NO only works on platforms where GNUnet can monitor the amount of traffic that 
the local host puts out on the network.  This is only implemented for Linux and 
Win32.  In order for the code to work, GNUnet needs to know the specific 
network interface that is used for the external connection (after all, the 
amount of traffic on loopback or on the LAN should never be counted since it is 
irrelevant).")
- '()
- #t
- #t
- #f
- 'advanced))
-
-(define (load-interfaces builder)
- (builder
- "LOAD"
- "INTERFACES"
- (_ "Network interface to monitor")
- (_ "For which interfaces should we do accounting?  GNUnet will evaluate the 
total traffic (not only the GNUnet related traffic) and adjust its bandwidth 
usage accordingly. You can currently only specify a single interface. GNUnet 
will also use this interface to determine the IP to use. Typical values are 
eth0, ppp0, eth1, wlan0, etc.  'ifconfig' will tell you what you have.  Never 
use 'lo', that just won't work.  Under Windows, specify the index number 
reported by  'gnunet-win-tool -n'.")
- '()
- #t
- "eth0"
- (list "*" "eth0" "eth1" "eth2")
- 'nobasiclimit))
-
-(define (load builder)
- (builder
-  ""
-  ""
-  (_ "Load management")
-  (nohelp)
-  (list 
-    (load-priority builder)
-    (load-maxdown builder)
-    (load-maxup builder)
-    (load-hard-up-limit builder)
-    (load-cpu builder)
-    (load-io builder)
-    (load-cpu-hard builder)
-    (load-basiclimiting builder)
-    (load-interfaces builder)
-    (load-padding builder)
-  )
-  #t
-  #f
-  #f
-  'always) )
-
-
-;; main-menu
-
-(define (main builder)
- (builder 
-  "Root"
-  ""
-  (_ "Root node")
-  (nohelp)
-  (list 
-    (meta builder)
-    (fundamentals builder)
-    (general builder) 
-    (advertising builder) 
-    (logging builder)
-    (load builder)
-    (transports builder) 
-    (applications builder) 
-  )
-  #t 
-  #f 
-  #f 
-  'always) )
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; first main method: build tree using build-tree-node
-;; The lambda expression is used to throw away the last argument,
-;; which we use internally and which is not used by build-tree-node!
-(define (gnunet-config-setup) 
- (main 
-  (lambda (a b c d e f g h i) (build-tree-node a b c d e f g h) ) ) )
-
-
-;; second main method: update visibility (and values)
-;; "change" uses again the tree builder but this time
-;; scans the "i" tags to determine how the visibility needs to change
-
-(define (gnunet-config-change ctx)
- (let 
-   ( 
-     (advanced (get-option ctx "Meta" "ADVANCED"))
-     (rare (get-option ctx "Meta" "RARE"))
-     (nobasiclimit (not (get-option ctx "LOAD" "BASICLIMITING")))
-     (experimental (get-option ctx "Meta" "EXPERIMENTAL"))
-     (ipv6 (not (get-option ctx "GNUNETD" "DISABLE-IPV6")))
-     (f2fr (not (get-option ctx "F2F" "RESTRICT") ) )
-     (f2f (or (get-option ctx "F2F" "FRIENDS-ONLY")
-              (not (eq? (get-option ctx "F2F" "MINIMUM") 0) ) ) )
-     (tcp-port-nz (eq? (get-option ctx "TCP" "PORT") 0) )
-     (udp-port-nz (eq? (get-option ctx "UDP" "PORT") 0) )
-     (http-port-nz (eq? (get-option ctx "HTTP" "PORT") 0) )
-     (mysql (string= (get-option ctx "MODULES" "sqstore") "sqstore_mysql") )
-     (fs-loaded (list? (member "fs" (string-split (get-option ctx "GNUNETD" 
"APPLICATIONS") #\  ) ) ) )
-     (hostlist-loaded (list? (member "hostlist" (string-split (get-option ctx 
"GNUNETD" "APPLICATIONS") #\  ) ) ) )
-     (nat-loaded (list? (member "nat" (string-split (get-option ctx "GNUNETD" 
"TRANSPORTS") #\  ) ) ) )
-     (tcp-loaded (list? (member "tcp" (string-split (get-option ctx "GNUNETD" 
"TRANSPORTS") #\  ) ) ) )
-     (udp-loaded (list? (member "udp" (string-split (get-option ctx "GNUNETD" 
"TRANSPORTS") #\  ) ) ) )
-     (http-loaded (list? (member "http" (string-split (get-option ctx 
"GNUNETD" "TRANSPORTS") #\  ) ) ) )
-     (smtp-loaded (list? (member "smtp" (string-split (get-option ctx 
"GNUNETD" "TRANSPORTS") #\  ) ) ) )
-   )
-  (begin 
-    (main
-     (lambda (a b c d e f g h i) 
-        (begin 
-          (cond
-            ((eq? i 'advanced)     (change-visible ctx a b advanced))
-            ((eq? i 'rare)         (change-visible ctx a b (and advanced 
rare)))
-            ((eq? i 'experimental) (change-visible ctx a b (and advanced 
experimental)))
-            ((eq? i 'f2f)          (change-visible ctx a b f2f))
-            ((eq? i 'ipv6)         (change-visible ctx a b ipv6))
-            ((eq? i 'f2fr)         (change-visible ctx a b f2fr))
-            ((eq? i 'mysql)        (change-visible ctx a b mysql))
-            ((eq? i 'fs-loaded)    (change-visible ctx a b fs-loaded))
-            ((eq? i 'hostlist-loaded)    (change-visible ctx a b 
hostlist-loaded))
-            ((eq? i 'nat-unlimited)(change-visible ctx a b nat-unlimited))
-            ((eq? i 'tcp-port-nz)  (change-visible ctx a b tcp-port-nz))
-            ((eq? i 'udp-port-nz)  (change-visible ctx a b udp-port-nz))
-            ((eq? i 'nat-loaded)   (change-visible ctx a b nat-loaded))
-            ((eq? i 'udp-loaded)   (change-visible ctx a b udp-loaded))
-            ((eq? i 'tcp-loaded)   (change-visible ctx a b tcp-loaded))
-            ((eq? i 'http-loaded)  (change-visible ctx a b http-loaded))
-            ((eq? i 'smtp-loaded)  (change-visible ctx a b smtp-loaded))
-            ((eq? i 'nobasiclimit) (change-visible ctx a b nobasiclimit))
-            (else 'nothing)
-          )
-   ) ) ) 
-   (change-visible ctx "NETWORK" "PORT" (and advanced (not (get-option ctx 
"TCPSERVER" "DISABLE"))))
-   (change-visible ctx "NETWORK" "TRUSTED" (and advanced (not (get-option ctx 
"TCPSERVER" "DISABLE"))))
-  )
-) )
-

Added: GNUnet/contrib/config-daemon.scm.in
===================================================================
--- GNUnet/contrib/config-daemon.scm.in                         (rev 0)
+++ GNUnet/contrib/config-daemon.scm.in 2009-01-08 12:59:24 UTC (rev 8092)
@@ -0,0 +1,1568 @@
+;; This is not a stand-alone guile application.
+;; It can only be executed from within gnunet-setup.
+;;
+;; GNUnet setup defines a function "build-tree-node"
+;; (with arguments section, option, description, help,
+;;  children, visible, value and range) which is
+;;  used by the script to create the configuration tree.
+;;
+;; GNUnet setup defines a function "change-visible"
+;; (with arguments context, section, option, yesno) which
+;;  can be used by the script to dynamically change the
+;;  visibility of options.
+;;
+;; GNUnet setup defines a function "get-option"
+;; (with arguments context, section, option) which
+;;  can be used to query the current value of an option.
+;;
+;; GNUnet setup defines a function "set-option"
+;; (with arguments context, section, option, value) which
+;;  can be used to set the value of an option.
+;;
+;;
+;; GNUnet setup requires two functions from this script.
+;; First, a function "gnunet-config-setup" which constructs the
+;; configuration tree.
+;;
+;; Second, a function "gnunet-config-change" which is notified whenever
+;; configuration options are changed; the script can then
+;; change the visibility of other options.
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; for GNU gettext
+(define (_ msg) msg)
+
+;; common string
+(define (nohelp) 
+  (_ "No help available.") )
+
+(define (nathelp)
+  (_ "You can use 'make check' in src/transports/upnp/ to find out if your NAT 
supports UPnP.  You should disable this option if you are sure that you are not 
behind a NAT.  If your NAT box does not support UPnP, having this on will not 
do much harm (only cost a small amount of resources).") )
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; menu definitions
+
+;; meta-menu
+
+(define (meta-exp builder) 
+ (builder
+   "Meta"
+   "EXPERIMENTAL"
+   (_ "Prompt for development and/or incomplete code")
+   (_
+"If EXPERIMENTAL is set to NO, options for experimental code are not shown.  
If in doubt, use NO.
+
+Some options apply to experimental code that maybe in a state of development 
where the functionality, stability, or the level of testing is not yet high 
enough for general use.  These features are said to be of \"alpha\" quality.  
If a feature is currently in alpha, uninformed use is discouraged (since the 
developers then do not fancy \"Why doesn't this work?\" type messages).
+
+However, active testing and qualified feedback of these features is always 
welcome.  Users should just be aware that alpha features may not meet the 
normal level of reliability or it may fail to work in some special cases.  Bug 
reports are usually welcomed by the developers, but please read the documents 
<file://README> and <http://gnunet.org/faq.php3> and use 
<https://gnunet.org/mantis/> for how to report problems." )
+   '()
+   #t
+   #f
+   #f
+   'advanced) )
+
+(define (meta-adv builder) 
+ (builder
+   "Meta"
+   "ADVANCED"
+   (_ "Show options for advanced users")
+   (_
+"These are options that maybe difficult to understand for the beginner. These 
options typically refer to features that allow tweaking of the installation.  
If in a hurry, say NO." )
+   '()
+   #t
+   #t
+   #f
+   'always) )
+
+(define (meta-rare builder) 
+ (builder
+  "Meta"
+   "RARE"
+   (_ "Show rarely used options")
+   (_
+"These are options that hardly anyone actually needs.  If you plan on doing 
development on GNUnet, you may want to look into these.  If in doubt or in a 
hurry, say NO." )
+   '()
+   #t
+   #t
+   #f
+   'advanced) )
+
+(define (meta builder)
+ (builder
+   "Meta"
+   "" 
+   (_ "Meta-configuration") 
+   (_ "Which level of configuration should be available")
+   (list 
+     (meta-adv builder) 
+     (meta-rare builder)
+     (meta-exp builder)
+   )
+   #t
+   #f
+   #f
+   'always) )
+
+;; fundamentals
+
+(define (paths-home builder)
+ (builder
+  "PATHS"
+  "GNUNETD_HOME"
+  (_ "Full pathname of GNUnet HOME directory")
+  (_ 
+"This gives the root-directory of the GNUnet installation. Make sure there is 
some space left in that directory. :-)  Users inserting or indexing files will 
be able to store data in this directory up to the (global) quota specified 
below.  Having a few gigabytes of free space is recommended." ) 
+  '()
+  #t
+  "@GN_DAEMON_HOME_DIR@"
+  '()
+  'always) )
+
+;; General menu
+
+(define (fs-path builder)
+ (builder
+  "FS"
+  "DIR"
+  (_ "Full pathname of GNUnet directory for file-sharing data")
+  (nohelp) 
+  '()
+  #t
+  "$GNUNETD_HOME/data/fs"
+  '()
+  'always) )
+
+(define (kv-path builder)
+ (builder
+  "KEYVALUE_DATABASE"
+  "DIR"
+  (_ "Full pathname to the directory with the key-value database")
+  (_ "Note that the kvstore is currently not used.") 
+  '()
+  #f
+  "$GNUNETD_HOME/kvstore/"
+  '()
+  'never) )
+
+(define (index-path builder)
+ (builder
+  "FS"
+  "INDEX-DIRECTORY"
+  (_ "Full pathname of GNUnet directory for indexed files symbolic links")
+  (nohelp) 
+  '()
+  #t
+  "$GNUNETD_HOME/data/shared"
+  '()
+  'always) )
+
+(define (general-helloexpires builder)
+ (builder
+  "GNUNETD"
+  "HELLOEXPIRES"
+  (_ "How many minutes should peer advertisements last?")
+  (_ 
+"How many minutes is the current IP valid?  (GNUnet will sign HELLO messages 
with this expiration timeline. If you are on dialup, 60 (for 1 hour) is 
suggested. If you have a static IP address, you may want to set this to a large 
value (say 14400).  The default is 1440 (1 day). If your IP changes 
periodically, you will want to choose an expiry period smaller than the 
frequency with which your IP changes." )
+  '()
+  #t
+  1440
+  (cons 1 14400)
+  'advanced) )
+
+(define (general-hostlisturl builder)
+ (builder
+  "GNUNETD"
+  "HOSTLISTURL"
+  (_ "Where can GNUnet find an initial list of peers?")
+  (_ 
+"GNUnet can automatically update the hostlist from the web. While GNUnet 
internally communicates which hosts are online, it is typically a good idea to 
get a fresh hostlist whenever gnunetd starts from the WEB. By setting this 
option, you can specify from which server gnunetd should try to download the 
hostlist. The default should be fine for now.
+               
+The general format is a list of space-separated URLs.  Each URL must have the 
format http://HOSTNAME/FILENAME
+               
+If you want to setup an alternate hostlist server, you must run a permanent 
node and \"cat data/hosts/* > hostlist\" every few minutes to keep the list 
up-to-date.
+               
+If you do not specify a HOSTLISTURL, you must copy valid hostkeys to 
data/hosts manually.")
+  '()
+  #t
+  "http://gnunet.org/hostlist.php http://gnunet.mine.nu:8081/hostlist 
http://vserver1236.vserver-on.de/hostlist-074";
+  '()
+  'always) )
+
+(define (general-http-proxy builder)
+ (builder
+  "GNUNETD"
+  "HTTP-PROXY"
+  (_ "HTTP Proxy Server")
+  (_ 
+"If you have to use a proxy for outbound HTTP connections, specify the proxy 
configuration here.  Default is no proxy." )
+  '()
+  #t
+  ""
+  '()
+  'advanced) )
+
+
+(define (general-hosts builder)
+ (builder
+  "GNUNETD"
+  "HOSTS"
+  (_ "Name of the directory where gnunetd should store contact information 
about peers")
+  (_ 
+"Unless you want to share the directory directly using a webserver, the 
default is most likely just fine." )
+  '()
+  #t
+  "$GNUNETD_HOME/data/hosts/"
+  '()
+  'rare) )
+
+
+;; logging options
+
+(define (log-level description option builder)
+ (builder
+   "LOGGING"
+   option
+   description
+   (nohelp)
+   '()
+   #t
+   "WARNING"
+   (list "SC" "NOTHING" "FATAL" "ERROR" "WARNING" "INFO" "STATUS" "DEBUG")
+   'always))
+
+(define (log-keeplog builder)
+ (builder
+  "GNUNETD"
+  "KEEPLOG"
+  (_ "How long should logs be kept?")
+  (_ 
+"How long should logs be kept? If you specify a value greater than zero, a log 
is created each day with the date appended to its filename. These logs are 
deleted after $KEEPLOG days. To keep logs forever, set this value to 0." )
+  '()
+  #t
+  3
+  (cons 0 36500)
+  'advanced) )
+
+(define (daemon-fdlimit builder)
+ (builder
+  "GNUNETD"
+  "FDLIMIT"
+  (_ "What maximum number of open file descriptors should be requested from 
the OS?")
+  (_ 
+"The default of 1024 should be fine for most systems.  If your system can 
support more, increasing the number might help support additional clients on 
machines with plenty of bandwidth.  For embedded systems, a smaller number 
might be acceptable.  A value of 0 will leave the descriptor limit untouched.  
This option is mostly for OS X systems where the default is too low.  Note that 
if gnunetd cannot obtain the desired number of file descriptors from the 
operating system, it will print a warning and try to run with what it is 
given." )
+  '()
+  #t
+  1024
+  (cons 64 65536)
+  'rare) )
+
+(define (log-logfile builder)
+ (builder
+  "GNUNETD"
+  "LOGFILE"
+  (_ "Where should gnunetd write the logs?")
+  (nohelp)
+  '()
+  #f
+  "$GNUNETD_HOME/daemon-logs"
+  '()
+  'rare) )
+
+(define (log-devel builder)
+ (builder
+  "LOGGING"
+  "DEVELOPER"
+  (_ "Enable for extra-verbose logging.")
+  (nohelp)
+  '()
+  #f
+  #f
+  #f
+  'rare) )
+
+(define (logging builder)
+ (builder
+   "LOGGING"
+   "" 
+   (_ "Logging") 
+   (_ "Specify which system messages should be logged how")
+   (list 
+     (log-keeplog builder)
+     (log-logfile builder)
+     (log-devel builder)
+     (log-level (_ "Logging of events for users") "USER-LEVEL" builder) 
+     (log-level (_ "Logging of events for the system administrator") 
"ADMIN-LEVEL" builder) 
+   )
+   #t
+   #f
+   #f
+   'advanced) )
+
+ 
+(define (general-pidfile builder)
+ (builder
+  "GNUNETD"
+  "PIDFILE"
+  (_ "Where should gnunetd write the PID?")
+  (_ "The default is no longer /var/run/gnunetd.pid since we could not delete 
the file on shutdown at that location." )
+  '()
+  #f
+  "@GN_DAEMON_PIDFILE@"
+  '()
+  'rare) )
+
+
+(define (general-username builder)
+ (builder
+  "GNUNETD"
+  "USER"
+  (_ "As which user should gnunetd run?")
+  (_ 
+"Empty means \"current user\". On computer startup, it is root/SYSTEM.  Under 
Windows, this setting affects the creation of a new system service only.")
+  '()
+  #f
+  ""
+  '()
+  'advanced) )
+ 
+
+
+(define (general-autostart builder)
+ (builder
+ "GNUNETD"
+ "AUTOSTART"
+ (_ "Should gnunetd be automatically started when the system boots?")
+ (_ "Set to YES if gnunetd should be automatically started on boot.  If this 
option is set, gnunet-setup will install a script to start the daemon upon 
completion.  This option may not work on all systems.")
+ '()
+ #t
+ #f
+ #f
+ 'rare) )
+
+
+(define (general-transports builder)
+ (builder
+  "GNUNETD"
+  "TRANSPORTS"
+  (_ "Which transport mechanisms should GNUnet use?")
+  (_ 
+"Use a space-separated list of modules, e.g.  \"udp smtp tcp\".  The available 
transports are udp, tcp, http, smtp and nat.
+               
+Loading the 'nat' and 'tcp' modules is required for peers behind NAT boxes 
that cannot directly be reached from the outside.  Peers that are NOT behind a 
NAT box and that want to *allow* peers that ARE behind a NAT box to connect 
must ALSO load the 'nat' module.  Note that the actual transfer will always be 
via tcp initiated by the peer behind the NAT box.  The nat transport requires 
the use of tcp, http and/or smtp in addition to nat itself.")
+  '()
+  #t
+  "udp tcp http nat"
+  (list "MC" "udp" "tcp" "nat" "http" "smtp")
+  'always) )
+ 
+
+(define (general-applications builder)
+ (builder
+  "GNUNETD"
+  "APPLICATIONS"
+  (_ "Which applications should gnunetd support?")
+  (_ 
+"Whenever this option is changed, you MUST run gnunet-update. Currently, the 
available applications are:
+
+advertising: advertises your peer to other peers. Without it, your peer will 
not participate in informing peers about other peers.  You should always load 
this module.
+
+getoption:  allows clients to query gnunetd about the values of various 
configuration options.  Many tools need this.  You should always load this 
module.
+
+stats: allows tools like gnunet-stats and gnunet-gtk to query gnunetd about 
various statistics.  This information is usually quite useful to diagnose 
errors, hence it is recommended that you load this module.
+
+traffic: keeps track of how many messages were recently received and 
transmitted.  This information can then be used to establish how much cover 
traffic is currently available.  The amount of cover traffic becomes important 
if you want to make anonymous requests with an anonymity level that is greater 
than one.  It is recommended that you load this module.
+
+fs: needed for anonymous file sharing. You should always load this module.
+
+hostlist: integrated hostlist HTTP server.  Useful if you want to offer a 
hostlist and running Apache would be overkill.
+
+chat: broadcast chat (demo-application, ALPHA quality).        Required for 
gnunet-chat.  Note that the current implementation of chat is not considered to 
be secure.
+
+tbench: benchmark transport performance.  Required for gnunet-tbench.  Note 
that tbench allows other users to abuse your resources.
+
+tracekit: topology visualization toolkit.  Required for gnunet-tracekit. Note 
that loading tracekit will make it slightly easier for an adversary to 
compromise your anonymity." )
+  '()
+  #t
+  "advertising getoption fs stats traffic"
+  (list "MC" "advertising" "getoption" "fs" "hostlist" "stats" "traffic" "dht" 
"tracekit" "tbench" "vpn" "chat")
+  'always) )
+ 
+
+
+(define (tcpserver-disable builder)
+ (builder
+ "TCPSERVER"
+ "DISABLE"
+ (_ "Disable client-server connections")
+ (_ "This option can be used to tell gnunetd not to open the client port.  
When run like this, gnunetd will participate as a peer in the network but not 
support any user interfaces.  This may be useful for headless systems that are 
never expected to have end-user interactions.  Note that this will also prevent 
you from running diagnostic tools like gnunet-stats!")
+ '()
+ #t
+ #f
+ #f
+ 'rare) )
+
+
+(define (gnunetd-disable-ipv6 builder)
+ (builder
+ "GNUNETD"
+ "DISABLE-IPV6"
+ (_ "YES disables IPv6 support, NO enables IPv6 support")
+ (_ "This option may be useful on peers where the kernel does not support 
IPv6.  You might also want to set this option if you do not have an IPv6 
network connection.")
+ '()
+ #t
+ #t
+ #t
+ 'advanced) )
+
+
+(define (gnunetd-private-network builder)
+ (builder
+ "GNUNETD"
+ "PRIVATE-NETWORK"
+ (_ "Disable peer discovery")
+ (_ "The option 'PRIVATE-NETWORK' can be used to limit the connections of this 
peer to peers of which the hostkey has been copied by hand to data/hosts;  if 
this option is given, GNUnet will not accept advertisements of peers that the 
local node does not already know about.  Note that in order for this option to 
work, HOSTLISTURL should either not be set at all or be set to a trusted peer 
that only advertises the private network. Also, the option does NOT work at the 
moment if the NAT transport is loaded; for that, a couple of lines above would 
need some minor editing :-).")
+ '()
+ #t
+ #f
+ #f
+ 'rare) )
+
+(define (network-disable-advertising builder)
+ (builder
+ "NETWORK"
+ "DISABLE-ADVERTISEMENTS"
+ (_ "Disable advertising this peer to other peers")
+ (nohelp)
+ '()
+ #t
+ #f
+ #f
+ 'rare) )
+
+(define (network-disable-autoconnect builder)
+ (builder
+ "NETWORK"
+ "DISABLE-AUTOCONNECT"
+ (_ "Disable automatic establishment of connections")
+ (_ "If this option is enabled, GNUnet will not automatically establish 
connections to other peers, but instead wait for applications to specifically 
request connections to other peers (or for other peers to connect to us).")
+ '()
+ #t
+ #f
+ #f
+ 'experimental) )
+
+(define (network-disable-helloexchange builder)
+ (builder
+ "NETWORK"
+ "HELLOEXCHANGE"
+ (_ "Enable advertising of other peers by this peer")
+ (_ "This option may be useful during testing, but turning it off is 
dangerous! If in any doubt, set it to YES (which is the default).")
+ '()
+ #t
+ #t
+ #t
+ 'experimental) )
+
+(define (network-port builder)
+ (builder
+ "NETWORK"
+ "PORT"
+ (_ "Port for communication with GNUnet user interfaces")
+ (_ "Which is the client-server port that is used between gnunetd and the 
clients (TCP only).  You may firewall this port for non-local machines (but you 
do not have to since GNUnet will perform access control and only allow 
connections from machines that are listed under TRUSTED).")
+ '()
+ #t
+ 2087
+ (cons 1 65535)
+ 'advanced) )
+
+(define (hostlist-port builder)
+ (builder
+ "HOSTLIST"
+ "PORT"
+ (_ "Port for the integrated hostlist HTTP server")
+ (nohelp)
+ '()
+ #t
+ 8080
+ (cons 1 65535)
+ 'hostlist-loaded) )
+
+(define (network-trusted builder)
+ (builder
+ "NETWORK"
+ "TRUSTED"
+ (_ "IPv4 networks allowed to use gnunetd server")
+ (_ "This option specifies which hosts are trusted enough to connect as 
clients (to the TCP port).  This is useful if you run gnunetd on one host of 
your network and want to allow all other hosts to use this node as their 
server.  By default, this is set to 'loopback only'.  The format is IP/NETMASK 
where the IP is specified in dotted-decimal and the netmask either in CIDR 
notation (/16) or in dotted decimal (255.255.0.0). Several entries must be 
separated by a semicolon, spaces are not allowed.")
+ '()
+ #t
+ "127.0.0.0/8;"
+ '()
+ 'advanced) )
+
+(define (network-trusted6 builder)
+ (builder
+ "NETWORK"
+ "TRUSTED6"
+ (_ "IPv6 networks allowed to use gnunetd server")
+ (_ "This option specifies which hosts are trusted enough to connect as 
clients (to the TCP port).  This is useful if you run gnunetd on one host of 
your network and want to allow all other hosts to use this node as their 
server.  By default, this is set to 'loopback only'.  The format is IP/NETMASK 
where the IP is specified in dotted-decimal and the netmask either in CIDR 
notation (/16) or in dotted decimal (255.255.0.0). Several entries must be 
separated by a semicolon, spaces are not allowed.")
+ '()
+ #t
+ "::1;"
+ '()
+ 'ipv6) )
+
+
+(define (limit-allow builder)
+ (builder
+ "GNUNETD"
+ "LIMIT-ALLOW"
+ (_ "Limit connections to the specfied set of peers.")
+ (_ "If this option is not set, any peer is allowed to connect.  If it is set, 
only the specified peers are allowed. Specify the list of peer IDs (not IPs!)")
+ '()
+ #t
+ ""
+ '()
+ 'rare))
+
+(define (general-groupname builder)
+ (builder
+ "GNUNETD"
+ "GROUP"
+ (_ "Run gnunetd as this group.")
+ (_ "When started as root, gnunetd will change permissions to the given 
group.")
+ '()
+ #t
+ "gnunetd"
+ '()
+ 'advanced))
+
+(define (limit-deny builder)
+ (builder
+ "GNUNETD"
+ "LIMIT-DENY"
+ (_ "Prevent the specfied set of peers from connecting.")
+ (_ "If this option is not set, any peer is allowed to connect.  If the ID of 
a peer is listed here, connections from that peer will be refused.  Specify the 
list of peer IDs (not IPs!)")
+ '()
+ #t
+ ""
+ '()
+ 'rare))
+
+(define (advertising builder)
+ (builder
+  "ADVERTISING"
+  ""
+ (_ "Topology Maintenance")
+ (_ "Rarely used settings for peer advertisements and connections")
+ (list
+    (general-helloexpires builder) 
+    (tcpserver-disable builder) 
+    (gnunetd-private-network builder) 
+    (network-disable-advertising builder) 
+    (network-disable-helloexchange builder) 
+    (network-disable-autoconnect builder) 
+    (limit-allow builder) 
+    (limit-deny builder) 
+ )
+  #t
+  #f
+  #f
+  'rare) )
+
+(define (general builder)
+ (builder
+  "GNUNETD"
+  ""
+  (_ "General settings")
+  (_ "Settings that change the behavior of GNUnet in general")
+  (list 
+    (network-port builder) 
+    (hostlist-port builder)
+    (network-trusted builder) 
+    (general-hostlisturl builder)
+    (general-hosts builder)
+    (general-http-proxy builder)
+    (f2f builder) 
+    (fs-path builder) 
+    (index-path builder) 
+    (daemon-fdlimit builder) 
+    (gnunetd-disable-ipv6 builder) 
+    (general-username builder) 
+    (general-groupname builder) 
+    (general-pidfile builder) 
+    (general-autostart builder) 
+  )
+  #t
+  #f
+  #f
+  'always) )
+
+(define (modules builder)
+ (builder
+  "MODULES"
+  ""
+  (_ "Modules")
+  (_ "Settings that select specific implementations for GNUnet modules")
+  (list 
+    (modules-sqstore builder) 
+    (modules-dstore builder) 
+    (modules-topology builder) 
+  )
+  #t
+  #f
+  #f
+  'advanced) )
+
+
+
+
+(define (fundamentals builder)
+ (builder
+  "PATHS"
+  ""
+  (_ "Fundamentals")
+  ""
+  (list 
+    (paths-home builder) 
+    (general-applications builder) 
+    (general-transports builder) 
+    (modules builder) 
+  )
+  #t
+  #f
+  #f
+  'always) )
+
+
+;; modules menu
+
+(define (modules-sqstore builder)
+ (builder
+  "MODULES"
+  "sqstore"
+  (_ "Which database should be used?")
+  (_ 
+"Which database should be used?  The options are \"sqstore_sqlite\", 
\"sqstore_postgres\" and \"sqstore_mysql\".  You must run gnunet-update after 
changing this value!
+                       
+In order to use MySQL or Postgres, you must configure the respective database, 
which is relatively simple.  Read the file doc/README.mysql or 
doc/README.postgres for how to setup the respective database." )
+  '()
+  #t
+  "sqstore_sqlite"
+  (list "SC" "sqstore_sqlite" "sqstore_postgres" "sqstore_mysql")
+  'fs-loaded) )
+
+(define (modules-dstore builder)
+ (builder
+  "MODULES"
+  "dstore"
+  (_ "Which topology should be used?")
+  (_ "Which database should be used for the temporary datastore of the DHT?" )
+  '()
+  #t
+  "dstore_sqlite"
+  (list "SC" "dstore_sqlite" "dstore_mysql")
+  'advanced) )
+
+
+(define (modules-topology builder)
+ (builder
+  "MODULES"
+  "topology"
+  (_ "Which topology should be used?")
+  (_ 
+"Which topology should be used?  The only option at the moment is 
\"topology_default\"" )
+  '()
+  #t
+  "topology_default"
+  (list "SC" "topology_default")
+  'rare) )
+
+
+;; f2f menu
+
+(define (f2f-minimum builder)
+ (builder
+ "F2F"
+ "MINIMUM"
+ (_ "The minimum number of connected friends before this peer is allowed to 
connect to peers that are not listed as friends")
+ (_ "Note that this option does not guarantee that the peer will be able to 
connect to the specified number of friends.  Also, if the peer had connected to 
a sufficient number of friends and then established non-friend connections, 
some of the friends may drop out of the network, temporarily resulting in 
having fewer than the specified number of friends connected while being 
connected to non-friends.  However, it is guaranteed that the peer itself will 
never choose to drop a friend's connection if this would result in dropping 
below the specified number of friends (unless that number is higher than the 
overall connection target).")
+ '()
+ #t
+ 0
+ (cons 0 1024)
+ 'f2fr) )
+
+(define (f2f-restrict builder)
+ (builder
+ "F2F"
+ "FRIENDS-ONLY"
+ (_ "If set to YES, the peer is only allowed to connect to other peers that 
are explicitly specified as friends")
+ (_ "Use YES only if you have (trustworthy) friends that use GNUnet and are 
afraid of establishing (direct) connections to unknown peers")
+ '()
+ #t
+ #f
+ #f
+ 'advanced) )
+
+(define (f2f-friends builder)
+ (builder
+  "F2F"
+  "FRIENDS"
+  (_ "List of friends for friend-to-friend topology")
+  (_ "Specifies the name of a file which contains a list of GNUnet peer IDs 
that are friends.  If used with the friend-to-friend topology, this will ensure 
that GNUnet only connects to these peers (via any available transport).")
+  '()
+  #f
+  "$GNUNETD_HOME/friends"
+  '()
+  'f2f) )
+
+(define (f2f builder)
+ (builder
+  "F2F"
+  ""
+ (_ "Friend-to-Friend Topology Specification")
+ (_ "Settings for restricting connections to friends")
+ (list
+    (f2f-restrict builder) 
+    (f2f-minimum builder) 
+    (f2f-friends builder) 
+ )
+  #t
+  #f
+  #f
+  'advanced) )
+
+;; mysql menu
+
+(define (mysql-database builder)
+ (builder
+  "MYSQL"
+  "DATABASE"
+  (_ "Name of the MySQL database GNUnet should use")
+  (nohelp) 
+  '()
+  #t
+  "gnunet"
+  '()
+  'mysql) )
+
+(define (mysql-config builder)
+ (builder
+  "MYSQL"
+  "CONFIG"
+  (_ "Configuration file that specifies the MySQL username and password")
+  (nohelp) 
+  '()
+  #t
+  "/etc/my.cnf"
+  '()
+  'mysql) )
+
+(define (mysql builder)
+ (builder
+  "MYSQL"
+  ""
+  (_ "Configuration of the MySQL database")
+  (nohelp)
+  (list
+    (mysql-config builder)
+    (mysql-database builder)
+  )
+  #t
+  #f
+  #f
+  'mysql) )
+ 
+
+
+;; applications menu
+
+(define (fs-quota builder)
+ (builder
+  "FS"
+  "QUOTA"
+  (_ "MB of diskspace GNUnet can use for anonymous file sharing")
+  (_
+"How much disk space (MB) is GNUnet allowed to use for anonymous file sharing? 
 This does not take indexed files into account, only the space directly used by 
GNUnet is accounted for.  GNUnet will gather content from the network if the 
current space-consumption is below the number given here (and if content 
migration is allowed below).
+
+Note that if you change the quota, you need to run gnunet-update afterwards.")
+  '()
+  #t
+  1024
+  (cons 1 1000000)
+  'always))
+
+
+(define (fs-migration-buffer builder)
+ (builder
+  "FS"
+  "MIGRATIONBUFFERSIZE"
+  (_ "Number of entries in the migration buffer")
+  (_ "Each entry uses about 32k of memory.  More entries can reduce disk IO 
and CPU usage at the expense of having gnunetd use more memory. Very large 
values may again increase CPU usage.  A value of 0 will prevent your peer from 
sending unsolicited responses.")
+  '()
+  #t
+  64
+  (cons 0 1048576)
+  'always))
+
+
+(define (fs-gap-tablesize builder)
+ (builder
+  "GAP"
+  "TABLESIZE"
+  (_ "Size of the routing table for anonymous routing.")
+  (nohelp)
+  '()
+  #t
+  65536
+  (cons 1024 1048576)
+  'rare))
+
+(define (fs-dht-tablesize builder)
+ (builder
+  "DHT"
+  "TABLESIZE"
+  (_ "Size of the routing table for DHT routing.")
+  (nohelp)
+  '()
+  #t
+  1024
+  (cons 128 1048576)
+  'rare))
+
+
+(define (fs-activemigration builder)
+ (builder
+  "FS"
+  "ACTIVEMIGRATION"
+  (_ "Allow migrating content to this peer.")
+  (_ 
+"If you say yes here, GNUnet will migrate content to your server, and you will 
not be able to control what data is stored on your machine. 
+                       
+If you activate it, you can claim for *all* the non-indexed (-n to 
gnunet-insert) content that you did not know what it was even if an adversary 
takes control of your machine.  If you do not activate it, it is obvious that 
you have knowledge of all the content that is hosted on your machine and thus 
can be considered liable for it.")
+  '()
+  #t
+  #f
+  #f
+  'advanced))
+
+
+(define (dstore-quota builder)
+ (builder
+  "DSTORE"
+  "QUOTA"
+  (_ "MB of diskspace GNUnet can use for caching DHT index data (the data will 
be stored in /tmp)")
+  (_ "DHT index data is inherently small and expires comparatively quickly.  
It is deleted whenever gnunetd is shut down.
+
+The size of the DSTORE QUOTA is specified in MB.")
+  '()
+  #t
+  1
+  (cons 1 1024)
+  'rare))
+ 
+
+(define (fs builder)
+ (builder
+  "FS"
+  ""
+  (_ "Options for anonymous file sharing")
+  (nohelp)
+  (list
+    (fs-quota builder)
+    (fs-activemigration builder)
+    (fs-gap-tablesize builder)
+    (fs-dht-tablesize builder)
+    (dstore-quota builder)
+    (mysql builder)
+  )
+  #t
+  #t
+  #f
+  'fs-loaded))
+
+(define (applications builder)
+ (builder
+  ""
+  ""
+  (_ "Applications")
+  (nohelp)
+  (list 
+    (fs builder)
+  )
+  #t
+  #f
+  #f
+  'always) )
+
+;; transport menus
+
+(define (nat builder)
+ (builder
+ "NAT"
+ "LIMITED"
+ (_ "Is this machine unreachable behind a NAT?")
+ (_ "Set to YES if this machine is behind a NAT that limits connections from 
the outside to the GNUnet port and that cannot be traversed using UPnP. Note 
that if you have configured your NAT box to allow direct connections from other 
machines to the GNUnet ports or if GNUnet can open ports using UPnP, you should 
set the option to NO. Set this only to YES if other peers cannot contact you 
directly. You can use 'make check' in src/transports/upnp/ to find out if your 
NAT supports UPnP. You can also use gnunet-transport-check with the '-p' option 
in order to determine which setting results in more connections.  Use YES only 
if you get no connections otherwise. Set to AUTO to use YES if the local IP is 
belongs to a private IP network and NO otherwise.")
+ '()
+ #t
+ "AUTO"
+ (list "SC" "YES" "AUTO" "NO")
+ 'nat-loaded) )
+
+(define (tcp-port builder)
+ (builder
+ "TCP"
+ "PORT"
+ (_ "Which port should be used by the TCP IPv4 transport?")
+ (nohelp)
+ '()
+ #t
+ 2086
+ (cons 0 65535)
+ 'advanced))
+
+(define (tcp-upnp builder)
+ (builder
+ "TCP"
+ "UPNP"
+ (_ "Should we try to determine our external IP using UPnP?")
+ (nathelp)
+ '()
+ #t
+ #t
+ #f
+ 'tcp-loaded))
+
+(define (tcp-blacklist builder)
+ (builder
+ "TCP"
+ "BLACKLISTV4"
+ (_ "Which IP(v4)s are not allowed to connect?")
+ (nohelp)
+ '()
+ #t
+ "127.0.0.1;"
+ '()
+ 'advanced))
+
+(define (tcp-whitelist builder)
+ (builder
+ "TCP"
+ "WHITELISTV4"
+ (_ "Which IP(v4)s are allowed to connect? Leave empty to use the IP of your 
primary network interface.")
+ (nohelp)
+ '()
+ #t
+ ""
+ '()
+ 'advanced))
+
+(define (tcp6-blacklist builder)
+ (builder
+ "TCP"
+ "BLACKLISTV6"
+ (_ "Which IPv6s are not allowed to connect?")
+ (nohelp)
+ '()
+ #t
+ ""
+ '()
+ 'ipv6))
+
+(define (tcp6-whitelist builder)
+ (builder
+ "TCP"
+ "WHITELISTV6"
+ (_ "Which IPv6s are allowed to connect? Leave empty to allow any IP to 
connect.")
+ (nohelp)
+ '()
+ #t
+ ""
+ '()
+ 'ipv6))
+
+
+(define (tcp builder)
+ (builder
+ "TCP"
+ ""
+ (_ "TCP transport")
+ (nohelp)
+ (list 
+   (tcp-port builder)
+   (tcp-upnp builder)
+   (tcp-blacklist builder)
+   (tcp-whitelist builder)
+   (tcp6-blacklist builder)
+   (tcp6-whitelist builder)
+ )
+ #t
+ #f
+ #f
+ 'tcp-loaded) )
+
+
+(define (http-port builder)
+ (builder
+ "HTTP"
+ "PORT"
+ (_ "Which port should be used by the HTTP transport?")
+ (nohelp)
+ '()
+ #t
+ 1080
+ (cons 0 65535)
+ 'advanced))
+
+(define (http-upnp builder)
+ (builder
+ "HTTP"
+ "UPNP"
+ (_ "Should we try to determine our external IP using UPnP?")
+ (nathelp)
+ '()
+ #t
+ #t
+ #f
+ 'http-port-nz))
+
+(define (http-advertised-port builder)
+ (builder
+ "HTTP"
+ "ADVERTISED-PORT"
+ (_ "Which is the external port of the HTTP transport?")
+ (_ "Use this option if your firewall maps, say, port 80 to your real HTTP 
port.  This can be useful in making the HTTP messages appear even more legit 
(without needing to run gnunetd as root due to the use of a privileged port).")
+ '()
+ #t
+ 80
+ (cons 0 65535)
+ 'advanced))
+
+(define (http builder)
+ (builder
+ "HTTP"
+ ""
+ (_ "HTTP transport")
+ (nohelp)
+ (list 
+   (http-port builder)
+   (http-advertised-port builder)
+   (http-upnp builder)
+ )
+ #t
+ #f
+ #f
+ 'http-loaded) )
+
+
+
+
+(define (smtp-mtu builder)
+ (builder
+ "SMTP"
+ "MTU"
+ (_ "What is the maximum transfer unit for SMTP?")
+ (nohelp)
+ '()
+ #t
+ 65528
+ (cons 1200 65528)
+ 'smtp-loaded))
+
+(define (smtp-ratelimit builder)
+ (builder
+ "SMTP"
+ "RATELIMIT"
+ (_ "What is the maximum number of e-mails that gnunetd would be allowed to 
send per hour?")
+ (_ "Use 0 for unlimited")
+ '()
+ #t
+ 0
+ (cons 0 1048576)
+ 'smtp-loaded))
+
+(define (smtp-email builder)
+ (builder
+ "SMTP"
+ "EMAIL"
+ (_ "Which e-mail address should be used to send e-mail to this peer?")
+ (_ "You must make sure that e-mail received at this address is forwarded to 
the PIPE which is read by gnunetd.  Use the FILTER option to filter e-mail with 
procmail and the PIPE option to set the name of the pipe.")
+ '()
+ #t
+ "address@hidden"
+ '()
+ 'smtp-loaded))
+
+(define (smtp-filter builder)
+ (builder
+ "SMTP"
+ "FILTER"
+ (_ "Which header line should other peers include in e-mails to enable 
filtering?")
+ (_ "You can specify a header line here which can then be used by procmail to 
filter GNUnet e-mail from your inbox and forward it to gnunetd.")
+ '()
+ #t
+ "X-mailer: GNUnet"
+ '()
+ 'smtp-loaded))
+
+(define (smtp-pipe builder)
+ (builder
+ "SMTP"
+ "PIPE"
+ (_ "What is the filename of the pipe where gnunetd can read its e-mail?")
+ (_ "Have a look at contrib/dot-procmailrc for an example .procmailrc file.")
+ '()
+ #t
+ "$GNUNETD_HOME/smtp-pipe"
+ '()
+ 'smtp-loaded))
+
+(define (smtp-server builder)
+ (builder
+ "SMTP"
+ "SERVER"
+ (_ "What is the name and port of the server for outgoing e-mail?")
+ (_ "The basic format is HOSTNAME:PORT.")
+ '()
+ #t
+ "localhost:25"
+ '()
+ 'smtp-loaded))
+
+(define (smtp builder)
+ (builder
+ "SMTP"
+ ""
+ (_ "SMTP transport")
+ (nohelp)
+ (list 
+   (smtp-email builder)
+   (smtp-ratelimit builder)
+   (smtp-filter builder)
+   (smtp-pipe builder)
+   (smtp-server builder)
+   (smtp-mtu builder)
+ )
+ #t
+ #f
+ #f
+ 'smtp-loaded) )
+
+
+
+
+
+(define (udp-port builder)
+ (builder
+ "UDP"
+ "PORT"
+ (_ "Which port should be used by the UDP IPv4 transport?")
+ (nohelp)
+ '()
+ #t
+ 2086
+ (cons 0 65535)
+ 'advanced))
+
+(define (udp-upnp builder)
+ (builder
+ "UDP"
+ "UPNP"
+ (_ "Should we try to determine our external IP using UPnP?")
+ (nathelp)
+ '()
+ #t
+ #t
+ #f
+ 'udp-port-nz))
+
+(define (udp-mtu builder)
+ (builder
+ "UDP"
+ "MTU"
+ (_ "What is the maximum transfer unit for UDP?")
+ (nohelp)
+ '()
+ #t
+ 1472
+ (cons 1200 65500)
+ 'rare))
+
+(define (udp-blacklist builder)
+ (builder
+ "UDP"
+ "BLACKLISTV4"
+ (_ "Which IPs are not allowed to connect?")
+ (nohelp)
+ '()
+ #t
+ "127.0.0.1;"
+ '()
+ 'advanced))
+
+(define (udp-whitelist builder)
+ (builder
+ "UDP"
+ "WHITELISTV4"
+ (_ "Which IPs are allowed to connect? Leave empty to allow connections from 
any IP.")
+ (nohelp)
+ '()
+ #t
+ ""
+ '()
+ 'advanced))
+
+(define (udp6-blacklist builder)
+ (builder
+ "UDP"
+ "BLACKLISTV6"
+ (_ "Which IPv6s are not allowed to connect?")
+ (nohelp)
+ '()
+ #t
+ ""
+ '()
+ 'ipv6))
+
+(define (udp6-whitelist builder)
+ (builder
+ "UDP6"
+ "WHITELISTV6"
+ (_ "Which IPv6s are allowed to connect? Leave empty to allow any IP to 
connect.")
+ (nohelp)
+ '()
+ #t
+ ""
+ '()
+ 'ipv6))
+
+(define (udp builder)
+ (builder
+ "UDP"
+ ""
+ (_ "UDP transport")
+ (nohelp)
+ (list 
+   (udp-port builder)
+   (udp-upnp builder)
+   (udp-mtu builder)
+   (udp-blacklist builder)
+   (udp-whitelist builder)
+   (udp6-blacklist builder)
+   (udp6-whitelist builder)
+ )
+ #t
+ #f
+ #f
+ 'udp-loaded) )
+
+
+
+(define (network-interface builder)
+ (builder
+ "NETWORK"
+ "INTERFACE"
+ (_ "Network interface")
+ (nohelp)
+ '()
+ #t
+ "eth0"
+ '()
+ 'advanced) )
+
+(define (network-ip builder)
+ (builder
+ "NETWORK"
+ "IP"
+ (_ "External IP address (leave empty to try auto-detection)")
+ (nohelp)
+ '()
+ #t
+ ""
+ '()
+ 'advanced) )
+
+(define (network-ip6 builder)
+ (builder
+ "NETWORK"
+ "IP6"
+ (_ "External IPv6 address (leave empty to try auto-detection)")
+ (nohelp)
+ '()
+ #t
+ ""
+ '()
+ 'ipv6) )
+
+(define (transports builder)
+ (builder
+  ""
+  ""
+  (_ "Transports")
+  (nohelp)
+  (list 
+    (nat builder)
+    (network-interface builder)
+    (network-ip builder)
+    (tcp builder)
+    (udp builder)
+    (http builder)
+    (smtp builder)
+  )
+  #t
+  #f
+  #f
+  'always) )
+
+
+
+(define (load-maxdown builder)
+ (builder
+ "LOAD"
+ "MAXNETDOWNBPSTOTAL"
+ (_ "What is the maximum number of bytes per second that we may receive?")
+ (nohelp)
+ '()
+ #t
+ 50000
+ (cons 1 999999999)
+ 'always))
+
+(define (load-maxup builder)
+ (builder
+ "LOAD"
+ "MAXNETUPBPSTOTAL"
+ (_ "What is the maximum number of bytes per second that we may send?")
+ (nohelp)
+ '()
+ #t
+ 50000
+ (cons 1 999999999)
+ 'always))
+
+(define (load-cpu builder)
+ (builder
+ "LOAD"
+ "MAXCPULOAD"
+ (_ "What is the maximum CPU load (percentage)?")
+ (_ "The highest tolerable CPU load. Load here always refers to the total 
system load, that is it includes CPU utilization by other processes.  A value 
of 50 means that once your 1 minute-load average goes over 50% non-idle, GNUnet 
will try to reduce CPU consumption until the load goes under the threshold.  
Reasonable values are typically between 50 and 100.  Multiprocessors may use 
values above 100." )
+ '()
+ #t
+ 100
+ (cons 0 10000)
+ 'always))
+
+(define (load-io builder)
+ (builder
+ "LOAD"
+ "MAXIOLOAD"
+ (_ "What is the maximum IO load (permille)?")
+ (_ 
+"The highest tolerable IO load.  Load here refers to the percentage of CPU 
cycles wasted waiting for IO for the entire system, that is it includes disk 
utilization by other processes.  A value of 10 means that once the average 
number of cycles wasted waiting for IO is more than 10% non-idle, GNUnet will 
try to reduce IO until the load goes under the threshold.  Reasonable values 
are typically between 10 and 75." )
+ '()
+ #t
+ 50
+ (cons 0 10000)
+ 'advanced))
+
+(define (load-cpu-hard builder)
+ (builder
+ "LOAD"
+ "HARDCPULIMIT"
+ (_ "What is the maximum CPU load (hard limit)?")
+ (_ "The highest tolerable CPU load.  This is the hard limit, so once it is 
reached, gnunetd will start to massively drop data to reduce the load.  Use 
with caution.")
+ '()
+ #t
+ 0
+ (cons 0 99999)
+ 'rare))
+
+(define (load-hard-up-limit builder)
+ (builder
+ "LOAD"
+ "HARDUPLIMIT"
+ (_ "What is the maximum upstream bandwidth (hard limit)?")
+ (_ "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to 
have MAXNETUPBPS be the hard limit.  Use zero for no limit.")
+ '()
+ #t
+ 0
+ (cons 0 999999999)
+ 'rare))
+
+
+(define (load-priority builder)
+ (builder
+ "LOAD"
+ "PRIORITY"
+ (_ "What priority should gnunetd use to run?")
+ (_ "You can specify priorities like NORMAL, ABOVE NORMAL, BELOW NORMAL, HIGH 
and IDLE or a numerical integer value (man nice).  The default is IDLE, which 
should result in gnunetd only using resources that would otherwise be idle.")
+ '()
+ #t
+ "IDLE"
+ '()
+ 'always))
+
+
+(define (load-padding builder)
+ (builder
+ "GNUNETD-EXPERIMENTAL"
+ "PADDING"
+ (_ "Should we disable random padding (experimental option)?")
+ (nohelp)
+ '()
+ #t
+ #f
+ #f
+ 'experimental))
+
+(define (load-basiclimiting builder)
+ (builder
+ "LOAD"
+ "BASICLIMITING"
+ (_ "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES.")
+ (_ 
+"Basic bandwidth limitation (YES) means simply that the bandwidth limits 
specified apply to GNUnet and only to GNUnet.  If set to YES, you simply 
specify the maximum bandwidth (upstream and downstream) that GNUnet is allowed 
to use and GNUnet will stick to those limitations.  This is useful if your 
overall bandwidth is so large that the limit is mostly used to ensure that 
enough capacity is left for other applications.  Even if you want to dedicate 
your entire connection to GNUnet you should not set the limits to values higher 
than what you have since GNUnet uses those limits to determine for example the 
number of connections to establish (and it would be inefficient if that 
computation yields a number that is far too high).  
+
+While basic bandwidth limitation is simple and always works, there are some 
situations where it is not perfect.  Suppose you are running another 
application which performs a larger download. During that particular time, it 
would be nice if GNUnet would throttle its bandwidth consumption 
(automatically) and resume using more bandwidth after the download is complete. 
 This is obviously advanced magic since GNUnet will have to monitor the 
behavior of other applications. Another scenario is a monthly cap on bandwidth 
imposed by your ISP, which you would want to ensure is obeyed.  Here, you may 
want GNUnet to monitor the traffic from other applications to ensure that the 
combined long-term traffic is within the pre-set bounds.  Note that you should 
probably not set the bounds tightly since GNUnet may observe that the bounds 
are about to be broken but would be unable to stop other applications from 
continuing to use bandwidth.
+
+If either of these two scenarios applies, set BASICLIMITING to NO. Then set 
the bandwidth limits to the COMBINED amount of traffic that is acceptable for 
both GNUnet and other applications.  GNUnet will then immediately throttle 
bandwidth consumption if the short-term average is above the limit, and it will 
also try to ensure that the long-term average is below the limit.  Note however 
that using NO can have the effect of GNUnet (almost) ceasing operations after 
other applications perform high-volume downloads that are beyond the defined 
limits.  GNUnet would reduce consumption until the long-term limits are again 
within bounds.
+
+NO only works on platforms where GNUnet can monitor the amount of traffic that 
the local host puts out on the network.  This is only implemented for Linux and 
Win32.  In order for the code to work, GNUnet needs to know the specific 
network interface that is used for the external connection (after all, the 
amount of traffic on loopback or on the LAN should never be counted since it is 
irrelevant).")
+ '()
+ #t
+ #t
+ #f
+ 'advanced))
+
+(define (load-interfaces builder)
+ (builder
+ "LOAD"
+ "INTERFACES"
+ (_ "Network interface to monitor")
+ (_ "For which interfaces should we do accounting?  GNUnet will evaluate the 
total traffic (not only the GNUnet related traffic) and adjust its bandwidth 
usage accordingly. You can currently only specify a single interface. GNUnet 
will also use this interface to determine the IP to use. Typical values are 
eth0, ppp0, eth1, wlan0, etc.  'ifconfig' will tell you what you have.  Never 
use 'lo', that just won't work.  Under Windows, specify the index number 
reported by  'gnunet-win-tool -n'.")
+ '()
+ #t
+ "eth0"
+ (list "*" "eth0" "eth1" "eth2")
+ 'nobasiclimit))
+
+(define (load builder)
+ (builder
+  ""
+  ""
+  (_ "Load management")
+  (nohelp)
+  (list 
+    (load-priority builder)
+    (load-maxdown builder)
+    (load-maxup builder)
+    (load-hard-up-limit builder)
+    (load-cpu builder)
+    (load-io builder)
+    (load-cpu-hard builder)
+    (load-basiclimiting builder)
+    (load-interfaces builder)
+    (load-padding builder)
+  )
+  #t
+  #f
+  #f
+  'always) )
+
+
+;; main-menu
+
+(define (main builder)
+ (builder 
+  "Root"
+  ""
+  (_ "Root node")
+  (nohelp)
+  (list 
+    (meta builder)
+    (fundamentals builder)
+    (general builder) 
+    (advertising builder) 
+    (logging builder)
+    (load builder)
+    (transports builder) 
+    (applications builder) 
+  )
+  #t 
+  #f 
+  #f 
+  'always) )
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; first main method: build tree using build-tree-node
+;; The lambda expression is used to throw away the last argument,
+;; which we use internally and which is not used by build-tree-node!
+(define (gnunet-config-setup) 
+ (main 
+  (lambda (a b c d e f g h i) (build-tree-node a b c d e f g h) ) ) )
+
+
+;; second main method: update visibility (and values)
+;; "change" uses again the tree builder but this time
+;; scans the "i" tags to determine how the visibility needs to change
+
+(define (gnunet-config-change ctx)
+ (let 
+   ( 
+     (advanced (get-option ctx "Meta" "ADVANCED"))
+     (rare (get-option ctx "Meta" "RARE"))
+     (nobasiclimit (not (get-option ctx "LOAD" "BASICLIMITING")))
+     (experimental (get-option ctx "Meta" "EXPERIMENTAL"))
+     (ipv6 (not (get-option ctx "GNUNETD" "DISABLE-IPV6")))
+     (f2fr (not (get-option ctx "F2F" "RESTRICT") ) )
+     (f2f (or (get-option ctx "F2F" "FRIENDS-ONLY")
+              (not (eq? (get-option ctx "F2F" "MINIMUM") 0) ) ) )
+     (tcp-port-nz (eq? (get-option ctx "TCP" "PORT") 0) )
+     (udp-port-nz (eq? (get-option ctx "UDP" "PORT") 0) )
+     (http-port-nz (eq? (get-option ctx "HTTP" "PORT") 0) )
+     (mysql (string= (get-option ctx "MODULES" "sqstore") "sqstore_mysql") )
+     (fs-loaded (list? (member "fs" (string-split (get-option ctx "GNUNETD" 
"APPLICATIONS") #\  ) ) ) )
+     (hostlist-loaded (list? (member "hostlist" (string-split (get-option ctx 
"GNUNETD" "APPLICATIONS") #\  ) ) ) )
+     (nat-loaded (list? (member "nat" (string-split (get-option ctx "GNUNETD" 
"TRANSPORTS") #\  ) ) ) )
+     (tcp-loaded (list? (member "tcp" (string-split (get-option ctx "GNUNETD" 
"TRANSPORTS") #\  ) ) ) )
+     (udp-loaded (list? (member "udp" (string-split (get-option ctx "GNUNETD" 
"TRANSPORTS") #\  ) ) ) )
+     (http-loaded (list? (member "http" (string-split (get-option ctx 
"GNUNETD" "TRANSPORTS") #\  ) ) ) )
+     (smtp-loaded (list? (member "smtp" (string-split (get-option ctx 
"GNUNETD" "TRANSPORTS") #\  ) ) ) )
+   )
+  (begin 
+    (main
+     (lambda (a b c d e f g h i) 
+        (begin 
+          (cond
+            ((eq? i 'advanced)     (change-visible ctx a b advanced))
+            ((eq? i 'rare)         (change-visible ctx a b (and advanced 
rare)))
+            ((eq? i 'experimental) (change-visible ctx a b (and advanced 
experimental)))
+            ((eq? i 'f2f)          (change-visible ctx a b f2f))
+            ((eq? i 'ipv6)         (change-visible ctx a b ipv6))
+            ((eq? i 'f2fr)         (change-visible ctx a b f2fr))
+            ((eq? i 'mysql)        (change-visible ctx a b mysql))
+            ((eq? i 'fs-loaded)    (change-visible ctx a b fs-loaded))
+            ((eq? i 'hostlist-loaded)    (change-visible ctx a b 
hostlist-loaded))
+            ((eq? i 'nat-unlimited)(change-visible ctx a b nat-unlimited))
+            ((eq? i 'tcp-port-nz)  (change-visible ctx a b tcp-port-nz))
+            ((eq? i 'udp-port-nz)  (change-visible ctx a b udp-port-nz))
+            ((eq? i 'nat-loaded)   (change-visible ctx a b nat-loaded))
+            ((eq? i 'udp-loaded)   (change-visible ctx a b udp-loaded))
+            ((eq? i 'tcp-loaded)   (change-visible ctx a b tcp-loaded))
+            ((eq? i 'http-loaded)  (change-visible ctx a b http-loaded))
+            ((eq? i 'smtp-loaded)  (change-visible ctx a b smtp-loaded))
+            ((eq? i 'nobasiclimit) (change-visible ctx a b nobasiclimit))
+            (else 'nothing)
+          )
+   ) ) ) 
+   (change-visible ctx "NETWORK" "PORT" (and advanced (not (get-option ctx 
"TCPSERVER" "DISABLE"))))
+   (change-visible ctx "NETWORK" "TRUSTED" (and advanced (not (get-option ctx 
"TCPSERVER" "DISABLE"))))
+  )
+) )
+

Modified: GNUnet/src/include/Makefile.am
===================================================================
--- GNUnet/src/include/Makefile.am      2009-01-07 13:26:34 UTC (rev 8091)
+++ GNUnet/src/include/Makefile.am      2009-01-08 12:59:24 UTC (rev 8092)
@@ -13,6 +13,9 @@
 
 gnunetincludedir = $(includedir)/GNUnet
 
+nodist_gnunetinclude_HEADERS = \
+  gnunet_directories.h
+
 gnunetinclude_HEADERS = \
   gnunet_bootstrap_service.h \
   gnunet_chat_lib.h \
@@ -21,7 +24,6 @@
   gnunet_datastore_service.h \
   gnunet_dht_lib.h \
   gnunet_dht_service.h \
-  gnunet_directories.h \
   gnunet_dstore_service.h \
   gnunet_ecrs_lib.h \
   gnunet_fragmentation_service.h \

Deleted: GNUnet/src/include/gnunet_directories.h
===================================================================
--- GNUnet/src/include/gnunet_directories.h     2009-01-07 13:26:34 UTC (rev 
8091)
+++ GNUnet/src/include/gnunet_directories.h     2009-01-08 12:59:24 UTC (rev 
8092)
@@ -1,37 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other 
contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file include/gnunet_directories.h
- * @brief directories and files in GNUnet (default locations)
- *
- * @author Christian Grothoff
- */
-
-#ifndef GNUNET_DIRECTORIES
-#define GNUNET_DIRECTORIES
-
-#define GNUNET_DEFAULT_CLIENT_CONFIG_FILE "~/.gnunet/gnunet.conf"
-#define GNUNET_DEFAULT_CLIENT_SITE_CONFIG_FILE "/etc/gnunet.conf"
-#define GNUNET_DEFAULT_DAEMON_CONFIG_FILE "/etc/gnunetd.conf"
-#define GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY       "$GNUNETD_HOME"
-#define GNUNET_DEFAULT_HOME_DIRECTORY      "$GNUNET_HOME"
-
-#endif

Added: GNUnet/src/include/gnunet_directories.h.in
===================================================================
--- GNUnet/src/include/gnunet_directories.h.in                          (rev 0)
+++ GNUnet/src/include/gnunet_directories.h.in  2009-01-08 12:59:24 UTC (rev 
8092)
@@ -0,0 +1,37 @@
+/*
+     This file is part of GNUnet.
+     (C) 2001, 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other 
contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 2, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file include/gnunet_directories.h
+ * @brief directories and files in GNUnet (default locations)
+ *
+ * @author Christian Grothoff
+ */
+
+#ifndef GNUNET_DIRECTORIES
+#define GNUNET_DIRECTORIES
+
+#define GNUNET_DEFAULT_CLIENT_CONFIG_FILE "@GN_USER_HOME_DIR@/gnunet.conf"
+#define GNUNET_DEFAULT_CLIENT_SITE_CONFIG_FILE 
"@GN_DAEMON_CONFIG_DIR@/gnunet.conf"
+#define GNUNET_DEFAULT_DAEMON_CONFIG_FILE "@GN_DAEMON_CONFIG_DIR@/gnunetd.conf"
+#define GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY       "$GNUNETD_HOME"
+#define GNUNET_DEFAULT_HOME_DIRECTORY      "$GNUNET_HOME"
+
+#endif