[GNUnet-SVN] r3639 - in GNUnet: . contrib

[grothoff]

Author: grothoff
Date: 2006-11-04 06:26:52 -0800 (Sat, 04 Nov 2006)
New Revision: 3639

Modified:
   GNUnet/contrib/config-client.scm
   GNUnet/contrib/config-daemon.scm
   GNUnet/todo
Log:
config hacking

Modified: GNUnet/contrib/config-client.scm
===================================================================
--- GNUnet/contrib/config-client.scm    2006-11-03 21:36:11 UTC (rev 3638)
+++ GNUnet/contrib/config-client.scm    2006-11-04 14:26:52 UTC (rev 3639)
@@ -264,8 +264,64 @@
    #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_lower:-libextractor_thumbnail"
+  '()
+  'advanced) )
+
+(define (fs builder)
+ (builder 
+  "File-Sharing"
+  ""
+  (_ "File-Sharing options")
+  (nohelp)
+  (list 
+    (fs-extractors builder)
+    (fs-disable-creation-time builder)
+  )
+  #t 
+  #f 
+  #f 
+  'always) )
+
 ;; main-menu
 
+(define (general-path builder)
+ (builder
+  "GNUNETD"
+  "GNUNETD_HOME"
+  (_ "Full pathname of GNUnet client HOME directory")
+  (_ "The directory for GNUnet files that belong to the user.")
+  '()
+  #t
+  "$HOME/.gnunet"
+  '()
+  'always) )
+
 (define (main builder)
  (builder 
   "Root"
@@ -273,6 +329,7 @@
   (_ "Root node")
   (nohelp)
   (list 
+    (general-path builder)
     (meta builder)
     (logging builder)
     (general builder)

Modified: GNUnet/contrib/config-daemon.scm
===================================================================
--- GNUnet/contrib/config-daemon.scm    2006-11-03 21:36:11 UTC (rev 3638)
+++ GNUnet/contrib/config-daemon.scm    2006-11-04 14:26:52 UTC (rev 3639)
@@ -122,7 +122,31 @@
   "/var/lib/GNUnet"
   '()
   'always) )
- 
+
+(define (fs-path builder)
+ (builder
+  "FS"
+  "DIR"
+  (_ "Full pathname of GNUnet directory for file-sharing data")
+  (nohelp) 
+  '()
+  #t
+  "/var/lib/GNUnet/data/fs"
+  '()
+  'always) )
+
+(define (index-path builder)
+ (builder
+  "FS"
+  "INDEX-DIRECTORY"
+  (_ "Full pathname of GNUnet directory for indexed files symbolic links")
+  (nohelp) 
+  '()
+  #t
+  "/var/lib/GNUnet/data/shared"
+  '()
+  'always) )
+
 (define (general-helloexpires builder)
  (builder
   "GNUNETD"
@@ -371,6 +395,54 @@
  #f
  '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-advertisting 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
+ 'rare) )
+
+(define (network-disable-helloexchange builder)
+ (builder
+ "NETWORK"
+ "HELLOEXCHANGE"
+ (_ "Disable advertising of other peers by this peer")
+ (nohelp)
+ '()
+ #t
+ #f
+ #f
+ 'rare) )
+
 (define (network-port builder)
  (builder
  "NETWORK"
@@ -396,7 +468,49 @@
  'advanced) )
 
 
+(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.")
+ '()
+ #t
+ ""
+ '()
+ 'rare))
 
+(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.")
+ '()
+ #t
+ ""
+ '()
+ 'rare))
+
+(define (general-advertising builder)
+ (builder
+  "ADVERTISING"
+  ""
+ (_ "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"
@@ -405,13 +519,13 @@
   (_ "Settings that change the behavior of GNUnet in general")
   (list 
     (general-path builder) 
+    (fs-path builder) 
+    (index-path builder) 
+    (general-pidfile builder) 
     (general-hostlisturl builder)
     (general-http-proxy builder)
-    (general-helloexpires builder) 
-    (tcpserver-disable builder) 
     (network-port builder) 
     (network-trusted builder) 
-    (general-pidfile builder) 
     (general-username builder) 
     (general-transports builder) 
     (general-applications builder) 
@@ -477,14 +591,54 @@
 (define (f2f 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
-  "$GNUNET_HOME/friends"
+  "/var/lib/GNUnet/friends"
   '()
   'f2f) )
+
+
+;; 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
+  )
+  #t
+  #f
+  #f
+  'mysql) )
  
 
 
@@ -545,6 +699,7 @@
     (fs-quota builder)
     (fs-activemigration builder)
     (fs-gap-tablesize builder)
+    (mysql builder)
   )
   #t
   #t
@@ -863,6 +1018,30 @@
  (cons 0 10000)
  'always))
 
+(define (load-cpu-hard builder)
+ (builder
+ "LOAD"
+ "HARDCPULIMIT"
+ (_ "What is the maximum CPU load (hard limit)?")
+ (_ "Which CPU load can be tolerated.  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)
+ 'advanced))
+
+(define (load-hard-up-limit builder)
+ (builder
+ "LOAD"
+ "HARDUPLIMIT"
+ (_ "What is the maximum upstream bandwidth (hard limit)?")
+ (_ "Use 0 for no limit.")
+ '()
+ #t
+ 0
+ (cons 0 999999999)
+ 'advanced))
+
 (define (load-padding builder)
  (builder
  "GNUNETD-EXPERIMENTAL"
@@ -924,7 +1103,9 @@
   (list 
     (load-maxdown builder)
     (load-maxup builder)
+    (load-hard-up-limit builder)
     (load-cpu builder)
+    (load-cpu-hard builder)
     (load-basiclimiting builder)
     (load-interfaces builder)
     (load-padding builder)
@@ -982,6 +1163,7 @@
      (nobasiclimit (not (get-option ctx "LOAD" "BASICLIMITING")))
      (experimental (get-option ctx "Meta" "EXPERIMENTAL"))
      (f2f (string= (get-option ctx "MODULES" "topology") "topology_f2f") )
+     (mysql (string= (get-option ctx "MODULES" "sqstore") "sqstore_mysql") )
      (fs-loaded (list? (member "fs" (string-split (get-option ctx "GNUNETD" 
"APPLICATIONS") #\  ) ) ) )
      (nat-loaded (list? (member "nat" (string-split (get-option ctx "GNUNETD" 
"TRANSPORTS") #\  ) ) ) )
      (nat-limited (get-option ctx "NAT" "LIMITED"))
@@ -1010,6 +1192,7 @@
             ((eq? i 'rare)         (change-visible ctx a b rare))
             ((eq? i 'experimental) (change-visible ctx a b experimental))
             ((eq? i 'f2f)          (change-visible ctx a b f2f))
+            ((eq? i 'mysql)        (change-visible ctx a b mysql))
             ((eq? i 'fs-loaded)    (change-visible ctx a b fs-loaded))
             ((eq? i 'nat-unlimited)(change-visible ctx a b nat-unlimited))
             ((eq? i 'nat-loaded)   (change-visible ctx a b nat-loaded))

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2006-11-03 21:36:11 UTC (rev 3638)
+++ GNUnet/todo 2006-11-04 14:26:52 UTC (rev 3639)
@@ -13,47 +13,26 @@
 
 
 0.7.1 [11'06] (aka "stabilization")
+- fix connection problem reported by Nils!
 - fix critical known bugs (see Mantis for updates):
   * Windows installer [Nils]
-               + uninstall: Remove account
-                       + libcurl, guile [RCpre0]
-       * provide HTTP transport (new binaries can't load old transport if 
activated
-         in config)
+    + uninstall: Remove account
+    + libcurl, guile [RCpre0]
+* provide HTTP transport (new binaries can't load old transport if activated
+     in config)
   * file/socket leak (#955) - possibly fixed
 - finish util refactoring: [RCpre0]
   * logger configuration:
     + util/boot code to parse configuration
       -- and improve scm code as well!
-  * gnunet-setup: [RCpre0]
-    + Scheme (scm) specification of entire configuration;
-      check options used in modules:
-      - advertising
-      - state
-      - datastore
-      - identity
-      - topology_default
-      - gap
-      - connect
-      - fs/module
-      - fsui
-      - ecrs
-      - uritrack
-      - namespace
-      - sqlite
-      - mysql
-      - gnunet-stats
-      - gnunet-tracekit
-      - gnunet-insert/download/unindex
-      - DHT options
-      - topology_f2f
-      - kvstore
-    + ncurses wizard
   * error handling: [RCpre1]
     + tcpio
     + fs/module
     + fs/fslib
     + fs/ecrs
     + fs/fsui
+  * gnunet-setup: [RCpre1]
+    + ncurses wizard
 - update documentation [RCpre2]
 - More testcases: [RCpre3]
   * advertising
@@ -73,6 +52,10 @@
   * SMTP/HTTP (using libcurl, libmicrohttpd, libesmtp)
 - Testcases not compiling or passing:
   * dht/tools
+- Scheme (scm) specification of entire configuration;
+  check options used in modules:
+  - DHT options
+  - kvstore
 - Features:
   * SMTP logger
   * Chat support [RC]