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

Data: No longer sort addresses in an RI by SHA256,

Browse Source 
it's undocumented, the other router implementations don't do it,
and unnecessary since we store addresses in a List, not a Set,
as of 0.8.14 2012-05
This commit is contained in:
zzz
2017-01-04 14:47:52 +00:00
parent 91163948b5
commit 6ad4cb0928
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
router/java/src/net/i2p/data/router/RouterInfo.java
View File

@ -62,9 +62,7 @@ public class RouterInfo extends DatabaseEntry {
private RouterIdentity _identity; private RouterIdentity _identity;
private volatile long _published; private volatile long _published;
/** /**
* Addresses must be sorted by SHA256. * Save addresses in the order received so the signature works.
* When an RI is created, they are sorted in setAddresses().
* Save addresses in the order received so we need not resort.
*/ */
private final List<RouterAddress> _addresses; private final List<RouterAddress> _addresses;
/** may be null to save memory, no longer final */ /** may be null to save memory, no longer final */
@ -205,10 +203,6 @@ public class RouterInfo extends DatabaseEntry {
* Specify a set of RouterAddress structures at which this router * Specify a set of RouterAddress structures at which this router
* can be contacted. * can be contacted.
* *
* Warning - Sorts the addresses here. Do not modify any address
* after calling this, as the sort order is based on the
* hash of the entire address structure.
*
* @param addresses may be null * @param addresses may be null
* @throws IllegalStateException if RouterInfo is already signed or addresses previously set * @throws IllegalStateException if RouterInfo is already signed or addresses previously set
*/ */
@ -217,12 +211,6 @@ public class RouterInfo extends DatabaseEntry {
throw new IllegalStateException(); throw new IllegalStateException();
if (addresses != null) { if (addresses != null) {
_addresses.addAll(addresses); _addresses.addAll(addresses);
if (_addresses.size() > 1) {
// WARNING this sort algorithm cannot be changed, as it must be consistent
// network-wide. The signature is not checked at readin time, but only
// later, and the addresses are stored in a Set, not a List.
SortHelper.sortStructureList(_addresses);
}
} }
} }