diff --git a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java index c5b5d2b1b78a1e925030821c4538aef47f1b9260..7bae180c5f1a28dcf42a0f6dd40f8c3632a11a8b 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java @@ -21,6 +21,7 @@ import java.util.Properties; import java.util.StringTokenizer; import net.i2p.I2PException; +import net.i2p.client.I2PClient; import net.i2p.client.I2PSessionException; import net.i2p.data.Base64; import net.i2p.data.DataFormatException; @@ -253,6 +254,11 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag } props.remove("STYLE"); + // Unconditionally override what the client may have set + // (iMule sets BestEffort) as None is more efficient + // and the client has no way to access delivery notifications + props.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_NONE); + if (style.equals("RAW")) { rawSession = new SAMRawSession(destKeystream, props, this); } else if (style.equals("DATAGRAM")) { diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java index 2612218d8eef826a1d0612cf05e20e05a37f4da5..ab979cae1e4a342a969b7e52711f7a14c595ad4f 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.StringTokenizer; import net.i2p.I2PException; +import net.i2p.client.I2PClient; import net.i2p.client.I2PSessionException; import net.i2p.data.Base64; import net.i2p.data.DataFormatException; @@ -514,7 +515,10 @@ public class SAMv3Handler extends SAMv1Handler } props.remove("STYLE"); - + // Unconditionally override what the client may have set + // (iMule sets BestEffort) as None is more efficient + // and the client has no way to access delivery notifications + i2cpProps.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_NONE); // Record the session in the database sSessionsHash Properties allProps = new Properties();