[GNUnet-SVN] r1120 - in GNUnet: doc/man src/applications/fs/tools

[grothoff]

Author: grothoff
Date: 2005-06-28 13:33:49 -0700 (Tue, 28 Jun 2005)
New Revision: 1120

Modified:
   GNUnet/doc/man/gnunet-download.1
   GNUnet/doc/man/gnunet-pseudonym.1
   GNUnet/doc/man/gnunet-search.1
   GNUnet/src/applications/fs/tools/gnunet-download.c
   GNUnet/src/applications/fs/tools/gnunet-insert.c
   GNUnet/src/applications/fs/tools/gnunet-pseudonym.c
   GNUnet/src/applications/fs/tools/gnunet-search.c
Log:
better anonymity level handling

Modified: GNUnet/doc/man/gnunet-download.1
===================================================================
--- GNUnet/doc/man/gnunet-download.1    2005-06-28 20:27:46 UTC (rev 1119)
+++ GNUnet/doc/man/gnunet-download.1    2005-06-28 20:33:49 UTC (rev 1120)
@@ -9,8 +9,7 @@
 Download files from GNUnet.
 .TP
 \fB\-a \fILEVEL\fR, \fB\-\-anonymity=LEVEL\fR
-set additional receiver anonymity enforcing level. If unset,
-value specified in config file is used. Default is 0.
+set desired level of receiver anonymity.  Default is 1.
 .TP
 \fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
 use config file (defaults: ~/.gnunet/gnunet.conf)

Modified: GNUnet/doc/man/gnunet-pseudonym.1
===================================================================
--- GNUnet/doc/man/gnunet-pseudonym.1   2005-06-28 20:27:46 UTC (rev 1119)
+++ GNUnet/doc/man/gnunet-pseudonym.1   2005-06-28 20:33:49 UTC (rev 1120)
@@ -1,4 +1,4 @@
-.TH GNUNET-PSEUDONYM "1" "04 Nov 2004" "GNUnet"
+.TH GNUNET-PSEUDONYM "1" "28 Jun 2005" "GNUnet"
 .SH NAME
 gnunet\-pseudonym \- create, delete or list pseudonyms
 .SH SYNOPSIS
@@ -19,7 +19,10 @@
 For more details about GNUnet namespaces and content encoding please read the 
'Encoding for Censorship-resistant Sharing' (ECRS) paper which can be found on 
the GNUnet webpage.
 
 .TP
-\fB\-a\fR, \fB\-\-automate\fR
+\fB\-a \fILEVEL\fR, \fB\-\-anonymity=LEVEL\fR
+set desired level of sender anonymity.  Default is 1.
+.TP
+\fB\-A\fR, \fB\-\-automate\fR
 Start a (new) collection.  Works only in conjunction with the \-C option.  A 
collection is an automatically managed directory in a namespace.  In essence, 
after starting the collection every file that you insert into GNUnet will 
automatically be placed into the collection.  Other users can browse your 
collection and be certain (thanks to cryptography) that all of these files were 
inserted into GNUnet by the same user (they do not necessarily know who it is, 
but if you specify your realname (\-r) they will be able to see that handle).  
Collections are useful for establishing a reputation for your GNUnet content, 
such that readers can form an opinion about quality and availability.  
Namespaces can be used to achieve the same thing, but collections are automatic 
and thus less work for you.
 
 Using collections has some security implications since it is possible for an 
adversary to see that all of these files originate from the same user.  This 
may help a correlation attack to break anonymity.  Nevertheless we encourage 
using collections, they are likely to be the right choice for most users.

Modified: GNUnet/doc/man/gnunet-search.1
===================================================================
--- GNUnet/doc/man/gnunet-search.1      2005-06-28 20:27:46 UTC (rev 1119)
+++ GNUnet/doc/man/gnunet-search.1      2005-06-28 20:33:49 UTC (rev 1120)
@@ -1,6 +1,6 @@
 .TH GNUNET-SEARCH "1" "15 Dec 2004" "GNUnet"
 .SH NAME
-gnunet-search \- a command line interface to search for content on GNUnet
+gnunet\-search \- a command line interface to search for content on GNUnet
 .SH SYNOPSIS
 .B gnunet\-search
 [\fIOPTIONS\fR] KEYWORD [AND KEYWORD]*
@@ -15,7 +15,7 @@
 
 The definition of ANONYMITY-RECEIVE is the following: If the value v is 0, 
anonymous routing is not required.  For 1, anonymous routing is required, but 
there is no lower bound on how much cover traffic must be present.  For values 
> 1 and < 1000, it means that if GNUnet routes n bytes of messages from foreign 
peers, it may originate n/v bytes of queries in the same time-period. The 
time\-period is twice the average delay that GNUnet deferrs forwarded queries. 
If the value v is >= 1000, it means that if GNUnet routes n bytes of QUERIES 
from at least (v % 1000) peers, it may originate n/v/1000 bytes of queries in 
the same time\-period.
 
-The default is 0 and this should be fine for most users.  Also notice that if 
you choose values above 1000, you may end up having no throughput at all, 
especially if many of your fellow GNUnet\-peers do the same.
+The default is 1 and this should be fine for most users.  Also notice that if 
you choose values above 1000, you may end up having no throughput at all, 
especially if many of your fellow GNUnet\-peers do the same.
 
 .TP
 \fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR

Modified: GNUnet/src/applications/fs/tools/gnunet-download.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-download.c  2005-06-28 20:27:46 UTC 
(rev 1119)
+++ GNUnet/src/applications/fs/tools/gnunet-download.c  2005-06-28 20:33:49 UTC 
(rev 1120)
@@ -63,6 +63,9 @@
                        char ** argv) {
   int c;
 
+  setConfigurationInt("FS",
+                     "ANONYMITY-RECEIVE",
+                     1);
   while (1) {
     int option_index = 0;
     static struct GNoption long_options[] = {

Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c    2005-06-28 20:27:46 UTC 
(rev 1119)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c    2005-06-28 20:33:49 UTC 
(rev 1120)
@@ -240,6 +240,9 @@
   FREENONNULL(setConfigurationString("GNUNET-INSERT",
                                     "INDEX-CONTENT",
                                     "YES"));
+  setConfigurationInt("FS",
+                     "ANONYMITY-SEND",
+                     1);
   while (1) {
     int option_index=0;
     static struct GNoption long_options[] = {

Modified: GNUnet/src/applications/fs/tools/gnunet-pseudonym.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-pseudonym.c 2005-06-28 20:27:46 UTC 
(rev 1119)
+++ GNUnet/src/applications/fs/tools/gnunet-pseudonym.c 2005-06-28 20:33:49 UTC 
(rev 1120)
@@ -29,7 +29,9 @@
 
 static void printhelp() {
   static Help help[] = {
-    { 'a', "automate", NULL,
+    { 'a', "anonymity", "LEVEL",
+      gettext_noop("set the desired LEVEL of sender-anonymity") },
+    { 'A', "automate", NULL,
       gettext_noop("automate creation of a namespace by starting a 
collection") },
     HELP_CONFIG,
     { 'C', "create", "NICKNAME",
@@ -73,11 +75,15 @@
           char * argv[]) {
   int c;
 
+  setConfigurationInt("FS",
+                     "ANONYMITY-SEND",
+                     1);
   while (1) {
     int option_index = 0;
     static struct GNoption long_options[] = {
       LONG_DEFAULT_OPTIONS,
-      { "automate", 0, 0, 'a' },
+      { "anonymity",     1, 0, 'a' },
+      { "automate", 0, 0, 'A' },
       { "create", 1, 0, 'C' },
       { "delete", 1, 0, 'D' },
       { "end", 0, 0, 'E' },
@@ -95,7 +101,7 @@
 
     c = GNgetopt_long(argc,
                      argv,
-                     "ac:C:D:Ehk:L:m:nqr:R:s:t:u:v",
+                     "a:Ac:C:D:Ehk:L:m:nqr:R:s:t:u:v",
                      long_options,
                      &option_index);
 
@@ -104,7 +110,23 @@
     if (YES == parseDefaultOptions(c, GNoptarg))
       continue;
     switch(c) {
-    case 'a':
+    case 'a': {
+      unsigned int receivePolicy;
+
+      if (1 != sscanf(GNoptarg,
+                     "%ud",
+                     &receivePolicy)) {
+        LOG(LOG_FAILURE,
+         _("You must pass a number to the '%s' option.\n"),
+           "-a");
+        return -1;
+      }
+      setConfigurationInt("FS",
+                          "ANONYMITY-SEND",
+                          receivePolicy);
+      break;
+    }
+    case 'A':
       FREENONNULL(setConfigurationString("PSEUDONYM",
                                         "AUTOMATE",
                                         "START"));
@@ -378,7 +400,8 @@
                         EXTRACTOR_OWNER,
                         pname);
       if (OK == FSUI_startCollection(ctx,
-                                    0, /* FIXME: anonymity level! */
+                                    getConfigurationInt("FS",
+                                                        "ANONYMITY-SEND"),
                                     ECRS_SBLOCK_UPDATE_SPORADIC, /* FIXME: 
allow other update policies */
                                     pname,
                                     meta)) {

Modified: GNUnet/src/applications/fs/tools/gnunet-search.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-search.c    2005-06-28 20:27:46 UTC 
(rev 1119)
+++ GNUnet/src/applications/fs/tools/gnunet-search.c    2005-06-28 20:33:49 UTC 
(rev 1120)
@@ -126,6 +126,9 @@
                        char ** argv) {
   int c;
 
+  setConfigurationInt("FS",
+                     "ANONYMITY-RECEIVE",
+                     1);
   while (1) {
     int option_index = 0;
     static struct GNoption long_options[] = {