CVS commit: src/sbin/ping6
Module Name:src
Committed By: maxv
Date: Mon Apr 23 06:51:26 UTC 2018
Modified Files:
src/sbin/ping6: ping6.8 ping6.c
Log Message:
Remove the "hops" parameter, it uses RH0, which is deprecated by RFC5095,
and doesn't work on modern networks anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sbin/ping6/ping6.8
cvs rdiff -u -r1.94 -r1.95 src/sbin/ping6/ping6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ping6/ping6.8
diff -u src/sbin/ping6/ping6.8:1.30 src/sbin/ping6/ping6.8:1.31
--- src/sbin/ping6/ping6.8:1.30 Fri May 15 08:02:39 2015
+++ src/sbin/ping6/ping6.8 Mon Apr 23 06:51:25 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: ping6.8,v 1.30 2015/05/15 08:02:39 kefren Exp $
+.\" $NetBSD: ping6.8,v 1.31 2018/04/23 06:51:25 maxv Exp $
.\" $KAME: ping6.8,v 1.57 2002/05/26 13:18:25 itojun Exp $
.\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd April 23, 2015
+.Dd April 23, 2018
.Dt PING6 8
.Os
.Sh NAME
@@ -57,7 +57,6 @@ packets to network hosts
.Op Fl s Ar packetsize
.Op Fl x Ar maxwait
.Op Fl X Ar deadline
-.Op Ar hops ...
.Ar host
.Sh DESCRIPTION
.Nm
@@ -217,16 +216,9 @@ when finished.
.It Fl R
Make the kernel believe that the target
.Ar host
-.Po
-or the first
-.Ar hop
-if you specify
-.Ar hops
-.Pc
is reachable, by injecting upper-layer reachability confirmation hint.
The option is meaningful only if the target
.Ar host
-.Pq or the first hop
is a neighbor.
.It Fl S Ar sourceaddr
Specifies the source address of request packets.
@@ -276,9 +268,6 @@ Time in milliseconds to wait for a reply
.It Fl X Ar deadline
Specify a timeout, in seconds, before ping exits regardless of
how many packets have been received.
-.It Ar hops
-IPv6 addresses for intermediate nodes,
-which will be put into type 0 routing header.
.It Ar host
IPv6 address of the final destination node.
.El
Index: src/sbin/ping6/ping6.c
diff -u src/sbin/ping6/ping6.c:1.94 src/sbin/ping6/ping6.c:1.95
--- src/sbin/ping6/ping6.c:1.94 Sun Apr 15 08:27:21 2018
+++ src/sbin/ping6/ping6.c Mon Apr 23 06:51:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ping6.c,v 1.94 2018/04/15 08:27:21 maxv Exp $ */
+/* $NetBSD: ping6.c,v 1.95 2018/04/23 06:51:25 maxv Exp $ */
/* $KAME: ping6.c,v 1.164 2002/11/16 14:05:37 itojun Exp $ */
/*
@@ -77,7 +77,7 @@ static char sccsid[] = "@(#)ping.c 8.1 (
#else
#include
#ifndef lint
-__RCSID("$NetBSD: ping6.c,v 1.94 2018/04/15 08:27:21 maxv Exp $");
+__RCSID("$NetBSD: ping6.c,v 1.95 2018/04/23 06:51:25 maxv Exp $");
#endif
#endif
@@ -315,7 +315,6 @@ main(int argc, char *argv[])
char *policy_out = NULL;
#endif
double intval;
- size_t rthlen;
#ifdef IPV6_USE_MIN_MTU
int mflag = 0;
#endif
@@ -605,21 +604,11 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;
- if (argc < 1) {
+ if (argc != 1) {
usage();
/*NOTREACHED*/
}
- if (argc > 1) {
- rthlen = CMSG_SPACE(inet6_rth_space(IPV6_RTHDR_TYPE_0,
- argc - 1));
- if (rthlen == 0) {
- errx(1, "too many intermediate hops");
- /*NOTREACHED*/
- }
- ip6optlen += rthlen;
- }
-
if (options & F_NIGROUP) {
target = nigroup(argv[argc - 1]);
if (target == NULL) {
@@ -913,39 +902,6 @@ main(int argc, char *argv[])
}
#endif
- if (argc > 1) { /* some intermediate addrs are specified */
- int hops, error;
- int rthdrlen;
-
- rthdrlen = inet6_rth_space(IPV6_RTHDR_TYPE_0, argc - 1);
- scmsgp->cmsg_len = CMSG_LEN(rthdrlen);
- scmsgp->cmsg_level = IPPROTO_IPV6;
- scmsgp->cmsg_type = IPV6_RTHDR;
- rthdr = (struct ip6_rthdr *)CMSG_DATA(scmsgp);
- rthdr = inet6_rth_init((void *)rthdr, rthdrlen,
- IPV6_RTHDR_TYPE_0, argc - 1);
- if (rthdr == NULL)
- errx(1, "can't initialize rthdr");
-
- for (hops = 0; hops < argc - 1; hops++) {
- struct addrinfo *iaip;
-
- if ((error = getaddrinfo(argv[hops], NULL, &hints,
- &iaip)))
-errx(1, "%s", gai_strerror(error));
- if (SIN6(iaip->ai_addr)->sin6_family != AF_INET6)
-errx(1,
-"bad addr family of an intermediate addr");
-
- if (inet6_rth_add(rthdr,
- &(SIN6(iaip->ai_addr))->sin6_addr))
-errx(1, "can't add an intermediate node");
- freeaddrinfo(iaip);
- }
-
- scmsgp = CMSG_NXTHDR(&smsghdr, scmsgp);
- }
-
if (!(options & F_SRCADDR)) {
/*
* get the source address. XXX since we revoked the root
@@ -2699,6 +2655,6 @@ usage(void)
"[-X deadline]\n"
"\t[-x maxwait] [-S sourceaddr] "
"[-s packetsize] [-h hoplimit]\n"
- "\t[-g gateway] [hops...] host\n");
+ "\t[-g gateway] host\n");
exit(1);
}
CVS commit: src/usr.sbin/traceroute6
Module Name:src
Committed By: maxv
Date: Mon Apr 23 06:42:02 UTC 2018
Modified Files:
src/usr.sbin/traceroute6: traceroute6.8 traceroute6.c
Log Message:
Remove the "-g" option, it uses RH0, which is deprecated by RFC5095, and
doesn't work on modern networks anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/traceroute6/traceroute6.8
cvs rdiff -u -r1.44 -r1.45 src/usr.sbin/traceroute6/traceroute6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/traceroute6/traceroute6.8
diff -u src/usr.sbin/traceroute6/traceroute6.8:1.17 src/usr.sbin/traceroute6/traceroute6.8:1.18
--- src/usr.sbin/traceroute6/traceroute6.8:1.17 Sat Aug 5 20:24:17 2017
+++ src/usr.sbin/traceroute6/traceroute6.8 Mon Apr 23 06:42:02 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: traceroute6.8,v 1.17 2017/08/05 20:24:17 wiz Exp $
+.\" $NetBSD: traceroute6.8,v 1.18 2018/04/23 06:42:02 maxv Exp $
.\" $KAME: traceroute6.8,v 1.8 2000/06/12 16:29:18 itojun Exp $
.\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd January 18, 2007
+.Dd April 23, 2018
.Dt TRACEROUTE6 8
.Os
.\"
@@ -74,12 +74,6 @@ Turn on AS# lookups for each hop encount
Turn on socket-level debugging.
.It Fl f Ar firsthop
Specify how many hops to skip in trace.
-.It Fl g Ar gateway
-Specify intermediate gateway
-.Po
-.Nm
-uses routing header
-.Pc .
.It Fl I
Use ICMP6 ECHO instead of UDP datagrams.
.It Fl l
Index: src/usr.sbin/traceroute6/traceroute6.c
diff -u src/usr.sbin/traceroute6/traceroute6.c:1.44 src/usr.sbin/traceroute6/traceroute6.c:1.45
--- src/usr.sbin/traceroute6/traceroute6.c:1.44 Thu Nov 17 09:21:34 2016
+++ src/usr.sbin/traceroute6/traceroute6.c Mon Apr 23 06:42:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: traceroute6.c,v 1.44 2016/11/17 09:21:34 shm Exp $ */
+/* $NetBSD: traceroute6.c,v 1.45 2018/04/23 06:42:02 maxv Exp $ */
/* $KAME: traceroute6.c,v 1.67 2004/01/25 03:24:39 itojun Exp $ */
/*
@@ -75,7 +75,7 @@ static char sccsid[] = "@(#)traceroute.c
#else
#include
#ifndef lint
-__RCSID("$NetBSD: traceroute6.c,v 1.44 2016/11/17 09:21:34 shm Exp $");
+__RCSID("$NetBSD: traceroute6.c,v 1.45 2018/04/23 06:42:02 maxv Exp $");
#endif
#endif
@@ -340,8 +340,6 @@ static struct in6_pktinfo *rcvpktinfo;
static struct sockaddr_in6 Src, Dst, Rcv;
static u_long datalen; /* How much data */
#define ICMP6ECHOLEN 8
-/* XXX: 2064 = 127(max hops in type 0 rthdr) * sizeof(ip6_hdr) + 16(margin) */
-static char rtbuf[2064];
#ifdef USE_RFC3542
static struct ip6_rthdr *rth;
#endif
@@ -376,7 +374,6 @@ main(int argc, char *argv[])
struct addrinfo hints, *res;
static u_char *rcvcmsgbuf;
u_long probe, hops, lport;
- struct hostent *hp;
size_t size;
/*
@@ -417,7 +414,7 @@ main(int argc, char *argv[])
seq = 0;
- while ((ch = getopt(argc, argv, "aA:df:g:Ilm:np:q:rs:w:v")) != -1)
+ while ((ch = getopt(argc, argv, "aA:df:Ilm:np:q:rs:w:v")) != -1)
switch (ch) {
case 'a':
as_path = 1;
@@ -436,35 +433,6 @@ main(int argc, char *argv[])
if (errno || !*optarg || *ep|| first_hop > 255)
errx(1, "Invalid min hoplimit `%s'", optarg);
break;
- case 'g':
- hp = getipnodebyname(optarg, AF_INET6, 0, &h_errno);
- if (hp == NULL)
-errx(1, "Unknown host `%s'", optarg);
-#ifdef USE_RFC3542
- if (rth == NULL) {
-/*
- * XXX: We can't detect the number of
- * intermediate nodes yet.
- */
-if ((rth = inet6_rth_init((void *)rtbuf,
-sizeof(rtbuf), IPV6_RTHDR_TYPE_0,
-0)) == NULL) {
- errx(1, "inet6_rth_init failed");
-}
- }
- if (inet6_rth_add((void *)rth,
- (struct in6_addr *)hp->h_addr))
-errx(1, "inet6_rth_add failed for `%s'",
-optarg);
-#else /* old advanced API */
- if (cmsg == NULL)
-cmsg = inet6_rthdr_init(rtbuf,
-IPV6_RTHDR_TYPE_0);
- inet6_rthdr_add(cmsg, (struct in6_addr *)hp->h_addr,
- IPV6_RTHDR_LOOSE);
-#endif
- freehostent(hp);
- break;
case 'I':
useicmp++;
/* same as ping6 */
@@ -1300,8 +1268,8 @@ usage(void)
{
fprintf(stderr,
-"Usage: %s [-adIlnrv] [-A as_server] [-f firsthop] [-g gateway]\n"
-"\t[-m hoplimit] [-p port] [-q probes] [-s src] [-w waittime] target [datalen]\n",
+"Usage: %s [-adIlnrv] [-A as_server] [-f firsthop] [-m hoplimit]\n"
+"\t[-p port] [-q probes] [-s src] [-w waittime] target [datalen]\n",
getprogname());
exit(1);
}
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Mon Apr 23 01:35:25 UTC 2018
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
- Backout if_wm.c rev.1.574 and print "device timeout (lost interrupt)"
when all descriptors in a queue are free. When all descripters are free after
wm_txeof(), it's caused by lost interrupt (though I've never seen it). One
possibility is chip bug and another possibility is software bug. We should
reset in any cases. If we don't reset and don't print error message, TX
processing is done intermittently and user might not noticed the problem.
- Rename txq_watchdog to txq_sending to make the meaning clear.
To generate a diff of this commit:
cvs rdiff -u -r1.575 -r1.576 src/sys/dev/pci/if_wm.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/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.575 src/sys/dev/pci/if_wm.c:1.576
--- src/sys/dev/pci/if_wm.c:1.575 Mon Apr 23 01:29:23 2018
+++ src/sys/dev/pci/if_wm.c Mon Apr 23 01:35:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.575 2018/04/23 01:29:23 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.576 2018/04/23 01:35:25 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.575 2018/04/23 01:29:23 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.576 2018/04/23 01:35:25 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -370,7 +370,7 @@ struct wm_txqueue {
bool txq_stopping;
- bool txq_watchdog;
+ bool txq_sending;
time_t txq_lastsent;
uint32_t txq_packets; /* for AIM */
@@ -3010,7 +3010,7 @@ wm_watchdog_txq(struct ifnet *ifp, struc
{
mutex_enter(txq->txq_lock);
- if (txq->txq_watchdog &&
+ if (txq->txq_sending &&
time_uptime - txq->txq_lastsent > wm_watchdog_timeout) {
wm_watchdog_txq_locked(ifp, txq, hang);
}
@@ -3032,14 +3032,17 @@ wm_watchdog_txq_locked(struct ifnet *ifp
*/
wm_txeof(txq, UINT_MAX);
- if (txq->txq_free != WM_NTXDESC(txq)) {
+ if (txq->txq_sending)
+ *hang |= __BIT(wmq->wmq_id);
+
+ if (txq->txq_free == WM_NTXDESC(txq)) {
+ log(LOG_ERR, "%s: device timeout (lost interrupt)\n",
+ device_xname(sc->sc_dev));
+ } else {
#ifdef WM_DEBUG
int i, j;
struct wm_txsoft *txs;
#endif
- if (txq->txq_watchdog)
- *hang |= __BIT(wmq->wmq_id);
-
log(LOG_ERR,
"%s: device timeout (txfree %d txsfree %d txnext %d)\n",
device_xname(sc->sc_dev), txq->txq_free, txq->txq_sfree,
@@ -6011,7 +6014,7 @@ wm_stop_locked(struct ifnet *ifp, int di
struct wm_queue *wmq = &sc->sc_queue[qidx];
struct wm_txqueue *txq = &wmq->wmq_txq;
mutex_enter(txq->txq_lock);
- txq->txq_watchdog = false; /* ensure watchdog disabled */
+ txq->txq_sending = false; /* ensure watchdog disabled */
for (i = 0; i < WM_TXQUEUELEN(txq); i++) {
txs = &txq->txq_soft[i];
if (txs->txs_mbuf != NULL) {
@@ -6700,7 +6703,7 @@ wm_init_tx_queue(struct wm_softc *sc, st
wm_init_tx_regs(sc, wmq, txq);
wm_init_tx_buffer(sc, txq);
- txq->txq_watchdog = false;
+ txq->txq_sending = false;
}
static void
@@ -7467,7 +7470,7 @@ wm_send_common_locked(struct ifnet *ifp,
if (txq->txq_free != ofree) {
/* Set a watchdog timer in case the chip flakes out. */
txq->txq_lastsent = time_uptime;
- txq->txq_watchdog = true;
+ txq->txq_sending = true;
}
}
@@ -8041,7 +8044,7 @@ wm_nq_send_common_locked(struct ifnet *i
if (sent) {
/* Set a watchdog timer in case the chip flakes out. */
txq->txq_lastsent = time_uptime;
- txq->txq_watchdog = true;
+ txq->txq_sending = true;
}
}
@@ -8186,7 +8189,7 @@ wm_txeof(struct wm_txqueue *txq, u_int l
* timer.
*/
if (txq->txq_sfree == WM_TXQUEUELEN(txq))
- txq->txq_watchdog = false;
+ txq->txq_sending = false;
return more;
}
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Mon Apr 23 01:29:23 UTC 2018
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Count timeout correctly. This change reduce timeout value for 80003 as
expected. Reported by mouse@.
To generate a diff of this commit:
cvs rdiff -u -r1.574 -r1.575 src/sys/dev/pci/if_wm.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/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.574 src/sys/dev/pci/if_wm.c:1.575
--- src/sys/dev/pci/if_wm.c:1.574 Fri Apr 20 03:03:13 2018
+++ src/sys/dev/pci/if_wm.c Mon Apr 23 01:29:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.574 2018/04/20 03:03:13 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.575 2018/04/23 01:29:23 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.574 2018/04/20 03:03:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.575 2018/04/23 01:29:23 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -13069,7 +13069,7 @@ wm_get_swfw_semaphore(struct wm_softc *s
else
timeout = 200;
- for (timeout = 0; timeout < 200; timeout++) {
+ while (timeout) {
if (wm_get_swsm_semaphore(sc)) {
aprint_error_dev(sc->sc_dev,
"%s: failed to get semaphore\n",
@@ -13085,6 +13085,7 @@ wm_get_swfw_semaphore(struct wm_softc *s
}
wm_put_swsm_semaphore(sc);
delay(5000);
+ timeout--;
}
printf("%s: failed to get swfw semaphore mask 0x%x swfw 0x%x\n",
device_xname(sc->sc_dev), mask, swfw_sync);
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Sun Apr 22 20:32:27 UTC 2018
Modified Files:
src/sys/dev/usb: if_axe.c
Log Message:
merge duplicated code, back to logging error.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/usb/if_axe.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/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.87 src/sys/dev/usb/if_axe.c:1.88
--- src/sys/dev/usb/if_axe.c:1.87 Sat Apr 21 14:07:23 2018
+++ src/sys/dev/usb/if_axe.c Sun Apr 22 16:32:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.87 2018/04/21 18:07:23 christos Exp $ */
+/* $NetBSD: if_axe.c,v 1.88 2018/04/22 20:32:27 christos Exp $ */
/* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.87 2018/04/21 18:07:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.88 2018/04/22 20:32:27 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -523,6 +523,20 @@ axe_setmulti(struct axe_softc *sc)
axe_unlock_mii(sc);
}
+static void
+axe_ax_init(struct axe_softc *sc)
+{
+ if (sc->axe_flags & AX178) {
+ axe_ax88178_init(sc);
+ } else if (sc->axe_flags & AX772) {
+ axe_ax88772_init(sc);
+ } else if (sc->axe_flags & AX772A) {
+ axe_ax88772a_init(sc);
+ } else if (sc->axe_flags & AX772B) {
+ axe_ax88772b_init(sc);
+ }
+}
+
static void
axe_reset(struct axe_softc *sc)
@@ -546,15 +560,8 @@ axe_reset(struct axe_softc *sc)
#else
axe_lock_mii(sc);
- if (sc->axe_flags & AX178) {
- axe_ax88178_init(sc);
- } else if (sc->axe_flags & AX772) {
- axe_ax88772_init(sc);
- } else if (sc->axe_flags & AX772A) {
- axe_ax88772a_init(sc);
- } else if (sc->axe_flags & AX772B) {
- axe_ax88772b_init(sc);
- }
+ axe_ax_init(sc);
+
axe_unlock_mii(sc);
#endif
}
@@ -971,20 +978,12 @@ axe_attach(device_t parent, device_t sel
/* Initialize controller and get station address. */
- if (sc->axe_flags & AX178) {
- axe_ax88178_init(sc);
- } else if (sc->axe_flags & AX772) {
- axe_ax88772_init(sc);
- } else if (sc->axe_flags & AX772A) {
- axe_ax88772a_init(sc);
- } else if (sc->axe_flags & AX772B) {
- axe_ax88772b_init(sc);
- }
+ axe_ax_init(sc);
- if (!(sc->axe_flags & AX772B)) {
+ if ((sc->axe_flags & AX772B) != 0) {
if (axe_cmd(sc, AXE_172_CMD_READ_NODEID, 0, 0, sc->axe_enaddr))
{
- aprint_debug_dev(self,
+ aprint_error_dev(self,
"failed to read ethernet address\n");
}
}
CVS commit: [pgoyette-compat] src/distrib/sets/lists/modules
Module Name:src Committed By: pgoyette Date: Sun Apr 22 12:45:10 UTC 2018 Modified Files: src/distrib/sets/lists/modules [pgoyette-compat]: mi Log Message: Update sets lists for new compat_sysv_xx version-specific modules To generate a diff of this commit: cvs rdiff -u -r1.114.2.17 -r1.114.2.18 src/distrib/sets/lists/modules/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.114.2.17 src/distrib/sets/lists/modules/mi:1.114.2.18 --- src/distrib/sets/lists/modules/mi:1.114.2.17 Tue Apr 17 08:02:35 2018 +++ src/distrib/sets/lists/modules/mi Sun Apr 22 12:45:10 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.114.2.17 2018/04/17 08:02:35 pgoyette Exp $ +# $NetBSD: mi,v 1.114.2.18 2018/04/22 12:45:10 pgoyette Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -102,6 +102,12 @@ ./@MODULEDIR@/compat_80/compat_80.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_ossaudio base-kernel-modules kmod ./@MODULEDIR@/compat_ossaudio/compat_ossaudio.kmod base-kernel-modules kmod +./@MODULEDIR@/compat_sysv_10 base-kernel-modules kmod +./@MODULEDIR@/compat_sysv_10/compat_sysv_10.kmod base-kernel-modules kmod +./@MODULEDIR@/compat_sysv_14 base-kernel-modules kmod +./@MODULEDIR@/compat_sysv_14/compat_sysv_14.kmod base-kernel-modules kmod +./@MODULEDIR@/compat_sysv_50 base-kernel-modules kmod +./@MODULEDIR@/compat_sysv_50/compat_sysv_50.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_sysv base-kernel-modules kmod ./@MODULEDIR@/compat_sysv/compat_sysv.kmod base-kernel-modules kmod ./@MODULEDIR@/coredumpbase-kernel-modules kmod
CVS commit: src/sys/netipsec
Module Name:src
Committed By: maxv
Date: Sun Apr 22 10:25:40 UTC 2018
Modified Files:
src/sys/netipsec: ipip_var.h ipsec_netbsd.c xform_ipip.c
Log Message:
Rename ipip_allow->ipip_spoofcheck, and add net.inet.ipsec.ipip_spoofcheck.
Makes it simpler, and also fixes PR/39919.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/netipsec/ipip_var.h
cvs rdiff -u -r1.52 -r1.53 src/sys/netipsec/ipsec_netbsd.c
cvs rdiff -u -r1.66 -r1.67 src/sys/netipsec/xform_ipip.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/netipsec/ipip_var.h
diff -u src/sys/netipsec/ipip_var.h:1.5 src/sys/netipsec/ipip_var.h:1.6
--- src/sys/netipsec/ipip_var.h:1.5 Thu Apr 19 08:27:38 2018
+++ src/sys/netipsec/ipip_var.h Sun Apr 22 10:25:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipip_var.h,v 1.5 2018/04/19 08:27:38 maxv Exp $ */
+/* $NetBSD: ipip_var.h,v 1.6 2018/04/22 10:25:40 maxv Exp $ */
/* $FreeBSD: ipip_var.h,v 1.1.4.1 2003/01/24 05:11:35 sam Exp $ */
/* $OpenBSD: ip_ipip.h,v 1.5 2002/06/09 16:26:10 itojun Exp $ */
/*
@@ -59,6 +59,6 @@
#define IPIP_NSTATS 10
#ifdef _KERNEL
-extern int ipip_allow;
+extern int ipip_spoofcheck;
#endif /* _KERNEL */
#endif /* !_NETINET_IPIP_H_ */
Index: src/sys/netipsec/ipsec_netbsd.c
diff -u src/sys/netipsec/ipsec_netbsd.c:1.52 src/sys/netipsec/ipsec_netbsd.c:1.53
--- src/sys/netipsec/ipsec_netbsd.c:1.52 Wed Apr 18 07:38:02 2018
+++ src/sys/netipsec/ipsec_netbsd.c Sun Apr 22 10:25:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_netbsd.c,v 1.52 2018/04/18 07:38:02 maxv Exp $ */
+/* $NetBSD: ipsec_netbsd.c,v 1.53 2018/04/22 10:25:40 maxv Exp $ */
/* $KAME: esp_input.c,v 1.60 2001/09/04 08:43:19 itojun Exp $ */
/* $KAME: ah_input.c,v 1.64 2001/09/04 08:43:19 itojun Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipsec_netbsd.c,v 1.52 2018/04/18 07:38:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_netbsd.c,v 1.53 2018/04/22 10:25:40 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -624,6 +624,12 @@ sysctl_net_inet_ipsec_setup(struct sysct
CTL_NET, PF_INET, ipproto_ipsec,
IPSECCTL_DEBUG, CTL_EOL);
sysctl_createv(clog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
+ CTLTYPE_INT, "ipip_spoofcheck", NULL,
+ NULL, 0, &ipip_spoofcheck, 0,
+ CTL_NET, PF_INET, ipproto_ipsec,
+ CTL_CREATE, CTL_EOL);
+ sysctl_createv(clog, 0, NULL, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READONLY,
CTLTYPE_STRUCT, "ipsecstats", NULL,
sysctl_net_inet_ipsec_stats, 0, NULL, 0,
Index: src/sys/netipsec/xform_ipip.c
diff -u src/sys/netipsec/xform_ipip.c:1.66 src/sys/netipsec/xform_ipip.c:1.67
--- src/sys/netipsec/xform_ipip.c:1.66 Thu Apr 19 08:27:39 2018
+++ src/sys/netipsec/xform_ipip.c Sun Apr 22 10:25:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_ipip.c,v 1.66 2018/04/19 08:27:39 maxv Exp $ */
+/* $NetBSD: xform_ipip.c,v 1.67 2018/04/22 10:25:40 maxv Exp $ */
/* $FreeBSD: xform_ipip.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.66 2018/04/19 08:27:39 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.67 2018/04/22 10:25:40 maxv Exp $");
/*
* IP-inside-IP processing
@@ -87,7 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: xform_ipip.c
/* XXX IPCOMP */
#define M_IPSEC (M_AUTHIPHDR|M_AUTHIPDGM|M_DECRYPTED)
-int ipip_allow = 0;
+int ipip_spoofcheck = 1;
percpu_t *ipipstat_percpu;
void ipe4_attach(void);
@@ -254,7 +254,7 @@ _ipip_input(struct mbuf *m, int iphlen)
/* Check for local address spoofing. */
if ((m_get_rcvif_NOMPSAFE(m) == NULL ||
!(m_get_rcvif_NOMPSAFE(m)->if_flags & IFF_LOOPBACK)) &&
- ipip_allow != 2) {
+ ipip_spoofcheck) {
int s = pserialize_read_enter();
IFNET_READER_FOREACH(ifp) {
IFADDR_READER_FOREACH(ifa, ifp) {
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jdolecek
Date: Sun Apr 22 07:47:15 UTC 2018
Modified Files:
src/sys/dev/usb: xhci.c
Log Message:
trigger the softint processing on that child bus which is not detached yet
fixes PR kern/53066 by Martin Husemann
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/usb/xhci.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/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.88 src/sys/dev/usb/xhci.c:1.89
--- src/sys/dev/usb/xhci.c:1.88 Sat Apr 21 15:53:24 2018
+++ src/sys/dev/usb/xhci.c Sun Apr 22 07:47:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.88 2018/04/21 15:53:24 jdolecek Exp $ */
+/* $NetBSD: xhci.c,v 1.89 2018/04/22 07:47:14 jdolecek Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.88 2018/04/21 15:53:24 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.89 2018/04/22 07:47:14 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1236,7 +1236,16 @@ xhci_intr(void *v)
ret = xhci_intr1(sc);
if (ret) {
- usb_schedsoftintr(&sc->sc_bus);
+ KASSERT(sc->sc_child || sc->sc_child2);
+
+ /*
+ * One of child busses could be already detached. It doesn't
+ * matter on which of the two the softintr is scheduled.
+ */
+ if (sc->sc_child)
+ usb_schedsoftintr(&sc->sc_bus);
+ else
+ usb_schedsoftintr(&sc->sc_bus2);
}
done:
mutex_spin_exit(&sc->sc_intr_lock);
CVS commit: [pgoyette-compat] src
Module Name:src Committed By: pgoyette Date: Sun Apr 22 07:20:30 UTC 2018 Modified Files: src [pgoyette-compat]: UPDATING src/bin/sh [pgoyette-compat]: arithmetic.c parser.c src/crypto/external/bsd/netpgp/dist/src/lib [pgoyette-compat]: libnetpgp.3 src/crypto/external/bsd/openssl/dist/crypto/rsa [pgoyette-compat]: rsa_gen.c src/distrib/sets/lists/base [pgoyette-compat]: shl.mi src/distrib/sets/lists/comp [pgoyette-compat]: mi shl.mi src/distrib/sets/lists/debug [pgoyette-compat]: shl.mi src/doc [pgoyette-compat]: 3RDPARTY CHANGES CHANGES.prev src/etc/defaults [pgoyette-compat]: rc.conf src/external/bsd/am-utils/dist/fixmount [pgoyette-compat]: fixmount.8 src/external/bsd/file/dist [pgoyette-compat]: ChangeLog Makefile.in README TODO aclocal.m4 compile config.guess config.h.in config.sub configure configure.ac depcomp install-sh ltmain.sh missing src/external/bsd/file/dist/doc [pgoyette-compat]: Makefile.in file.1 magic.5 src/external/bsd/file/dist/magic [pgoyette-compat]: Makefile.am Makefile.in src/external/bsd/file/dist/magic/magdir [pgoyette-compat]: acorn animation apple archive audio c64 compress console elf filesystems fonts games geo gnu images intel macintosh mozilla msdos msooxml netbsd ole2compounddocs pgp revision riff sgml spectrum ssl terminfo vorbis windows src/external/bsd/file/dist/python [pgoyette-compat]: Makefile.in src/external/bsd/file/dist/src [pgoyette-compat]: Makefile.am Makefile.in apprentice.c ascmagic.c cdf.c compress.c encoding.c file.c file.h file_opts.h funcs.c is_tar.c readcdf.c readelf.c softmagic.c src/external/bsd/file/dist/tests [pgoyette-compat]: Makefile.in src/external/bsd/file/include [pgoyette-compat]: config.h src/external/bsd/file/lib [pgoyette-compat]: Makefile shlib_version src/external/gpl2/gmake/dist/glob [pgoyette-compat]: glob.c src/external/gpl3/binutils/dist [pgoyette-compat]: config.guess config.sub configure configure.ac src/external/gpl3/binutils/dist/bfd [pgoyette-compat]: ChangeLog Makefile.am Makefile.in aoutx.h archive.c archures.c bfd-in2.h bfd.c coff-alpha.c coffcode.h config.bfd configure configure.ac configure.host cpu-mips.c cpu-or1k.c cpu-riscv.c dwarf2.c elf-bfd.h elf-eh-frame.c elf.c elf32-arm.c elf32-avr.c elf32-hppa.c elf32-i386.c elf32-m68k.c elf32-or1k.c elf32-ppc.c elf32-sh.c elf32-vax.c elf64-alpha.c elf64-mips.c elf64-ppc.c elf64-x86-64.c elflink.c elfn32-mips.c elfnn-riscv.c elfxx-mips.c elfxx-riscv.c elfxx-riscv.h elfxx-sparc.c libbfd.h linker.c reloc.c syms.c targets.c version.h src/external/gpl3/binutils/dist/bfd/doc [pgoyette-compat]: Makefile.in bfdt.texi bfdver.texi reloc.texi src/external/gpl3/binutils/dist/binutils [pgoyette-compat]: ChangeLog Makefile.in NEWS ar.c arsup.c bucomm.c configure objcopy.c readelf.c strings.c src/external/gpl3/binutils/dist/binutils/doc [pgoyette-compat]: Makefile.am Makefile.in addr2line.1 ar.1 binutils.info binutils.texi cxxfilt.man dlltool.1 elfedit.1 nlmconv.1 nm.1 objcopy.1 objdump.1 ranlib.1 readelf.1 size.1 strings.1 strip.1 windmc.1 windres.1 src/external/gpl3/binutils/dist/cpu [pgoyette-compat]: or1kcommon.cpu src/external/gpl3/binutils/dist/gas [pgoyette-compat]: ChangeLog Makefile.am Makefile.in atof-generic.c configure configure.ac configure.tgt remap.c write.c src/external/gpl3/binutils/dist/gas/config [pgoyette-compat]: atof-vax.c obj-elf.c tc-alpha.c tc-arm.c tc-m68k.c tc-mips.c tc-mips.h tc-or1k.c tc-or1k.h tc-ppc.c tc-riscv.c tc-riscv.h tc-sparc.c tc-vax.c tc-vax.h vax-inst.h src/external/gpl3/binutils/dist/gas/doc [pgoyette-compat]: Makefile.am Makefile.in as.1 as.info as.texinfo c-mips.texi c-ppc.texi src/external/gpl3/binutils/dist/gold [pgoyette-compat]: Makefile.am src/external/gpl3/binutils/dist/gprof [pgoyette-compat]: corefile.c gprof.1 gprof.c gprof.info src/external/gpl3/binutils/dist/include [pgoyette-compat]: bfdlink.h dis-asm.h objalloc.h src/external/gpl3/binutils/dist/include/elf [pgoyette-compat]: common.h internal.h mips.h or1k.h ppc.h riscv.h src/external/gpl3/binutils/dist/include/opcode [pgoyette-compat]: hppa.h mips.h ppc.h riscv-opc.h riscv.h src/external/gpl3/binutils/dist/ld [pgoyette-compat]: ChangeLog Makefile.am Makefile.in configure configure.ac configure.host configu
