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

i2psnark: display peer version when available

Browse Source
This commit is contained in:
zzz
2014-06-07 17:07:44 +00:00
parent 40e5bcbdbb
commit 299a44e7eb
2 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i2psnark/java/src/org/klomp/snark/PeerID.java
View File

@ -42,7 +42,7 @@ import org.klomp.snark.bencode.InvalidBEncodingException;
* and the PeerID is not required.
* Equality is now determined solely by the dest hash.
*/
class PeerID implements Comparable<PeerID>
public class PeerID implements Comparable<PeerID>
{
private byte[] id;
private Destination address;

56
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
View File

@ -32,6 +32,7 @@ import org.klomp.snark.I2PSnarkUtil;
import org.klomp.snark.MagnetURI;
import org.klomp.snark.MetaInfo;
import org.klomp.snark.Peer;
import org.klomp.snark.PeerID;
import org.klomp.snark.Snark;
import org.klomp.snark.SnarkManager;
import org.klomp.snark.Storage;
@ -1478,7 +1479,8 @@ public class I2PSnarkServlet extends BasicServlet {
continue;
out.write("<tr class=\"" + rowClass + "\"><td></td>");
out.write("<td colspan=\"4\" align=\"right\">");
String ch = peer.toString().substring(0, 4);
PeerID pid = peer.getPeerID();
String ch = pid != null ? pid.toString().substring(0, 4) : "????";
String client;
if ("AwMD".equals(ch))
client = _("I2PSnark");
@ -1487,15 +1489,15 @@ public class I2PSnarkServlet extends BasicServlet {
else if ("TTMt".equals(ch))
client = "I2P-BT";
else if ("LUFa".equals(ch))
client = "Azureus";
client = "Vuze" + getAzVersion(pid.getID());
else if ("CwsL".equals(ch))
client = "I2PSnarkXL";
else if ("ZV".equals(ch.substring(2,4)) || "VUZP".equals(ch))
client = "Robert";
client = "Robert" + getRobtVersion(pid.getID());
else if (ch.startsWith("LV")) // LVCS 1.0.2?; LVRS 1.0.4
client = "Transmission";
client = "Transmission" + getAzVersion(pid.getID());
else if ("LUtU".equals(ch))
client = "KTorrent";
client = "KTorrent" + getAzVersion(pid.getID());
else
client = _("Unknown") + " (" + ch + ')';
out.write(client + "&nbsp;&nbsp;<tt>" + peer.toString().substring(5, 9)+ "</tt>");
@ -1569,6 +1571,50 @@ public class I2PSnarkServlet extends BasicServlet {
}
}
}
/**
* Get version from bytes 3-6
* @return " w.x.y.z" or ""
* @since 0.9.14
*/
private static String getAzVersion(byte[] id) {
if (id[7] != '-')
return "";
StringBuilder buf = new StringBuilder(16);
buf.append(' ');
for (int i = 3; i <= 6; i++) {
int val = id[i] - '0';
if (val < 0)
return "";
if (val > 9)
val = id[i] - 'A';
if (i != 6 || val != 0) {
if (i != 3)
buf.append('.');
buf.append(val);
}
}
return buf.toString();
}
/**
* Get version from bytes 3-5
* @return " w.x.y" or ""
* @since 0.9.14
*/
private static String getRobtVersion(byte[] id) {
StringBuilder buf = new StringBuilder(8);
buf.append(' ');
for (int i = 3; i <= 5; i++) {
int val = id[i];
if (val < 0)
return "";
if (i != 3)
buf.append('.');
buf.append(val);
}
return buf.toString();
}
/** @since 0.8.2 */
private static String thinsp(boolean disable) {