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

initial reverse/firewall support

Browse Source
This commit is contained in:
zzz
2011-08-24 14:21:44 +00:00
parent 6d064270fc
commit 3849a96ed2
1 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java
View File

@@ -1,6 +1,7 @@
package net.i2p.i2ptunnel.irc; package net.i2p.i2ptunnel.irc;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.util.Log;
/** /**
@@ -356,10 +357,16 @@ abstract class IRCFilter {
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
return null; return null;
} }
if (cPort < 0 || cPort > 65535)
return null;
int port = -1; int port = -1;
if (haveIP) { if (haveIP) {
port = helper.newIncoming(b32, cPort, type); if (cPort > 0)
port = helper.newIncoming(b32, cPort, type);
else
// "reverse/firewall DCC" - send it through without tracking
port = cPort;
} else if (type.equals("ACCEPT")) { } else if (type.equals("ACCEPT")) {
port = helper.acceptIncoming(cPort); port = helper.acceptIncoming(cPort);
} else if (type.equals("RESUME")) { } else if (type.equals("RESUME")) {
@@ -371,8 +378,13 @@ abstract class IRCFilter {
buf.append(pfx) buf.append(pfx)
.append(type).append(' ').append(arg).append(' '); .append(type).append(' ').append(arg).append(' ');
if (haveIP) { if (haveIP) {
byte[] myIP = helper.getLocalAddress(); if (port > 0) {
buf.append(DataHelper.fromLong(myIP, 0, myIP.length)).append(' '); byte[] myIP = helper.getLocalAddress();
buf.append(DataHelper.fromLong(myIP, 0, myIP.length)).append(' ');
} else {
// "reverse/firewall DCC" - set dummy IP and send it through
buf.append("0 ");
}
} }
buf.append(port); buf.append(port);
while (args.length > nextArg) { while (args.length > nextArg) {
@@ -435,8 +447,9 @@ abstract class IRCFilter {
// "reverse/firewall DCC" // "reverse/firewall DCC"
// http://en.wikipedia.org/wiki/Direct_Client-to-Client // http://en.wikipedia.org/wiki/Direct_Client-to-Client
// xchat sends an IP of 199 and a port of 0 // xchat sends an IP of 199 and a port of 0
System.err.println("Reverse / Firewall DCC not supported IP = 0x" + Long.toHexString(ipl)); Log log = new Log(IRCFilter.class);
return null; log.logAlways(Log.WARN, "Reverse / Firewall DCC, IP = 0x" + Long.toHexString(ipl));
//return null;
} }
ip = DataHelper.toLong(4, ipl); ip = DataHelper.toLong(4, ipl);
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
@@ -450,16 +463,22 @@ abstract class IRCFilter {
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
return null; return null;
} }
if (cPort <= 0) { if (cPort < 0 || cPort > 65535)
// "reverse/firewall DCC"
// http://en.wikipedia.org/wiki/Direct_Client-to-Client
System.err.println("Reverse / Firewall DCC not supported");
return null; return null;
}
int port = -1; int port = -1;
if (haveIP) { if (haveIP) {
port = helper.newOutgoing(ip, cPort, type); if (cPort > 0) {
// nonzero port but bogus IP? hmm. Fix IP and hope.
if (ip[0] == 0)
ip = new byte[] {127, 0, 0, 1};
port = helper.newOutgoing(ip, cPort, type);
} else {
// "reverse/firewall DCC" - send it through without tracking
Log log = new Log(IRCFilter.class);
log.logAlways(Log.WARN, "Reverse / Firewall DCC, port = 0");
port = cPort;
}
} else if (type.equals("ACCEPT")) { } else if (type.equals("ACCEPT")) {
port = helper.acceptOutgoing(cPort); port = helper.acceptOutgoing(cPort);
} else if (type.equals("RESUME")) { } else if (type.equals("RESUME")) {
@@ -470,8 +489,13 @@ abstract class IRCFilter {
StringBuilder buf = new StringBuilder(256); StringBuilder buf = new StringBuilder(256);
buf.append(pfx) buf.append(pfx)
.append(type).append(' ').append(arg).append(' '); .append(type).append(' ').append(arg).append(' ');
if (haveIP) if (haveIP) {
buf.append(helper.getB32Hostname()).append(' '); if (port > 0)
buf.append(helper.getB32Hostname()).append(' ');
else
// "reverse/firewall DCC" - set dummy IP and send it through
buf.append("0 ");
}
buf.append(port); buf.append(port);
while (args.length > nextArg) { while (args.length > nextArg) {
buf.append(' ').append(args[nextArg++]); buf.append(' ').append(args[nextArg++]);