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

2006-01-25 dust

Browse Source 
* Fix IRC client proxy to use ISO-8859-1.
This commit is contained in:
dust
2006-01-25 15:34:28 +00:00
committed by zzz
parent 17eb7fa983
commit ab8e11657f
3 changed files with 14 additions and 11 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

@ -125,10 +125,10 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
} }
public void run() { public void run() {
InputStream input; BufferedReader in;
OutputStream output; OutputStream output;
try { try {
input=remote.getInputStream(); in = new BufferedReader(new InputStreamReader(remote.getInputStream(), "ISO-8859-1"));
output=local.getOutputStream(); output=local.getOutputStream();
} catch (IOException e) { } catch (IOException e) {
if (_log.shouldLog(Log.ERROR)) if (_log.shouldLog(Log.ERROR))
@ -141,7 +141,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
while(true) while(true)
{ {
try { try {
String inmsg = DataHelper.readLine(input); String inmsg = in.readLine();
if(inmsg==null) if(inmsg==null)
break; break;
if(inmsg.endsWith("\r")) if(inmsg.endsWith("\r"))
@ -159,7 +159,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
_log.info("inbound: "+outmsg); _log.info("inbound: "+outmsg);
} }
outmsg=outmsg+"\n"; outmsg=outmsg+"\n";
output.write(outmsg.getBytes()); output.write(outmsg.getBytes("ISO-8859-1"));
} else { } else {
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))
_log.warn("inbound BLOCKED: "+inmsg); _log.warn("inbound BLOCKED: "+inmsg);
@ -195,10 +195,10 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
} }
public void run() { public void run() {
InputStream input; BufferedReader in;
OutputStream output; OutputStream output;
try { try {
input=local.getInputStream(); in = new BufferedReader(new InputStreamReader(local.getInputStream(), "ISO-8859-1"));
output=remote.getOutputStream(); output=remote.getOutputStream();
} catch (IOException e) { } catch (IOException e) {
if (_log.shouldLog(Log.ERROR)) if (_log.shouldLog(Log.ERROR))
@ -211,7 +211,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
while(true) while(true)
{ {
try { try {
String inmsg = DataHelper.readLine(input); String inmsg = in.readLine();
if(inmsg==null) if(inmsg==null)
break; break;
if(inmsg.endsWith("\r")) if(inmsg.endsWith("\r"))
@ -229,7 +229,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
_log.info("outbound: "+outmsg); _log.info("outbound: "+outmsg);
} }
outmsg=outmsg+"\n"; outmsg=outmsg+"\n";
output.write(outmsg.getBytes()); output.write(outmsg.getBytes("ISO-8859-1"));
} else { } else {
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))
_log.warn("outbound BLOCKED: "+"\""+inmsg+"\""); _log.warn("outbound BLOCKED: "+"\""+inmsg+"\"");

5
history.txt
View File

@ -1,4 +1,7 @@
$Id: history.txt,v 1.393 2006/01/19 23:40:24 complication Exp $ $Id: history.txt,v 1.394 2006/01/22 19:51:57 jrandom Exp $
2006-01-25 dust
* Fix IRC client proxy to use ISO-8859-1.
2006-01-22 jrandom 2006-01-22 jrandom
* New tunnel build process - does not use the new crypto or new peer * New tunnel build process - does not use the new crypto or new peer

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.337 $ $Date: 2006/01/19 23:40:25 $"; public final static String ID = "$Revision: 1.338 $ $Date: 2006/01/22 19:51:56 $";
public final static String VERSION = "0.6.1.9"; public final static String VERSION = "0.6.1.9";
public final static long BUILD = 6; public final static long BUILD = 7;
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);