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

[grothoff]

Author: grothoff
Date: 2005-07-12 18:40:29 -0700 (Tue, 12 Jul 2005)
New Revision: 1444

Modified:
   GNUnet-docs/WWW/protocol_transport.php3
   GNUnet-docs/WWW/protocol_transport_tcp.php3
   GNUnet-docs/WWW/scripts.inc
Log:
try

Modified: GNUnet-docs/WWW/protocol_transport.php3
===================================================================
--- GNUnet-docs/WWW/protocol_transport.php3     2005-07-13 01:32:08 UTC (rev 
1443)
+++ GNUnet-docs/WWW/protocol_transport.php3     2005-07-13 01:40:29 UTC (rev 
1444)
@@ -39,19 +39,14 @@
   extlink_("download/transport.ps","transport paper"));
 
 
-W("In addition to the message itself, the transport mechanism must 
communicate:");
-EP();
-echo "<ul>\n";
-LI("The sender identity (hash of public key)");
-LI("If the message is in plaintext or encrypted");
-LI("The CRC of the (plaintext) message");
-LI("The size of the message");
-echo "</ul>\n";
-BP();
+W("In addition to the message itself, the transport mechanism must communicate 
the sender identity (hash of public key) and the size of the message.");
+P();
 W("The transport layer implementation defines an appropriate message format to 
transmit this data.");
 W("The encapsulation format can be different for each transport.");
-W("Depending on the implementation of the transport mechanism, not all of 
these must be transmitted explicitly in each message.");
+W("Depending on the implementation of the transport mechanism, it may not be 
necessary to transmit the sender identity or the size explicitly in each 
message.");
 W("For example, a stateful transport such as TCP may only transmit the sender 
identity once and use special messages to switch between plaintext and 
encrypted messages.");
+W("UDP on the other hand must transmit the sender identity each time.");
+W("However, the packet size of UDP makes it unnecessary to explicitly transmit 
the message size.");
 EP();
 
 include("html_footer.php3");

Modified: GNUnet-docs/WWW/protocol_transport_tcp.php3
===================================================================
--- GNUnet-docs/WWW/protocol_transport_tcp.php3 2005-07-13 01:32:08 UTC (rev 
1443)
+++ GNUnet-docs/WWW/protocol_transport_tcp.php3 2005-07-13 01:40:29 UTC (rev 
1444)
@@ -8,17 +8,12 @@
 H2("The TCP transport service");
 
 BP();
-W("For the TCP transport service, the sender address has this %s:",
-  extlink_("doxygen/html/structHostAddress.html","format"));
-EP();
-echo "<table class=\"border\" border=\"0\" cellspacing=\"0\" 
cellpadding=\"0\">\n";
-include("bittable.inc");
-rowIntEntryNBO("IP");
-row(shortEntry_("sender port",
-               NBO_()),
-    shortEntry_("reserved (must be 0)",
-               NBO_()));
-echo "</table>\n";
+W("For the TCP transport service, the sender address has this format:");
 
+LAYOUT("HostAddress",
+       F(ARRAY(N("IP", NBO_()) => 4,
+               N("sender port", NBO_()) => 2,
+               V("reserved", 0, NBO_()))));
+
 include("html_footer.php3");
-?>
\ No newline at end of file
+?>

Modified: GNUnet-docs/WWW/scripts.inc
===================================================================
--- GNUnet-docs/WWW/scripts.inc 2005-07-13 01:32:08 UTC (rev 1443)
+++ GNUnet-docs/WWW/scripts.inc 2005-07-13 01:40:29 UTC (rev 1444)
@@ -50,36 +50,35 @@
       if ( ($size >= 4) || ($size == 0) ) {
         $ret[] = "<td>$offset</td><td colspan=4>$name</td>";
         $mod = $size % 4;
+        $offset += $size - $mod;
+        $size = $mod;
+      }
+      if ($size > 0) {
+        $currString = "<td>$offset</td><td colspan=$mod>$name</td>";
+        $offset += $mod;
+      }
+    } else {
+      $left = 4 - ($offset % 4);
+      if ($left > $size)
+        $left = $size;
+      $currString = $currString . "<td colspan=$left>$name</td>";
+      $offset += $left;
+      $size -= $left;
+      if ($offset % 4 == 0) {
+        $ret[] = $currString;
+        $currString = "";
+      }
+      if ($size > 0) {
+        $mod = $size % 4;
+        if ($size >= 4) {
+          $size -= $mod;
+         $ret[] = "<td>$offset</td><td colspan=4>$name</td>";
+          $offset += $size;
+        }
         if ($mod > 0) {
-         $offset += $size - $mod;
           $currString = "<td>$offset</td><td colspan=$mod>$name</td>";
-          $offset += $mod;
-        } else {
-         $offset += $size;
+          $offset += $mod;        
         }
-      } else {
-        $left = 4 - ($offset % 4);
-       if ($left > $size)
-          $left = $size;
-        $currString = $currString . "<td colspan=$left>$name</td>";
-        $offset += $left;
-        $size -= $left;
-        if ($offset % 4 == 0) {
-          $ret[] = $currString;
-          $currString = "";
-        }
-        if ($size > 0) {
-          $mod = $size % 4;
-          if ($size >= 4) {
-           $size -= $mod;
-           $ret[] = "<td>$offset</td><td colspan=4>$name</td>";
-            $offset += $size;
-          }
-          if ($mod > 0) {
-            $currString = "<td>$offset</td><td colspan=$mod>$name</td>";
-            $offset += $mod;
-          } 
-        }
       }
     }
   }