Date: Thu, 17 Jun 2010 11:06:25 GMT From: Alexander Motin <mav@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 179703 for review Message-ID: <201006171106.o5HB6Pa6087465@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@179703?ac=10 Change 179703 by mav@mav_mavtest on 2010/06/17 11:06:06 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile.inc1#24 integrate .. //depot/projects/scottl-camlock/src/bin/sh/histedit.c#8 integrate .. //depot/projects/scottl-camlock/src/contrib/tzcode/zic/zic.8#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/ChangeLog#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/Makefile#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/README-WPS#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/ap.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/beacon.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/config.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/config.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/doc/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/driver_bsd.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/driver_hostap.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/driver_wired.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/drivers.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/hostapd.8#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/hostapd.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/hostapd.conf#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/hostapd_cli.1#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/hw_features.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/ieee802_11.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/preauth.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/radiotap.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/radiotap.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/radiotap_iter.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/wme.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/wme.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/wpa.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/wpa.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/wpa_auth_i.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/wpa_auth_ie.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/wpa_ft.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/wps_hostapd.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/wps_hostapd.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/common/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/src/common/ieee802_11_common.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/common/ieee802_11_common.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/common/ieee802_11_defs.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/common/nl80211_copy.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/common/version.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/common/wireless_copy.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/common/wpa_common.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/crypto/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/src/crypto/crypto_cryptoapi.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/crypto/crypto_gnutls.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/crypto/crypto_internal.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/crypto/dh_groups.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/crypto/ms_funcs.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/crypto/rc4.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/crypto/rc4.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/crypto/sha1.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/crypto/sha256.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/crypto/tls.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/crypto/tls_gnutls.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/crypto/tls_openssl.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/drivers/Makefile#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/drivers/driver.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/drivers/driver_ndis.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/drivers/driver_ndis_.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/drivers/driver_ndiswrapper.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/drivers/driver_wired.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/drivers/ndis_events.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/drivers/radiotap.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/drivers/radiotap.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/drivers/radiotap_iter.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_common/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_common/eap_defs.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_common/eap_fast_common.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_common/eap_tlv_common.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_peer/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_peer/eap_fast.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_peer/eap_gpsk.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_peer/eap_methods.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_peer/eap_sim.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_peer/eap_tls_common.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_peer/eap_tnc.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_peer/eap_ttls.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_peer/eap_wsc.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_peer/tncc.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_server/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_server/eap.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_server/eap_fast.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_server/eap_gpsk.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_server/eap_i.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_server/eap_tls_common.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_server/eap_tnc.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eap_server/eap_ttls.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eapol_supp/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/src/eapol_supp/eapol_supp_sm.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/hlr_auc_gw/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/l2_packet/Makefile#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/l2_packet/l2_packet_freebsd.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/l2_packet/l2_packet_ndis.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/l2_packet/l2_packet_none.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/radius/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/src/radius/radius_client.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/radius/radius_server.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/rsn_supp/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/src/rsn_supp/wpa.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/rsn_supp/wpa_ft.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/rsn_supp/wpa_i.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/tls/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/src/tls/rsa.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/tls/tlsv1_client.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/tls/tlsv1_server_read.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/utils/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/src/utils/base64.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/utils/common.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/utils/common.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/utils/eloop_none.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/utils/eloop_win.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/utils/os_none.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/utils/os_unix.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/utils/os_win32.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/src/utils/wpa_debug.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/utils/wpa_debug.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/utils/wpabuf.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/wps/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/src/wps/httpread.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/wps/wps.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/wps/wps_attr_parse.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/wps/wps_common.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/wps/wps_enrollee.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/wps/wps_i.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/wps/wps_registrar.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/wps/wps_upnp.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/wps/wps_upnp_event.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/wps/wps_upnp_i.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/wps/wps_upnp_ssdp.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/src/wps/wps_upnp_web.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/Makefile#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/README#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/README-WPS#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/defconfig#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/doc/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/doc/docbook/.gitignore#2 delete .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/doc/porting.doxygen#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/events.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/main_none.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/mlme.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/nmake.mak#1 branch .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/scan.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/wpa_priv.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/wpas_glue.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/wpa/wpa_supplicant/wps_supplicant.c#2 integrate .. //depot/projects/scottl-camlock/src/etc/Makefile#10 integrate .. //depot/projects/scottl-camlock/src/etc/periodic/daily/800.scrub-zfs#1 branch .. //depot/projects/scottl-camlock/src/games/random/random.c#4 integrate .. //depot/projects/scottl-camlock/src/games/random/randomize_fd.c#3 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libdialog/TESTS/check3.c#2 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libdialog/TESTS/menu3.c#2 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libdialog/TESTS/radio1.c#2 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libdialog/TESTS/radio3.c#2 integrate .. //depot/projects/scottl-camlock/src/include/histedit.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/clang/clang.build.mk#3 integrate .. //depot/projects/scottl-camlock/src/lib/clang/libllvmanalysis/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/clang/libllvmbitreader/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/clang/libllvmbitwriter/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/clang/libllvmcodegen/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/clang/libllvmcore/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/clang/libllvmipo/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/clang/libllvmmc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/clang/libllvmscalaropts/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/clang/libllvmsupport/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/clang/libllvmsystem/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/clang/libllvmtarget/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/SYS.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/Symbol.map#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/_ctx_start.S#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/_setjmp.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/makecontext.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/setjmp.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/gen/sigsetjmp.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/string/bcmp.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/string/bcopy.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/string/bzero.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/string/ffs.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/string/index.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/string/rindex.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/string/strcmp.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/string/strlen.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/sys/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/sys/Ovfork.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/sys/brk.S#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/sys/cerror.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/sys/exect.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/sys/fork.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/sys/pipe.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/sys/ptrace.S#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/sys/sbrk.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libedit/filecomplete.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libedit/filecomplete.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libmemstat/memstat.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libmemstat/memstat.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libmemstat/memstat_internal.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libmemstat/memstat_uma.c#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/mips/rtld_start.S#3 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/ebuf.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/hast_proto.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/hastd.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/metadata.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/nv.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/primary.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/secondary.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ping6/ping6.c#4 integrate .. //depot/projects/scottl-camlock/src/share/examples/kld/syscall/test/call.c#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/bpf.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/periodic.conf.5#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vfs_busy.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vfs_unbusy.9#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_wakeup.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/fpu.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#39 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/vm_machdep.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/mca.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/nexus.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#35 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/metadata.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/pxeldr/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.mips#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_lem.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/md/md.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder_eq.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder_rate.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_run.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_ural.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clport.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdport.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vnops.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/geom/gate/g_gate.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_wakeup.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/mca.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_conf.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_tc.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_lock.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/cpu.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/pmap.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/pte.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/tlb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/mips/cpu.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/mp_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/tlb.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/mips/trap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpfdesc.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_patch.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_asconf.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_syscons.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/sys/conf.h#20 integrate .. //depot/projects/scottl-camlock/src/sys/sys/pmc.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#36 integrate .. //depot/projects/scottl-camlock/src/sys/sys/time.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/vm/uma.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/vm/uma_core.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/vm/uma_int.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/x86/x86/mca.c#3 integrate .. //depot/projects/scottl-camlock/src/tools/build/mk/OptionalObsoleteFiles.inc#12 integrate .. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/nanobsd.sh#9 integrate .. //depot/projects/scottl-camlock/src/usr.bin/vmstat/vmstat.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wtmpcvt/wtmpcvt.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/moused/moused.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/powerd/powerd.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/devices.c#9 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/disks.c#7 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/label.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/tzsetup/tzsetup.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wpa/hostapd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wpa/l2_packet.c#3 delete .. //depot/projects/scottl-camlock/src/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wpa/wpa_supplicant/driver_wired.c#2 delete Differences ... ==== //depot/projects/scottl-camlock/src/Makefile.inc1#24 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.652 2010/06/13 13:02:43 raj Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.653 2010/06/16 16:52:35 raj Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1458,8 +1458,8 @@ DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/ .if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE) -FDT_DTS_FILE!= grep "^makeoptions[[:space:]]\+FDT_DTS_FILE" \ - ${KERNCONFDIR}/${KERNCONF} 2> /dev/null | cut -d= -f2 +FDT_DTS_FILE!= awk '/^makeoptions[[:space:]]+FDT_DTS_FILE/ {FS="=|[ \t]+"; print $$3}' \ + ${KERNCONFDIR}/${KERNCONF} .endif .endif ==== //depot/projects/scottl-camlock/src/bin/sh/histedit.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.35 2010/06/02 19:16:58 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.36 2010/06/15 21:58:40 jilles Exp $"); #include <sys/param.h> #include <limits.h> @@ -119,6 +119,9 @@ if (hist) el_set(el, EL_HIST, history, hist); el_set(el, EL_PROMPT, getprompt); + el_set(el, EL_ADDFN, "sh-complete", + "Filename completion", + _el_fn_sh_complete); } else { bad: out2fmt_flush("sh: can't initialize editing\n"); @@ -135,6 +138,7 @@ el_set(el, EL_EDITOR, "vi"); else if (Eflag) el_set(el, EL_EDITOR, "emacs"); + el_set(el, EL_BIND, "^I", "sh-complete", NULL); el_source(el, NULL); } } else { ==== //depot/projects/scottl-camlock/src/contrib/tzcode/zic/zic.8#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/tzcode/zic/zic.8,v 1.1 2010/02/25 06:53:46 edwin Exp $ +.\" $FreeBSD: src/contrib/tzcode/zic/zic.8,v 1.2 2010/06/15 11:37:33 edwin Exp $ .Dd June 20, 2004 .Dt ZIC 8 .Os @@ -120,9 +120,9 @@ rule lines, zone lines, and link lines. .Pp A rule line has the form: -.Dl "Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +.Dl "Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S" For example: -.Dl "Rule US 1967 1973 \- Apr lastSun 2:00 1:00 D +.Dl "Rule US 1967 1973 \- Apr lastSun 2:00 1:00 D" .Pp The fields that make up a rule line are: .Bl -tag -width "LETTER/S" -offset indent @@ -262,7 +262,7 @@ A zone line has the form: .Dl "Zone NAME GMTOFF RULES/SAVE FORMAT [UNTILYEAR [MONTH [DAY [TIME]]]]" For example: -.Dl "Zone Australia/Adelaide 9:30 Aus CST 1971 Oct 31 2:00 +.Dl "Zone Australia/Adelaide 9:30 Aus CST 1971 Oct 31 2:00" The fields that make up a zone line are: .Bl -tag -width indent .It NAME @@ -319,9 +319,9 @@ .El .Pp A link line has the form -.Dl "Link LINK-FROM LINK-TO +.Dl "Link LINK-FROM LINK-TO" For example: -.Dl "Link Europe/Istanbul Asia/Istanbul +.Dl "Link Europe/Istanbul Asia/Istanbul" The .Em LINK-FROM field should appear as the @@ -335,9 +335,9 @@ lines may appear in any order in the input. .Pp Lines in the file that describes leap seconds have the following form: -.Dl "Leap YEAR MONTH DAY HH:MM:SS CORR R/S +.Dl "Leap YEAR MONTH DAY HH:MM:SS CORR R/S" For example: -.Dl "Leap 1974 Dec 31 23:59:60 + S +.Dl "Leap 1974 Dec 31 23:59:60 + S" The .Em YEAR , .Em MONTH , ==== //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/ChangeLog#2 (text+ko) ==== @@ -1,5 +1,37 @@ ChangeLog for hostapd +2010-01-12 - v0.6.10 + * fixed SHA-256 based key derivation function to match with the + standard when using CCMP (for IEEE 802.11r and IEEE 802.11w) + (note: this breaks interoperability with previous version) [Bug 307] + * fixed WPS selected registrar expiration for internal PIN registrar + * disable PMTU discovery for RADIUS packets + * fixed WPS UPnP SSDP on 32-bit targets + * fixed WPS AP reconfiguration with drivers that do not use hostapd + MLME + * fixed RSN parameter setting for multi-BSS case + * added WPS workarounds for known interoperability issues with broken, + deployed implementation + * update IEEE 802.11w implementation to match with the published + standard + * fixed OpCode when proxying WSC_ACK or WSC_NACK from WPS ER + * fixed proxying of WSC_NACK to WPS ER + * fixed compilation with newer GnuTLS versions + * added support for defining timeout for WPS PINs + * fixed WPS Probe Request processing to handle missing required + attribute + * fixed PKCS#12 use with OpenSSL 1.0.0 + +2009-03-23 - v0.6.9 + * driver_nl80211: fixed STA accounting data collection (TX/RX bytes + reported correctly; TX/RX packets not yet available from kernel) + * fixed EAPOL/EAP reauthentication when using an external RADIUS + authentication server + * driver_prism54: fixed segmentation fault on initialization + * fixed TNC with EAP-TTLS + * fixed IEEE 802.11r key derivation function to match with the standard + (note: this breaks interoperability with previous version) [Bug 303] + 2009-02-15 - v0.6.8 * increased hostapd_cli ping interval to 5 seconds and made this configurable with a new command line options (-G<seconds>) ==== //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/README-WPS#2 (text+ko) ==== @@ -165,10 +165,17 @@ hostapd_cli wps_pin 53b63a98-d29e-4457-a2ed-094d7e6a669c 12345670 If the UUID-E is not available (e.g., Enrollee waits for the Registrar -to be selected before connecting), wildcard UUID may be used to allow the PIN to be used once with any UUID: +to be selected before connecting), wildcard UUID may be used to allow +the PIN to be used once with any UUID: hostapd_cli wps_pin any 12345670 +To reduce likelihood of PIN being used with other devices or of +forgetting an active PIN available for potential attackers, expiration +time can be set for the new PIN: + +hostapd_cli wps_pin any 12345670 300 + After this, the Enrollee can connect to the AP again and complete WPS negotiation. At that point, a new, random WPA PSK is generated for the ==== //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/ap.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ #define WLAN_STA_PENDING_POLL BIT(6) /* pending activity poll not ACKed */ #define WLAN_STA_SHORT_PREAMBLE BIT(7) #define WLAN_STA_PREAUTH BIT(8) -#define WLAN_STA_WME BIT(9) +#define WLAN_STA_WMM BIT(9) #define WLAN_STA_MFP BIT(10) #define WLAN_STA_HT BIT(11) #define WLAN_STA_WPS BIT(12) ==== //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/beacon.c#2 (text+ko) ==== @@ -298,8 +298,8 @@ pos = hostapd_eid_wpa(hapd, pos, epos - pos, sta); - /* Wi-Fi Wireless Multimedia Extensions */ - pos = hostapd_eid_wme(hapd, pos); + /* Wi-Fi Alliance WMM */ + pos = hostapd_eid_wmm(hapd, pos); pos = hostapd_eid_ht_capabilities_info(hapd, pos); pos = hostapd_eid_ht_operation(hapd, pos); @@ -395,8 +395,8 @@ tailpos = hostapd_eid_wpa(hapd, tailpos, tail + BEACON_TAIL_BUF_SIZE - tailpos, NULL); - /* Wi-Fi Wireless Multimedia Extensions */ - tailpos = hostapd_eid_wme(hapd, tailpos); + /* Wi-Fi Alliance WMM */ + tailpos = hostapd_eid_wmm(hapd, tailpos); #ifdef CONFIG_IEEE80211N if (hapd->iconf->ieee80211n) { ==== //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/config.c#2 (text+ko) ==== @@ -201,15 +201,15 @@ struct hostapd_config *conf; struct hostapd_bss_config *bss; int i; - const int aCWmin = 15, aCWmax = 1024; - const struct hostapd_wme_ac_params ac_bk = + const int aCWmin = 4, aCWmax = 10; + const struct hostapd_wmm_ac_params ac_bk = { aCWmin, aCWmax, 7, 0, 0 }; /* background traffic */ - const struct hostapd_wme_ac_params ac_be = + const struct hostapd_wmm_ac_params ac_be = { aCWmin, aCWmax, 3, 0, 0 }; /* best effort traffic */ - const struct hostapd_wme_ac_params ac_vi = /* video traffic */ - { aCWmin >> 1, aCWmin, 2, 3000 / 32, 1 }; - const struct hostapd_wme_ac_params ac_vo = /* voice traffic */ - { aCWmin >> 2, aCWmin >> 1, 2, 1500 / 32, 1 }; + const struct hostapd_wmm_ac_params ac_vi = /* video traffic */ + { aCWmin - 1, aCWmin, 2, 3000 / 32, 1 }; + const struct hostapd_wmm_ac_params ac_vo = /* voice traffic */ + { aCWmin - 2, aCWmin - 1, 2, 1500 / 32, 1 }; conf = os_zalloc(sizeof(*conf)); bss = os_zalloc(sizeof(*bss)); @@ -251,10 +251,10 @@ for (i = 0; i < NUM_TX_QUEUES; i++) conf->tx_queue[i].aifs = -1; /* use hw default */ - conf->wme_ac_params[0] = ac_be; - conf->wme_ac_params[1] = ac_bk; - conf->wme_ac_params[2] = ac_vi; - conf->wme_ac_params[3] = ac_vo; + conf->wmm_ac_params[0] = ac_be; + conf->wmm_ac_params[1] = ac_bk; + conf->wmm_ac_params[2] = ac_vi; + conf->wmm_ac_params[3] = ac_vo; #ifdef CONFIG_IEEE80211N conf->ht_capab = HT_CAP_INFO_SMPS_DISABLED; @@ -1166,14 +1166,14 @@ } -static int hostapd_config_wme_ac(struct hostapd_config *conf, char *name, - char *val) +static int hostapd_config_wmm_ac(struct hostapd_config *conf, char *name, + char *val) { int num, v; char *pos; - struct hostapd_wme_ac_params *ac; + struct hostapd_wmm_ac_params *ac; - /* skip 'wme_ac_' prefix */ + /* skip 'wme_ac_' or 'wmm_ac_' prefix */ pos = name + 7; if (os_strncmp(pos, "be_", 3) == 0) { num = 0; @@ -1188,11 +1188,11 @@ num = 3; pos += 3; } else { - wpa_printf(MSG_ERROR, "Unknown wme name '%s'", pos); + wpa_printf(MSG_ERROR, "Unknown WMM name '%s'", pos); return -1; } - ac = &conf->wme_ac_params[num]; + ac = &conf->wmm_ac_params[num]; if (os_strcmp(pos, "aifs") == 0) { v = atoi(val); @@ -1221,7 +1221,7 @@ wpa_printf(MSG_ERROR, "Invalid txop value %d", v); return -1; } - ac->txopLimit = v; + ac->txop_limit = v; } else if (os_strcmp(pos, "acm") == 0) { v = atoi(val); if (v < 0 || v > 1) { @@ -1230,7 +1230,7 @@ } ac->admission_control_mandatory = v; } else { - wpa_printf(MSG_ERROR, "Unknown wme_ac_ field '%s'", pos); + wpa_printf(MSG_ERROR, "Unknown wmm_ac_ field '%s'", pos); return -1; } @@ -1452,13 +1452,13 @@ } else if (os_strcmp(buf, "bridge") == 0) { os_strlcpy(bss->bridge, pos, sizeof(bss->bridge)); } else if (os_strcmp(buf, "driver") == 0) { - int i; + int j; /* clear to get error below if setting is invalid */ conf->driver = NULL; - for (i = 0; hostapd_drivers[i]; i++) { - if (os_strcmp(pos, hostapd_drivers[i]->name) == + for (j = 0; hostapd_drivers[j]; j++) { + if (os_strcmp(pos, hostapd_drivers[j]->name) == 0) { - conf->driver = hostapd_drivers[i]; + conf->driver = hostapd_drivers[j]; break; } } @@ -2070,11 +2070,13 @@ "queue item", line); errors++; } - } else if (os_strcmp(buf, "wme_enabled") == 0) { - bss->wme_enabled = atoi(pos); - } else if (os_strncmp(buf, "wme_ac_", 7) == 0) { - if (hostapd_config_wme_ac(conf, buf, pos)) { - wpa_printf(MSG_ERROR, "Line %d: invalid wme " + } else if (os_strcmp(buf, "wme_enabled") == 0 || + os_strcmp(buf, "wmm_enabled") == 0) { + bss->wmm_enabled = atoi(pos); + } else if (os_strncmp(buf, "wme_ac_", 7) == 0 || + os_strncmp(buf, "wmm_ac_", 7) == 0) { + if (hostapd_config_wmm_ac(conf, buf, pos)) { + wpa_printf(MSG_ERROR, "Line %d: invalid WMM " "ac item", line); errors++; } @@ -2255,28 +2257,29 @@ fclose(f); - if (bss->individual_wep_key_len == 0) { - /* individual keys are not use; can use key idx0 for broadcast - * keys */ - bss->broadcast_key_idx_min = 0; - } + for (i = 0; i < conf->num_bss; i++) { + bss = &conf->bss[i]; - /* Select group cipher based on the enabled pairwise cipher suites */ - pairwise = 0; - if (bss->wpa & 1) - pairwise |= bss->wpa_pairwise; - if (bss->wpa & 2) { - if (bss->rsn_pairwise == 0) - bss->rsn_pairwise = bss->wpa_pairwise; - pairwise |= bss->rsn_pairwise; - } - if (pairwise & WPA_CIPHER_TKIP) - bss->wpa_group = WPA_CIPHER_TKIP; - else - bss->wpa_group = WPA_CIPHER_CCMP; + if (bss->individual_wep_key_len == 0) { + /* individual keys are not use; can use key idx0 for + * broadcast keys */ + bss->broadcast_key_idx_min = 0; + } - for (i = 0; i < conf->num_bss; i++) { - bss = &conf->bss[i]; + /* Select group cipher based on the enabled pairwise cipher + * suites */ + pairwise = 0; + if (bss->wpa & 1) + pairwise |= bss->wpa_pairwise; + if (bss->wpa & 2) { + if (bss->rsn_pairwise == 0) + bss->rsn_pairwise = bss->wpa_pairwise; + pairwise |= bss->rsn_pairwise; + } + if (pairwise & WPA_CIPHER_TKIP) + bss->wpa_group = WPA_CIPHER_TKIP; + else + bss->wpa_group = WPA_CIPHER_CCMP; bss->radius->auth_server = bss->radius->auth_servers; bss->radius->acct_server = bss->radius->acct_servers; @@ -2476,6 +2479,8 @@ for (i = 0; i < conf->num_bss; i++) hostapd_config_free_bss(&conf->bss[i]); os_free(conf->bss); + os_free(conf->supported_rates); + os_free(conf->basic_rates); os_free(conf); } ==== //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/config.h#2 (text+ko) ==== @@ -135,11 +135,11 @@ int configured; }; -struct hostapd_wme_ac_params { +struct hostapd_wmm_ac_params { int cwmin; int cwmax; int aifs; - int txopLimit; /* in units of 32us */ + int txop_limit; /* in units of 32us */ int admission_control_mandatory; }; @@ -271,7 +271,7 @@ int ap_max_inactivity; int ignore_broadcast_ssid; - int wme_enabled; + int wmm_enabled; struct hostapd_vlan *vlan, *vlan_tail; @@ -371,13 +371,13 @@ struct hostapd_tx_queue_params tx_queue[NUM_TX_QUEUES]; /* - * WME AC parameters, in same order as 802.1D, i.e. + * WMM AC parameters, in same order as 802.1D, i.e. * 0 = BE (best effort) * 1 = BK (background) * 2 = VI (video) * 3 = VO (voice) */ - struct hostapd_wme_ac_params wme_ac_params[4]; + struct hostapd_wmm_ac_params wmm_ac_params[4]; enum { INTERNAL_BRIDGE_DO_NOT_CONTROL = -1, ==== //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/ctrl_iface.c#2 (text+ko) ==== @@ -18,6 +18,7 @@ #include <sys/un.h> #include <sys/stat.h> +#include <stddef.h> #include "hostapd.h" #include "eloop.h" @@ -60,7 +61,8 @@ dst->next = hapd->ctrl_dst; hapd->ctrl_dst = dst; wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor attached", - (u8 *) from->sun_path, fromlen); + (u8 *) from->sun_path, + fromlen - offsetof(struct sockaddr_un, sun_path)); return 0; } @@ -74,15 +76,18 @@ dst = hapd->ctrl_dst; while (dst) { if (fromlen == dst->addrlen && - os_memcmp(from->sun_path, dst->addr.sun_path, fromlen) == - 0) { + os_memcmp(from->sun_path, dst->addr.sun_path, + fromlen - offsetof(struct sockaddr_un, sun_path)) + == 0) { if (prev == NULL) hapd->ctrl_dst = dst->next; else prev->next = dst->next; os_free(dst); wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor detached", - (u8 *) from->sun_path, fromlen); + (u8 *) from->sun_path, + fromlen - + offsetof(struct sockaddr_un, sun_path)); return 0; } prev = dst; @@ -104,10 +109,12 @@ dst = hapd->ctrl_dst; while (dst) { if (fromlen == dst->addrlen && - os_memcmp(from->sun_path, dst->addr.sun_path, fromlen) == - 0) { + os_memcmp(from->sun_path, dst->addr.sun_path, + fromlen - offsetof(struct sockaddr_un, sun_path)) + == 0) { wpa_hexdump(MSG_DEBUG, "CTRL_IFACE changed monitor " - "level", (u8 *) from->sun_path, fromlen); + "level", (u8 *) from->sun_path, fromlen - + offsetof(struct sockaddr_un, sun_path)); dst->debug_level = atoi(level); return 0; } @@ -246,10 +253,21 @@ static int hostapd_ctrl_iface_wps_pin(struct hostapd_data *hapd, char *txt) { char *pin = os_strchr(txt, ' '); + char *timeout_txt; + int timeout; + if (pin == NULL) return -1; *pin++ = '\0'; - return hostapd_wps_add_pin(hapd, txt, pin); + + timeout_txt = os_strchr(pin, ' '); + if (timeout_txt) { + *timeout_txt++ = '\0'; + timeout = atoi(timeout_txt); + } else + timeout = 0; + + return hostapd_wps_add_pin(hapd, txt, pin, timeout); } #endif /* CONFIG_WPS */ @@ -434,14 +452,44 @@ } os_memset(&addr, 0, sizeof(addr)); +#ifdef __FreeBSD__ + addr.sun_len = sizeof(addr); +#endif /* __FreeBSD__ */ addr.sun_family = AF_UNIX; fname = hostapd_ctrl_iface_path(hapd); if (fname == NULL) goto fail; os_strlcpy(addr.sun_path, fname, sizeof(addr.sun_path)); if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { - perror("bind(PF_UNIX)"); - goto fail; + wpa_printf(MSG_DEBUG, "ctrl_iface bind(PF_UNIX) failed: %s", + strerror(errno)); + if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { + wpa_printf(MSG_DEBUG, "ctrl_iface exists, but does not" + " allow connections - assuming it was left" + "over from forced program termination"); + if (unlink(fname) < 0) { + perror("unlink[ctrl_iface]"); + wpa_printf(MSG_ERROR, "Could not unlink " + "existing ctrl_iface socket '%s'", + fname); + goto fail; + } + if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < + 0) { + perror("bind(PF_UNIX)"); + goto fail; + } + wpa_printf(MSG_DEBUG, "Successfully replaced leftover " + "ctrl_iface socket '%s'", fname); + } else { + wpa_printf(MSG_INFO, "ctrl_iface exists and seems to " + "be in use - cannot override it"); + wpa_printf(MSG_INFO, "Delete '%s' manually if it is " + "not used anymore", fname); + os_free(fname); + fname = NULL; + goto fail; + } } if (hapd->conf->ctrl_interface_gid_set && @@ -536,15 +584,17 @@ next = dst->next; if (level >= dst->debug_level) { wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor send", - (u8 *) dst->addr.sun_path, dst->addrlen); + (u8 *) dst->addr.sun_path, dst->addrlen - + offsetof(struct sockaddr_un, sun_path)); msg.msg_name = &dst->addr; msg.msg_namelen = dst->addrlen; if (sendmsg(hapd->ctrl_sock, &msg, 0) < 0) { - fprintf(stderr, "CTRL_IFACE monitor[%d]: ", - idx); - perror("sendmsg"); + int _errno = errno; + wpa_printf(MSG_INFO, "CTRL_IFACE monitor[%d]: " + "%d - %s", + idx, errno, strerror(errno)); dst->errors++; - if (dst->errors > 10) { + if (dst->errors > 10 || _errno == ENOENT) { hostapd_ctrl_iface_detach( hapd, &dst->addr, dst->addrlen); ==== //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/drivers.c#2 (text+ko) ==== @@ -27,6 +27,9 @@ #ifdef CONFIG_DRIVER_MADWIFI extern struct wpa_driver_ops wpa_driver_madwifi_ops; /* driver_madwifi.c */ #endif /* CONFIG_DRIVER_MADWIFI */ +#ifdef CONFIG_DRIVER_ATHEROS +extern struct wpa_driver_ops wpa_driver_atheros_ops; /* driver_atheros.c */ +#endif /* CONFIG_DRIVER_ATHEROS */ #ifdef CONFIG_DRIVER_BSD extern struct wpa_driver_ops wpa_driver_bsd_ops; /* driver_bsd.c */ #endif /* CONFIG_DRIVER_BSD */ @@ -55,6 +58,9 @@ #ifdef CONFIG_DRIVER_MADWIFI &wpa_driver_madwifi_ops, #endif /* CONFIG_DRIVER_MADWIFI */ +#ifdef CONFIG_DRIVER_ATHEROS + &wpa_driver_atheros_ops, +#endif /* CONFIG_DRIVER_ATHEROS */ #ifdef CONFIG_DRIVER_BSD &wpa_driver_bsd_ops, #endif /* CONFIG_DRIVER_BSD */ ==== //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/hostapd.8#2 (text+ko) ==== @@ -3,7 +3,7 @@ hostapd \- IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator .SH SYNOPSIS .B hostapd -[-hdBKtv] [-P <PID file>] <configuration file(s)> +[\-hdBKtv] [\-P <PID file>] <configuration file(s)> .SH DESCRIPTION This manual page documents briefly the .B hostapd ==== //depot/projects/scottl-camlock/src/contrib/wpa/hostapd/hostapd.c#2 (text+ko) ==== @@ -249,7 +249,7 @@ if (!hapd->conf->ieee802_1x && !hapd->conf->wpa) accounting_sta_start(hapd, sta); - hostapd_wme_sta_config(hapd, sta); + hostapd_wmm_sta_config(hapd, sta); /* Start IEEE 802.1X authentication process for new stations */ ieee802_1x_new_station(hapd, sta); @@ -306,7 +306,7 @@ wconf->rsn_preauth = conf->rsn_preauth; wconf->eapol_version = conf->eapol_version; wconf->peerkey = conf->peerkey; - wconf->wme_enabled = conf->wme_enabled; + wconf->wmm_enabled = conf->wmm_enabled; wconf->okc = conf->okc; #ifdef CONFIG_IEEE80211W wconf->ieee80211w = conf->ieee80211w; @@ -339,6 +339,7 @@ struct hostapd_data *hapd = iface->bss[0]; struct hostapd_config *newconf, *oldconf; struct wpa_auth_config wpa_auth_conf; + size_t j; newconf = hostapd_config_read(iface->config_fname); if (newconf == NULL) @@ -348,7 +349,8 @@ * Deauthenticate all stations since the new configuration may not * allow them to use the BSS anymore. */ - hostapd_flush_old_stations(hapd); + for (j = 0; j < iface->num_bss; j++) + hostapd_flush_old_stations(iface->bss[j]); /* TODO: update dynamic data based on changed configuration * items (e.g., open/close sockets, etc.) */ @@ -378,6 +380,16 @@ ieee802_11_set_beacon(hapd); + if (hapd->conf->ssid.ssid_set && + hostapd_set_ssid(hapd, (u8 *) hapd->conf->ssid.ssid, + hapd->conf->ssid.ssid_len)) { + wpa_printf(MSG_ERROR, "Could not set SSID for kernel driver"); + /* try to continue */ + } + + if (hapd->conf->ieee802_1x || hapd->conf->wpa) + hostapd_set_ieee8021x(hapd->conf->iface, hapd, 1); + hostapd_config_free(oldconf); wpa_printf(MSG_DEBUG, "Reconfigured interface %s", hapd->conf->iface); @@ -465,7 +477,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006171106.o5HB6Pa6087465>