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

stub out resume/accept; allow xdcc

Browse Source
This commit is contained in:
zzz
2011-07-16 12:46:05 +00:00
parent a4ec6a5369
commit 59424a899f
3 changed files with 147 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,4 +199,20 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements DCCHelper
_log.info("New incoming " + type + ' ' + b32 + ' ' + port + " returns " + rv);
return rv;
}
public int resumeOutgoing(int port) {
return -1;
}
public int resumeIncoming(int port) {
return -1;
}
public int acceptOutgoing(int port) {
return -1;
}
public int acceptIncoming(int port) {
return -1;
}
}

40
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/DCCHelper.java
View File

@@ -20,18 +20,50 @@ public interface DCCHelper {
* @param ip local irc client IP
* @param port local irc client port
* @param type string
* @return i2p port or -1 on error
* @return local DCC server i2p port or -1 on error
*/
public int newOutgoing(byte[] ip, int port, String type);
/**
* An incoming DCC request
*
* @param b32 remote dcc server address
* @param port remote dcc server port
* @param b32 remote dcc server b32 address
* @param port remote dcc server I2P port
* @param type string
* @return local server port or -1 on error
* @return local DCC client tunnel port or -1 on error
*/
public int newIncoming(String b32, int port, String type);
/**
* An outgoing RESUME request
*
* @param port local DCC client tunnel port
* @return remote DCC server i2p port or -1 on error
*/
public int resumeOutgoing(int port);
/**
* An incoming RESUME request
*
* @param port local dcc server I2P port
* @return local IRC client DCC port or -1 on error
*/
public int resumeIncoming(int port);
/**
* An outgoing ACCEPT response
*
* @param port local irc client DCC port
* @return local DCC server i2p port or -1 on error
*/
public int acceptOutgoing(int port);
/**
* An incoming ACCEPT response
*
* @param port remote dcc server I2P port
* @return local DCC client tunnel port or -1 on error
*/
public int acceptIncoming(int port);
}

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

@@ -123,6 +123,10 @@ abstract class IRCFilter {
buf.append(":\001DCC ");
return filterDCCIn(buf.toString(), msg.substring(4), helper);
}
// XDCC looks safe, ip/port happens over regular DCC
// http://en.wikipedia.org/wiki/XDCC
if (msg.toUpperCase().startsWith("XDCC ") && helper != null && helper.isEnabled())
return s;
if (ALLOW_ALL_CTCP_IN)
return s;
return null; // Block all other ctcp
@@ -265,6 +269,10 @@ abstract class IRCFilter {
}
if (msg.startsWith("DCC "))
return filterDCCOut(field[0] + ' ' + field[1] + " :\001DCC ", msg.substring(4), helper);
// XDCC looks safe, ip/port happens over regular DCC
// http://en.wikipedia.org/wiki/XDCC
if (msg.toUpperCase().startsWith("XDCC ") && helper != null && helper.isEnabled())
return s;
if (ALLOW_ALL_CTCP_OUT)
return s;
return null; // Block all other ctcp
@@ -295,6 +303,14 @@ abstract class IRCFilter {
}
/**
*<pre>
* DCC CHAT chat xxx.b32.i2p i2p-port -> DCC CHAT chat IP port
* DCC SEND file xxx.b32.i2p i2p-port length -> DCC SEND file IP port length
* DCC RESUME file i2p-port offset -> DCC RESUME file port offset
* DCC ACCEPT file i2p-port offset -> DCC ACCEPT file port offset
* DCC xxx -> null
*</pre>
*
* @param pfx the message through the "DCC " part
* @param msg the message after the "DCC " part
* @param helper may be null
@@ -310,10 +326,11 @@ abstract class IRCFilter {
if (args.length <= 0)
return null;
String type = args[0];
// no IP in these but port needs to be fixed still
//if (type == "RESUME" || type == "ACCEPT")
// return msg;
if (!(type.equals("CHAT") || type.equals("SEND"))) {
boolean haveIP = true;
// no IP in these, replace port only
if (type == "RESUME" || type == "ACCEPT") {
haveIP = false;
} else if (!(type.equals("CHAT") || type.equals("SEND"))) {
if (ALLOW_ALL_DCC_IN) {
if (ctcp > 0)
return pfx + msg + (char) 0x01;
@@ -323,36 +340,59 @@ abstract class IRCFilter {
}
if (helper == null || !helper.isEnabled())
return null;
if (args.length < 4)
if (args.length < 3)
return null;
if (haveIP && args.length < 4)
return null;
String arg = args[1];
String b32 = args[2];
int nextArg = 2;
String b32 = null;
if (haveIP)
b32 = args[nextArg++];
int cPort;
try {
String cp = args[3];
String cp = args[nextArg++];
cPort = Integer.parseInt(cp);
} catch (NumberFormatException nfe) {
return null;
}
int port = helper.newIncoming(b32, cPort, type);
int port = -1;
if (haveIP) {
port = helper.newIncoming(b32, cPort, type);
} else if (type.equals("ACCEPT")) {
port = helper.acceptIncoming(cPort);
} else if (type.equals("RESUME")) {
port = helper.resumeIncoming(cPort);
}
if (port < 0)
return null;
StringBuilder buf = new StringBuilder(256);
buf.append(pfx)
.append(type).append(' ').append(arg).append(' ');
if (haveIP) {
// fixme what is our address?
byte[] myIP = { 127, 0, 0, 1 };
buf.append(pfx)
.append(type).append(' ').append(arg).append(' ')
.append(DataHelper.fromLong(myIP, 0, myIP.length)).append(' ')
.append(port);
if (args.length > 4)
buf.append(' ').append(args[4]);
buf.append(DataHelper.fromLong(myIP, 0, myIP.length)).append(' ');
}
buf.append(port);
while (args.length > nextArg) {
buf.append(' ').append(args[nextArg++]);
}
if (pfx.indexOf(0x01) >= 0)
buf.append((char) 0x01);
return buf.toString();
}
/**
*<pre>
* DCC CHAT chat IP port -> DCC CHAT chat xxx.b32.i2p i2p-port
* DCC SEND file IP port length -> DCC SEND file xxx.b32.i2p i2p-port length
* DCC RESUME file port offset -> DCC RESUME file i2p-port offset
* DCC ACCEPT file port offset -> DCC ACCEPT file i2p-port offset
* DCC xxx -> null
*</pre>
*
* @param pfx the message through the "DCC " part
* @param msg the message after the "DCC " part
* @param helper may be null
@@ -368,10 +408,11 @@ abstract class IRCFilter {
if (args.length <= 0)
return null;
String type = args[0];
// no IP in these but port needs to be fixed still
//if (type == "RESUME" || type == "ACCEPT")
// return msg;
if (!(type.equals("CHAT") || type.equals("SEND"))) {
boolean haveIP = true;
// no IP in these, replace port only
if (type == "RESUME" || type == "ACCEPT") {
haveIP = false;
} else if (!(type.equals("CHAT") || type.equals("SEND"))) {
if (ALLOW_ALL_DCC_OUT) {
if (ctcp > 0)
return pfx + msg + (char) 0x01;
@@ -380,12 +421,16 @@ abstract class IRCFilter {
}
if (helper == null || !helper.isEnabled())
return null;
if (args.length < 4)
if (args.length < 3)
return null;
if (haveIP && args.length < 4)
return null;
String arg = args[1];
byte[] ip;
byte[] ip = null;
int nextArg = 2;
if (haveIP) {
try {
String ips = args[2];
String ips = args[nextArg++];
long ipl = Long.parseLong(ips);
if (ipl < 0x01000000) {
// "reverse/firewall DCC"
@@ -398,9 +443,10 @@ abstract class IRCFilter {
} catch (NumberFormatException nfe) {
return null;
}
}
int cPort;
try {
String cp = args[3];
String cp = args[nextArg++];
cPort = Integer.parseInt(cp);
} catch (NumberFormatException nfe) {
return null;
@@ -411,16 +457,26 @@ abstract class IRCFilter {
System.err.println("Reverse / Firewall DCC not supported");
return null;
}
int port = helper.newOutgoing(ip, cPort, type);
int port = -1;
if (haveIP) {
port = helper.newOutgoing(ip, cPort, type);
} else if (type.equals("ACCEPT")) {
port = helper.acceptOutgoing(cPort);
} else if (type.equals("RESUME")) {
port = helper.resumeOutgoing(cPort);
}
if (port < 0)
return null;
StringBuilder buf = new StringBuilder(256);
buf.append(pfx)
.append(type).append(' ').append(arg).append(' ')
.append(helper.getB32Hostname()).append(' ')
.append(port);
if (args.length > 4)
buf.append(' ').append(args[4]);
.append(type).append(' ').append(arg).append(' ');
if (haveIP)
buf.append(helper.getB32Hostname()).append(' ');
buf.append(port);
while (args.length > nextArg) {
buf.append(' ').append(args[nextArg++]);
}
if (pfx.indexOf(0x01) >= 0)
buf.append((char) 0x01);
return buf.toString();