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

SAM: Close datagram or raw session when underlying

Browse Source 
I2P session closes (ticket #1563)
This commit is contained in:
zzz
2015-05-07 16:04:08 +00:00
parent dd9abd3f09
commit c1e70ac7d2
7 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/sam/java/src/net/i2p/sam/SAMDatagramSession.java
View File

@ -80,9 +80,10 @@ class SAMDatagramSession extends SAMMessageSession {
* @param data Bytes to be sent
*
* @return True if the data was sent, false otherwise
* @throws DataFormatException
* @throws DataFormatException on unknown / bad dest
* @throws I2PSessionException on serious error, probably session closed
*/
public boolean sendBytes(String dest, byte[] data) throws DataFormatException {
public boolean sendBytes(String dest, byte[] data) throws DataFormatException, I2PSessionException {
if (data.length > DGRAM_SIZE_MAX)
throw new DataFormatException("Datagram size exceeded (" + data.length + ")");
byte[] dgram ;

16
apps/sam/java/src/net/i2p/sam/SAMMessageSession.java
View File

@ -92,9 +92,10 @@ abstract class SAMMessageSession {
* @param data Bytes to be sent
*
* @return True if the data was sent, false otherwise
* @throws DataFormatException
* @throws DataFormatException on unknown / bad dest
* @throws I2PSessionException on serious error, probably session closed
*/
public abstract boolean sendBytes(String dest, byte[] data) throws DataFormatException;
public abstract boolean sendBytes(String dest, byte[] data) throws DataFormatException, I2PSessionException;
/**
* Actually send bytes through the SAM message-based session I2PSession
@ -108,21 +109,18 @@ abstract class SAMMessageSession {
*
* @return True if the data was sent, false otherwise
* @throws DataFormatException on unknown / bad dest
* @throws I2PSessionException on serious error, probably session closed
*/
protected boolean sendBytesThroughMessageSession(String dest, byte[] data,
int proto, int fromPort, int toPort) throws DataFormatException {
int proto, int fromPort, int toPort)
throws DataFormatException, I2PSessionException {
Destination d = SAMUtils.getDest(dest);
if (_log.shouldLog(Log.DEBUG)) {
_log.debug("Sending " + data.length + " bytes to " + dest);
}
try {
return session.sendMessage(d, data, proto, fromPort, toPort);
} catch (I2PSessionException e) {
_log.error("I2PSessionException while sending data", e);
return false;
}
return session.sendMessage(d, data, proto, fromPort, toPort);
}
/**

5
apps/sam/java/src/net/i2p/sam/SAMRawSession.java
View File

@ -69,9 +69,10 @@ class SAMRawSession extends SAMMessageSession {
* @param data Bytes to be sent
*
* @return True if the data was sent, false otherwise
* @throws DataFormatException
* @throws DataFormatException on unknown / bad dest
* @throws I2PSessionException on serious error, probably session closed
*/
public boolean sendBytes(String dest, byte[] data) throws DataFormatException {
public boolean sendBytes(String dest, byte[] data) throws DataFormatException, I2PSessionException {
if (data.length > RAW_SIZE_MAX)
throw new DataFormatException("Data size limit exceeded (" + data.length + ")");
// TODO pass ports through

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

@ -466,6 +466,8 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
if (!getDatagramSession().sendBytes(dest, data)) {
_log.error("DATAGRAM SEND failed");
// a message send failure is no reason to drop the SAM session
// for raw and repliable datagrams, just carry on our merry way
return true;
}
@ -485,6 +487,9 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
_log.debug("Invalid key specified with DATAGRAM SEND message",
e);
return false;
} catch (I2PSessionException e) {
_log.error("Session error with DATAGRAM SEND message", e);
return false;
}
} else {
if (_log.shouldLog(Log.DEBUG))
@ -546,6 +551,8 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
if (!getRawSession().sendBytes(dest, data)) {
_log.error("RAW SEND failed");
// a message send failure is no reason to drop the SAM session
// for raw and repliable datagrams, just carry on our merry way
return true;
}
@ -565,6 +572,9 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
_log.debug("Invalid key specified with RAW SEND message",
e);
return false;
} catch (I2PSessionException e) {
_log.error("Session error with RAW SEND message", e);
return false;
}
} else {
if (_log.shouldLog(Log.DEBUG))
@ -646,6 +656,8 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
if (!getStreamSession().sendBytes(id, getClientSocket().socket().getInputStream(), size)) { // data)) {
if (_log.shouldLog(Log.WARN))
_log.warn("STREAM SEND [" + size + "] failed");
// a message send failure is no reason to drop the SAM session
// for style=stream, tell the client the stream failed, and kill the virtual connection..
boolean rv = writeString("STREAM CLOSED RESULT=CANT_REACH_PEER ID=" + id + " MESSAGE=\"Send of " + size + " bytes failed\"\n");
getStreamSession().closeConnection(id);
return rv;

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

@ -55,7 +55,7 @@ class SAMv3Handler extends SAMv1Handler
interface Session {
String getNick();
void close();
boolean sendBytes(String dest, byte[] data) throws DataFormatException;
boolean sendBytes(String dest, byte[] data) throws DataFormatException, I2PSessionException;
}
/**

2
history.txt
View File

@ -1,4 +1,6 @@
2015-05-07 zzz
* SAM: Close datagram or raw session when underlying
I2P session closes (ticket #1563)
* Update: Add support for su3-signed development builds (ticket #1381)
2015-05-06 zzz

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 17;
public final static long BUILD = 18;
/** for example "-test" */
public final static String EXTRA = "";