I2P-zero v1.9 - now has version command, to assist integration. Tunnel control port changed as per suggestion by moneromooo

This commit is contained in:
knaccc
2019-07-21 06:31:40 +01:00
parent 72114641b6
commit 12e4907204
5 changed files with 23 additions and 10 deletions
+8
View File
@@ -188,6 +188,14 @@ or, for pleasant viewing on the command line, automatically updating every 2 sec
`watch "tunnel-control.sh router.getBandwidthStats | tr ',' '\n' | sort"`
#### Get the I2P-zero version
`tunnel-control.sh version`
example response:
`i2p-zero 1.8`
## Watch the I2P log for messages
+6 -6
View File
@@ -47,12 +47,12 @@ getFileSizeMB () {
print4ColsJustified "OS" "Uncompressed size (MB)" "Compressed size (MB)" "v$VERSION Reproducible build SHA-256"
print4ColsJustified "------------------------" "------------------------" "------------------------" "------------------------------------------------------------------"
print4ColsJustified "Mac" "`getFileSizeMB $basedir/dist/mac`" "`getFileSizeMB $basedir/dist-zip/i2p-zero-mac.v${VERSION}.zip`" "\``getHash $basedir/dist-zip/i2p-zero-mac.v${VERSION}.zip`\`"
print4ColsJustified "Windows" "`getFileSizeMB $basedir/dist/win`" "`getFileSizeMB $basedir/dist-zip/i2p-zero-win.v${VERSION}.zip`" "\``getHash $basedir/dist-zip/i2p-zero-win.v${VERSION}.zip`\`"
print4ColsJustified "Linux" "`getFileSizeMB $basedir/dist/linux`" "`getFileSizeMB $basedir/dist-zip/i2p-zero-linux.v${VERSION}.zip`" "\``getHash $basedir/dist-zip/i2p-zero-linux.v${VERSION}.zip`\`"
print4ColsJustified "Mac GUI" "`getFileSizeMB $basedir/dist/mac-gui`" "`getFileSizeMB $basedir/dist-zip/i2p-zero-mac-gui.v${VERSION}.zip`" "\``getHash $basedir/dist-zip/i2p-zero-mac-gui.v${VERSION}.zip`\`"
print4ColsJustified "Windows GUI" "`getFileSizeMB $basedir/dist/win-gui`" "`getFileSizeMB $basedir/dist-zip/i2p-zero-win-gui.v${VERSION}.zip`" "\``getHash $basedir/dist-zip/i2p-zero-win-gui.v${VERSION}.zip`\`"
print4ColsJustified "Linux GUI" "`getFileSizeMB $basedir/dist/linux-gui`" "`getFileSizeMB $basedir/dist-zip/i2p-zero-linux-gui.v${VERSION}.zip`" "\``getHash $basedir/dist-zip/i2p-zero-linux-gui.v${VERSION}.zip`\`"
print4ColsJustified "Mac" "`getFileSizeMB $basedir/dist/mac`" "`getFileSizeMB $basedir/dist-zip/i2p-zero-mac.v${VERSION}.zip`" "\``getHash $basedir/dist-zip/i2p-zero-mac.v${VERSION}.zip`\`"
print4ColsJustified "Windows" "`getFileSizeMB $basedir/dist/win`" "`getFileSizeMB $basedir/dist-zip/i2p-zero-win.v${VERSION}.zip`" "\``getHash $basedir/dist-zip/i2p-zero-win.v${VERSION}.zip`\`"
print4ColsJustified "Linux" "`getFileSizeMB $basedir/dist/linux`" "`getFileSizeMB $basedir/dist-zip/i2p-zero-linux.v${VERSION}.zip`" "\``getHash $basedir/dist-zip/i2p-zero-linux.v${VERSION}.zip`\`"
print4ColsJustified "Mac GUI" "`getFileSizeMB $basedir/dist/mac-gui`" "`getFileSizeMB $basedir/dist-zip/i2p-zero-mac-gui.v${VERSION}.zip`" "\``getHash $basedir/dist-zip/i2p-zero-mac-gui.v${VERSION}.zip`\`"
print4ColsJustified "Windows GUI" "`getFileSizeMB $basedir/dist/win-gui`" "`getFileSizeMB $basedir/dist-zip/i2p-zero-win-gui.v${VERSION}.zip`" "\``getHash $basedir/dist-zip/i2p-zero-win-gui.v${VERSION}.zip`\`"
print4ColsJustified "Linux GUI" "`getFileSizeMB $basedir/dist/linux-gui`" "`getFileSizeMB $basedir/dist-zip/i2p-zero-linux-gui.v${VERSION}.zip`" "\``getHash $basedir/dist-zip/i2p-zero-linux-gui.v${VERSION}.zip`\`"
echo ""
echo "Note: Reproducible builds are currently experimental. Due to JDK differences, Builds on Mac will consistently have different hashes than builds on Linux. Official releases will always be built on Linux (Ubuntu)."
@@ -37,7 +37,7 @@ public class TunnelControl implements Runnable {
private File tunnelControlTempDir;
private TunnelList tunnelList;
private static final int TUNNEL_CONTROL_LISTENING_PORT = 30000;
private static final int TUNNEL_CONTROL_LISTENING_PORT = 31337;
public static class TunnelList {
private File tunnelControlConfigDir;
@@ -475,7 +475,7 @@ public class TunnelControl implements Runnable {
for(var t : tunnelList.tunnels) if(t.getEnabled()) t.start();
try {
controlServerSocket = new ServerSocket(30000, 0, InetAddress.getLoopbackAddress());
controlServerSocket = new ServerSocket(31337, 0, InetAddress.getLoopbackAddress());
while (!stopping) {
try (var socket = controlServerSocket.accept()) {
var out = new PrintWriter(socket.getOutputStream(), true);
@@ -621,6 +621,11 @@ public class TunnelControl implements Runnable {
break;
}
case "version": {
out.println("i2p-zero " + UpdateCheck.currentVersion);
break;
}
case "router.reachability": {
out.println(routerWrapper.getReachability().getMessage());
break;
@@ -1 +1 @@
1.8
1.9
+1 -1
View File
@@ -1,3 +1,3 @@
#!/bin/bash
exec 3<>/dev/tcp/localhost/30000; echo "$1 $2 $3 $4" >&3; cat <&3
exec 3<>/dev/tcp/localhost/31337; echo "$1 $2 $3 $4" >&3; cat <&3