From 6ad4cb092833b8d9dc5f569ca5f504937d4090c2 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 4 Jan 2017 14:47:52 +0000
Subject: [PATCH] Data: No longer sort addresses in an RI by SHA256, 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
---
.../java/src/net/i2p/data/router/RouterInfo.java | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/router/java/src/net/i2p/data/router/RouterInfo.java b/router/java/src/net/i2p/data/router/RouterInfo.java
index 2ad3227f8a..f0c24abcda 100644
--- a/router/java/src/net/i2p/data/router/RouterInfo.java
+++ b/router/java/src/net/i2p/data/router/RouterInfo.java
@@ -62,9 +62,7 @@ public class RouterInfo extends DatabaseEntry {
private RouterIdentity _identity;
private volatile long _published;
/**
- * Addresses must be sorted by SHA256.
- * When an RI is created, they are sorted in setAddresses().
- * Save addresses in the order received so we need not resort.
+ * Save addresses in the order received so the signature works.
*/
private final List<RouterAddress> _addresses;
/** 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
* 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
* @throws IllegalStateException if RouterInfo is already signed or addresses previously set
*/
@@ -217,12 +211,6 @@ public class RouterInfo extends DatabaseEntry {
throw new IllegalStateException();
if (addresses != null) {
_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);
- }
}
}
--
GitLab