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

2005-04-01 jrandom

Browse Source 
* Fix to check for missing news file (thanks smeghead!)
    * Added destination display CLI:
      java -cp lib/i2p.jar net.i2p.data.Destination privKeyFilename
    * Added destination display to the web interface (thanks pnspns)
    * Installed CIA backdoor
This commit is contained in:
jrandom
2005-04-01 11:28:06 +00:00
committed by zzz
parent 083ac1f125
commit 33366cc291
9 changed files with 73 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
View File

@ -324,6 +324,18 @@ public class TunnelController implements Logging {
public String getTargetDestination() { return _config.getProperty("targetDestination"); }
public String getProxyList() { return _config.getProperty("proxyList"); }
public boolean getStartOnLoad() { return "true".equalsIgnoreCase(_config.getProperty("startOnLoad", "true")); }
public String getMyDestination() {
if (_tunnel != null) {
List sessions = _tunnel.getSessions();
for (int i = 0; i < sessions.size(); i++) {
I2PSession session = (I2PSession)sessions.get(i);
Destination dest = session.getMyDestination();
if (dest != null)
return dest.toBase64();
}
}
return null;
}
public boolean getIsRunning() { return _running; }
public boolean getIsStarting() { return _starting; }

13
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
View File

@ -350,6 +350,19 @@ public class IndexBean {
return "";
}
public String getDestinationBase64(int tunnel) {
TunnelController tun = getController(tunnel);
if (tun != null) {
String rv = tun.getMyDestination();
if (rv != null)
return rv;
else
return "";
} else {
return "";
}
}
///
/// bean props for form submission
///

4
apps/i2ptunnel/jsp/editServer.jsp
View File

@ -110,6 +110,10 @@ Port: <input type="text" size="4" maxlength="4" name="targetPort" value="<%=edit
</td>
</tr>
<tr>
<td valign="top" align="left"><b>Local destination:</b><br /><i>(if known)</i></td>
<td valign="top" align="left"><input type="text" size="60" value="<%=editBean.getDestinationBase64(curTunnel)%>" /></td>
</tr>
<tr>
<td colspan="2" align="center">
<b><hr size="1">
Advanced networking options<br />

5
apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java
View File

@ -33,6 +33,10 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
_context = ctx;
_log = ctx.logManager().getLog(NewsFetcher.class);
_instance = this;
updateLastFetched();
}
private void updateLastFetched() {
File news = new File(NEWS_FILE);
if (news.exists())
_lastFetch = news.lastModified();
@ -58,6 +62,7 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
}
private boolean shouldFetchNews() {
updateLastFetched();
String freq = _context.getProperty(ConfigUpdateHandler.PROP_REFRESH_FREQUENCY);
if (freq == null)
freq = ConfigUpdateHandler.DEFAULT_REFRESH_FREQUENCY;

19
core/java/src/net/i2p/data/Destination.java
View File

@ -12,6 +12,7 @@ package net.i2p.data;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.FileInputStream;
import net.i2p.util.Log;
@ -155,4 +156,22 @@ public class Destination extends DataStructureImpl {
if (__calculatedHash == null) __calculatedHash = super.calculateHash();
return __calculatedHash;
}
public static void main(String args[]) {
if (args.length == 0) {
System.err.println("Usage: Destination filename");
} else {
FileInputStream in = null;
try {
in = new FileInputStream(args[0]);
Destination d = new Destination();
d.readBytes(in);
System.out.println(d.toBase64());
} catch (Exception e) {
e.printStackTrace();
} finally {
if (in != null) try { in.close(); } catch (IOException ioe) {}
}
}
}
}

9
history.txt
View File

@ -1,4 +1,11 @@
$Id: history.txt,v 1.182 2005/03/26 02:13:38 jrandom Exp $
$Id: history.txt,v 1.183 2005/03/29 19:07:40 jrandom Exp $
2005-04-01 jrandom
* Fix to check for missing news file (thanks smeghead!)
* Added destination display CLI:
java -cp lib/i2p.jar net.i2p.data.Destination privKeyFilename
* Added destination display to the web interface (thanks pnspns)
* Installed CIA backdoor
* 2005-03-29 0.5.0.5 released

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

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
*
*/
public class RouterVersion {
public final static String ID = "$Revision: 1.175 $ $Date: 2005/03/26 02:13:38 $";
public final static String ID = "$Revision: 1.176 $ $Date: 2005/03/29 19:07:39 $";
public final static String VERSION = "0.5.0.5";
public final static long BUILD = 0;
public final static long BUILD = 1;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION);
System.out.println("Router ID: " + RouterVersion.ID);

6
router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
View File

@ -288,8 +288,10 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
getContext().statManager().addRateData("client.leaseSetFailedRemoteTime", lookupTime, lookupTime);
}
if (_log.shouldLog(Log.ERROR))
_log.error("Unable to send to " + _toString + " because we couldn't find their leaseSet");
if (!_finished) {
if (_log.shouldLog(Log.ERROR))
_log.error("Unable to send to " + _toString + " because we couldn't find their leaseSet");
}
dieFatal();
}

8
router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
View File

@ -204,8 +204,12 @@ class SearchJob extends JobImpl {
+ peer + " : " + (ds == null ? "null" : ds.getClass().getName()));
_state.replyTimeout(peer);
} else {
sendSearch((RouterInfo)ds);
sent++;
if (getContext().shitlist().isShitlisted(peer)) {
// dont bother
} else {
sendSearch((RouterInfo)ds);
sent++;
}
}
}
if (sent <= 0) {