Merge branch 'moonshot' of ssh://moonshot.suchdamage.org:822/srv/git/libeap into...

[libeap.git] / wpa_supplicant / main.c

diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c
index 817d973..c0aa59c 100644 (file)
--- a/wpa_supplicant/main.c
+++ b/wpa_supplicant/main.c
@@ -19,19 +19,9 @@
 
 #include "common.h"
 #include "wpa_supplicant_i.h"
+#include "driver_i.h"
 
-
-extern const char *wpa_supplicant_version;
-extern const char *wpa_supplicant_license;
-#ifndef CONFIG_NO_STDOUT_DEBUG
-extern const char *wpa_supplicant_full_license1;
-extern const char *wpa_supplicant_full_license2;
-extern const char *wpa_supplicant_full_license3;
-extern const char *wpa_supplicant_full_license4;
-extern const char *wpa_supplicant_full_license5;
-#endif /* CONFIG_NO_STDOUT_DEBUG */
-
-extern struct wpa_driver_ops *wpa_supplicant_drivers[];
+extern struct wpa_driver_ops *wpa_drivers[];
 
 
 static void usage(void)
@@ -39,11 +29,12 @@ static void usage(void)
        int i;
        printf("%s\n\n%s\n"
               "usage:\n"
-              "  wpa_supplicant [-BddhKLqqtuvwW] [-P<pid file>] "
+              "  wpa_supplicant [-BddhKLqqstuvW] [-P<pid file>] "
               "[-g<global ctrl>] \\\n"
               "        -i<ifname> -c<config file> [-C<ctrl>] [-D<driver>] "
               "[-p<driver_param>] \\\n"
               "        [-b<br_ifname>] [-f<debug file>] \\\n"
+              "        [-o<override driver>] [-O<override ctrl>] \\\n"
               "        [-N -i<ifname> -c<conf> [-C<ctrl>] "
               "[-D<driver>] \\\n"
               "        [-p<driver_param>] [-b<br_ifname>] ...]\n"
@@ -51,10 +42,10 @@ static void usage(void)
               "drivers:\n",
               wpa_supplicant_version, wpa_supplicant_license);
 
-       for (i = 0; wpa_supplicant_drivers[i]; i++) {
+       for (i = 0; wpa_drivers[i]; i++) {
                printf("  %s = %s\n",
-                      wpa_supplicant_drivers[i]->name,
-                      wpa_supplicant_drivers[i]->desc);
+                      wpa_drivers[i]->name,
+                      wpa_drivers[i]->desc);
        }
 
 #ifndef CONFIG_NO_STDOUT_DEBUG
@@ -65,27 +56,33 @@ static void usage(void)
               "  -C = ctrl_interface parameter (only used if -c is not)\n"
               "  -i = interface name\n"
               "  -d = increase debugging verbosity (-dd even more)\n"
-              "  -D = driver name\n"
+              "  -D = driver name (can be multiple drivers: nl80211,wext)\n");
 #ifdef CONFIG_DEBUG_FILE
-              "  -f = log output to debug file instead of stdout\n"
+       printf("  -f = log output to debug file instead of stdout\n");
 #endif /* CONFIG_DEBUG_FILE */
-              "  -g = global ctrl_interface\n"
-              "  -K = include keys (passwords, etc.) in debug output\n"
-              "  -t = include timestamp in debug messages\n"
+       printf("  -g = global ctrl_interface\n"
+              "  -K = include keys (passwords, etc.) in debug output\n");
+#ifdef CONFIG_DEBUG_SYSLOG
+       printf("  -s = log output to syslog instead of stdout\n");
+#endif /* CONFIG_DEBUG_SYSLOG */
+       printf("  -t = include timestamp in debug messages\n"
               "  -h = show this help text\n"
-              "  -L = show license (GPL and BSD)\n");
-       printf("  -p = driver parameters\n"
+              "  -L = show license (GPL and BSD)\n"
+              "  -o = override driver parameter for new interfaces\n"
+              "  -O = override ctrl_interface parameter for new interfaces\n"
+              "  -p = driver parameters\n"
               "  -P = PID file\n"
-              "  -q = decrease debugging verbosity (-qq even less)\n"
-#ifdef CONFIG_CTRL_IFACE_DBUS
-              "  -u = enable DBus control interface\n"
-#endif /* CONFIG_CTRL_IFACE_DBUS */
-              "  -v = show version\n"
+              "  -q = decrease debugging verbosity (-qq even less)\n");
+#ifdef CONFIG_DBUS
+       printf("  -u = enable DBus control interface\n");
+#endif /* CONFIG_DBUS */
+       printf("  -v = show version\n"
               "  -W = wait for a control interface monitor before starting\n"
               "  -N = start describing new interface\n");
 
        printf("example:\n"
-              "  wpa_supplicant -Dwext -iwlan0 -c/etc/wpa_supplicant.conf\n");
+              "  wpa_supplicant -D%s -iwlan0 -c/etc/wpa_supplicant.conf\n",
+              wpa_drivers[i] ? wpa_drivers[i]->name : "wext");
 #endif /* CONFIG_NO_STDOUT_DEBUG */
 }
 
@@ -146,7 +143,7 @@ int main(int argc, char *argv[])
        wpa_supplicant_fd_workaround();
 
        for (;;) {
-               c = getopt(argc, argv, "b:Bc:C:D:df:g:hi:KLNp:P:qtuvW");
+               c = getopt(argc, argv, "b:Bc:C:D:df:g:hi:KLNo:O:p:P:qstuvW");
                if (c < 0)
                        break;
                switch (c) {
@@ -197,6 +194,12 @@ int main(int argc, char *argv[])
                        license();
                        exitcode = 0;
                        goto out;
+               case 'o':
+                       params.override_driver = optarg;
+                       break;
+               case 'O':
+                       params.override_ctrl_interface = optarg;
+                       break;
                case 'p':
                        iface->driver_param = optarg;
                        break;
@@ -207,14 +210,19 @@ int main(int argc, char *argv[])
                case 'q':
                        params.wpa_debug_level++;
                        break;
+#ifdef CONFIG_DEBUG_SYSLOG
+               case 's':
+                       params.wpa_debug_syslog++;
+                       break;
+#endif /* CONFIG_DEBUG_SYSLOG */
                case 't':
                        params.wpa_debug_timestamp++;
                        break;
-#ifdef CONFIG_CTRL_IFACE_DBUS
+#ifdef CONFIG_DBUS
                case 'u':
                        params.dbus_ctrl_interface = 1;
                        break;
-#endif /* CONFIG_CTRL_IFACE_DBUS */
+#endif /* CONFIG_DBUS */
                case 'v':
                        printf("%s\n", wpa_supplicant_version);
                        exitcode = 0;