head	1.8;
access;
symbols
	RELENG_8_4:1.8.0.2
	RELENG_9_1_0_RELEASE:1.7.2.1.4.2
	RELENG_9_1:1.7.2.1.0.4
	RELENG_9_1_BP:1.7.2.1
	RELENG_8_3_0_RELEASE:1.6.2.2.8.1
	RELENG_8_3:1.6.2.2.0.8
	RELENG_8_3_BP:1.6.2.2
	RELENG_9_0_0_RELEASE:1.7.2.1.2.1
	RELENG_9_0:1.7.2.1.0.2
	RELENG_9_0_BP:1.7.2.1
	RELENG_9:1.7.0.2
	RELENG_9_BP:1.7
	RELENG_7_4_0_RELEASE:1.2.2.1.8.1
	RELENG_8_2_0_RELEASE:1.6.2.2.6.1
	RELENG_7_4:1.2.2.1.0.8
	RELENG_7_4_BP:1.2.2.1
	RELENG_8_2:1.6.2.2.0.6
	RELENG_8_2_BP:1.6.2.2
	RELENG_8_1_0_RELEASE:1.6.2.2.4.1
	RELENG_8_1:1.6.2.2.0.4
	RELENG_8_1_BP:1.6.2.2
	RELENG_7_3_0_RELEASE:1.2.2.1.6.1
	RELENG_7_3:1.2.2.1.0.6
	RELENG_7_3_BP:1.2.2.1
	RELENG_8_0_0_RELEASE:1.6.2.2.2.1
	RELENG_8_0:1.6.2.2.0.2
	RELENG_8_0_BP:1.6.2.2
	RELENG_8:1.6.0.2
	RELENG_8_BP:1.6
	RELENG_7_2_0_RELEASE:1.2.2.1.4.1
	RELENG_7_2:1.2.2.1.0.4
	RELENG_7_2_BP:1.2.2.1
	RELENG_7_1_0_RELEASE:1.2.2.1.2.1
	RELENG_6_4_0_RELEASE:1.1.2.1.8.1
	RELENG_7_1:1.2.2.1.0.2
	RELENG_7_1_BP:1.2.2.1
	RELENG_6_4:1.1.2.1.0.8
	RELENG_6_4_BP:1.1.2.1
	RELENG_7_0_0_RELEASE:1.2
	RELENG_6_3_0_RELEASE:1.1.2.1
	RELENG_7_0:1.2.0.4
	RELENG_7_0_BP:1.2
	RELENG_6_3:1.1.2.1.0.6
	RELENG_6_3_BP:1.1.2.1
	RELENG_7:1.2.0.2
	RELENG_7_BP:1.2
	RELENG_6_2_0_RELEASE:1.1.2.1
	RELENG_6_2:1.1.2.1.0.4
	RELENG_6_2_BP:1.1.2.1
	RELENG_6_1_0_RELEASE:1.1.2.1
	RELENG_6_1:1.1.2.1.0.2
	RELENG_6_1_BP:1.1.2.1
	RELENG_6_0_0_RELEASE:1.1.4.1
	RELENG_6_0:1.1.0.4
	RELENG_6_0_BP:1.1
	RELENG_6:1.1.0.2
	RELENG_6_BP:1.1;
locks; strict;
comment	@# @;


1.8
date	2012.11.17.01.49.06;	author svnexp;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	2009.08.23.05.47.19;	author dougb;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2008.04.20.20.37.21;	author sam;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	2008.04.08.23.12.15;	author sam;	state Exp;
branches;
next	1.4;

1.4
date	2008.04.08.23.00.04;	author sam;	state Exp;
branches;
next	1.3;

1.3
date	2008.04.08.18.54.42;	author sam;	state Exp;
branches;
next	1.2;

1.2
date	2005.10.19.22.26.47;	author jkim;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2005.06.30.04.52.47;	author brooks;	state Exp;
branches
	1.1.2.1
	1.1.4.1;
next	;

1.8.2.1
date	2012.11.17.01.49.06;	author svnexp;	state dead;
branches;
next	1.8.2.2;

1.8.2.2
date	2013.03.28.13.02.44;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.7.2.1.2.1
	1.7.2.1.4.1;
next	1.7.2.2;

1.7.2.2
date	2012.11.17.11.36.11;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.7.2.1.2.2;

1.7.2.1.2.2
date	2012.11.17.08.36.11;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.7.2.1.4.2;

1.7.2.1.4.2
date	2012.11.17.08.47.01;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches;
next	1.6.2.2;

1.6.2.2
date	2009.08.26.21.08.41;	author dougb;	state Exp;
branches
	1.6.2.2.2.1
	1.6.2.2.4.1
	1.6.2.2.6.1
	1.6.2.2.8.1;
next	1.6.2.3;

1.6.2.3
date	2012.11.17.10.35.57;	author svnexp;	state Exp;
branches;
next	;

1.6.2.2.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.6.2.2.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.6.2.2.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.6.2.2.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.6.2.2.8.2;

1.6.2.2.8.2
date	2012.11.17.08.24.38;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2008.04.25.17.05.42;	author sam;	state Exp;
branches
	1.2.2.1.2.1
	1.2.2.1.4.1
	1.2.2.1.6.1
	1.2.2.1.8.1;
next	1.2.2.2;

1.2.2.2
date	2012.11.17.08.01.23;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.2.2.1.4.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.2.2.1.6.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.2.2.1.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.2.2.1.8.2;

1.2.2.1.8.2
date	2012.11.17.08.16.37;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2005.10.27.17.06.45;	author wpaul;	state Exp;
branches
	1.1.2.1.8.1;
next	1.1.2.2;

1.1.2.2
date	2012.11.17.07.39.09;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.8.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.1.4.1
date	2005.10.27.17.08.55;	author wpaul;	state Exp;
branches;
next	;


desc
@@


1.8
log
@Switching exporter and resync
@
text
@#!/bin/sh
#
# $FreeBSD: head/etc/rc.d/wpa_supplicant 196436 2009-08-23 05:47:19Z dougb $
#

# PROVIDE: wpa_supplicant
# REQUIRE: mountcritremote
# KEYWORD: nojail nostart

. /etc/rc.subr
. /etc/network.subr

name="wpa_supplicant"
rcvar=

ifn="$2"
if [ -z "$ifn" ]; then
	return 1
fi

is_ndis_interface()
{
	case `sysctl -n net.wlan.${1#wlan}.%parent 2>/dev/null` in
		ndis*) true ;;
		*) false ;;
	esac
}

if is_wired_interface ${ifn} ; then
	driver="wired"
elif is_ndis_interface ${ifn} ; then
	driver="ndis"
else
	driver="bsd"
fi

load_rc_config $name

command=${wpa_supplicant_program}
conf_file=${wpa_supplicant_conf_file}
pidfile="/var/run/${name}/${ifn}.pid"
command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile"
required_files=$conf_file
required_modules="wlan_wep wlan_tkip wlan_ccmp"

run_rc_command "$1"
@


1.8.2.1
log
@file wpa_supplicant was added on branch RELENG_8_4 on 2013-03-28 13:02:44 +0000
@
text
@d1 46
@


1.8.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 46
#!/bin/sh
#
# $FreeBSD: releng/8.4/etc/rc.d/wpa_supplicant 196566 2009-08-26 21:08:41Z dougb $
#

# PROVIDE: wpa_supplicant
# REQUIRE: mountcritremote
# KEYWORD: nojail nostart

. /etc/rc.subr
. /etc/network.subr

name="wpa_supplicant"
rcvar=

ifn="$2"
if [ -z "$ifn" ]; then
	return 1
fi

is_ndis_interface()
{
	case `sysctl -n net.wlan.${1#wlan}.%parent 2>/dev/null` in
		ndis*) true ;;
		*) false ;;
	esac
}

if is_wired_interface ${ifn} ; then
	driver="wired"
elif is_ndis_interface ${ifn} ; then
	driver="ndis"
else
	driver="bsd"
fi

load_rc_config $name

command=${wpa_supplicant_program}
conf_file=${wpa_supplicant_conf_file}
pidfile="/var/run/${name}/${ifn}.pid"
command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile"
required_files=$conf_file
required_modules="wlan_wep wlan_tkip wlan_ccmp"

run_rc_command "$1"
@


1.7
log
@SVN rev 196436 on 2009-08-23 05:47:19Z by dougb

Move is_wired_interface() from rc.d/wpa_supplicant into network.subr,
simplify it a bit, and make use of that method to determine if an
interface is a candidate for IPv6 rtsol rather than listing all of the
possible wireless interfaces that should _not_ get rtsol'ed.

This change is only relevant for 8.0+ unless the "wlan mandatory" code
gets ported back to RELENG_7.
@
text
@d3 1
a3 1
# $FreeBSD$
@


1.7.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.7.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d3 1
a3 1
# $FreeBSD: stable/9/etc/rc.d/wpa_supplicant 196436 2009-08-23 05:47:19Z dougb $
@


1.7.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.4.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.1/etc/rc.d/wpa_supplicant 196436 2009-08-23 05:47:19Z dougb $
@


1.7.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.0/etc/rc.d/wpa_supplicant 196436 2009-08-23 05:47:19Z dougb $
@


1.6
log
@rc support for vaps
@
text
@a20 12
is_wired_interface()
{
	media=`ifconfig $1 2>/dev/null | while read line; do
		case "$line" in
		*media:?Ethernet*)
			echo Ethernet
			;;
		esac
	done`
	test "$media" = "Ethernet"
}

@


1.6.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.6.2.2
log
@SVN rev 196566 on 2009-08-26 21:08:41Z by dougb

MFC 196436;

Move is_wired_interface() from rc.d/wpa_supplicant into network.subr,
simplify it a bit, and make use of that method to determine if an
interface is a candidate for IPv6 rtsol rather than listing all of the
possible wireless interfaces that should _not_ get rtsol'ed.

This change is only relevant for 8.0+ unless the "wlan mandatory" code
gets ported back to RELENG_7.

Approved by:	re (kib)
@
text
@d21 12
@


1.6.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d3 1
a3 1
# $FreeBSD: stable/8/etc/rc.d/wpa_supplicant 196566 2009-08-26 21:08:41Z dougb $
@


1.6.2.2.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.6.2.2.8.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/8.3/etc/rc.d/wpa_supplicant 196566 2009-08-26 21:08:41Z dougb $
@


1.6.2.2.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.6.2.2.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.6.2.2.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.5
log
@o add rc.conf knobs to set the wpa_supplicant program, logging flags,
  and config file
o change default logging options from -q to -s (log to syslog); this
  is currently broken for boot-time startup as syslogd is started too
  late but that'll be dealt with separately

MFC after:	2 weeks
@
text
@d33 11
a43 2
case ${ifn} in
ndis*)
d45 3
a47 9
	;;
*)
	if is_wired_interface ${ifn} ; then
		driver="wired"
	else
		driver="bsd"
	fi
	;;
esac
d56 1
@


1.4
log
@add support wired interfaces

MFC after:	2 weeks
@
text
@a14 2
command="/usr/sbin/${name}"
conf_file="/etc/wpa_supplicant.conf"
d48 2
d51 1
a51 1
command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pidfile"
@


1.3
log
@spell pidfile correctly so multiple wpa_supplicant processes can be run

MFC after:	1 week
@
text
@d23 12
d40 5
a44 1
	driver="bsd"
@


1.2
log
@wpa_supplicant(8) requires -D option for ndis(4) now.
@
text
@d34 2
a35 2
pid_file="/var/run/${name}/${ifn}.pid"
command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file"
@


1.2.2.1
log
@MFC 1.3: spell pidfile correctly so multiple wpa_supplicant processes can be run
@
text
@d34 2
a35 2
pidfile="/var/run/${name}/${ifn}.pid"
command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pidfile"
@


1.2.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/7/etc/rc.d/wpa_supplicant 220110 2011-03-28 19:29:30Z dougb $
@


1.2.2.1.8.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.8.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/7.4/etc/rc.d/wpa_supplicant 178513 2008-04-25 17:05:42Z sam $
@


1.2.2.1.6.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.4.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.1
log
@Add support for starting wpa_supplicant by adding the WPA keyword to an
interface's ifconfig_<ifn> entry in /etc/rc.conf.

Approved by:	re (network interface startup blanket)
@
text
@d23 9
d35 1
a35 1
command_args="-B -q -i $ifn -P $pid_file -c $conf_file"
@


1.1.4.1
log
@MFC: synchronize the NDISulator with the head and RELENG_5 branches,
add -D ndis support to wpa_supplicant

Approved by:	re
@
text
@a22 9
case ${ifn} in
ndis*)
	driver="ndis"
	;;
*)
	driver="bsd"
	;;
esac

d26 1
a26 1
command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file"
@


1.1.2.1
log
@MFC: synchronize the NDISulator with the head and RELENG_5 branches,
add -D ndis support to wpa_supplicant

Approved by:	re
@
text
@a22 9
case ${ifn} in
ndis*)
	driver="ndis"
	;;
*)
	driver="bsd"
	;;
esac

d26 1
a26 1
command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file"
@


1.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/6/etc/rc.d/wpa_supplicant 151742 2005-10-27 17:08:57Z wpaul $
@


1.1.2.1.8.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


