CVS commit: src/share/man/man3lua

[Marc Balmer]

Module Name:src
Committed By:   mbalmer
Date:   Tue Jan 19 10:11:02 UTC 2016

Modified Files:
src/share/man/man3lua: intro.3lua

Log Message:
fix typo, bump date


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/man/man3lua/intro.3lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/share/man/man3lua

[Marc Balmer]

Module Name:src
Committed By:   mbalmer
Date:   Tue Jan 19 10:11:02 UTC 2016

Modified Files:
src/share/man/man3lua: intro.3lua

Log Message:
fix typo, bump date


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/man/man3lua/intro.3lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man3lua/intro.3lua
diff -u src/share/man/man3lua/intro.3lua:1.5 src/share/man/man3lua/intro.3lua:1.6
--- src/share/man/man3lua/intro.3lua:1.5	Mon Jan  6 09:23:18 2014
+++ src/share/man/man3lua/intro.3lua	Tue Jan 19 10:11:02 2016
@@ -1,6 +1,7 @@
-.\"	$NetBSD: intro.3lua,v 1.5 2014/01/06 09:23:18 wiz Exp $
+.\"	$NetBSD: intro.3lua,v 1.6 2016/01/19 10:11:02 mbalmer Exp $
 .\"
-.\" Copyright (c) 2013 Marc Balmer . All rights reserved.
+.\" Copyright (c) 2013, 2016 Marc Balmer .
+.\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -27,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd November 13, 2013
+.Dd January 19, 2016
 .Dt INTRO 3lua
 .Os
 .Sh NAME
@@ -51,7 +52,7 @@ Access
 .Xr sqlite3 1
 files.
 .It Em syslog
-Acces
+Access
 .Xr syslog 3
 functionality.
 .El

CVS commit: src/sys/nfs

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Tue Jan 19 10:57:00 UTC 2016

Modified Files:
src/sys/nfs: nfs_vnops.c

Log Message:
Return an error if NFSPROC_LOOKUP returns the file handle of the current
directory.  Treating it as DOT lookup would put garbage into the name
cache and could panic on future lookups.

Seen with ZFS file system exported from OmniOS, an OpenSolaris derivative.

Fixes PR kern/50664 "cd .." over NFS/ZFS can panic kernel


To generate a diff of this commit:
cvs rdiff -u -r1.308 -r1.309 src/sys/nfs/nfs_vnops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/nfs/nfs_vnops.c
diff -u src/sys/nfs/nfs_vnops.c:1.308 src/sys/nfs/nfs_vnops.c:1.309
--- src/sys/nfs/nfs_vnops.c:1.308	Thu May 14 17:35:54 2015
+++ src/sys/nfs/nfs_vnops.c	Tue Jan 19 10:56:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_vnops.c,v 1.308 2015/05/14 17:35:54 chs Exp $	*/
+/*	$NetBSD: nfs_vnops.c,v 1.309 2016/01/19 10:56:59 hannken Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.308 2015/05/14 17:35:54 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.309 2016/01/19 10:56:59 hannken Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
@@ -954,18 +954,11 @@ dorpc:
 
 	if (NFS_CMPFH(np, fhp, fhsize)) {
 		/*
-		 * as we handle "." lookup locally, this should be
+		 * As we handle "." lookup locally, this is
 		 * a broken server.
 		 */
-		vref(dvp);
-		newvp = dvp;
-#ifndef NFS_V2_ONLY
-		if (v3) {
-			nfsm_postop_attr(newvp, attrflag, 0);
-			nfsm_postop_attr(dvp, attrflag, 0);
-		} else
-#endif
-			nfsm_loadattr(newvp, (struct vattr *)0, 0);
+		m_freem(mrep);
+		return EBADRPC;
 	} else if (flags & ISDOTDOT) {
 		/*
 		 * ".." lookup

CVS commit: src/sys/nfs

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Tue Jan 19 10:57:00 UTC 2016

Modified Files:
src/sys/nfs: nfs_vnops.c

Log Message:
Return an error if NFSPROC_LOOKUP returns the file handle of the current
directory.  Treating it as DOT lookup would put garbage into the name
cache and could panic on future lookups.

Seen with ZFS file system exported from OmniOS, an OpenSolaris derivative.

Fixes PR kern/50664 "cd .." over NFS/ZFS can panic kernel


To generate a diff of this commit:
cvs rdiff -u -r1.308 -r1.309 src/sys/nfs/nfs_vnops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 18:09:09 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
wpa_supplicant dropped the -w option a long time ago, lets not pretend
it still works.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
diff -u src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.19 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.20
--- src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.19	Tue Jan 19 17:22:57 2016
+++ src/external/bsd/wpa/dist/src/drivers/driver_bsd.c	Tue Jan 19 18:09:09 2016
@@ -1228,20 +1228,16 @@ wpa_driver_bsd_event_receive(int sock, v
 		switch (ifan->ifan_what) {
 		case IFAN_DEPARTURE:
 			event.interface_status.ievent = EVENT_INTERFACE_REMOVED;
-		default:
-#if 1
-			event.interface_status.ievent = EVENT_INTERFACE_ADDED;
 			break;
-#else
+		default:
 			return;
-#endif
 		}
 		wpa_printf(MSG_DEBUG, "RTM_IFANNOUNCE: Interface '%s' %s",
 			   event.interface_status.ifname,
 			   ifan->ifan_what == IFAN_DEPARTURE ?
 "removed" : "added");
 		wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS, );
-		return;
+		break;
 	case RTM_IEEE80211:
 		ifan = (struct if_announcemsghdr *) rtm;
 		drv = bsd_get_drvindex(global, ifan->ifan_index);

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 18:09:09 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
wpa_supplicant dropped the -w option a long time ago, lets not pretend
it still works.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/usb

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jan 19 19:03:27 UTC 2016

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.700 -r1.701 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.701 -r1.702 src/sys/dev/usb/usbdevs_data.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/usb

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jan 19 19:02:32 UTC 2016

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
Add a NetChip USB-IDE bridge


To generate a diff of this commit:
cvs rdiff -u -r1.708 -r1.709 src/sys/dev/usb/usbdevs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.708 src/sys/dev/usb/usbdevs:1.709
--- src/sys/dev/usb/usbdevs:1.708	Tue Jan 19 03:24:58 2016
+++ src/sys/dev/usb/usbdevs	Tue Jan 19 19:02:32 2016
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.708 2016/01/19 03:24:58 msaitoh Exp $
+$NetBSD: usbdevs,v 1.709 2016/01/19 19:02:32 martin Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -2334,6 +2334,7 @@ product NEODIO ND5010		0x5010	Multi-form
 product NETCHIP TURBOCONNECT	0x1080	Turbo-Connect
 product NETCHIP CLIK40		0xa140	Clik! 40
 product NETCHIP ETHERNETGADGET	0xa4a2	Linux Ethernet/RNDIS gadget on pxa210/25x/26x
+product NETCHIP NET2270		0xa612	USB-IDE Bridge
 
 /* Netgear products */
 product NETGEAR EA101		0x1001	Ethernet adapter

CVS commit: src/sys/dev/usb

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jan 19 19:02:32 UTC 2016

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
Add a NetChip USB-IDE bridge


To generate a diff of this commit:
cvs rdiff -u -r1.708 -r1.709 src/sys/dev/usb/usbdevs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/bind

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jan 20 02:14:03 UTC 2016

Modified Files:
src/external/bsd/bind/dist: CHANGES README srcid version
src/external/bsd/bind/dist/bin/named: bind9.xsl.h
src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man.dnssec-importkey.html
man.dnssec-keyfromlabel.html man.dnssec-keygen.html
man.dnssec-revoke.html man.dnssec-settime.html
man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html
man.host.html man.isc-hmac-fixup.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.html man.nsec3hash.html
man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
man.rndc.html
src/external/bsd/bind/dist/lib/dns: api message.c resolver.c
src/external/bsd/bind/dist/lib/dns/rdata/in_1: apl_42.c
src/external/bsd/bind/include/dns: enumclass.h enumtype.h rdatastruct.h
src/external/bsd/bind/lib/libbind9: shlib_version
src/external/bsd/bind/lib/libdns: shlib_version
src/external/bsd/bind/lib/libirs: shlib_version
src/external/bsd/bind/lib/libisc: shlib_version
src/external/bsd/bind/lib/libisccc: shlib_version
src/external/bsd/bind/lib/libisccfg: shlib_version
src/external/bsd/bind/lib/liblwres: shlib_version

Log Message:
Merge 9.10.3-P3:

4288.   [bug]   Fixed a regression in resolver.c:possibly_mark()
which caused known-bogus servers to be queried
anyway. [RT #41321]

4286.   [security]  render_ecs errors were mishandled when printing out
a OPT record resulting in a assertion failure.
(CVE-2015-8705) [RT #41397]

4285.   [security]  Specific APL data could trigger a INSIST.
(CVE-2015-8704) [RT #41396]


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/README
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/srcid
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/bin/named/bind9.xsl.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \
src/external/bsd/bind/dist/doc/arm/man.arpaname.html \
src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.delv.html \
src/external/bsd/bind/dist/doc/arm/man.dig.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \
src/external/bsd/bind/dist/doc/arm/man.genrandom.html \
src/external/bsd/bind/dist/doc/arm/man.host.html \
src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \
src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \
src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \
src/external/bsd/bind/dist/doc/arm/man.named.html \
src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \
src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \
src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.html
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/dns/api
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/dist/lib/dns/message.c
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/bind/dist/lib/dns/resolver.c
cvs rdiff -u -r1.6 -r1.7 \

CVS commit: src/external/bsd/bind

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jan 20 02:14:03 UTC 2016

Modified Files:
src/external/bsd/bind/dist: CHANGES README srcid version
src/external/bsd/bind/dist/bin/named: bind9.xsl.h
src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man.dnssec-importkey.html
man.dnssec-keyfromlabel.html man.dnssec-keygen.html
man.dnssec-revoke.html man.dnssec-settime.html
man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html
man.host.html man.isc-hmac-fixup.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.html man.nsec3hash.html
man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
man.rndc.html
src/external/bsd/bind/dist/lib/dns: api message.c resolver.c
src/external/bsd/bind/dist/lib/dns/rdata/in_1: apl_42.c
src/external/bsd/bind/include/dns: enumclass.h enumtype.h rdatastruct.h
src/external/bsd/bind/lib/libbind9: shlib_version
src/external/bsd/bind/lib/libdns: shlib_version
src/external/bsd/bind/lib/libirs: shlib_version
src/external/bsd/bind/lib/libisc: shlib_version
src/external/bsd/bind/lib/libisccc: shlib_version
src/external/bsd/bind/lib/libisccfg: shlib_version
src/external/bsd/bind/lib/liblwres: shlib_version

Log Message:
Merge 9.10.3-P3:

4288.   [bug]   Fixed a regression in resolver.c:possibly_mark()
which caused known-bogus servers to be queried
anyway. [RT #41321]

4286.   [security]  render_ecs errors were mishandled when printing out
a OPT record resulting in a assertion failure.
(CVE-2015-8705) [RT #41397]

4285.   [security]  Specific APL data could trigger a INSIST.
(CVE-2015-8704) [RT #41396]


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/README
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/srcid
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/bin/named/bind9.xsl.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \
src/external/bsd/bind/dist/doc/arm/man.arpaname.html \
src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.delv.html \
src/external/bsd/bind/dist/doc/arm/man.dig.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \
src/external/bsd/bind/dist/doc/arm/man.genrandom.html \
src/external/bsd/bind/dist/doc/arm/man.host.html \
src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \
src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \
src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \
src/external/bsd/bind/dist/doc/arm/man.named.html \
src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \
src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \
src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.html
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/dns/api
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/dist/lib/dns/message.c
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/bind/dist/lib/dns/resolver.c
cvs rdiff -u -r1.6 -r1.7 \

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jan 20 02:15:15 UTC 2016

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
mention new bind.


To generate a diff of this commit:
cvs rdiff -u -r1.1300 -r1.1301 src/doc/3RDPARTY
cvs rdiff -u -r1.2132 -r1.2133 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib/sets/lists

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jan 20 02:20:41 UTC 2016

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi

Log Message:
bump bind libraries.


To generate a diff of this commit:
cvs rdiff -u -r1.759 -r1.760 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.121 -r1.122 src/distrib/sets/lists/debug/shl.mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/netinet

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Wed Jan 20 05:58:49 UTC 2016

Modified Files:
src/sys/netinet: ip_encap.c

Log Message:
remove unused variable.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/netinet/ip_encap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/netinet/ip_encap.c
diff -u src/sys/netinet/ip_encap.c:1.47 src/sys/netinet/ip_encap.c:1.48
--- src/sys/netinet/ip_encap.c:1.47	Wed Dec  9 06:00:51 2015
+++ src/sys/netinet/ip_encap.c	Wed Jan 20 05:58:49 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_encap.c,v 1.47 2015/12/09 06:00:51 knakahara Exp $	*/
+/*	$NetBSD: ip_encap.c,v 1.48 2016/01/20 05:58:49 knakahara Exp $	*/
 /*	$KAME: ip_encap.c,v 1.73 2001/10/02 08:30:58 itojun Exp $	*/
 
 /*
@@ -64,13 +64,10 @@
  *
  * The code assumes that radix table code can handle non-continuous netmask,
  * as it will pass radix table memory region with (src + dst) sockaddr pair.
- *
- * FreeBSD is excluded here as they make max_keylen a static variable, and
- * thus forbid definition of radix table other than proper domains.
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.47 2015/12/09 06:00:51 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.48 2016/01/20 05:58:49 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mrouting.h"
@@ -127,7 +124,6 @@ static void encap_fillarg(struct mbuf *,
 
 LIST_HEAD(, encaptab) encaptab = LIST_HEAD_INITIALIZER();
 
-extern int max_keylen;	/* radix.c */
 struct radix_node_head *encap_head[2];	/* 0 for AF_INET, 1 for AF_INET6 */
 
 void

CVS commit: src/sys/netinet

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Wed Jan 20 05:58:49 UTC 2016

Modified Files:
src/sys/netinet: ip_encap.c

Log Message:
remove unused variable.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/netinet/ip_encap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 15:08:29 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
Don't log RTM messages we aren't interested in at all.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
diff -u src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.12 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.13
--- src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.12	Thu Jan 14 21:19:41 2016
+++ src/external/bsd/wpa/dist/src/drivers/driver_bsd.c	Tue Jan 19 15:08:29 2016
@@ -1327,32 +1327,9 @@ wpa_driver_bsd_event_receive(int sock, v
 			wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' "
 			"if=%x drv=%x", event.interface_status.ifname,
 			ifm->ifm_flags, drv->flags);
- 		}
+		}
 		drv->flags = ifm->ifm_flags;
 		break;
-#ifdef RTM_OIFINFO
-	case RTM_OIFINFO:
-		wpa_printf(MSG_DEBUG, "RTM_OIFINFO ignored");
-		break;
-#endif
-#ifdef RTM_OOIFINFO
-	case RTM_OOIFINFO:
-		wpa_printf(MSG_DEBUG, "RTM_OOIFINFO ignored");
-		break;
-#endif
-#ifdef RTM_LOSING
-	case RTM_LOSING:
-		wpa_printf(MSG_DEBUG, "RTM_LOSING ignored");
-		break;
-#endif
-#ifdef RTM_MISS
-	case RTM_MISS:
-		wpa_printf(MSG_DEBUG, "RTM_MISS ignored");
-		break;
-#endif
-	default:
-		wpa_printf(MSG_DEBUG, "RTM_???: %d", rtm->rtm_type);
-		break;
 	}
 }
 

Re: CVS commit: src/external/bsd/wpa/dist/src/drivers

[Christos Zoulas]

In article <20160119150829.60108f...@cvs.netbsd.org>,
Roy Marples  wrote:
>-=-=-=-=-=-
>
>Module Name:   src
>Committed By:  roy
>Date:  Tue Jan 19 15:08:29 UTC 2016
>
>Modified Files:
>   src/external/bsd/wpa/dist/src/drivers: driver_bsd.c
>
>Log Message:
>Don't log RTM messages we aren't interested in at all.

But these were debugging printfs...

christos

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 15:08:29 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
Don't log RTM messages we aren't interested in at all.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 15:18:20 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
Remove added debug to sync more with upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
diff -u src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.13 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.14
--- src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.13	Tue Jan 19 15:08:29 2016
+++ src/external/bsd/wpa/dist/src/drivers/driver_bsd.c	Tue Jan 19 15:18:20 2016
@@ -1237,10 +1237,10 @@ wpa_driver_bsd_event_receive(int sock, v
 			return;
 #endif
 		}
-		wpa_printf(MSG_DEBUG, "RTM_IFANNOUNCE: Interface '%s' %s (%d)",
+		wpa_printf(MSG_DEBUG, "RTM_IFANNOUNCE: Interface '%s' %s",
 			   event.interface_status.ifname,
 			   ifan->ifan_what == IFAN_DEPARTURE ?
-"removed" : "added", ifan->ifan_what);
+"removed" : "added");
 		wpa_supplicant_event(ctx, EVENT_INTERFACE_STATUS, );
 		return;
 	case RTM_IEEE80211:
@@ -1250,22 +1250,16 @@ wpa_driver_bsd_event_receive(int sock, v
 		case RTM_IEEE80211_REASSOC:
 			if (drv->is_ap)
 break;
-			wpa_printf(MSG_DEBUG, "RTM_IEEE80211: (re)assoc (%d)",
-			ifan->ifan_what);
 			wpa_supplicant_event(ctx, EVENT_ASSOC, NULL);
 			break;
 		case RTM_IEEE80211_DISASSOC:
 			if (drv->is_ap)
 break;
-			wpa_printf(MSG_DEBUG, "RTM_IEEE80211: disassoc (%d)",
-			ifan->ifan_what);
 			wpa_supplicant_event(ctx, EVENT_DISASSOC, NULL);
 			break;
 		case RTM_IEEE80211_SCAN:
 			if (drv->is_ap)
 break;
-			wpa_printf(MSG_DEBUG, "RTM_IEEE80211: scan result (%d)",
-			ifan->ifan_what);
 			wpa_supplicant_event(ctx, EVENT_SCAN_RESULTS, NULL);
 			break;
 		case RTM_IEEE80211_LEAVE:
@@ -1280,8 +1274,6 @@ wpa_driver_bsd_event_receive(int sock, v
 			bsd_new_sta(drv, ctx, join->iev_addr);
 			break;
 		case RTM_IEEE80211_REPLAY:
-			wpa_printf(MSG_DEBUG, "RTM_IEEE80211: replay (%d)",
-			ifan->ifan_what);
 			/* ignore */
 			break;
 		case RTM_IEEE80211_MICHAEL:
@@ -1297,10 +1289,6 @@ wpa_driver_bsd_event_receive(int sock, v
 			wpa_supplicant_event(ctx, EVENT_MICHAEL_MIC_FAILURE,
 );
 			break;
-		default:
-			wpa_printf(MSG_DEBUG, "RTM_IEEE80211: ??? (%d)",
-			ifan->ifan_what);
-			break;
 		}
 		break;
 	case RTM_IFINFO:

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 15:18:20 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
Remove added debug to sync more with upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 15:27:57 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
Remove pointless check


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 15:27:57 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
Remove pointless check


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
diff -u src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.14 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.15
--- src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.14	Tue Jan 19 15:18:20 2016
+++ src/external/bsd/wpa/dist/src/drivers/driver_bsd.c	Tue Jan 19 15:27:57 2016
@@ -870,11 +870,9 @@ bsd_init(struct hostapd_data *hapd, stru
 
 	return drv;
 bad:
-	if (drv != NULL) {
-		if (drv->sock_xmit != NULL)
-			l2_packet_deinit(drv->sock_xmit);
-		os_free(drv);
-	}
+	if (drv->sock_xmit != NULL)
+		l2_packet_deinit(drv->sock_xmit);
+	os_free(drv);
 	return NULL;
 }
 

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 15:45:00 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
Revert an older change as upstream now calculates level from rssi and noise.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 15:49:07 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
Syntax (no functional change)


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 15:49:07 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
Syntax (no functional change)


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
diff -u src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.16 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.17
--- src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.16	Tue Jan 19 15:45:00 2016
+++ src/external/bsd/wpa/dist/src/drivers/driver_bsd.c	Tue Jan 19 15:49:07 2016
@@ -1613,7 +1613,7 @@ wpa_driver_bsd_get_capa(void *priv, stru
 #endif /* HOSTAPD */
 
 static void *
-bsd_global_init()
+bsd_global_init(void)
 {
 	struct bsd_driver_global *global;
 

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 16:47:44 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
Use the interface index from the correc structure according to the message
to find the driver instead of assuming that rtm_index is corect.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 16:47:44 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
Use the interface index from the correc structure according to the message
to find the driver instead of assuming that rtm_index is corect.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
diff -u src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.17 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.18
--- src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.17	Tue Jan 19 15:49:07 2016
+++ src/external/bsd/wpa/dist/src/drivers/driver_bsd.c	Tue Jan 19 16:47:44 2016
@@ -777,12 +777,12 @@ bsd_wireless_event_receive(int sock, voi
 			   rtm->rtm_version);
 		return;
 	}
-	drv = bsd_get_drvindex(global, rtm->rtm_index);
-	if (drv == NULL)
-		return;
 	switch (rtm->rtm_type) {
 	case RTM_IEEE80211:
 		ifan = (struct if_announcemsghdr *) rtm;
+		drv = bsd_get_drvindex(global, ifan->ifan_index);
+		if (drv == NULL)
+			return;
 		switch (ifan->ifan_what) {
 		case RTM_IEEE80211_ASSOC:
 		case RTM_IEEE80211_REASSOC:
@@ -1214,14 +1214,13 @@ wpa_driver_bsd_event_receive(int sock, v
 			   rtm->rtm_version);
 		return;
 	}
-	drv = bsd_get_drvindex(global, rtm->rtm_index);
-	if (drv == NULL)
-		return;
-	ctx = drv->ctx;
 	os_memset(, 0, sizeof(event));
 	switch (rtm->rtm_type) {
 	case RTM_IFANNOUNCE:
 		ifan = (struct if_announcemsghdr *) rtm;
+		drv = bsd_get_drvindex(global, ifan->ifan_index);
+		if (drv == NULL)
+			return;
 		os_strlcpy(event.interface_status.ifname, drv->ifname,
 			   sizeof(event.interface_status.ifname));
 		switch (ifan->ifan_what) {
@@ -1239,37 +1238,40 @@ wpa_driver_bsd_event_receive(int sock, v
 			   event.interface_status.ifname,
 			   ifan->ifan_what == IFAN_DEPARTURE ?
 "removed" : "added");
-		wpa_supplicant_event(ctx, EVENT_INTERFACE_STATUS, );
+		wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS, );
 		return;
 	case RTM_IEEE80211:
 		ifan = (struct if_announcemsghdr *) rtm;
+		drv = bsd_get_drvindex(global, ifan->ifan_index);
+		if (drv == NULL)
+			return;
 		switch (ifan->ifan_what) {
 		case RTM_IEEE80211_ASSOC:
 		case RTM_IEEE80211_REASSOC:
 			if (drv->is_ap)
 break;
-			wpa_supplicant_event(ctx, EVENT_ASSOC, NULL);
+			wpa_supplicant_event(drv->ctx, EVENT_ASSOC, NULL);
 			break;
 		case RTM_IEEE80211_DISASSOC:
 			if (drv->is_ap)
 break;
-			wpa_supplicant_event(ctx, EVENT_DISASSOC, NULL);
+			wpa_supplicant_event(drv->ctx, EVENT_DISASSOC, NULL);
 			break;
 		case RTM_IEEE80211_SCAN:
 			if (drv->is_ap)
 break;
-			wpa_supplicant_event(ctx, EVENT_SCAN_RESULTS, NULL);
+			wpa_supplicant_event(drv->ctx, EVENT_SCAN_RESULTS, NULL);
 			break;
 		case RTM_IEEE80211_LEAVE:
 			leave = (struct ieee80211_leave_event *) [1];
-			drv_event_disassoc(ctx, leave->iev_addr);
+			drv_event_disassoc(drv->ctx, leave->iev_addr);
 			break;
 		case RTM_IEEE80211_JOIN:
 #ifdef RTM_IEEE80211_REJOIN
 		case RTM_IEEE80211_REJOIN:
 #endif
 			join = (struct ieee80211_join_event *) [1];
-			bsd_new_sta(drv, ctx, join->iev_addr);
+			bsd_new_sta(drv, drv->ctx, join->iev_addr);
 			break;
 		case RTM_IEEE80211_REPLAY:
 			/* ignore */
@@ -1284,13 +1286,16 @@ wpa_driver_bsd_event_receive(int sock, v
 			os_memset(, 0, sizeof(event));
 			event.michael_mic_failure.unicast =
 !IEEE80211_IS_MULTICAST(mic->iev_dst);
-			wpa_supplicant_event(ctx, EVENT_MICHAEL_MIC_FAILURE,
-);
+			wpa_supplicant_event(drv->ctx,
+EVENT_MICHAEL_MIC_FAILURE, );
 			break;
 		}
 		break;
 	case RTM_IFINFO:
 		ifm = (struct if_msghdr *) rtm;
+		drv = bsd_get_drvindex(global, ifm->ifm_index);
+		if (drv == NULL)
+			return;
 		if ((ifm->ifm_flags & IFF_UP) == 0 &&
 		(drv->flags & IFF_UP) != 0) {
 			os_strlcpy(event.interface_status.ifname, drv->ifname,
@@ -1298,7 +1303,8 @@ wpa_driver_bsd_event_receive(int sock, v
 			event.interface_status.ievent = EVENT_INTERFACE_REMOVED;
 			wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' DOWN",
    event.interface_status.ifname);
-			wpa_supplicant_event(ctx, EVENT_INTERFACE_STATUS, );
+			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS,
+	 );
 		} else if ((ifm->ifm_flags & IFF_UP) != 0 &&
 		(drv->flags & IFF_UP) == 0) {
 			os_strlcpy(event.interface_status.ifname, drv->ifname,
@@ -1306,7 +1312,8 @@ wpa_driver_bsd_event_receive(int sock, v
 			event.interface_status.ievent = EVENT_INTERFACE_ADDED;
 			wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' UP",
    event.interface_status.ifname);
-			wpa_supplicant_event(ctx, EVENT_INTERFACE_STATUS, );
+			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS,
+	 );
 		} else {
 			os_strlcpy(event.interface_status.ifname, drv->ifname,
 

CVS commit: src/crypto/external/bsd/openssh/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 19 17:10:55 UTC 2016

Modified Files:
src/crypto/external/bsd/openssh/dist: clientloop.c clientloop.h mux.c
ssh.c sshbuf-getput-crypto.c sshbuf.c sshconnect.c sshconnect2.c
version.h

Log Message:
More fixes from upstream:
- X connection forwarding fixes
- more explicit_bzero
- more closing file descriptors
XXX: pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/clientloop.c
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/clientloop.h
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/mux.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssh/dist/sshbuf-getput-crypto.c \
src/crypto/external/bsd/openssh/dist/sshbuf.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 17:22:57 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
Downing the interface now disables it instead of removing it.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
diff -u src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.18 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.19
--- src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.18	Tue Jan 19 16:47:44 2016
+++ src/external/bsd/wpa/dist/src/drivers/driver_bsd.c	Tue Jan 19 17:22:57 2016
@@ -288,6 +288,7 @@ bsd_ctrl_iface(void *priv, int enable)
 			   strerror(errno));
 		return -1;
 	}
+	drv->flags = ifr.ifr_flags;
 
 	if (enable) {
 		if (ifr.ifr_flags & IFF_UP)
@@ -305,6 +306,7 @@ bsd_ctrl_iface(void *priv, int enable)
 		return -1;
 	}
 
+	drv->flags = ifr.ifr_flags;
 	return 0;
 }
 
@@ -1298,28 +1300,16 @@ wpa_driver_bsd_event_receive(int sock, v
 			return;
 		if ((ifm->ifm_flags & IFF_UP) == 0 &&
 		(drv->flags & IFF_UP) != 0) {
-			os_strlcpy(event.interface_status.ifname, drv->ifname,
-   sizeof(event.interface_status.ifname));
-			event.interface_status.ievent = EVENT_INTERFACE_REMOVED;
 			wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' DOWN",
-   event.interface_status.ifname);
-			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS,
-	 );
+   drv->ifname);
+			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_DISABLED,
+	 NULL);
 		} else if ((ifm->ifm_flags & IFF_UP) != 0 &&
 		(drv->flags & IFF_UP) == 0) {
-			os_strlcpy(event.interface_status.ifname, drv->ifname,
-sizeof(event.interface_status.ifname));
-			event.interface_status.ievent = EVENT_INTERFACE_ADDED;
 			wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' UP",
-   event.interface_status.ifname);
-			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS,
-	 );
-		} else {
-			os_strlcpy(event.interface_status.ifname, drv->ifname,
-sizeof(event.interface_status.ifname));
-			wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' "
-			"if=%x drv=%x", event.interface_status.ifname,
-			ifm->ifm_flags, drv->flags);
+   drv->ifname);
+			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED,
+	 NULL);
 		}
 		drv->flags = ifm->ifm_flags;
 		break;

CVS commit: src/external/bsd/wpa/dist/src/drivers

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 19 17:22:57 UTC 2016

Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c

Log Message:
Downing the interface now disables it instead of removing it.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.