Tweak dhcp-discover subcommand

deploy.sh

@@ -42,11 +42,18 @@ for dir in "${path[@]}"; do
         ls -1"
     )"
 
-    # Only try to create the subdir if does not already exist
-    if [[ "${dir_content[*]}" =~ "${dir}" ]]; then
-        echo "Dir: ${old_path}/${dir} already exists"
-    else
-        echo "Creating dir: ${old_path}/${dir}"
+    # Loop over the dir content and check if this exact dir already exists
+    path_exists=0
+    for content in "${dir_content[@]}"; do
+        if [[ "${content}" == "${dir}" ]]; then
+            echo "Dir: ${old_path}/${dir} already exists"
+            path_exists=1
+        fi
+    done
+
+    # If the dir does not exist, create it
+    if [[ "${path_exists}" -eq 0 ]]; then
+        echo "Dir: ${old_path}/${dir} does not exist. Creating it."
         sftp -b - "${USER}"@"${HOST}" <<< "cd ${old_path}
         -mkdir ${dir}"
     fi

src/syscalls/sendto.c

@@ -34,7 +34,8 @@ ssize_t FTLsendto(int sockfd, void *buf, size_t len, int flags, const struct soc
 
 	// Final error checking (may have failed for some other reason then an
 	// EINTR = interrupted system call), also ignore EPROTONOSUPPORT (ARP scanning)
-	if(ret < 0 && errno != EPROTONOSUPPORT)
+	// and EPERM + ENOKEY (DHCP probing)
+	if(ret < 0 && errno != EPROTONOSUPPORT && errno != EPERM && errno != ENOKEY)
 		logg("WARN: Could not sendto() in %s() (%s:%i): %s",
 		     func, file, line, strerror(errno));
 

src/tools/arp-scan.c

@@ -632,6 +632,18 @@ int run_arp_scan(const bool scan_all, const bool extreme_mode)
 		// Create a thread for interfaces of type AF_INET
 		if(tmp->ifa_addr && tmp->ifa_addr->sa_family == AF_INET)
 		{
+			// Skip interface scan if ...
+			// - interface is not up
+			// - ARP is not supported
+			// - interface is loopback net
+			if(!(tmp->ifa_flags & IFF_UP) ||
+			    (tmp->ifa_flags & IFF_NOARP) ||
+			    (tmp->ifa_flags & IFF_LOOPBACK))
+			{
+				tmp = tmp->ifa_next;
+				continue;
+			}
+
 			thread_data[tid].ifa = tmp;
 			strncpy(thread_data[tid].iface, tmp->ifa_name, sizeof(thread_data[tid].iface) - 1);