updated hash after commit

README.md

@@ -1,6 +1,6 @@
 # conn
 
-__this branch has been merged into main and is no longer maintained__
+__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>

conn.sh

@@ -17,6 +17,19 @@ 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 "#############################################"
@@ -42,10 +55,9 @@ function run_update {
 }
 
 function prepare {
-  check_update
+  #check_update
-  get_args "$@"
+  get_args $@
   set_argvars $args
-  validate $input
 }
 
 function get_args {
@@ -55,175 +67,35 @@ function get_args {
     input=$(echo "$input" | sed "s/$arg//g")
   done
 
-  #quick fix to prevent nslookups interactive mode being triggered by invalid arguments
+# needs work
-  #some other places in the code have also gotten a leading space to prevent similar issues
+#  argcheck=$(echo $input | grep -o -e " -* " | xargs)
-  input=$(echo "$input" | tr -d "-")
+#  echo $argcheck
+#  if [[ -n "$argcheck" ]];then
+#    for arg in $argcheck; do
+#      echo "the given argument \""$arg"\" is not known"
+#    done
+#  fi
 }
 
 function set_argvars {
   if [[ $@ =~ -6 ]] || [[ $@ =~ --force-ipv6 ]];then
-    only="-6"
+    only6=true
   fi
-  if [[ $@ =~ -4 ]] || [[ $@ =~ --force-ipv4 ]];then
-    only="-4"
-  fi
-  if [[ $@ =~ -y ]] || [[ $@ =~ --yes ]];then
-    doportscan=true
-  fi
-  if [[ $@ =~ -n ]] || [[ $@ =~ --no ]];then
-    doportscan=false
-  fi
-  if [[ $@ =~ -s ]] || [[ $@ =~ --simple ]];then
-    simpleoutput=true
-  fi
-  if [[ $@ =~ -w ]] || [[ $@ =~ --wait ]];then
-    waitcheck=true
-  fi
-  if [[ $@ =~ -f ]] || [[ $@ =~ --fast ]];then
-    oscheck=false
-  fi
-}
-
-function validate {
-  for arg in $@; do
-    if ip route show " $arg" 2&> /dev/null;then
-      hosts="$hosts $arg"
-    elif nslookup "$arg" > /dev/null;then
-      hosts="$hosts $arg"
-    else
-      echo "invalid input: $arg"
-    fi
-  done
 }
 
 function main {
-  if [[ $simpleoutput == true ]] && [[ -n $hosts ]];then
+  true
-    echo "-------------------Availability----------------------"
-    fping $only -e $@
-    if [[ $oscheck != "false" ]];then
-      echo ""
-      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
-    for host in $hosts;do
-      if [[ $waitcheck == true ]];then
-        echo "-w used, waiting for active connection"
-        echo "checking connection status for $host"
-        fping=$(fping $only -a $host)
-        if [[ ! $oscheck == false ]];then
-          p135=$(nping $only -q1 -c1 -p135 $host)
-          p3389=$(nping $only -q1 -c1 -p3389 $host)
-        fi
-        if [[ $fping != "$host" ]] && [[ -n $(echo $p135 | grep "Successful connections: 1") ]] || [[ $fping != "$host" ]] && [[ -n $(echo $p3389 | grep "Successful connections: 1") ]];then
-          echo "-------------------Availability----------------------"
-          echo "note: this seems to be a windows machine which does not respond to ICMP"
-          notify-send "$host is now reachable" "and seems to be a windows machine" -u normal -t 30000 -a conn
-          echo "-----------------------------------------------------"
-        elif [[ $fping = "$host" ]] && [[ -n $(echo $p135 | grep "Successful connections: 1") ]];then
-          echo "-------------------Availability----------------------"
-          echo "note: this seems to be a windows machine which does respond to ICMP"
-          fping -e $host
-          notify-send "$host is now reachable" "and seems to be a windows machine" -u normal -t 30000 -a conn
-          echo "-----------------------------------------------------" 
-        else
-          while [[ "$(fping $only -m -q -u $host)" == "$host" ]]; do :
-            done
-          echo "-------------------Availability----------------------"
-          fping -e $host
-          if [[ ! $oscheck == false ]];then
-            rescue=$(nping $only -q1 -c1 -p22,222 $host)
-          fi
-          if [[ -n $(echo $rescue | grep "Successful connections: 1") ]];then
-            echo "note: this seems to be a linux machine"
-            notify-send "$host is now reachable" "and seems to be in a linux system" -u normal -t 30000 -a conn
-          elif [[ -n $(echo $rescue | grep "Successful connections: 2") ]];then
-            echo "note: this machine seems to be in the rescue system"
-            notify-send "$host is now reachable" "and seems to be in the rescue system" -u normal -t 30000 -a conn
-          elif [[ -n $(echo $p135 | grep "Successful connections: 1") ]] || [[ -n $(echo $p3389 | grep "Successful connections: 1") ]];then
-            echo "note: this machine seems to be booted into windows"
-            notify-send "$host is now reachable" "and seems to be booted into windows" -u normal -t 30000 -a conn
-          else
-            notify-send "$host is now reachable" -u normal -t 30000 -a conn
-          fi
-          echo "-----------------------------------------------------"
-        fi
-      else
-        echo "checking connection status for $host"
-        fping=$(fping $only -a $host)
-        if [[ ! $oscheck == false ]];then
-          p135=$(nping $only -q1 -c1 -p135 $host)
-          p3389=$(nping $only -q1 -c1 -p3389 $host)
-        fi
-        if [[ $fping != "$host" ]] && [[ -n $(echo $p135 | grep "Successful connections: 1") ]] || [[ $fping != "$host" ]] && [[ -n $(echo $p3389 | grep "Successful connections: 1") ]];then
-          echo "-------------------Availability----------------------"
-          echo "note: this seems to be a windows machine which does not respond to ICMP"
-          echo "-----------------------------------------------------"
-        elif [[ $fping != "$host" ]] && [[ -z $(echo $p135 | grep "Successful connections: 1") ]] || [[ $fping != "$host" ]] && [[ -z $(echo $p3389 | grep "Successful connections: 1") ]];then
-          echo "-------------------Availability----------------------"
-          echo "$host is not reachable"
-          echo "-----------------------------------------------------"
-        else
-          echo "-------------------Availability----------------------"
-          fping $only -e $host
-          if [[ ! $oscheck == false ]];then
-            rescue=$(nping $only -q1 -c1 -p22,222 $host)
-            if [[ -n $(echo $rescue | grep "Successful connections: 1") ]];then
-              echo "note: this seems to be a linux machine"
-            elif [[ -n $(echo $rescue | grep "Successful connections: 2") ]];then
-              echo "note: this machine seems to be in the rescue system"
-            elif [[ -n $(echo $p135 | grep "Successful connections: 1") ]] || [[ -n $(echo $p3389 | grep "Successful connections: 1") ]];then
-              echo "note: this machine seems to be booted into windows"
-            fi
-          fi
-          echo "-----------------------------------------------------"
-        fi
-      fi
-      if [[ ! $doportscan == false ]];then
-        if [[ $doportscan == true ]];then
-          portscan=y
-        else
-          echo "portscan? (y/n) (default: y)"
-          read portscan
-        fi
-        if [[ "$portscan" = "y" ]] || [[ -z "$portscan" ]]; then
-          echo "-------------------Portscan---------------------"
-          nmap $only --reason -Pn $host
-          echo ""
-          fping $only -c 4 $host
-          echo "------------------------------------------------"
-          echo ""
-        else
-          echo ""
-        fi
-      fi
-    done
-  fi
 }
 
 if [[ -n $1 ]];then
-  prepare "$@"
+  prepare $@
-  main "$hosts"
+  main "$input"
 elif [[ "$1" == "-u" ]];then
   run_update
 elif [[ "$1" == "-h" ]];then
   check_update
   echo "$show_help"
 else
-  check_update
+  #check_update
   echo "$show_help"
 fi

hash

@@ -1 +1 @@
-0f91143820ae11bd353a4ff25dc8cca5
+c1c8ed7c16c6b7ee272f52ee7c86aad5