Merge pull request #105 from derekdai/master

Add debian support to kill-wpa.sh and find wpa_supplicant throught PATH

README.md

@@ -103,7 +103,7 @@ If you feel confidence enough (since systemd is the entrypoint for an OS) extrac
 
 Steps to use it as sink:
 
- 1. shutdown wpa_supplicant
+ 1. shutdown wpa_supplicant and NetworkManager
 
         $ sudo kill -9 $(ps -ef | grep wpa_supplican[t] | awk '{print $2}')
         # now you can use `res/kill-wpa.sh`

res/miracle-utils.sh

@@ -113,12 +113,18 @@ function check_archlinux_distro {
 function check_ubuntu_distro {
    cat /proc/version | grep -i ubuntu
 }
+#
+# checking if distro is debian
+#
+function check_debian_distro {
+   cat /proc/version | grep -i debian
+}
 
 #
 # ubuntu manager restarts automatically wpa_supplicant
 #
 function kill_ubuntu_network_manager {
-   if check_ubuntu_distro
+   if check_ubuntu_distro || check_debian_distro
    then
       echo stopping NetworkManager
       sudo service NetworkManager stop
@@ -140,7 +146,7 @@ function kill_archlinux_network_manager {
 # start ubuntu manager
 #
 function start_ubuntu_network_manager {
-   if check_ubuntu_distro
+   if check_ubuntu_distro || check_debian_distro
    then
       echo starting NetworkManager
       sudo service NetworkManager start

res/normal-wifi.sh

@@ -47,7 +47,7 @@ CONFIG_FILE=${1:-/run/network/wpa_supplicant_${ETHERNAME}.conf}
 
 
 echo starting wpa_supplicant for normal connection
-if check_ubuntu_distro
+if check_ubuntu_distro || check_debian_distro
 then
     start_ubuntu_network_manager
     sudo wpa_supplicant -B -u -s -O /var/run/wpa_supplicant

src/wifi/wifid-supplicant.c

@@ -24,6 +24,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <systemd/sd-event.h>
 #include <systemd/sd-journal.h>
@@ -2401,6 +2402,49 @@ static void supplicant_run(struct supplicant *s, const char *binary)
 	execve(argv[0], argv, environ);
 }
 
+static int supplicant_find(char **binary)
+{
+    _shl_free_ char *path = getenv("PATH");
+    if(!path) {
+        return -EINVAL;
+    }
+
+    path = strdup(path);
+    if(!path) {
+        return log_ENOMEM();
+    }
+
+    struct stat bin_stat;
+    char *curr = path, *next;
+    while(1) {
+        curr = strtok_r(curr, ":", &next);
+        if(!curr) {
+            break;
+        }
+
+        _shl_free_ char *bin = shl_strcat(curr, "/wpa_supplicant");
+        if (!bin)
+            return log_ENOMEM();
+
+        if(stat(bin, &bin_stat) < 0) {
+            if(ENOENT == errno) {
+                goto end;
+            }
+            return log_ERRNO();
+        }
+
+        if (!access(bin, X_OK)) {
+            *binary = strdup(bin);
+            return 0;
+        }
+
+end:
+        curr = NULL;
+    }
+
+    return -EINVAL;
+}
+
 static int supplicant_spawn(struct supplicant *s)
 {
 	_shl_free_ char *binary = NULL;
@@ -2414,14 +2458,12 @@ static int supplicant_spawn(struct supplicant *s)
 
 	log_debug("spawn supplicant of %s", s->l->ifname);
 
-	binary = shl_strcat(arg_wpa_bindir, "/wpa_supplicant");
-	if (!binary)
-		return log_ENOMEM();
+    if (supplicant_find(&binary) < 0) {
+        log_error("execution of wpas (%s) not possible: %m", binary);
+        return -EINVAL;
+    }
 
-	if (access(binary, X_OK) < 0) {
-		log_error("execution of wpas (%s) not possible: %m", binary);
-		return -EINVAL;
-	}
+    log_info("wpa_supplicant found: %s", binary);
 
 	pid = fork();
 	if (pid < 0) {

src/wifi/wifid.c

@@ -40,7 +40,6 @@
 #include "wifid.h"
 #include "config.h"
 
-const char *arg_wpa_bindir = "/usr/bin";
 const char *interface_name = NULL;
 unsigned int arg_wpa_loglevel = LOG_NOTICE;
 
@@ -457,7 +456,6 @@ static int help(void)
 	       "\n"
 	       "  -i --interface           Choose the interface to use\n"
 	       "\n"
-	       "     --wpa-bindir <dir>    wpa_supplicant binary dir [/usr/bin]\n"
 	       "     --wpa-loglevel <lvl   wpa_supplicant log-level\n"
 	       , program_invocation_short_name);
 	/*
@@ -475,7 +473,6 @@ static int parse_argv(int argc, char *argv[])
 		ARG_LOG_LEVEL,
 		ARG_LOG_TIME,
 
-		ARG_WPA_BINDIR,
 		ARG_WPA_LOGLEVEL,
 	};
 	static const struct option options[] = {
@@ -484,7 +481,6 @@ static int parse_argv(int argc, char *argv[])
 		{ "log-level",	required_argument,	NULL,	ARG_LOG_LEVEL },
 		{ "log-time",	no_argument,		NULL,	ARG_LOG_TIME },
 
-		{ "wpa-bindir",		required_argument,	NULL,	ARG_WPA_BINDIR },
 		{ "wpa-loglevel",	required_argument,	NULL,	ARG_WPA_LOGLEVEL },
 		{ "interface",	required_argument,	NULL,	'i' },
 		{}
@@ -508,9 +504,6 @@ static int parse_argv(int argc, char *argv[])
 			log_init_time();
 			break;
 
-		case ARG_WPA_BINDIR:
-			arg_wpa_bindir = optarg;
-			break;
 		case ARG_WPA_LOGLEVEL:
 			arg_wpa_loglevel = log_parse_arg(optarg);
 			break;

src/wifi/wifid.h

@@ -203,7 +203,6 @@ void manager_dbus_disconnect(struct manager *m);
 
 /* cli arguments */
 
-extern const char *arg_wpa_bindir;
 extern unsigned int arg_wpa_loglevel;
 
 #endif /* WIFID_H */