1
0

3 Ревизии b5a1749f9d ... 8329321db4

Автор SHA1 Съобщение Дата
  Daniel Sheffield 8329321db4 simplify ifconfig parsing and parallelize преди 1 ден
  Daniel Sheffield 159886726c simplify sweep script using ipcalc and nmap преди 1 ден
  Daniel Sheffield 431eb3c0d1 add user ssh config преди 2 седмици
променени са 2 файла, в които са добавени 36 реда и са изтрити 33 реда
  1. 26 0
      ssh/.ssh/config
  2. 10 33
      termux-shortcuts/.shortcuts/sweep.sh

+ 26 - 0
ssh/.ssh/config

@@ -0,0 +1,26 @@
+Compression yes
+#CompressionLevel 9 #(or any other desired level)
+
+Host pi* *.pi*
+        User pi
+
+Host ssl.pi pi ssl.*4 pi*4
+        ProxyCommand openssl s_client -4 -connect www.shandan.one:443 -strict -quiet
+
+Host ssl.*6 pi*6
+        ProxyCommand openssl s_client -6 -connect www.shandan.one:443 -strict -quiet
+
+Host ssh.pi4 ssh.pi
+        Port 2222
+        AddressFamily inet
+
+Host ssh.pi6
+        AddressFamily inet6
+
+Host ssl.pi4 ssl.pi pi4 pi ssl.pi6 pi6 ssh.pi4 ssh.pi ssh.pi6
+        Hostname shandan.one
+
+Host pc
+        Hostname 192.168.0.150
+        User das
+        ProxyJump ssl.pi

+ 10 - 33
termux-shortcuts/.shortcuts/sweep.sh

@@ -1,36 +1,13 @@
 #!/usr/bin/env bash
+#
+# Depends: nmap, ipcalc
+#
 set -euo pipefail
 
-IFACE=rndis0
-
-getip(){
-    local iface="$1"
-    ifconfig | awk -v FS="\n" -vRS="\n\n" "/$iface/ {print \$0}" | awk '/inet / {print $2}'
-}
-
-MYIP="$(getip "$IFACE")"
-[ "$MYIP" ] || {
-    echo "Failed to find ip on $IFACE" >&2
-    exit 1
-}
-
-# XXX: assume subnet is /24
-PREFIX="$(echo "$MYIP" | cut -d'.' -f1-3)"
-
-findpeer(){
-    local prefix="$1"
-    local me="$2"
-    for ip in {1..254}
-    do
-        [ "$me" == "${prefix}.${ip}" ] && continue
-        {
-            ping -c1 -W1  "${prefix}.${ip}" 2>&1 1>/dev/null && echo "${prefix}.${ip}"
-        } &
-    done
-    wait
-}
-PEERIP="$(findpeer "$PREFIX" "$MYIP")"
-[ "$PEERIP" ] || {
-    echo "Failed to find peer on $IFACE (${PREFIX}.0/24)" >&2
-    exit 1
-}
+while read ip mask
+do
+	if [ "${ip%%.*}" -eq "127" ]; then continue; fi
+	cidr=$(ipcalc "$ip" "$mask" | grep -oE '[0-9.]+/[0-9]+')
+	nmap -T5 "$cidr" -sn | grep 'report' | cut -d' ' -f5 &
+done <<< $(ifconfig | awk '/inet / {print $2 " " $4}')
+wait