From f33303f394ece5882cad90c0926bcf661d7ccd2a Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 9 Aug 2014 16:21:02 +0000 Subject: [PATCH] Use cached Destinations Specify min I2P version of 0.9.9 for Destination.create() --- scripts/plugin.config | 1 + src/jsp/announce.jsp | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/plugin.config b/scripts/plugin.config index 41d0523..d8da14b 100644 --- a/scripts/plugin.config +++ b/scripts/plugin.config @@ -8,3 +8,4 @@ updateURL=http://stats.i2p/i2p/plugins/zzzot-update.xpi2p websiteURL=http://zzz.i2p/forums/16 license=Apache 2.0 min-jetty-version=7 +min-i2p-version=0.9.9 diff --git a/src/jsp/announce.jsp b/src/jsp/announce.jsp index 637b959..462217c 100644 --- a/src/jsp/announce.jsp +++ b/src/jsp/announce.jsp @@ -1,4 +1,4 @@ -<%@page import="java.util.ArrayList" %><%@page import="java.util.Collections" %><%@page import="java.util.List" %><%@page import="java.util.Map" %><%@page import="java.util.HashMap" %><%@page import="net.i2p.data.Base64" %><%@page import="net.i2p.data.Destination" %><%@page import="net.i2p.zzzot.*" %><%@page import="org.klomp.snark.bencode.BEncoder" %><% +<%@page import="java.io.ByteArrayInputStream,java.util.ArrayList,java.util.Collections,java.util.List,java.util.Map,java.util.HashMap,net.i2p.data.Base64,net.i2p.data.Destination,net.i2p.zzzot.*,org.klomp.snark.bencode.BEncoder" %><% /* * Above one-liner is so there is no whitespace -> IllegalStateException @@ -94,7 +94,10 @@ try { if (ip.endsWith(".i2p")) ip = ip.substring(0, ip.length() - 4); - d = new Destination(ip); // from b64 string + byte[] b = Base64.decode(ip); + if (b == null) + throw new Exception(); + d = Destination.create(new ByteArrayInputStream(b)); // cache } catch (Exception e) { fail = true; msg = "bad dest " + e;