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

Build: More prep for different release and API versions

Browse Source 
Use API version as manifest Specification-Version
Use API version in I2CP
Reduce sybil penalty for version and banlist
This commit is contained in:
zzz
2021-02-23 10:43:32 -05:00
parent 58e5c55cfd
commit 6e2292354a
11 changed files with 77 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
router/java/build.xml
View File

@@ -79,7 +79,7 @@
<!-- so people with very old wrapper.config files will still work with Jetty 6 -->
<attribute name="${manifest.classpath.name}" value="i2p.jar addressbook.jar jetty-i2p.jar jetty-rewrite-handler.jar jetty-start.jar jetty-util.jar" />
<attribute name="Specification-Title" value="I2P Router" />
<attribute name="Specification-Version" value="${release.number}" />
<attribute name="Specification-Version" value="${api.version}" />
<attribute name="Specification-Vendor" value="The I2P Project https://geti2p.net/" />
<attribute name="Implementation-Title" value="I2P Java Router" />
<attribute name="Implementation-Version" value="${full.version}" />
@@ -189,7 +189,7 @@
<fileset dir="./build/javadoc" />
<manifest>
<attribute name="Specification-Title" value="I2P Router" />
<attribute name="Specification-Version" value="${release.number}" />
<attribute name="Specification-Version" value="${api.version}" />
<attribute name="Specification-Vendor" value="The I2P Project https://geti2p.net/" />
<attribute name="Implementation-Title" value="I2P Java Router" />
<attribute name="Implementation-Version" value="${full.version}" />
@@ -206,7 +206,7 @@
<fileset dir="./src" />
<manifest>
<attribute name="Specification-Title" value="I2P Router" />
<attribute name="Specification-Version" value="${release.number}" />
<attribute name="Specification-Version" value="${api.version}" />
<attribute name="Specification-Vendor" value="The I2P Project https://geti2p.net/" />
<attribute name="Implementation-Title" value="I2P Java Router" />
<attribute name="Implementation-Version" value="${full.version}" />
@@ -300,7 +300,7 @@
<manifest>
<attribute name="${manifest.classpath.name}" value="i2p.jar" />
<attribute name="Specification-Title" value="I2P Router" />
<attribute name="Specification-Version" value="${release.number}" />
<attribute name="Specification-Version" value="${api.version}" />
<attribute name="Specification-Vendor" value="The I2P Project https://geti2p.net/" />
<attribute name="Implementation-Title" value="I2P Java Router" />
<attribute name="Implementation-Version" value="${full.version}" />
@@ -320,7 +320,7 @@
<manifest>
<attribute name="${manifest.classpath.name}" value="i2p.jar" />
<attribute name="Specification-Title" value="I2P Router" />
<attribute name="Specification-Version" value="${release.number}" />
<attribute name="Specification-Version" value="${api.version}" />
<attribute name="Specification-Vendor" value="The I2P Project https://geti2p.net/" />
<attribute name="Implementation-Title" value="I2P Java Router" />
<attribute name="Implementation-Version" value="${full.version}" />

2
router/java/src/net/i2p/router/client/ClientManager.java
View File

@@ -835,7 +835,7 @@ class ClientManager {
try {
// only send version if the client can handle it (0.8.7 or greater)
runner.doSend(new SetDateMessage(runner.getClientVersion() != null ?
CoreVersion.VERSION : null));
CoreVersion.PUBLISHED_VERSION : null));
} catch (I2CPMessageException ime) {}
}
if (_isStarted)

11
router/java/src/net/i2p/router/sybil/Analysis.java
View File

@@ -89,10 +89,12 @@ public class Analysis extends JobImpl implements RouterApp {
private static final double PAIR_DISTANCE_FACTOR = 2.0;
private static final double OUR_KEY_FACTOR = 4.0;
private static final double VERSION_FACTOR = 1.0;
private static final double POINTS_BAD_VERSION = 50.0;
private static final double POINTS_BAD_VERSION = 20.0;
private static final double POINTS_UNREACHABLE = 4.0;
private static final double POINTS_NEW = 4.0;
private static final double POINTS_BANLIST = 25.0;
// since we're blocking by default now, don't make this too high,
// so we don't always turn a temporary block into a permanent one.
private static final double POINTS_BANLIST = 10.0;
public static final boolean DEFAULT_BLOCK = true;
public static final double DEFAULT_BLOCK_THRESHOLD = 50.0;
public static final long DEFAULT_BLOCK_TIME = 7*24*60*60*1000L;
@@ -775,6 +777,7 @@ public class Analysis extends JobImpl implements RouterApp {
RouterInfo us = _context.router().getRouterInfo();
if (us == null) return;
String ourVer = us.getVersion();
// TODO do the math once we hit version 1.0.0
if (!ourVer.startsWith("0.9.")) return;
ourVer = ourVer.substring(4);
int dot = ourVer.indexOf('.');
@@ -793,7 +796,9 @@ public class Analysis extends JobImpl implements RouterApp {
addPoints(points, h, POINTS_NONFF, "Non-floodfill");
String hisFullVer = info.getVersion();
if (!hisFullVer.startsWith("0.9.")) {
addPoints(points, h, POINTS_BAD_VERSION, "Strange version " + DataHelper.escapeHTML(hisFullVer));
if (!hisFullVer.startsWith("1."))
addPoints(points, h, POINTS_BAD_VERSION, "Strange version " + DataHelper.escapeHTML(hisFullVer));
// TODO do the math once we hit version 1.0.0
continue;
}
String hisVer = hisFullVer.substring(4);