diff options
| author | sam <sam@FreeBSD.org> | 2006-03-07 05:54:20 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2006-03-07 05:54:20 +0000 |
| commit | ccaf726b20f34444c6cbe5c3fb217acfbac4d5e6 (patch) | |
| tree | 71109b51f18b2430ee5028f4d31e9c0897b4d55e /usr.sbin/wpa/wpa_supplicant | |
| parent | 7ec4eb033d83d1150a5d461349c32d7113770a57 (diff) | |
| download | FreeBSD-src-ccaf726b20f34444c6cbe5c3fb217acfbac4d5e6.zip FreeBSD-src-ccaf726b20f34444c6cbe5c3fb217acfbac4d5e6.tar.gz | |
update for v0.4.8 import of wpa_supplicant and hostapd
MFC after: 2 weeks
Diffstat (limited to 'usr.sbin/wpa/wpa_supplicant')
| -rw-r--r-- | usr.sbin/wpa/wpa_supplicant/Makefile | 11 | ||||
| -rw-r--r-- | usr.sbin/wpa/wpa_supplicant/driver_freebsd.c | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile index 3c138fc..62ecde8 100644 --- a/usr.sbin/wpa/wpa_supplicant/Makefile +++ b/usr.sbin/wpa/wpa_supplicant/Makefile @@ -5,8 +5,8 @@ WPA_SUPPLICANT_DISTDIR?= ${.CURDIR}/../../../contrib/wpa_supplicant PROG= wpa_supplicant SRCS= config.c eloop.c common.c md5.c rc4.c sha1.c aes_wrap.c \ - wpa_supplicant.c wpa.c \ - ctrl_iface.c l2_packet.c drivers.c driver_freebsd.c \ + wpa_supplicant.c events.c wpa.c preauth.c \ + ctrl_iface.c l2_packet.c main.c drivers.c driver_freebsd.c \ driver_ndis.c driver_ndis_.c Packet32.c MAN= wpa_supplicant.8 wpa_supplicant.conf.5 @@ -19,6 +19,10 @@ CFLAGS+= -g DPADD+= ${LIBPCAP} LDADD+= -lpcap +# NB: we only support wpa_supplicant.conf file +SRCS+= config_file.c base64.c +CFLAGS+=-DCONFIG_BACKEND_FILE + .if !defined(NO_WPA_SUPPLICANT_EAPOL) SRCS+= eapol_sm.c eap.c CFLAGS+= -DIEEE8021X_EAPOL @@ -26,7 +30,8 @@ CFLAGS+= -DIEEE8021X_EAPOL .if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) CFLAGS+=-DEAP_TLS -DEAP_PEAP -DEAP_MSCHAPv2 -DEAP_LEAP -DEAP_PSK \ -DEAP_TLV -DEAP_TLS_FUNCS -SRCS+= eap_tls.c eap_peap.c eap_mschapv2.c eap_leap.c eap_psk.c \ +SRCS+= eap_tls.c eap_peap.c eap_mschapv2.c eap_leap.c \ + eap_psk.c eap_psk_common.c \ eap_tlv.c eap_tls_common.c tls_openssl.c ms_funcs.c crypto.c CFLAGS+=-DEAP_TTLS -DEAP_MD5 diff --git a/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c b/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c index 6a02df6..b88a9cc 100644 --- a/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c +++ b/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c @@ -78,7 +78,8 @@ get80211var(struct wpa_driver_bsd_data *drv, int op, void *arg, int arg_len) ireq.i_data = arg; if (ioctl(drv->sock, SIOCG80211, &ireq) < 0) { - perror("ioctl[SIOCG80211]"); + fprintf(stderr, "ioctl[SIOCG80211, op %u, len %u]: %s\n", + op, arg_len, strerror(errno)); return -1; } return ireq.i_len; |
