gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r1481 - GNUnet-docs/WWW


From: grothoff
Subject: [GNUnet-SVN] r1481 - GNUnet-docs/WWW
Date: Wed, 13 Jul 2005 12:13:38 -0700 (PDT)

Author: grothoff
Date: 2005-07-13 12:13:35 -0700 (Wed, 13 Jul 2005)
New Revision: 1481

Modified:
   GNUnet-docs/WWW/protocol_p2p_afs.php3
   GNUnet-docs/WWW/todo
Log:
update

Modified: GNUnet-docs/WWW/protocol_p2p_afs.php3
===================================================================
--- GNUnet-docs/WWW/protocol_p2p_afs.php3       2005-07-13 19:06:26 UTC (rev 
1480)
+++ GNUnet-docs/WWW/protocol_p2p_afs.php3       2005-07-13 19:13:35 UTC (rev 
1481)
@@ -56,10 +56,10 @@
 
 P();
 W("The GAP protocol defines the following messages:");
-echo "<ul>";
-LI(intlink_("#QUERY","GAP_QUERY"));
-LI(intlink_("#RESULT","GAP_RESULT"));
-echo "</ul>";
+echo "<ul>\n";
+LILI("#QUERY","GAP_QUERY");
+LILI("#RESULT","GAP_RESULT");
+echo "</ul>\n";
 EP();
 
 ANCHOR("QUERY");H4("QUERY");
@@ -73,16 +73,15 @@
   extlink_("download/ecrs.ps","ECRS"));
 EP();
 
-echo "<table class=\"border\" border=\"0\" cellspacing=\"0\" 
cellpadding=\"0\">\n";
-include("bittable.inc");
-rowSizeType("36+20*n","16");
-rowIntEntryNBO("type");
-rowIntEntryNBO("priority");
-rowIntEntryNBO("time-to-live");
-fiveRowIntEntries("return to");
-fiveRowIntEntries("query [n &gt; 1]");
-echo "</table>\n";
-
+LAYOUT("GAP_QUERY",
+       F(ARRAY(N("message size", NBO_()) => 2,
+               V("request type", 16, NBO_()) => 2,
+               N("ECRS block type", NBO_()) => 4,
+               N("priority", NBO_()) => 4,
+               N("time-to-live", NBO_()) => 4,
+               N("return-to peer identity", NBO_()) => 64,
+               N("query hash", NBO_()) => 64,
+               N("namespace (optional, depending on block type)", NBO_()) => 
64)));
 BP();
 W("The priority is used to determine the value of the query.");
 W("Queries with lower priorities are more likely to be dropped.");
@@ -94,24 +93,25 @@
   extlink_("download/gap.ps", "GAP"));
 W("The type field and all hash codes after the first query are only passed 
along and used by the %s.",
   extlink_("download/ecrs.ps", "ECRS encoding"));
+W("The current protocol uses at most one additional hash code for the 
namespace, but the GAP code should allow for any number of additional hash 
codes to be passed around.");
 
 EP();
 ANCHOR("RESULT");H4("RESULT");
 BP();
 W("A GAP RESULT message is a reply of a GNUnet node to a %s that was used to 
request a specific block of a file.",
   extlink_("#QUERY","QUERY"));
-W("The GAP RESULT message contains the type and first hash code from the 
respective QUERY.");
-W("Note that the type is necessary since the QUERY may specify <em>any</em> 
for the type.");
-W("The data portion of the result depends on the query type and is again 
defined by ECRS.");
+W("The GAP RESULT message contains the first hash code from the respective 
QUERY (also called the primary key).");
+W("Note that the type is encoded by ECRS in the data portion.");
+W("The size of the data portion of the result depends on the query type and is 
again defined by ECRS.");
 W("See also the %s and the %s for the way data is transmitted in GNUnet.",
   ARRAY(extlink_("download/esed.ps","GNUnet encoding paper"),
        extlink_("encoding.php3","encoding page")));
 EP();
-echo "<table class=\"border\" border=\"0\" cellspacing=\"0\" 
cellpadding=\"0\">\n";
-include("bittable.inc");
-rowSizeType("28+N","17");
-rowIntEntry("N bytes content");
-echo "</table>\n";
+LAYOUT("GAP_REPLY",
+       F(ARRAY(N("message size", NBO_()) => 2,
+               V("request type", 17, NBO_()) => 2,
+               N("primary key", NBO_()) => 64,
+               N("ECRS-encoded data", NBO_()) => 0)));
 
 include("html_footer.php3");
 ?>
\ No newline at end of file

Modified: GNUnet-docs/WWW/todo
===================================================================
--- GNUnet-docs/WWW/todo        2005-07-13 19:06:26 UTC (rev 1480)
+++ GNUnet-docs/WWW/todo        2005-07-13 19:13:35 UTC (rev 1481)
@@ -1,5 +1,4 @@
 * update P2P protocol texts about:
-  * RPC
   * GAP
 
 NEW content to be written:





reply via email to

[Prev in Thread] Current Thread [Next in Thread]