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

* NetDB: Add more su3 checks

Browse Source 
* SU3File: Improve CLI help
This commit is contained in:
zzz
2014-06-29 11:43:57 +00:00
parent 9827c48527
commit d855c5de50
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/src/net/i2p/crypto/SU3File.java
View File

@ -513,14 +513,16 @@ public class SU3File {
/** @since 0.9.9 */ /** @since 0.9.9 */
private static String dumpTypes() { private static String dumpTypes() {
StringBuilder buf = new StringBuilder(256); StringBuilder buf = new StringBuilder(256);
buf.append("Available signature types:\n"); buf.append("Available signature types (-t):\n");
for (SigType t : EnumSet.allOf(SigType.class)) { for (SigType t : EnumSet.allOf(SigType.class)) {
buf.append(" ").append(t).append("\t(code: ").append(t.getCode()).append(')'); buf.append(" ").append(t).append("\t(code: ").append(t.getCode()).append(')');
if (t.getCode() == DEFAULT_SIG_CODE) if (t.getCode() == DEFAULT_SIG_CODE)
buf.append(" DEFAULT"); buf.append(" DEFAULT");
if (!t.isAvailable())
buf.append(" UNAVAILABLE");
buf.append('\n'); buf.append('\n');
} }
buf.append("Available content types:\n"); buf.append("Available content types (-c):\n");
for (ContentType t : EnumSet.allOf(ContentType.class)) { for (ContentType t : EnumSet.allOf(ContentType.class)) {
buf.append(" ").append(t).append("\t(code: ").append(t.getCode()).append(')'); buf.append(" ").append(t).append("\t(code: ").append(t.getCode()).append(')');
if (t == DEFAULT_CONTENT_TYPE) if (t == DEFAULT_CONTENT_TYPE)

2
router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
View File

@ -498,6 +498,8 @@ public class Reseeder {
name.equals(ourB64) || name.equals(ourB64) ||
f.length() > 10*1024 || f.length() > 10*1024 ||
f.lastModified() < minTime || f.lastModified() < minTime ||
!name.startsWith(ROUTERINFO_PREFIX) ||
!name.endsWith(ROUTERINFO_SUFFIX) ||
!f.isFile()) { !f.isFile()) {
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))
_log.warn("Skipping " + f); _log.warn("Skipping " + f);