I2P_Developers/i2p.www
3
0
Fork 5
Code Issues 27 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move multiple SAM session types to proposed 3.3

Browse Source 
Add missing i2ptunnel SSL config options
This commit is contained in:
zzz
2015-11-25 00:13:38 +00:00
parent 0a0e22fb2a
commit a451077fde
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
i2p2www/pages/site/docs/api/samv3.html
View File

@@ -1,7 +1,7 @@
{% extends "global/layout.html" %}
{% block title %}SAM V3{% endblock %}
{% block lastupdated %}June 2015{% endblock %}
{% block accuratefor %}0.9.20{% endblock %}
{% block lastupdated %}November 2015{% endblock %}
{% block accuratefor %}0.9.24{% endblock %}
{% block content %}
<p>Specified below is a simple client protocol for interacting with I2P.
</p>
@@ -64,6 +64,8 @@ Version 3.2 is not yet implemented, and the changes listed below are preliminary
<li>DATAGRAM RECEIVED, RAW RECEIVED, and forwarded or received streams and datagrams, when SILENT=false,
now appends to the first line is FROM_PORT=nnnn TO_PORT=nnnn to indicate I2P ports
<li>The first line of datagrams sent through port 7655 may now start with any 3.x version
<li>The first line of datagrams sent through port 7655 may have, after the destination,
any of the options FROM_PORT=nnnn TO_PORT=nnnn PROTOCOL=nnn
<li>RAW RECEIVED now appends to the first line PROTOCOL=nnn to indicate I2P protocol
<li>DATAGRAM SEND and RAW SEND now supports options SEND_TAGS=nnn, TAG_THRESHOLD=nnn, EXPIRES=nnnnnnn, and SEND_LEASESET=true|false.
These will be passed to I2CP if supported. See <a href="..//i2cp#msg_SendMessageExpire">the I2CP specification</a> for details.
@@ -83,8 +85,6 @@ Version 3.2 is not yet implemented, and the changes listed below are preliminary
</ul>
<li>Multiple concurrent pending STREAM ACCEPTs are allowed on the same session ID (even with the same port).
It isn't clear (either in the spec or the code) if these are allowed now.
<li>The same session ID may be used for streams, datagrams, and raw simultaneously.
Incoming packets and streams will be routed based on I2P protocol and to-port.
<li>The server's control socket may optionally offer SSL/TLS support, as configured on the server and client.
Implementations may offer other transport layers as well; this is outside the scope of the protocol definition.
<li>For STREAM FORWARD, client may add SSL=true to use an SSL socket
@@ -93,6 +93,17 @@ Version 3.2 is not yet implemented, and the changes listed below are preliminary
<h3>Version 3.3 Proposal</h3>
<p>
Version 3.3 is not yet implemented, and the changes listed below are preliminary.
<ul>
<li>The same session ID may be used for streams, datagrams, and raw simultaneously.
Incoming packets and streams will be routed based on I2P protocol and to-port.
</ul>
</p>
<h2>Version 3 Protocol</h2>
<h3>Simple Anonymous Messaging (SAM version 3.0) Specification Overview</h3>
<p>

24
i2p2www/pages/site/docs/spec/configuration.html
View File

@@ -1,7 +1,7 @@
{% extends "global/layout.html" %}
{% block title %}{% trans %}Configuration File Specification{% endtrans %}{% endblock %}
{% block lastupdated %}{% trans %}November 2014{% endtrans %}{% endblock %}
{% block accuratefor %}0.9.17{% endblock %}
{% block lastupdated %}{% trans %}November 2015{% endtrans %}{% endblock %}
{% block accuratefor %}0.9.24{% endblock %}
{% block content %}
<h2>{% trans %}Overview{% endtrans %}</h2>
<p>{% trans -%}
@@ -281,6 +281,23 @@ tunnel.N.option.ircserver.webircPassword=
# IRC Server only.
tunnel.N.option.ircserver.webircSpoofIP=
# For clients only. Alias for the the private key in the keystore for the SSL socket.
# Will be autogenerated if a new key is created.
tunnel.N.option.keyAlias=
# For clients only. Password for the private key for the SSL socket.
# Will be autogenerated if a new key is created.
tunnel.N.option.keyPassword=
# For clients only. Path to the keystore file containing the private key for the SSL socket.
# Will be autogenerated if a new keystore is created.
# Relative to $(I2P_CONFIG_DIR)/keystore/ if not absolute.
tunnel.N.option.keystoreFile=i2ptunnel-(random string).ks
# For clients only. Password for the keystore containing the private key for the SSL socket.
# Default is "changeit"
tunnel.N.option.keystorePassword=changeit
# HTTP Server only. Max number of POSTs allowed for one destination per postCheckTime. Default 0 (unlimited)
tunnel.N.option.maxPosts=nnn
@@ -323,7 +340,8 @@ tunnel.N.option.rejectInproxy=true|false
# Servers only. Overrides targetHost and targetPort for incoming port NNNN.
tunnel.N.option.targetForPort.NNNN=hostnameOrIP:nnnn
# Servers only. Default false. Use SSL for connections to local server.
# Default false. For servers, use SSL for connections to local server.
# For clients, SSL is required for connections from local clients.
tunnel.N.option.useSSL=false
# Each option is passed to I2CP and streaming with "tunnel.N.option." stripped off. See those docs.