From 07860d018cc342217b4a206a5844feb68dfcc344 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 16 Mar 2011 17:28:10 +0000
Subject: [PATCH] add b32 links to susidns; add source property for additions
 via susidns

---
 .../src/java/src/i2p/susi/dns/AddressBean.java     | 14 ++++++++++++++
 .../java/src/i2p/susi/dns/NamingServiceBean.java   |  1 +
 .../src/java/src/i2p/susi/dns/VersionBean.java     |  5 +++--
 apps/susidns/src/jsp/addressbook.jsp               |  7 +++++--
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java
index 5d91d469c..8e611a112 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java
@@ -24,6 +24,10 @@
 
 package i2p.susi.dns;
 
+import net.i2p.I2PAppContext;
+import net.i2p.data.Base32;
+import net.i2p.data.Base64;
+
 public class AddressBean
 {
 	private String name, destination;
@@ -58,4 +62,14 @@ public class AddressBean
 	{
 		this.name = name;
 	}
+
+	/** @since 0.8.6 */
+	public String getB32() 
+	{
+		byte[] dest = Base64.decode(destination);
+		if (dest == null)
+			return "";
+		byte[] hash = I2PAppContext.getGlobalContext().sha().calculateHash(dest).getData();
+		return Base32.encode(hash) + ".b32.i2p";
+	}
 }
diff --git a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
index 752266422..1d5d2a12b 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
@@ -222,6 +222,7 @@ public class NamingServiceBean extends AddressbookBean
 						} else {
 							try {
 								Destination dest = new Destination(destination);
+					                        nsOptions.setProperty("s", _("Manually added via SusiDNS"));
 								boolean success = getNamingService().put(hostname, dest, nsOptions);
 								if (success) {
 									changed = true;
diff --git a/apps/susidns/src/java/src/i2p/susi/dns/VersionBean.java b/apps/susidns/src/java/src/i2p/susi/dns/VersionBean.java
index ffc701046..0949ec31f 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/VersionBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/VersionBean.java
@@ -26,8 +26,9 @@ package i2p.susi.dns;
 
 public class VersionBean {
 	
-	private static String version = "0.5";
-	private static String url = "http://susi.i2p/?i2paddresshelper=T2DU1KAz3meB0B53U8Y06-I7vHR7XmC0qXAJfLW6b-1L1FVKoySRZz4xazHAwyv2xtRpvKrv6ukLm1tThEW0zQWtZPtX8G6KkzMibD8t7IS~4yw-9VkBtUydyYfsX08AK3v~-egSW8HCXTdyIJVtrETJb337VDUHW-7D4L1JLbwSH4if2ooks6yFTrljK5aVMi-16dZOVvmoyJc3jBqSdK6kraO4gW5-vHTmbLwL498p9nug1KOg1DqgN2GeU5X1QlVrlpFb~IIfdP~O8NT7u-LAjW3jSJsMbLDHMSYTIhC7xmJIiBoi-qk8p6TLynAmvJ7HRvbx4N1EB-uJHyD16wsZkkHyEOfmXbj0ZqLyKEGb3thPwCz-M9v~c2Qt3WbwjXJAtHpjlHkdJ4Fg91cX2oak~JoapnPf6Syw8hko5syf6VVoCYLnrrYyM8oGl8mLclHkj~VCidQNqMSM74IhrHfK6HmRikqtZBexb5M6wfMTTqBvaHURdD21GOpFKYBUAAAA";
+	private static String version = "0.6";
+	//private static String url = "http://susi.i2p/?i2paddresshelper=T2DU1KAz3meB0B53U8Y06-I7vHR7XmC0qXAJfLW6b-1L1FVKoySRZz4xazHAwyv2xtRpvKrv6ukLm1tThEW0zQWtZPtX8G6KkzMibD8t7IS~4yw-9VkBtUydyYfsX08AK3v~-egSW8HCXTdyIJVtrETJb337VDUHW-7D4L1JLbwSH4if2ooks6yFTrljK5aVMi-16dZOVvmoyJc3jBqSdK6kraO4gW5-vHTmbLwL498p9nug1KOg1DqgN2GeU5X1QlVrlpFb~IIfdP~O8NT7u-LAjW3jSJsMbLDHMSYTIhC7xmJIiBoi-qk8p6TLynAmvJ7HRvbx4N1EB-uJHyD16wsZkkHyEOfmXbj0ZqLyKEGb3thPwCz-M9v~c2Qt3WbwjXJAtHpjlHkdJ4Fg91cX2oak~JoapnPf6Syw8hko5syf6VVoCYLnrrYyM8oGl8mLclHkj~VCidQNqMSM74IhrHfK6HmRikqtZBexb5M6wfMTTqBvaHURdD21GOpFKYBUAAAA";
+	private static String url = "http://susi.i2p/";
 	
 	public String getVersion() {
 		return version;
diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp
index 848a3160e..9c34fe741 100644
--- a/apps/susidns/src/jsp/addressbook.jsp
+++ b/apps/susidns/src/jsp/addressbook.jsp
@@ -141,6 +141,7 @@ ${book.loadBookMessages}
 </c:if>
 
 <th><%=intl._("Name")%></th>
+<th><%=intl._("Links")%></th>
 <th><%=intl._("Destination")%></th>
 </tr>
 <!-- limit iterator, or "Form too large" may result on submit, and is a huge web page if we don't -->
@@ -149,8 +150,10 @@ ${book.loadBookMessages}
 <c:if test="${book.master || book.router || book.published || book.private}">
 <td class="checkbox"><input type="checkbox" name="checked" value="${addr.name}" title="<%=intl._("Mark for deletion")%>"></td>
 </c:if>
-<td class="names"><a href="http://${addr.name}/">${addr.name}</a> -
-<span class="addrhlpr">(<a href="http://${addr.name}/?i2paddresshelper=${addr.destination}"><%=intl._("address helper link")%></a>)</span>
+<td class="names"><a href="http://${addr.name}/">${addr.name}</a>
+</td><td class="names">
+<span class="addrhlpr">(<a href="http://${addr.b32}/">b32</a>)</span>
+<span class="addrhlpr">(<a href="http://${addr.name}/?i2paddresshelper=${addr.destination}"><%=intl._("helper")%></a>)</span>
 </td>
 <td class="destinations"><textarea rows="1" style="height: 3em;" cols="40" wrap="off" readonly="readonly" name="dest_${addr.name}" >${addr.destination}</textarea></td>
 </tr>