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

2006-06-11 Kloug

Browse Source 
* Bugfix to the I2PTunnel IRC filter to support multiple concurrent
      outstanding pings/pongs
This commit is contained in:
jrandom
2006-06-11 19:48:37 +00:00
committed by zzz
parent 23f30ba576
commit 0a3281c279
3 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java
View File

@ -27,8 +27,6 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
protected List dests; protected List dests;
private static final long DEFAULT_READ_TIMEOUT = 5*60*1000; // -1 private static final long DEFAULT_READ_TIMEOUT = 5*60*1000; // -1
protected long readTimeout = DEFAULT_READ_TIMEOUT; protected long readTimeout = DEFAULT_READ_TIMEOUT;
/** this is the pong response the client expects for their last ping. at least, i hope so... */
private String _expectedPong;
/** /**
* @throws IllegalArgumentException if the I2PTunnel does not contain * @throws IllegalArgumentException if the I2PTunnel does not contain
@ -47,8 +45,6 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
notifyThis, notifyThis,
"IRCHandler " + (++__clientId), tunnel); "IRCHandler " + (++__clientId), tunnel);
_expectedPong = null;
StringTokenizer tok = new StringTokenizer(destinations, ","); StringTokenizer tok = new StringTokenizer(destinations, ",");
dests = new ArrayList(1); dests = new ArrayList(1);
while (tok.hasMoreTokens()) { while (tok.hasMoreTokens()) {
@ -85,9 +81,10 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
try { try {
i2ps = createI2PSocket(dest); i2ps = createI2PSocket(dest);
i2ps.setReadTimeout(readTimeout); i2ps.setReadTimeout(readTimeout);
Thread in = new I2PThread(new IrcInboundFilter(s,i2ps)); StringBuffer expectedPong = new StringBuffer();
Thread in = new I2PThread(new IrcInboundFilter(s,i2ps, expectedPong));
in.start(); in.start();
Thread out = new I2PThread(new IrcOutboundFilter(s,i2ps)); Thread out = new I2PThread(new IrcOutboundFilter(s,i2ps, expectedPong));
out.start(); out.start();
} catch (Exception ex) { } catch (Exception ex) {
if (_log.shouldLog(Log.ERROR)) if (_log.shouldLog(Log.ERROR))
@ -123,10 +120,12 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
private Socket local; private Socket local;
private I2PSocket remote; private I2PSocket remote;
private StringBuffer expectedPong;
IrcInboundFilter(Socket _local, I2PSocket _remote) { IrcInboundFilter(Socket _local, I2PSocket _remote, StringBuffer pong) {
local=_local; local=_local;
remote=_remote; remote=_remote;
expectedPong=pong;
} }
public void run() { public void run() {
@ -153,7 +152,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
inmsg=inmsg.substring(0,inmsg.length()-1); inmsg=inmsg.substring(0,inmsg.length()-1);
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("in: [" + inmsg + "]"); _log.debug("in: [" + inmsg + "]");
String outmsg = inboundFilter(inmsg); String outmsg = inboundFilter(inmsg, expectedPong);
if(outmsg!=null) if(outmsg!=null)
{ {
if(!inmsg.equals(outmsg)) { if(!inmsg.equals(outmsg)) {
@ -195,10 +194,12 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
private Socket local; private Socket local;
private I2PSocket remote; private I2PSocket remote;
private StringBuffer expectedPong;
IrcOutboundFilter(Socket _local, I2PSocket _remote) { IrcOutboundFilter(Socket _local, I2PSocket _remote, StringBuffer pong) {
local=_local; local=_local;
remote=_remote; remote=_remote;
expectedPong=pong;
} }
public void run() { public void run() {
@ -225,7 +226,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
inmsg=inmsg.substring(0,inmsg.length()-1); inmsg=inmsg.substring(0,inmsg.length()-1);
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("out: [" + inmsg + "]"); _log.debug("out: [" + inmsg + "]");
String outmsg = outboundFilter(inmsg); String outmsg = outboundFilter(inmsg, expectedPong);
if(outmsg!=null) if(outmsg!=null)
{ {
if(!inmsg.equals(outmsg)) { if(!inmsg.equals(outmsg)) {
@ -264,7 +265,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
* *
*/ */
public String inboundFilter(String s) { public String inboundFilter(String s, StringBuffer expectedPong) {
String field[]=s.split(" ",4); String field[]=s.split(" ",4);
String command; String command;
@ -311,9 +312,9 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
// though, does 127.0.0.1 work for irc clients connecting remotely? and for all of them? sure would // though, does 127.0.0.1 work for irc clients connecting remotely? and for all of them? sure would
// be great if irc clients actually followed the RFCs here, but i guess thats too much to ask. // be great if irc clients actually followed the RFCs here, but i guess thats too much to ask.
// If we haven't PINGed them, or the PING we sent isn't something we know how to filter, this // If we haven't PINGed them, or the PING we sent isn't something we know how to filter, this
// is null. // is blank.
String pong = _expectedPong; String pong = expectedPong.length() > 0 ? expectedPong.toString() : null;
_expectedPong = null; expectedPong.setLength(0);
return pong; return pong;
} }
@ -347,7 +348,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
return null; return null;
} }
public String outboundFilter(String s) { public String outboundFilter(String s, StringBuffer expectedPong) {
String field[]=s.split(" ",3); String field[]=s.split(" ",3);
String command; String command;
@ -397,24 +398,24 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
// Yuck. // Yuck.
String rv = null; String rv = null;
expectedPong.setLength(0);
if (field.length == 1) { // PING if (field.length == 1) { // PING
rv = "PING"; rv = "PING";
_expectedPong = "PONG 127.0.0.1"; expectedPong.append("PONG 127.0.0.1");
} else if (field.length == 2) { // PING nonce } else if (field.length == 2) { // PING nonce
rv = "PING " + field[1]; rv = "PING " + field[1];
_expectedPong = "PONG " + field[1]; expectedPong.append("PONG ").append(field[1]);
} else if (field.length == 3) { // PING nonce serverLocation } else if (field.length == 3) { // PING nonce serverLocation
rv = "PING " + field[1]; rv = "PING " + field[1];
_expectedPong = "PONG " + field[1]; expectedPong.append("PONG ").append(field[1]);
} else { } else {
if (_log.shouldLog(Log.ERROR)) if (_log.shouldLog(Log.ERROR))
_log.error("IRC client sent a PING we don't understand, filtering it (\"" + s + "\")"); _log.error("IRC client sent a PING we don't understand, filtering it (\"" + s + "\")");
rv = null; rv = null;
_expectedPong = null;
} }
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))
_log.warn("sending ping " + rv + ", waiting for " + _expectedPong + " orig was [" + s + "]"); _log.warn("sending ping " + rv + ", waiting for " + expectedPong + " orig was [" + s + "]");
return rv; return rv;
} }

6
history.txt
View File

@ -1,4 +1,8 @@
$Id: history.txt,v 1.484 2006-06-09 19:34:44 jrandom Exp $ $Id: history.txt,v 1.485 2006-06-10 15:14:57 jrandom Exp $
2006-06-11 Kloug
* Bugfix to the I2PTunnel IRC filter to support multiple concurrent
outstanding pings/pongs
2006-06-10 jrandom 2006-06-10 jrandom
* Further reduction in proactive rejections * Further reduction in proactive rejections

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

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
* *
*/ */
public class RouterVersion { public class RouterVersion {
public final static String ID = "$Revision: 1.424 $ $Date: 2006-06-09 19:34:51 $"; public final static String ID = "$Revision: 1.425 $ $Date: 2006-06-10 15:15:01 $";
public final static String VERSION = "0.6.1.20"; public final static String VERSION = "0.6.1.20";
public final static long BUILD = 4; public final static long BUILD = 5;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID); System.out.println("Router ID: " + RouterVersion.ID);