Simple Anonymous Messaging (SAM) Version 3.3 Specification Overview
The client application talks to the SAM bridge, which deals with -all of the I2P functionality (using the streaming -library for virtual streams, or I2CP directly for datagrams). +all of the I2P functionality (using the streaming library +for virtual streams, or I2CP directly for datagrams).
By default, the client<-->SAM bridge communication is unencrypted and unauthenticated. @@ -211,7 +211,7 @@ The protocol, as specified, is case-sensitive. It is recommended but not required that the server map commands to upper case, for ease in testing via telnet. This would allow, for example, "hello version" to work. This is implementation-dependent. -Do not map keys or values to upper case, as this would corrupt I2CP options. +Do not map keys or values to upper case, as this would corrupt I2CP options.
@@ -287,9 +287,9 @@ and then disconnects.I2CP Ports and Protocol
-As of SAM 3.2, the I2CP ports and protocol may be specified by the -SAM client sender to be passed through to I2CP, and -the SAM bridge will pass the received I2CP port and protocol +As of SAM 3.2, the I2CP ports and protocol may be specified by the +SAM client sender to be passed through to I2CP, and +the SAM bridge will pass the received I2CP port and protocol information to the SAM client.
For FROM_PORT and TO_PORT, the valid range is 0-65535, and the default is 0. @@ -298,9 +298,9 @@ For PROTOCOL, which may be specified only for RAW, the valid range is 0-255, and
For SESSION commands, the specified ports and protocol are the defaults for that session. For individual streams or datagrams, the specified ports and protocol override the session defaults. -For received streams or datagrams, the indicated ports and protocol are as received from I2CP. +For received streams or datagrams, the indicated ports and protocol are as received from I2CP.
-See the I2CP specification for more information. +See the I2CP specification for more information.
@@ -795,7 +795,7 @@ This is all on one line (space separated), shown on multiple lines for clarity: All options are per-datagram settings that override the defaults specified in the SESSION CREATE.
The MASTER session connects to the router and builds tunnels. When the SAM bridge responds, tunnels have been built and the session is ready for subsessions to be added. -All I2CP options pertaining to tunnel parameters such as length, quantity, and nickname must +All I2CP options pertaining to tunnel parameters such as length, quantity, and nickname must be provided in the master's SESSION CREATE.
All utility commands are supported on a master session. @@ -1358,7 +1358,7 @@ SAM SESSION CREATE line.
All sessions may include I2CP options such as tunnel lengths. -STREAM sessions may include Streaming lib options. +STREAM sessions may include Streaming library options. See those references for option names and defaults. diff --git a/i2p2www/pages/site/docs/applications/bittorrent.html b/i2p2www/pages/site/docs/applications/bittorrent.html index 4ddc3bb6..02189116 100644 --- a/i2p2www/pages/site/docs/applications/bittorrent.html +++ b/i2p2www/pages/site/docs/applications/bittorrent.html @@ -236,7 +236,8 @@ to receive repliable (signed) datagrams. This is used for queries, except for announces. We call this the "query port". This is the "port" value from the extension message. -Queries use I2CP protocol number 17. +Queries use I2CP +protocol number 17. {%- endtrans %}
{% trans -%} @@ -248,7 +249,8 @@ contain tokens sent in the query, and need not be signed. We call this the "response port". This is the "rport" value from the extension message. It must be 1 + the query port. -Responses and announces use I2CP protocol number 18. +Responses and announces use I2CP +protocol number 18. {%- endtrans %}
{% trans -%} @@ -316,7 +318,7 @@ with 2 packets instead of 4, omitting the connect request and response. In this case, the announce request would be a repliable datagram sent to the tracker's query port, and the tracker would not require a response port. While this is more efficient, it would be more difficult to modify an existing tracker to support this mode. -The URL for the 4-packet-mode tracker would use standard "udp://" prefix. +The URL for the 4-packet-mode tracker would use standard "udp://" prefix. The URL for a modified 2-packet-mode tracker would require a different prefix if both modes are supported in I2P. {%- endtrans %}
diff --git a/i2p2www/pages/site/docs/how/intro.html b/i2p2www/pages/site/docs/how/intro.html index d79d36a3..93bbd9a3 100644 --- a/i2p2www/pages/site/docs/how/intro.html +++ b/i2p2www/pages/site/docs/how/intro.html @@ -115,12 +115,12 @@ encryption (e.g. the TCP transport uses AES256 with ephemeral keys). {%- endtrans %}{% trans -%} -End-to-end (I2CP) encryption (client application to server application) was disabled in I2P release -0.6; end-to-end (garlic) encryption (I2P client router to I2P server router) from Alice's router "a" -to Bob's router "h" remains. Notice the different use of terms! All data from a to h is end-to-end -encrypted, but the I2CP connection between the I2P router and the applications is not end-to-end -encrypted! A and h are the routers of Alice and Bob, while Alice and Bob in following chart are the -applications running atop of I2P. +End-to-end (I2CP) encryption (client application to +server application) was disabled in I2P release 0.6; end-to-end (garlic) encryption (I2P client router +to I2P server router) from Alice's router "a" to Bob's router "h" remains. Notice the different use of +terms! All data from a to h is end-to-end encrypted, but the I2CP connection between the I2P router and +the applications is not end-to-end encrypted! A and h are the routers of Alice and Bob, while Alice and +Bob in following chart are the applications running atop of I2P. {%- endtrans %}
 }} "{% trans %}End to end layered encryption{% endtrans %}")
{% trans trac='https://trac.i2p2.de/report/1' -%} diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css index 2e0d5e82..32489466 100644 --- a/i2p2www/static/styles/duck/desktop.css +++ b/i2p2www/static/styles/duck/desktop.css @@ -49,21 +49,25 @@ ul.languages { } ul.languages li { - display: inline-block; - *display: inline; - *zoom: 1; + /*display: inline-block;*/ + display: inline; margin: 0 -2px !important; } .langname { background: green; - display: none; + display: block; padding: 0.5em; - position: absolute; + /*position: absolute;*/ right: 0; text-align: center; top: 4em; z-index: 1; + min-width: 4rem; +} + +#cssmenu img { + display: none; } /* Dropdown menu CSS */ @@ -75,6 +79,7 @@ menu ul, margin: 0; padding: 0; position: relative; + display: block; } #cssmenu {