aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/main.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-11-04 18:16:15 (GMT)
committerJouni Malinen <j@w1.fi>2009-11-04 18:16:15 (GMT)
commitd27df100b587dd95f3256a8baf9db0c5d4380089 (patch)
tree394c5e612ee63af8453ef0214e7becd6bb101ea2 /wpa_supplicant/main.c
parent0ae7b0869107d4ae1b28bc417cfe4c5b0fc9e0ed (diff)
downloadhostap-d27df100b587dd95f3256a8baf9db0c5d4380089.zip
hostap-d27df100b587dd95f3256a8baf9db0c5d4380089.tar.gz
hostap-d27df100b587dd95f3256a8baf9db0c5d4380089.tar.bz2
Allow driver and ctrl_interface parameters to be overridden
New wpa_supplicant command line options -o<driver> and -O<ctrl> can now be used to override the parameters received in add interface command from dbus or global ctrl_interface. This can be used, e.g., to enable control interface when using NetworkManager (add -O/var/run/wpa_supplicant into the Exec parameter in /usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service). Similarly, this can be used to use another driver wrapper with NetworkManager (e.g., -onl80211 to replace WEXT with nl80211).
Diffstat (limited to 'wpa_supplicant/main.c')
-rw-r--r--wpa_supplicant/main.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c
index 7e77e3f..bb3dcd8 100644
--- a/wpa_supplicant/main.c
+++ b/wpa_supplicant/main.c
@@ -34,6 +34,7 @@ static void usage(void)
" -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"
@@ -67,6 +68,8 @@ static void usage(void)
printf(" -t = include timestamp in debug messages\n"
" -h = show this help text\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");
@@ -140,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:qstuvW");
+ c = getopt(argc, argv, "b:Bc:C:D:df:g:hi:KLNo:O:p:P:qstuvW");
if (c < 0)
break;
switch (c) {
@@ -191,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;