zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

SAMv3: bug corrected: sending datagrams through the datagram session socket works (like in v1 and v2)

Browse Source
This commit is contained in:
mkvore-commit
2009-05-08 14:33:03 +00:00
parent 30b73ffe6d
commit ef737415c5
4 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
View File

@@ -178,8 +178,8 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
if (getDatagramSession() != null) {
getDatagramSession().close();
}
if (streamSession != null) {
streamSession.close();
if (getStreamSession() != null) {
getStreamSession().close();
}
}
}
@@ -192,7 +192,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
try{
if (opcode.equals("CREATE")) {
if ((getRawSession() != null) || (getDatagramSession() != null)
|| (streamSession != null)) {
|| (getStreamSession() != null)) {
_log.debug("Trying to create a session, but one still exists");
return writeString("SESSION STATUS RESULT=I2P_ERROR MESSAGE=\"Session already exists\"\n");
}
@@ -408,7 +408,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
in.readFully(data);
if (!datagramSession.sendBytes(dest, data)) {
if (!getDatagramSession().sendBytes(dest, data)) {
_log.error("DATAGRAM SEND failed");
return true;
}
@@ -507,7 +507,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
/* Parse and execute a STREAM message */
protected boolean execStreamMessage(String opcode, Properties props) {
if (streamSession == null) {
if (getStreamSession() == null) {
_log.error("STREAM message received, but no STREAM session exists");
return false;
}
@@ -567,11 +567,11 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
}
try {
if (!streamSession.sendBytes(id, getClientSocket().socket().getInputStream(), size)) { // data)) {
if (!getStreamSession().sendBytes(id, getClientSocket().socket().getInputStream(), size)) { // data)) {
if (_log.shouldLog(Log.WARN))
_log.warn("STREAM SEND [" + size + "] failed");
boolean rv = writeString("STREAM CLOSED RESULT=CANT_REACH_PEER ID=" + id + " MESSAGE=\"Send of " + size + " bytes failed\"\n");
streamSession.closeConnection(id);
getStreamSession().closeConnection(id);
return rv;
}
@@ -622,7 +622,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
try {
try {
if (!streamSession.connect(id, dest, props)) {
if (!getStreamSession().connect(id, dest, props)) {
_log.debug("STREAM connection failed");
return false;
}
@@ -673,7 +673,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
}
}
boolean closed = streamSession.closeConnection(id);
boolean closed = getStreamSession().closeConnection(id);
if ( (!closed) && (_log.shouldLog(Log.WARN)) )
_log.warn("Stream unable to be closed, but this is non fatal");
return true;
@@ -765,7 +765,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
public void streamSendAnswer( int id, String result, String bufferState ) throws IOException
{
if ( streamSession == null )
if ( getStreamSession() == null )
{
_log.error ( "BUG! Want to answer to stream SEND, but session is null!" );
throw new NullPointerException ( "BUG! STREAM session is null!" );
@@ -783,7 +783,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
public void notifyStreamSendBufferFree( int id ) throws IOException
{
if ( streamSession == null )
if ( getStreamSession() == null )
{
_log.error ( "BUG! Stream outgoing buffer is free, but session is null!" );
throw new NullPointerException ( "BUG! STREAM session is null!" );
@@ -797,7 +797,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
public void notifyStreamIncomingConnection(int id, Destination d) throws IOException {
if (streamSession == null) {
if (getStreamSession() == null) {
_log.error("BUG! Received stream connection, but session is null!");
throw new NullPointerException("BUG! STREAM session is null!");
}
@@ -811,7 +811,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
public void notifyStreamOutgoingConnection ( int id, String result, String msg ) throws IOException
{
if ( streamSession == null )
if ( getStreamSession() == null )
{
_log.error ( "BUG! Received stream connection, but session is null!" );
throw new NullPointerException ( "BUG! STREAM session is null!" );
@@ -832,7 +832,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
}
public void receiveStreamBytes(int id, ByteBuffer data) throws IOException {
if (streamSession == null) {
if (getStreamSession() == null) {
_log.error("Received stream bytes, but session is null!");
throw new NullPointerException("BUG! STREAM session is null!");
}
@@ -852,7 +852,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
}
public void notifyStreamDisconnection(int id, String result, String msg) throws IOException {
if (streamSession == null) {
if (getStreamSession() == null) {
_log.error("BUG! Received stream disconnection, but session is null!");
throw new NullPointerException("BUG! STREAM session is null!");
}
@@ -868,7 +868,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
public void stopStreamReceiving() {
_log.debug("stopStreamReceiving() invoked", new Exception("stopped"));
if (streamSession == null) {
if (getStreamSession() == null) {
_log.error("BUG! Got stream receiving stop, but session is null!");
throw new NullPointerException("BUG! STREAM session is null!");
}

4
apps/sam/java/src/net/i2p/sam/SAMv2Handler.java
View File

@@ -72,7 +72,7 @@ public class SAMv2Handler extends SAMv1Handler implements SAMRawReceiver, SAMDat
/* Parse and execute a STREAM message */
protected boolean execStreamMessage ( String opcode, Properties props )
{
if ( streamSession == null )
if ( getStreamSession() == null )
{
_log.error ( "STREAM message received, but no STREAM session exists" );
return false;
@@ -173,7 +173,7 @@ public class SAMv2Handler extends SAMv1Handler implements SAMRawReceiver, SAMDat
}
}
streamSession.setReceiveLimit ( id, limit, nolimit ) ;
getStreamSession().setReceiveLimit ( id, limit, nolimit ) ;
return true;
}

8
apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
View File

@@ -390,6 +390,8 @@ public class SAMv3Handler extends SAMv1Handler
canContinue = execDestMessage(opcode, props);
} else if (domain.equals("NAMING")) {
canContinue = execNamingMessage(opcode, props);
} else if (domain.equals("DATAGRAM")) {
canContinue = execDatagramMessage(opcode, props);
} else {
_log.debug("Unrecognized message domain: \""
+ domain + "\"");
@@ -418,7 +420,7 @@ public class SAMv3Handler extends SAMv1Handler
}
if (streamForwardingSocket)
{
if (this.streamSession!=null) {
if (this.getStreamSession()!=null) {
try {
this.streamSession.stopForwardingIncoming();
} catch (SAMException e) {
@@ -464,7 +466,7 @@ public class SAMv3Handler extends SAMv1Handler
try{
if (opcode.equals("CREATE")) {
if ((this.getRawSession()!= null) || (this.getDatagramSession() != null)
|| (streamSession != null)) {
|| (this.getStreamSession() != null)) {
_log.debug("Trying to create a session, but one still exists");
return writeString("SESSION STATUS RESULT=I2P_ERROR MESSAGE=\"Session already exists\"\n");
}
@@ -761,7 +763,7 @@ public class SAMv3Handler extends SAMv1Handler
}
public void notifyStreamIncomingConnection(Destination d) throws IOException {
if (streamSession == null) {
if (getStreamSession() == null) {
_log.error("BUG! Received stream connection, but session is null!");
throw new NullPointerException("BUG! STREAM session is null!");
}