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

add b32 links to susidns; add source property for additions via susidns

Browse Source
This commit is contained in:
zzz
2011-03-16 17:28:10 +00:00
parent ce5ce12e3b
commit 07860d018c
4 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java
View File

@@ -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";
}
}

1
apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
View File

@@ -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;

5
apps/susidns/src/java/src/i2p/susi/dns/VersionBean.java
View File

@@ -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;

7
apps/susidns/src/jsp/addressbook.jsp
View File

@@ -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>