updated hash after commit

Merge rewrite into main

README.md

@@ -1,32 +1,29 @@
 # conn
 
-__the script is actively being rewritten on this branch and might not be on a usable state right now__
-
 quick and dirty server availability check <br> <br>
 basically just a way too complex wrapper for nmap and fping <br>
+the pre-rewrite version is available as conn.sh.old and is no longer maintained <br>
 
 ### features: 
-- multi-input detection
+- ~~multi-input detection~~ (not needed anymore since the rewrite)
-- ipv4 input detection
+- ~~ipv4 input detection~~ (not needed anymore since the rewrite)
-- ipv6 input detection
+- ~~ipv6 input detection~~ (not needed anymore since the rewrite)
 - waiting for availability
 - send notification on availability
 - updater built in
 
 # usage
-Usage: conn (options) [ip] <br>
+Usage: conn <args> [IP(s)/hostname(s)] <br>
 Options: <br>
- -m/--multi -- test multiple ips / disable portscan <br>
+  -h / --help       show help page (this) <br>
- -h/--help -- show help <br>
+  -6 / --force-ipv6 force ipv6 portscanning (also forces portscanning) <br>
- -6/--force-ipv6 -- force ipv6 portscanning (also forces portscanning) <br>
+  -4 / --force-ipv4 force ipv4 portscanning (also forces portscanning) <br>
- -4/--force-ipv4 -- force ipv4 portscanning (also forces portscanning) <br>
+  -y / --yes        portscan without asking <br>
- -y/--yes -- portscan without asking <br>
+  -n / --no         dont portscan <br>
- -n/--no -- dont portscan <br>
+  -w / --wait       wait for active connection <br>
- -p/--portscan -- same as -y <br>
+  -u / --update     update the script <br>
- -w/--wait -- wait for active connection <br>
+  -f / --fast       disable os check <br>
- -u/--update -- update the script <br>
+  -s / --simple     simplify output <br>
- -f/ --fast -- disable os check <br>
- -s/ --simple -- same as -f <br>
 
 # installation
 1. download the script: <br>
@@ -46,28 +43,33 @@ chmod +x conn.sh && ./conn.sh
 
 # sample output
 ```bash
-checking connection status for localhost
+./conn.sh nils.lol
+checking connection status for nils.lol
 -------------------Availability----------------------
-localhost is alive (545 ms)
+nils.lol is alive (35.5 ms)
 note: this seems to be a linux machine
 -----------------------------------------------------
+portscan? (y/n) (default: y)
+
 -------------------Portscan---------------------
-Starting Nmap 7.91 ( https://nmap.org ) at 2021-02-15 15:07 CET
+Starting Nmap 7.92 ( https://nmap.org ) at 2021-12-05 13:42 CET
-Nmap scan report for localhost (127.0.0.1)
+Nmap scan report for nils.lol (168.119.185.158)
-Host is up, received user-set (0.047s latency).
+Host is up, received user-set (0.048s latency).
-Other addresses for localhost (not scanned): ::1
+Not shown: 995 filtered tcp ports (no-response)
-Not shown: 998 closed ports
-Reason: 998 conn-refused
 PORT    STATE  SERVICE   REASON
+21/tcp  open   ftp       syn-ack
 22/tcp  open   ssh       syn-ack
-631/tcp open  ipp     syn-ack
+80/tcp  open   http      syn-ack
-Nmap done: 1 IP address (1 host up) scanned in 3.23 seconds
+81/tcp  closed hosts2-ns conn-refused
+443/tcp open   https     syn-ack
 
-localhost : [0], 64 bytes, 0.185 ms (0.185 avg, 0% loss)
+Nmap done: 1 IP address (1 host up) scanned in 5.54 seconds
-localhost : [1], 64 bytes, 0.058 ms (0.122 avg, 0% loss)
-localhost : [2], 64 bytes, 0.060 ms (0.101 avg, 0% loss)
-localhost : [3], 64 bytes, 0.081 ms (0.096 avg, 0% loss)
 
-localhost : xmt/rcv/%loss = 4/4/0%, min/avg/max = 0.058/0.096/0.185
+nils.lol : [0], 64 bytes, 36.5 ms (36.5 avg, 0% loss)
+nils.lol : [1], 64 bytes, 35.7 ms (36.1 avg, 0% loss)
+nils.lol : [2], 64 bytes, 34.7 ms (35.6 avg, 0% loss)
+nils.lol : [3], 64 bytes, 33.5 ms (35.1 avg, 0% loss)
+
+nils.lol : xmt/rcv/%loss = 4/4/0%, min/avg/max = 33.5/35.1/36.5
 ------------------------------------------------
 ```

conn.sh

@@ -17,19 +17,6 @@ arguments:
   -f / --fast       disable os check
   -s / --simple     simplify output"
 
-show_notfound="[error] argument not found
-
-available arguments:
-  -h / --help       show help page (this)
-  -6 / --force-ipv6 force ipv6 portscanning (also forces portscanning)
-  -4 / --force-ipv4 force ipv4 portscanning (also forces portscanning)
-  -y / --yes        portscan without asking
-  -n / --no         dont portscan
-  -w / --wait       wait for active connection
-  -u / --update     update the script
-  -f / --fast       disable os check
-  -s / --simple     simplify output"
-
 function check_update {
   if [[ $(curl -s https://raw.githubusercontent.com/byReqz/conn/main/hash) != $(md5sum $0 | cut -c -32) ]] && [[ -z $1 ]] || [[ $(curl -s https://raw.githubusercontent.com/byReqz/conn/main/hash) != $(md5sum $0 | cut -c -32) ]] && [[ $1 != "--update" ]] || [[ $(curl -s https://raw.githubusercontent.com/byReqz/conn/main/hash) != $(md5sum $0 | cut -c -32) ]] && [[ $1 != "-u" ]];then
     echo "#############################################"
@@ -55,7 +42,7 @@ function run_update {
 }
 
 function prepare {
-  #check_update
+  check_update
   get_args "$@"
   set_argvars $args
   validate $input
@@ -68,18 +55,16 @@ function get_args {
     input=$(echo "$input" | sed "s/$arg//g")
   done
 
-# needs work
+  #quick fix to prevent nslookups interactive mode being triggered by invalid arguments
-#  argcheck=$(echo $input | grep -o -e " -* " | xargs)
-#  echo $argcheck
-#  if [[ -n "$argcheck" ]];then
-#    for arg in $argcheck; do
-#      echo "the given argument \""$arg"\" is not known"
-#    done
-#  fi
-
-  #quick fix to prevent nslookups interactive mode being triggered by wrong arguments
   #some other places in the code have also gotten a leading space to prevent similar issues
-  input=$(echo "$input" | tr -d "-")
+  for v in $input; do
+    if [[ ! $(echo $v | cut -c1) == "-" ]];then
+      newinput="$newinput $v"
+    else
+      newinput="$newinput $(echo $v | cut -c 2-)"
+    fi
+  done
+  input="$newinput"
 }
 
 function set_argvars {
@@ -108,9 +93,12 @@ function set_argvars {
 
 function validate {
   for arg in $@; do
-    if $(ip route show " $arg" 2&> /dev/null);then
+    if [[ "$arg" =~ : ]];then
+      only="-6" # enable ipv6, this needs a more complex function to avoid treating every argument as v6
+    fi
+    if ip route show "$arg" 2&> /dev/null;then
       hosts="$hosts $arg"
-    elif $(nslookup "$arg" > /dev/null);then
+    elif nslookup "$arg" > /dev/null;then
       hosts="$hosts $arg"
     else
       echo "invalid input: $arg"
@@ -122,10 +110,23 @@ function main {
   if [[ $simpleoutput == true ]] && [[ -n $hosts ]];then
     echo "-------------------Availability----------------------"
     fping $only -e $@
-    quickport=$(nping $only -c1 -p22,222,3389,135 $@ | grep -e "completed")
+    if [[ $oscheck != "false" ]];then
-    if [[ -n $quickport ]];then
       echo ""
-      echo "$quickport"
+      for host in $@;do
+        linuxping=$(nping $only -c1 -p22,222 "$host")
+        if [[ -n $(echo "$linuxping" | grep -e "Successful connections: 1") ]];then
+          echo "$host seems to be booted into a Linux system"
+        elif [[ -n $(echo "$linuxping" | grep -e "Successful connections: 2") ]];then
+          echo "$host seems to be booted into the rescue system"
+        fi
+        winping135=$(nping $only -c1 -p135 "$host")
+        winping3389=$(nping $only -c1 -p3389 "$host")
+        if [[ -n $(echo "$winping135" | grep -e "Successful connections: 1") ]] && [[ -n $(echo "$winping3389" | grep -e "Successful connections: 1") ]];then
+          echo "$host seems to be booted into Windows"
+        elif [[ -z $(fping $only -a $host) ]] && [[ -n $(echo "$winping3389" | grep -e "Successful connections: 1") ]];then
+          echo "$host seems to be booted into (desktop) Windows"
+        fi
+    done
     fi
     echo "-----------------------------------------------------"
   else
@@ -233,6 +234,6 @@ elif [[ "$1" == "-h" ]];then
   check_update
   echo "$show_help"
 else
-  #check_update
+  check_update
   echo "$show_help"
 fi

hash

@@ -1 +1 @@
-5b070b9e7adbdc0b30d6feeae8db6d24
+03ef6d9fd9c11b849ada616caf66bf22