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

* SAMv3 : doc/sam.3.0-protocol.txt updated

Browse Source 
* SAMv3 : SAMv3StreamSession.java: thread naming for debugging purpose
This commit is contained in:
mkvore-commit
2009-04-26 10:14:23 +00:00
parent 0c738e2c6f
commit 4ffa2450c2
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/sam/doc/sam.3.0-protocol.txt
View File

@ -135,7 +135,7 @@ Streams are bidirectional communication sockets between two I2P
destinations, but their opening has to be requested by one of them. destinations, but their opening has to be requested by one of them.
Hereafter, CONNECT commands are used by the SAM client for such a Hereafter, CONNECT commands are used by the SAM client for such a
request. FORWARD / ACCEPT commands are used by the SAM client when request. FORWARD / ACCEPT commands are used by the SAM client when
it wants to listen to requests coming from other I2P destinations. he wants to listen to requests coming from other I2P destinations.
----------------------------- -----------------------------
@ -231,10 +231,11 @@ I2P destination peer, until one of the peer closes the socket.
SAM virtual streams : FORWARD SAM virtual streams : FORWARD
----------------------------- -----------------------------
A client waits for an incoming connection request by : A client can use a regular socket server and wait for connection requests
* opening a new socket with the SAM bridge coming from I2P. For that, the client has to :
* passing the same HELLO handshake as above * open a new socket with the SAM bridge
* sending the forward command : * pass the same HELLO handshake as above
* send the forward command :
-> STREAM FORWARD -> STREAM FORWARD
ID={$nickname} ID={$nickname}
@ -242,7 +243,7 @@ A client waits for an incoming connection request by :
[HOST={$host}] [HOST={$host}]
[SILENCE={true,false}] [SILENCE={true,false}]
This makes the session ${nickname} listen forever for incoming This makes the session ${nickname} listen for incoming
connection requests from the I2P network. connection requests from the I2P network.
The SAM bridge answers with : The SAM bridge answers with :
@ -257,16 +258,12 @@ The RESULT value may be one of:
I2P_ERROR I2P_ERROR
INVALID_ID INVALID_ID
The socket is closed immediately after the message by the SAM
bridge. If the result is OK, the SAM bridge starts waiting for
incoming connection requests from other I2P peers.
* {$host} is the hostname or IP address of the socket server to which * {$host} is the hostname or IP address of the socket server to which
SAM will forward connection requests. If not given, SAM takes the IP SAM will forward connection requests. If not given, SAM takes the IP
of the socket that issued the forward command. of the socket that issued the forward command.
* {$port} is the port number of the socket server to which SAM will * {$port} is the port number of the socket server to which SAM will
forward connection requests. Is is mandatory. forward connection requests. It is mandatory.
When a connexion request arrives from I2P, the SAM bridge requests a When a connexion request arrives from I2P, the SAM bridge requests a
socket connexion from {$host}:{$port}. If it is accepted after no more socket connexion from {$host}:{$port}. If it is accepted after no more
@ -284,6 +281,11 @@ socket.
The I2P router will stop listening to incoming connection requests as
soon as the "forwarding" socket is closed.
---------------------------------------------------------------------- ----------------------------------------------------------------------
SAM repliable datagrams : sending a datagram SAM repliable datagrams : sending a datagram

20
apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
View File

@ -156,8 +156,8 @@ public class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handle
WritableByteChannel toClient = handler.getClientSocket(); WritableByteChannel toClient = handler.getClientSocket();
WritableByteChannel toI2P = Channels.newChannel(i2ps.getOutputStream()); WritableByteChannel toI2P = Channels.newChannel(i2ps.getOutputStream());
(new Thread(rec.getThreadGroup(), new I2PAppThread(new Pipe(fromClient,toI2P), "SAMPipeClientToI2P"))).start(); (new Thread(rec.getThreadGroup(), new I2PAppThread(new Pipe(fromClient,toI2P, "SAMPipeClientToI2P"), "SAMPipeClientToI2P"), "SAMPipeClientToI2P")).start();
(new Thread(rec.getThreadGroup(), new I2PAppThread(new Pipe(fromI2P,toClient), "SAMPipeClientToI2P"))).start(); (new Thread(rec.getThreadGroup(), new I2PAppThread(new Pipe(fromI2P,toClient, "SAMPipeI2PToClient"), "SAMPipeI2PToClient"), "SAMPipeI2PToClient")).start();
} }
@ -209,8 +209,8 @@ public class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handle
WritableByteChannel toClient = handler.getClientSocket(); WritableByteChannel toClient = handler.getClientSocket();
WritableByteChannel toI2P = Channels.newChannel(i2ps.getOutputStream()); WritableByteChannel toI2P = Channels.newChannel(i2ps.getOutputStream());
(new Thread(rec.getThreadGroup(), new I2PAppThread(new Pipe(fromClient,toI2P), "SAMPipeClientToI2P"))).start(); (new Thread(rec.getThreadGroup(), new I2PAppThread(new Pipe(fromClient,toI2P, "SAMPipeClientToI2P"), "SAMPipeClientToI2P"), "SAMPipeClientToI2P")).start();
(new Thread(rec.getThreadGroup(), new I2PAppThread(new Pipe(fromI2P,toClient), "SAMPipeClientToI2P"))).start(); (new Thread(rec.getThreadGroup(), new I2PAppThread(new Pipe(fromI2P,toClient, "SAMPipeI2PToClient"), "SAMPipeI2PToClient"), "SAMPipeI2PToClient")).start();
} }
@ -245,8 +245,7 @@ public class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handle
} }
SocketForwarder forwarder = new SocketForwarder(host, port, this, verbose); SocketForwarder forwarder = new SocketForwarder(host, port, this, verbose);
(new Thread(rec.getThreadGroup(), new I2PAppThread(forwarder, "SAMStreamForwarder"))).start(); (new Thread(rec.getThreadGroup(), new I2PAppThread(forwarder, "SAMStreamForwarder"), "SAMStreamForwarder")).start();
} }
public class SocketForwarder extends Thread public class SocketForwarder extends Thread
@ -309,8 +308,10 @@ public class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handle
ReadableByteChannel fromI2P = Channels.newChannel(i2ps.getInputStream()); ReadableByteChannel fromI2P = Channels.newChannel(i2ps.getInputStream());
WritableByteChannel toClient = clientServerSock ; WritableByteChannel toClient = clientServerSock ;
WritableByteChannel toI2P = Channels.newChannel(i2ps.getOutputStream()); WritableByteChannel toI2P = Channels.newChannel(i2ps.getOutputStream());
new I2PAppThread(new Pipe(fromClient,toI2P), "SAMPipeClientToI2P").start(); I2PAppThread send = new I2PAppThread(new Pipe(fromClient,toI2P, "SAMPipeClientToI2P"), "SAMPipeClientToI2P");
new I2PAppThread(new Pipe(fromI2P,toClient), "SAMPipeClientToI2P").start(); I2PAppThread recv = new I2PAppThread(new Pipe(fromI2P,toClient, "SAMPipeI2PToClient"), "SAMPipeI2PToClient");
send.start();
recv.start();
} catch (IOException e) { } catch (IOException e) {
try { try {
@ -330,8 +331,9 @@ public class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handle
WritableByteChannel out ; WritableByteChannel out ;
ByteBuffer buf ; ByteBuffer buf ;
public Pipe(ReadableByteChannel in, WritableByteChannel out) public Pipe(ReadableByteChannel in, WritableByteChannel out, String name)
{ {
super(name);
this.in = in ; this.in = in ;
this.out = out ; this.out = out ;
this.buf = ByteBuffer.allocate(BUFFER_SIZE) ; this.buf = ByteBuffer.allocate(BUFFER_SIZE) ;