CVS commit: src/tests/rump/modautoload
Module Name:src Committed By: ozaki-r Date: Wed Sep 14 03:19:11 UTC 2016 Modified Files: src/tests/rump/modautoload: t_modautoload.c Log Message: Fill old_len which is required by sysctlbyname To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/rump/modautoload/t_modautoload.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/rump/modautoload/t_modautoload.c diff -u src/tests/rump/modautoload/t_modautoload.c:1.4 src/tests/rump/modautoload/t_modautoload.c:1.5 --- src/tests/rump/modautoload/t_modautoload.c:1.4 Sun Dec 27 08:21:44 2015 +++ src/tests/rump/modautoload/t_modautoload.c Wed Sep 14 03:19:11 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: t_modautoload.c,v 1.4 2015/12/27 08:21:44 pgoyette Exp $ */ +/* $NetBSD: t_modautoload.c,v 1.5 2016/09/14 03:19:11 ozaki-r Exp $ */ #include #include @@ -46,6 +46,7 @@ mountkernfs(void) atf_tc_fail_errno("mkdir /kern"); new_autoload = true; + old_len = sizeof(old_autoload); new_len = sizeof(new_autoload); error = sysctlbyname("kern.module.autoload", _autoload, _len,
CVS commit: src/tests/rump/modautoload
Module Name:src Committed By: ozaki-r Date: Wed Sep 14 03:19:11 UTC 2016 Modified Files: src/tests/rump/modautoload: t_modautoload.c Log Message: Fill old_len which is required by sysctlbyname To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/rump/modautoload/t_modautoload.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-localcount] src
Module Name:src Committed By: pgoyette Date: Wed Sep 14 03:04:19 UTC 2016 Modified Files: src/distrib/sets/lists/comp [pgoyette-localcount]: mi Added Files: src/distrib/sets/lists/debug [pgoyette-localcount]: md.ia64 src/external/bsd/llvm/dist/clang/test/CodeGen [pgoyette-localcount]: builtins-sparc.c sparc-vaarg.c src/external/bsd/llvm/dist/llvm/test/Analysis/DivergenceAnalysis/AMDGPU [pgoyette-localcount]: interp-intrinsics.ll src/external/bsd/llvm/dist/llvm/test/CodeGen/AMDGPU [pgoyette-localcount]: bug-vopc-commute.ll hsa-default-device.ll multilevel-break.ll promote-alloca-array-allocation.ll promote-alloca-invariant-markers.ll promote-alloca-mem-intrinsics.ll promote-alloca-unhandled-intrinsic.ll promote-alloca-volatile.ll ret_jump.ll si-annotate-cfg-loop-assert.ll si-spill-sgpr-stack.ll split-smrd.ll src/external/bsd/llvm/dist/llvm/test/CodeGen/ARM/Windows [pgoyette-localcount]: builtin_longjmp.ll dbzchk.ll src/external/bsd/llvm/dist/llvm/test/CodeGen/Mips/cconv [pgoyette-localcount]: roundl-call.ll src/external/bsd/llvm/dist/llvm/test/CodeGen/PowerPC [pgoyette-localcount]: aggressive-anti-dep-breaker-subreg.ll pr27350.ll src/external/bsd/llvm/dist/llvm/test/CodeGen/X86 [pgoyette-localcount]: base-pointer-and-cmpxchg.ll i686-win-shrink-wrapping.ll src/external/bsd/llvm/dist/llvm/test/Instrumentation/MemorySanitizer/Mips [pgoyette-localcount]: vararg-mips64.ll vararg-mips64el.ll src/external/bsd/llvm/dist/llvm/test/LTO/X86 [pgoyette-localcount]: pr25919.ll src/external/bsd/tmux/dist [pgoyette-localcount]: cmd-set-hook.c example_tmux.conf hooks.c proc.c xmalloc.h src/external/bsd/tmux/dist/compat [pgoyette-localcount]: reallocarray.c src/external/bsd/unbound [pgoyette-localcount]: Makefile Makefile.inc TODO src/external/bsd/unbound/bin [pgoyette-localcount]: Makefile Makefile.inc src/external/bsd/unbound/bin/unbound-host [pgoyette-localcount]: Makefile src/external/bsd/unbound/dist [pgoyette-localcount]: .gitignore LICENSE Makefile.in README ac_pkg_swig.m4 aclocal.m4 acx_nlnetlabs.m4 acx_python.m4 ax_pthread.m4 config.guess config.h.in config.sub configure configure.ac install-sh ltmain.sh src/external/bsd/unbound/dist/cachedb [pgoyette-localcount]: cachedb.c cachedb.h src/external/bsd/unbound/dist/compat [pgoyette-localcount]: arc4_lock.c arc4random.c arc4random_uniform.c chacha_private.h ctime_r.c explicit_bzero.c fake-rfc2553.c fake-rfc2553.h getentropy_linux.c getentropy_osx.c getentropy_solaris.c getentropy_win.c gmtime_r.c inet_aton.c inet_ntop.c inet_pton.c isblank.c malloc.c memcmp.c memcmp.h memmove.c reallocarray.c sha512.c snprintf.c strlcat.c strlcpy.c strptime.c strsep.c src/external/bsd/unbound/dist/contrib [pgoyette-localcount]: README -filter-iterator.patch build-unbound-localzone-from-hosts.pl create_unbound_ad_servers.cmd create_unbound_ad_servers.sh parseunbound.pl patch_rsamd5_enable.diff rc_d_unbound unbound-host.nagios.patch unbound.init unbound.init_fedora unbound.plist unbound.spec unbound.spec_fedora unbound_cache.cmd unbound_cache.sh unbound_cacti.tar.gz unbound_munin_ unbound_smf22.tar.gz update-anchor.sh validation-reporter.sh warmup.cmd warmup.sh src/external/bsd/unbound/dist/contrib/selinux [pgoyette-localcount]: unbound.fc unbound.te src/external/bsd/unbound/dist/daemon [pgoyette-localcount]: acl_list.c acl_list.h cachedump.c cachedump.h daemon.c daemon.h remote.c remote.h stats.c stats.h unbound.c worker.c worker.h src/external/bsd/unbound/dist/dns64 [pgoyette-localcount]: dns64.c dns64.h src/external/bsd/unbound/dist/dnstap [pgoyette-localcount]: dnstap.c dnstap.h dnstap.m4 dnstap.proto dnstap_config.h.in src/external/bsd/unbound/dist/doc [pgoyette-localcount]: CREDITS Changelog FEATURES LICENSE README README.DNS64 README.svn README.tests TODO control_proto_spec.txt example.conf.in ietf67-design-02.odp ietf67-design-02.pdf libunbound.3.in requirements.txt unbound-anchor.8.in unbound-checkconf.8.in unbound-control.8.in unbound-host.1.in unbound.8.in unbound.conf.5.in unbound.doxygen src/external/bsd/unbound/dist/iterator [pgoyette-localcount]: iter_delegpt.c iter_delegpt.h iter_donotq.c iter_donotq.h iter_fwd.c iter_fwd.h iter_hints.c iter_hints.h
CVS commit: [pgoyette-localcount] src
Module Name:src Committed By: pgoyette Date: Wed Sep 14 03:04:19 UTC 2016 Modified Files: src/distrib/sets/lists/comp [pgoyette-localcount]: mi Added Files: src/distrib/sets/lists/debug [pgoyette-localcount]: md.ia64 src/external/bsd/llvm/dist/clang/test/CodeGen [pgoyette-localcount]: builtins-sparc.c sparc-vaarg.c src/external/bsd/llvm/dist/llvm/test/Analysis/DivergenceAnalysis/AMDGPU [pgoyette-localcount]: interp-intrinsics.ll src/external/bsd/llvm/dist/llvm/test/CodeGen/AMDGPU [pgoyette-localcount]: bug-vopc-commute.ll hsa-default-device.ll multilevel-break.ll promote-alloca-array-allocation.ll promote-alloca-invariant-markers.ll promote-alloca-mem-intrinsics.ll promote-alloca-unhandled-intrinsic.ll promote-alloca-volatile.ll ret_jump.ll si-annotate-cfg-loop-assert.ll si-spill-sgpr-stack.ll split-smrd.ll src/external/bsd/llvm/dist/llvm/test/CodeGen/ARM/Windows [pgoyette-localcount]: builtin_longjmp.ll dbzchk.ll src/external/bsd/llvm/dist/llvm/test/CodeGen/Mips/cconv [pgoyette-localcount]: roundl-call.ll src/external/bsd/llvm/dist/llvm/test/CodeGen/PowerPC [pgoyette-localcount]: aggressive-anti-dep-breaker-subreg.ll pr27350.ll src/external/bsd/llvm/dist/llvm/test/CodeGen/X86 [pgoyette-localcount]: base-pointer-and-cmpxchg.ll i686-win-shrink-wrapping.ll src/external/bsd/llvm/dist/llvm/test/Instrumentation/MemorySanitizer/Mips [pgoyette-localcount]: vararg-mips64.ll vararg-mips64el.ll src/external/bsd/llvm/dist/llvm/test/LTO/X86 [pgoyette-localcount]: pr25919.ll src/external/bsd/tmux/dist [pgoyette-localcount]: cmd-set-hook.c example_tmux.conf hooks.c proc.c xmalloc.h src/external/bsd/tmux/dist/compat [pgoyette-localcount]: reallocarray.c src/external/bsd/unbound [pgoyette-localcount]: Makefile Makefile.inc TODO src/external/bsd/unbound/bin [pgoyette-localcount]: Makefile Makefile.inc src/external/bsd/unbound/bin/unbound-host [pgoyette-localcount]: Makefile src/external/bsd/unbound/dist [pgoyette-localcount]: .gitignore LICENSE Makefile.in README ac_pkg_swig.m4 aclocal.m4 acx_nlnetlabs.m4 acx_python.m4 ax_pthread.m4 config.guess config.h.in config.sub configure configure.ac install-sh ltmain.sh src/external/bsd/unbound/dist/cachedb [pgoyette-localcount]: cachedb.c cachedb.h src/external/bsd/unbound/dist/compat [pgoyette-localcount]: arc4_lock.c arc4random.c arc4random_uniform.c chacha_private.h ctime_r.c explicit_bzero.c fake-rfc2553.c fake-rfc2553.h getentropy_linux.c getentropy_osx.c getentropy_solaris.c getentropy_win.c gmtime_r.c inet_aton.c inet_ntop.c inet_pton.c isblank.c malloc.c memcmp.c memcmp.h memmove.c reallocarray.c sha512.c snprintf.c strlcat.c strlcpy.c strptime.c strsep.c src/external/bsd/unbound/dist/contrib [pgoyette-localcount]: README -filter-iterator.patch build-unbound-localzone-from-hosts.pl create_unbound_ad_servers.cmd create_unbound_ad_servers.sh parseunbound.pl patch_rsamd5_enable.diff rc_d_unbound unbound-host.nagios.patch unbound.init unbound.init_fedora unbound.plist unbound.spec unbound.spec_fedora unbound_cache.cmd unbound_cache.sh unbound_cacti.tar.gz unbound_munin_ unbound_smf22.tar.gz update-anchor.sh validation-reporter.sh warmup.cmd warmup.sh src/external/bsd/unbound/dist/contrib/selinux [pgoyette-localcount]: unbound.fc unbound.te src/external/bsd/unbound/dist/daemon [pgoyette-localcount]: acl_list.c acl_list.h cachedump.c cachedump.h daemon.c daemon.h remote.c remote.h stats.c stats.h unbound.c worker.c worker.h src/external/bsd/unbound/dist/dns64 [pgoyette-localcount]: dns64.c dns64.h src/external/bsd/unbound/dist/dnstap [pgoyette-localcount]: dnstap.c dnstap.h dnstap.m4 dnstap.proto dnstap_config.h.in src/external/bsd/unbound/dist/doc [pgoyette-localcount]: CREDITS Changelog FEATURES LICENSE README README.DNS64 README.svn README.tests TODO control_proto_spec.txt example.conf.in ietf67-design-02.odp ietf67-design-02.pdf libunbound.3.in requirements.txt unbound-anchor.8.in unbound-checkconf.8.in unbound-control.8.in unbound-host.1.in unbound.8.in unbound.conf.5.in unbound.doxygen src/external/bsd/unbound/dist/iterator [pgoyette-localcount]: iter_delegpt.c iter_delegpt.h iter_donotq.c iter_donotq.h iter_fwd.c iter_fwd.h iter_hints.c iter_hints.h
CVS commit: src/tests/net/if_pppoe
Module Name:src Committed By: knakahara Date: Wed Sep 14 01:48:08 UTC 2016 Modified Files: src/tests/net/if_pppoe: t_pppoe.sh Log Message: Disable rechallenge for chap test case. NetBSD's PPPoE client doesn't support chap rechallenge yet. >From Shoichi YAMAGUCHI, Thanks. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/net/if_pppoe/t_pppoe.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/if_pppoe/t_pppoe.sh diff -u src/tests/net/if_pppoe/t_pppoe.sh:1.3 src/tests/net/if_pppoe/t_pppoe.sh:1.4 --- src/tests/net/if_pppoe/t_pppoe.sh:1.3 Mon Sep 12 14:47:24 2016 +++ src/tests/net/if_pppoe/t_pppoe.sh Wed Sep 14 01:48:08 2016 @@ -1,4 +1,4 @@ -# $NetBSD: t_pppoe.sh,v 1.3 2016/09/12 14:47:24 christos Exp $ +# $NetBSD: t_pppoe.sh,v 1.4 2016/09/14 01:48:08 knakahara Exp $ # # Copyright (c) 2016 Internet Initiative Japan Inc. # All rights reserved. @@ -102,11 +102,18 @@ run_test() local auth=$1 setup + # As pppoe client doesn't support rechallenge yet. + local server_optparam="" + if [ $auth = "chap" ]; then + server_optparam="norechallenge" + fi + export RUMP_SERVER=$SERVER local setup_serverparam="pppoectl pppoe0 hisauthproto=$auth \ 'hisauthname=$AUTHNAME' \ 'hisauthsecret=$SECRET' \ -'myauthproto=none'" +'myauthproto=none' \ +$server_optparam" atf_check -s exit:0 -x "$HIJACKING $setup_serverparam" atf_check -s exit:0 rump.ifconfig pppoe0 up unset RUMP_SERVER
CVS commit: src/tests/net/if_pppoe
Module Name:src Committed By: knakahara Date: Wed Sep 14 01:48:08 UTC 2016 Modified Files: src/tests/net/if_pppoe: t_pppoe.sh Log Message: Disable rechallenge for chap test case. NetBSD's PPPoE client doesn't support chap rechallenge yet. >From Shoichi YAMAGUCHI, Thanks. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/net/if_pppoe/t_pppoe.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools
Module Name:src Committed By: christos Date: Wed Sep 14 00:41:05 UTC 2016 Modified Files: src/tools: Makefile.nbincludes Log Message: Add exec_ecoff.h To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tools/Makefile.nbincludes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/Makefile.nbincludes diff -u src/tools/Makefile.nbincludes:1.4 src/tools/Makefile.nbincludes:1.5 --- src/tools/Makefile.nbincludes:1.4 Sat Jan 24 11:21:33 2015 +++ src/tools/Makefile.nbincludes Tue Sep 13 20:41:04 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.nbincludes,v 1.4 2015/01/24 16:21:33 uwe Exp $ +# $NetBSD: Makefile.nbincludes,v 1.5 2016/09/14 00:41:04 christos Exp $ # NOxxx definitions are copied from Makefile.host, and are # required before .include . The include of bsd.own.mk @@ -35,7 +35,7 @@ _INCS= disktab.h _SYSINCS= bootblock.h \ disklabel.h disklabel_acorn.h disklabel_gpt.h disklabel_rdb.h \ dkbad.h \ - exec_elf.h + exec_elf.h exec_ecoff.h HOST_CPPFLAGS+= -I${TOOLDIR}/include -I${TOOLDIR}/include/nbinclude
CVS commit: src/tools
Module Name:src Committed By: christos Date: Wed Sep 14 00:41:05 UTC 2016 Modified Files: src/tools: Makefile.nbincludes Log Message: Add exec_ecoff.h To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tools/Makefile.nbincludes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/shutdown
Module Name:src Committed By: kre Date: Wed Sep 14 00:16:31 UTC 2016 Modified Files: src/sbin/shutdown: shutdown.8 Log Message: Update the history, shutdown was first in 4.1 BSD (and existed earlier). Ride date bump for previous update. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sbin/shutdown/shutdown.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/shutdown
Module Name:src Committed By: kre Date: Wed Sep 14 00:16:31 UTC 2016 Modified Files: src/sbin/shutdown: shutdown.8 Log Message: Update the history, shutdown was first in 4.1 BSD (and existed earlier). Ride date bump for previous update. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sbin/shutdown/shutdown.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/shutdown/shutdown.8 diff -u src/sbin/shutdown/shutdown.8:1.32 src/sbin/shutdown/shutdown.8:1.33 --- src/sbin/shutdown/shutdown.8:1.32 Mon Sep 12 06:22:35 2016 +++ src/sbin/shutdown/shutdown.8 Wed Sep 14 00:16:31 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: shutdown.8,v 1.32 2016/09/12 06:22:35 sevan Exp $ +.\" $NetBSD: shutdown.8,v 1.33 2016/09/14 00:16:31 kre Exp $ .\" .\" Copyright (c) 1988, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -237,7 +237,9 @@ System shutdown commands The hours and minutes in the second time format may be separated by a colon (``:'') for backward compatibility. .Sh HISTORY -The +A .Nm -command appeared in -.Bx 4.2 . +command was originally written by Ian Johnstone for UNSW's modified +.At "6th Edn" , +modified, and then incorporated in +.Bx 4.1 .
Re: CVS commit: src/sbin/shutdown
Date:Tue, 13 Sep 2016 15:25:26 +0700 From:Robert ElzMessage-ID: <27729.1473755...@andromeda.noi.kre.to> | Shutdown originated in 6th edn (maybe 5th) UNSW (pdp-11) unix, | | At one stage it had (in comments in the source) our names all neatly | lined up ... | | Ian Johnstone | K. Robert Elz | William N Joy Turns out I didn't remember the format as well as I thought, it was actually ... * Ian Johnstone, Sydney, 1977 * Robert Elz, Melbourne, 1978 * Peter Lamb, Melbourne, 1980 * William Joy, Berkeley, 1981 * Michael Toy, Berkeley, 1981 * Dave Presotto, Berkeley, 1981 The neat alignment I remembered was still there though, and the final mis-alignment (and then this stuff was all deleted a little later). It was added Feb 1981, 4.1BSD was June 1981, so shutdown was in 4.1 (and the man page SCCS file confirms that as well, the 4.1 and 4.2 man pages both appear there.) | till someone else in CSRG (one of the Keith's I suspect) modified it more, Keith Bostic did get at it, the log says "complete rewrite", but that was later, 1988, after 4.3, so would have been for Tahoe or Reno. kre
CVS commit: src/sys/net
Module Name:src Committed By: joerg Date: Tue Sep 13 19:51:12 UTC 2016 Modified Files: src/sys/net: if_spppsubr.c Log Message: Report link state changes for sppp consumers. The link is considered up, if the current phase is SPPP_PHASE_NETWORK, otherwise it is down. Useful when using dhcpcd for DHCPv6 PD. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/sys/net/if_spppsubr.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/net/if_spppsubr.c diff -u src/sys/net/if_spppsubr.c:1.148 src/sys/net/if_spppsubr.c:1.149 --- src/sys/net/if_spppsubr.c:1.148 Fri Sep 9 12:41:14 2016 +++ src/sys/net/if_spppsubr.c Tue Sep 13 19:51:12 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: if_spppsubr.c,v 1.148 2016/09/09 12:41:14 christos Exp $ */ +/* $NetBSD: if_spppsubr.c,v 1.149 2016/09/13 19:51:12 joerg Exp $ */ /* * Synchronous PPP/Cisco link level subroutines. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.148 2016/09/09 12:41:14 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.149 2016/09/13 19:51:12 joerg Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -442,6 +442,27 @@ static const struct cp *cps[IDX_COUNT] = , /* IDX_CHAP */ }; +static void +sppp_change_phase(struct sppp *sp, int phase) +{ + STDDCL; + + if (sp->pp_phase == phase) + return; + + sp->pp_phase = phase; + + if (phase == SPPP_PHASE_NETWORK) + if_link_state_change(ifp, LINK_STATE_UP); + else + if_link_state_change(ifp, LINK_STATE_DOWN); + + if (debug) + { + log(LOG_INFO, "%s: phase %s\n", ifp->if_xname, + sppp_phase_name(sp->pp_phase)); + } +} /* * Exported functions, comprising our interface to the lower layer. @@ -2481,7 +2502,7 @@ drop: static void sppp_lcp_tlu(struct sppp *sp) { - STDDCL; + struct ifnet *ifp = >pp_if; int i; uint32_t mask; @@ -2498,15 +2519,9 @@ sppp_lcp_tlu(struct sppp *sp) if ((sp->lcp.opts & (1 << LCP_OPT_AUTH_PROTO)) != 0 || (sp->pp_flags & PP_NEEDAUTH) != 0) - sp->pp_phase = SPPP_PHASE_AUTHENTICATE; + sppp_change_phase(sp, SPPP_PHASE_AUTHENTICATE); else - sp->pp_phase = SPPP_PHASE_NETWORK; - - if (debug) - { - log(LOG_INFO, "%s: phase %s\n", ifp->if_xname, - sppp_phase_name(sp->pp_phase)); - } + sppp_change_phase(sp, SPPP_PHASE_NETWORK); /* * Open all authentication protocols. This is even required @@ -2543,17 +2558,10 @@ sppp_lcp_tlu(struct sppp *sp) static void sppp_lcp_tld(struct sppp *sp) { - STDDCL; int i; uint32_t mask; - sp->pp_phase = SPPP_PHASE_TERMINATE; - - if (debug) - { - log(LOG_INFO, "%s: phase %s\n", ifp->if_xname, - sppp_phase_name(sp->pp_phase)); - } + sppp_change_phase(sp, SPPP_PHASE_TERMINATE); /* * Take upper layers down. We send the Down event first and @@ -2571,7 +2579,6 @@ sppp_lcp_tld(struct sppp *sp) static void sppp_lcp_tls(struct sppp *sp) { - STDDCL; if (sp->pp_max_auth_fail != 0 && sp->pp_auth_failures >= sp->pp_max_auth_fail) { printf("%s: authentication failed %d times, not retrying again\n", @@ -2580,13 +2587,7 @@ sppp_lcp_tls(struct sppp *sp) return; } - sp->pp_phase = SPPP_PHASE_ESTABLISH; - - if (debug) - { - log(LOG_INFO, "%s: phase %s\n", ifp->if_xname, - sppp_phase_name(sp->pp_phase)); - } + sppp_change_phase(sp, SPPP_PHASE_ESTABLISH); /* Notify lower layer if desired. */ if (sp->pp_tls) @@ -2596,15 +2597,8 @@ sppp_lcp_tls(struct sppp *sp) static void sppp_lcp_tlf(struct sppp *sp) { - STDDCL; - sp->pp_phase = SPPP_PHASE_DEAD; - - if (debug) - { - log(LOG_INFO, "%s: phase %s\n", ifp->if_xname, - sppp_phase_name(sp->pp_phase)); - } + sppp_change_phase(sp, SPPP_PHASE_DEAD); /* Notify lower layer if desired. */ if (sp->pp_tlf) @@ -5368,17 +5362,10 @@ sppp_params(struct sppp *sp, u_long cmd, static void sppp_phase_network(struct sppp *sp) { - STDDCL; int i; uint32_t mask; - sp->pp_phase = SPPP_PHASE_NETWORK; - - if (debug) - { - log(LOG_INFO, "%s: phase %s\n", ifp->if_xname, - sppp_phase_name(sp->pp_phase)); - } + sppp_change_phase(sp, SPPP_PHASE_NETWORK); /* Notify NCPs now. */ for (i = 0; i < IDX_COUNT; i++)
CVS commit: src/sys/dev/tc
Module Name:src Committed By: christos Date: Tue Sep 13 16:54:26 UTC 2016 Modified Files: src/sys/dev/tc: tcu.c Log Message: Adapt driver to final CPLD implementation. (Felix Deichmann) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/tc/tcu.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/tc
Module Name:src Committed By: christos Date: Tue Sep 13 16:54:26 UTC 2016 Modified Files: src/sys/dev/tc: tcu.c Log Message: Adapt driver to final CPLD implementation. (Felix Deichmann) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/tc/tcu.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/tc/tcu.c diff -u src/sys/dev/tc/tcu.c:1.1 src/sys/dev/tc/tcu.c:1.2 --- src/sys/dev/tc/tcu.c:1.1 Thu Aug 11 05:05:42 2016 +++ src/sys/dev/tc/tcu.c Tue Sep 13 12:54:26 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: tcu.c,v 1.1 2016/08/11 09:05:42 christos Exp $ */ +/* $NetBSD: tcu.c,v 1.2 2016/09/13 16:54:26 christos Exp $ */ /*- * Copyright (c) 2016, Felix Deichmann @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tcu.c,v 1.1 2016/08/11 09:05:42 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcu.c,v 1.2 2016/09/13 16:54:26 christos Exp $"); #include #include @@ -48,11 +48,15 @@ __KERNEL_RCSID(0, "$NetBSD: tcu.c,v 1.1 #include "slhci_tcu.h" #define TCU_GPIO_NPINS 8 -#define TCU_GPIO_OFFS 0x80 -#define TCU_GPIO_SIZE (3 * 4) -#define TCU_GPIO_DIR 0x0 -#define TCU_GPIO_IN 0x4 -#define TCU_GPIO_OUT 0x8 + +#define TCU_CPLD_OFFS 0x80 +#define TCU_CPLD_SIZE (4 * 4) + +#define TCU_CFG 0x0 +#define TCU_CFG_RUN __BIT(7) /* write-only */ +#define TCU_GPIO_DIR 0x4 +#define TCU_GPIO_IN 0x8 +#define TCU_GPIO_OUT 0xc struct tcu_softc { #if NGPIO > 0 @@ -94,8 +98,45 @@ tcu_match(device_t parent, cfdata_t cf, static void tcu_attach(device_t parent, device_t self, void *aux) { + struct tc_attach_args *ta = aux; + bus_space_tag_t iot = ta->ta_memt; + bus_space_handle_t ioh; + int error; + uint8_t cfg; + char buf[30]; printf(": TC-USB\n"); + + error = bus_space_map(iot, ta->ta_addr + TCU_CPLD_OFFS, TCU_CPLD_SIZE, + 0, ); + if (error) { + aprint_error_dev(self, "bus_space_map() failed (%d)\n", error); + return; + } + + /* + * Force reset in case system didn't. SL811 reset pulse and hold time + * must be min. 16 clocks long (at 48 MHz clock) each. + */ + bus_space_write_1(iot, ioh, TCU_CFG, 0); + DELAY(1000); + bus_space_write_1(iot, ioh, TCU_CFG, TCU_CFG_RUN); + DELAY(1000); + + cfg = bus_space_read_1(iot, ioh, TCU_CFG); + + bus_space_unmap(iot, ioh, TCU_CPLD_SIZE); + + /* Display DIP switch configuration. */ + (void)snprintb(buf, sizeof(buf), + "\177\020" + "b\3S1-1\0" + "b\2S1-2\0" + "b\1S1-3\0" + "b\0S1-4\0" + "\0", cfg); + aprint_normal_dev(self, "config %s\n", buf); + #if NSLHCI_TCU > 0 /* Attach slhci. */ (void)config_found_ia(self, "tcu", aux, tcu_print); @@ -132,7 +173,7 @@ tcu_gpio_attach(device_t parent, device_ sc->sc_gpio_iot = iot; - error = bus_space_map(iot, ta->ta_addr + TCU_GPIO_OFFS, TCU_GPIO_SIZE, + error = bus_space_map(iot, ta->ta_addr + TCU_CPLD_OFFS, TCU_CPLD_SIZE, 0, >sc_gpio_ioh); if (error) { aprint_error_dev(self, "bus_space_map() failed (%d)\n", error);
CVS commit: src/usr.bin/config
Module Name:src Committed By: christos Date: Tue Sep 13 16:06:59 UTC 2016 Modified Files: src/usr.bin/config: sem.c Log Message: define the attribute first. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/usr.bin/config/sem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/config
Module Name:src Committed By: christos Date: Tue Sep 13 16:06:59 UTC 2016 Modified Files: src/usr.bin/config: sem.c Log Message: define the attribute first. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/usr.bin/config/sem.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.bin/config/sem.c diff -u src/usr.bin/config/sem.c:1.76 src/usr.bin/config/sem.c:1.77 --- src/usr.bin/config/sem.c:1.76 Fri Sep 9 17:09:11 2016 +++ src/usr.bin/config/sem.c Tue Sep 13 12:06:59 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: sem.c,v 1.76 2016/09/09 21:09:11 christos Exp $ */ +/* $NetBSD: sem.c,v 1.77 2016/09/13 16:06:59 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ #endif #include -__RCSID("$NetBSD: sem.c,v 1.76 2016/09/09 21:09:11 christos Exp $"); +__RCSID("$NetBSD: sem.c,v 1.77 2016/09/13 16:06:59 christos Exp $"); #include #include @@ -336,6 +336,14 @@ defattr(const char *name, struct loclist struct attr *a, *dep; struct attrlist *al; + if (getrefattr(name, )) { + cfgerror("attribute `%s' already defined", name); + loclist_destroy(locs); + return (1); + } + if (a == NULL) + a = mkattr(name); + /* * If this attribute depends on any others, make sure none of * the dependencies are interface attributes. @@ -352,13 +360,6 @@ defattr(const char *name, struct loclist CFGDBG(2, "attr `%s' depends on attr `%s'", name, dep->a_name); } - if (getrefattr(name, )) { - cfgerror("attribute `%s' already defined", name); - loclist_destroy(locs); - return (1); - } - if (a == NULL) - a = mkattr(name); a->a_deps = deps; expandattr(a, NULL);
CVS commit: src/sys
Module Name:src Committed By: christos Date: Tue Sep 13 15:57:50 UTC 2016 Modified Files: src/sys/netinet: in.c src/sys/netinet6: in6.c Log Message: revert previous, roy says it breaks DaD. To generate a diff of this commit: cvs rdiff -u -r1.180 -r1.181 src/sys/netinet/in.c cvs rdiff -u -r1.219 -r1.220 src/sys/netinet6/in6.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/in.c diff -u src/sys/netinet/in.c:1.180 src/sys/netinet/in.c:1.181 --- src/sys/netinet/in.c:1.180 Tue Sep 13 11:41:33 2016 +++ src/sys/netinet/in.c Tue Sep 13 11:57:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: in.c,v 1.180 2016/09/13 15:41:33 christos Exp $ */ +/* $NetBSD: in.c,v 1.181 2016/09/13 15:57:50 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -91,7 +91,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.180 2016/09/13 15:41:33 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.181 2016/09/13 15:57:50 christos Exp $"); #include "arp.h" @@ -1065,7 +1065,6 @@ in_ifinit(struct ifnet *ifp, struct in_i */ oldaddr = ia->ia_addr; ia->ia_addr = *sin; - ia->ia4_flags = 0; /* Set IN_IFF flags early for if_addr_init() */ if (hostIsNew && if_do_dad(ifp) && !in_nullhost(ia->ia_addr.sin_addr)) { Index: src/sys/netinet6/in6.c diff -u src/sys/netinet6/in6.c:1.219 src/sys/netinet6/in6.c:1.220 --- src/sys/netinet6/in6.c:1.219 Tue Sep 13 11:41:34 2016 +++ src/sys/netinet6/in6.c Tue Sep 13 11:57:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: in6.c,v 1.219 2016/09/13 15:41:34 christos Exp $ */ +/* $NetBSD: in6.c,v 1.220 2016/09/13 15:57:50 christos Exp $ */ /* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.219 2016/09/13 15:41:34 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.220 2016/09/13 15:57:50 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1708,7 +1708,6 @@ in6_ifinit(struct ifnet *ifp, struct in6 } ia->ia_addr = *sin6; - ia->ia6_flags = 0; if (ifacount <= 0 && (error = if_addr_init(ifp, >ia_ifa, true)) != 0) {
CVS commit: src/sys
Module Name:src Committed By: christos Date: Tue Sep 13 15:57:50 UTC 2016 Modified Files: src/sys/netinet: in.c src/sys/netinet6: in6.c Log Message: revert previous, roy says it breaks DaD. To generate a diff of this commit: cvs rdiff -u -r1.180 -r1.181 src/sys/netinet/in.c cvs rdiff -u -r1.219 -r1.220 src/sys/netinet6/in6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: christos Date: Tue Sep 13 15:41:34 UTC 2016 Modified Files: src/sys/netinet: in.c src/sys/netinet6: in6.c Log Message: When initializing addresses, reset the interface flags to 0. This fixes an issue where point to point addresses that started down, and then came up, were left with stale flags on one side of the point to point link. To generate a diff of this commit: cvs rdiff -u -r1.179 -r1.180 src/sys/netinet/in.c cvs rdiff -u -r1.218 -r1.219 src/sys/netinet6/in6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: christos Date: Tue Sep 13 15:41:34 UTC 2016 Modified Files: src/sys/netinet: in.c src/sys/netinet6: in6.c Log Message: When initializing addresses, reset the interface flags to 0. This fixes an issue where point to point addresses that started down, and then came up, were left with stale flags on one side of the point to point link. To generate a diff of this commit: cvs rdiff -u -r1.179 -r1.180 src/sys/netinet/in.c cvs rdiff -u -r1.218 -r1.219 src/sys/netinet6/in6.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/in.c diff -u src/sys/netinet/in.c:1.179 src/sys/netinet/in.c:1.180 --- src/sys/netinet/in.c:1.179 Thu Sep 1 00:27:00 2016 +++ src/sys/netinet/in.c Tue Sep 13 11:41:33 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: in.c,v 1.179 2016/09/01 04:27:00 ozaki-r Exp $ */ +/* $NetBSD: in.c,v 1.180 2016/09/13 15:41:33 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -91,7 +91,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.179 2016/09/01 04:27:00 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.180 2016/09/13 15:41:33 christos Exp $"); #include "arp.h" @@ -1065,6 +1065,7 @@ in_ifinit(struct ifnet *ifp, struct in_i */ oldaddr = ia->ia_addr; ia->ia_addr = *sin; + ia->ia4_flags = 0; /* Set IN_IFF flags early for if_addr_init() */ if (hostIsNew && if_do_dad(ifp) && !in_nullhost(ia->ia_addr.sin_addr)) { Index: src/sys/netinet6/in6.c diff -u src/sys/netinet6/in6.c:1.218 src/sys/netinet6/in6.c:1.219 --- src/sys/netinet6/in6.c:1.218 Fri Sep 2 11:57:54 2016 +++ src/sys/netinet6/in6.c Tue Sep 13 11:41:34 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: in6.c,v 1.218 2016/09/02 15:57:54 roy Exp $ */ +/* $NetBSD: in6.c,v 1.219 2016/09/13 15:41:34 christos Exp $ */ /* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.218 2016/09/02 15:57:54 roy Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.219 2016/09/13 15:41:34 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1708,6 +1708,7 @@ in6_ifinit(struct ifnet *ifp, struct in6 } ia->ia_addr = *sin6; + ia->ia6_flags = 0; if (ifacount <= 0 && (error = if_addr_init(ifp, >ia_ifa, true)) != 0) {
Re: CVS commit: src/usr.bin/config
On 09/09/2016 22:09, Christos Zoulas wrote: > Module Name: src > Committed By: christos > Date: Fri Sep 9 21:09:11 UTC 2016 > > Modified Files: > src/usr.bin/config: defs.h files.c sem.c > > Log Message: > Make attribute deselection work: > - when deselecting attributes, remove files that depend on them > - when deselecting attributes, remove devices that depend on them > > > To generate a diff of this commit: > cvs rdiff -u -r1.97 -r1.98 src/usr.bin/config/defs.h > cvs rdiff -u -r1.35 -r1.36 src/usr.bin/config/files.c > cvs rdiff -u -r1.75 -r1.76 src/usr.bin/config/sem.c # compile config/sem.o /home/roy/tools/amd64/bin/x86_64--netbsd-clang -O2 -g -fPIE -fstack-protector -Wstack-protector --param ssp-buffer-size=1 -std=gnu99 -Wno-sign-compare -Wno-pointer-sign -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wno-sign-compare -Wa,--fatal-warnings -Wreturn-type -Wswitch -Wshadow -Wcast- qual -Wwrite-strings -Wextra -Wno-unused-parameter -Wno-sign-compare -Wold-style-definition -Wconversion -Wsign-compare -Wformat=2 -Wpointer-sign -Wmissing-no return -Werror -Wno-format-y2k -pipe --sysroot=/home/roy/src/src/obj/destdir.amd64 -I/home/roy/src/src/usr.bin/config -I. -I/home/roy/src/src/usr.bin/cksum -D_FORTIFY_SOURCE=2 -c/home/roy/src/src/usr.bin/config/sem.c /home/roy/src/src/usr.bin/config/sem.c:351:29: error: variable 'a' is uninitialized when used here [-Werror,-Wuninitialized] addvalue(V_ATTRIBUTE, a, dep)); ^ /home/roy/src/src/usr.bin/config/defs.h:528:68: note: expanded from macro 'ht_insert2' #define ht_insert2(ht, nam1, nam2, val) ht_insrep2(ht, nam1, nam2, val, 0) ^~~ /home/roy/src/src/usr.bin/config/sem.c:336:16: note: initialize the variable 'a' to silence this warning struct attr *a, *dep; ^ = NULL 1 error generated. *** [sem.o] Error code 1
Re: CVS commit: src/sys
On 13/09/2016 02:28, Ryota Ozaki wrote: > On Mon, Sep 12, 2016 at 6:28 PM, Kengo NAKAHARAwrote: >> Hi, >> >> On 2016/09/12 17:28, Roy Marples wrote: >>> On 09/09/2016 20:08, Martin Husemann wrote: On Thu, Sep 08, 2016 at 02:19:15PM +0900, Kengo NAKAHARA wrote: > > On 2016/09/08 0:41, Roy Marples wrote: >> Module Name: src >> Committed By: roy >> Date: Wed Sep 7 15:41:44 UTC 2016 >> >> Modified Files: >>src/sys/netinet: ip_input.c >>src/sys/netinet6: ip6_input.c >> >> Log Message: >> Disallow input to detached addresses because they are not yet valid. >> >> >> To generate a diff of this commit: >> cvs rdiff -u -r1.340 -r1.341 src/sys/netinet/ip_input.c >> cvs rdiff -u -r1.167 -r1.168 src/sys/netinet6/ip6_input.c >> >> Please note that diffs are not public domain; they are subject to the >> copyright notices on the relevant files. > > ATF net/if_pppoe/t_pppoe:pap fails after this commit. I revert this > commit locally, and then the ATF become successful. I see the failure too, but manually configuring two rump servers in a very similar setup than the test still works for me - something must be wrong in the test, but I don't see it right now. >>> >>> martin@ did more testing and discovered that the PPP connection works >>> fine, so something is wrong in the test. >>> >>> I believe that the function wait_for_session_established needs an >>> additional pause to wait for the detached flag to clear. >>> If the interface is marked IFF_UP at this point, it should be possible >>> to add ifconfig -w 5 -W -5 and the test should then succeed. I'm getting >>> symbol errors still trying to run this test so cannot fix it myself >>> right now. >> >> I add ifconfig -w 15 -W 15 in wait_for_session_established(), however >> net/if_pppoe/t_pppoe:pap still fails. >> >> Hmm, does my below modification match your pointing out, doesn't it? > > It seems that DAD doesn't run on ifconfig pppoe0 up > and pppoe0 remains as detached. > > The following processing is happening: > - ifconfig up calls ioctl(SIOCSIFFLAGS) > that calls ifioctl_common normally > - ifioctl_common schedules DAD eventually > but only if IFF_UP & IFF_RUNNING > (see in_if_link_up) > - However, some interfaces including pppoe set > IFF_RUNNING *after* calling ifioctl_common > - Such interfaces don't run DAD > and remain as detached > > I don't know how to fix it properly. OK, I've had a quick look over the code. It looks like IFF_RUNNING is used to indicate whether a PPP session is currently running or not as opposed to hardware resources being allocated. It strikes me that the easiest fix is to set IFF_RUNNING before calling ifioctl_common if going_up and clear it if there is an error. We should also hook the interface link state code into ppp as well because we should know when the link is ready for use. Any reason why this cannot be done? Roy
Re: CVS commit: src/sys
On Tue, Sep 13, 2016 at 01:38:38PM +0100, Roy Marples wrote: > Where does pppoe even set IFF_RUNNING? I couldn't find that. Various places in if_spppsubr.c, depending on the interface flags for incoming or "auto dial". Martin
Re: CVS commit: src/sys
On 13/09/2016 02:28, Ryota Ozaki wrote: > It seems that DAD doesn't run on ifconfig pppoe0 up > and pppoe0 remains as detached. > > The following processing is happening: > - ifconfig up calls ioctl(SIOCSIFFLAGS) > that calls ifioctl_common normally > - ifioctl_common schedules DAD eventually > but only if IFF_UP & IFF_RUNNING > (see in_if_link_up) > - However, some interfaces including pppoe set > IFF_RUNNING *after* calling ifioctl_common > - Such interfaces don't run DAD > and remain as detached > > I don't know how to fix it properly. Where does pppoe even set IFF_RUNNING? I couldn't find that.
Re: CVS commit: src/sbin/shutdown
Date:Mon, 12 Sep 2016 06:22:35 + From:"Sevan Janiyan"Message-ID: <20160912062235.6396bf...@cvs.netbsd.org> | Modified Files: | src/sbin/shutdown: shutdown.8 | | Log Message: | shutdown appeared as a standalone utility in 4.2BSD release, in 4BSD its a | target in init. I will need to find where I put my CSRG SCCS files to check, but I don't think shutdown can really have first appeared in 4.2 Shutdown originated in 6th edn (maybe 5th) UNSW (pdp-11) unix, originally written by Ian Johnstone - I had it (and modified it) in the Melbourne Uni version of Wollongong University's Interdata 6th edition, and then added to 3BSD at Melb, and then added it to the Berkeley sources, where Bill Joy modified it even more. At one stage it had (in comments in the source) our names all neatly lined up ... Ian Johnstone K. Robert Elz William N Joy till someone else in CSRG (one of the Keith's I suspect) modified it more, and added their name, and the nice block layout was broken ... so all that nonsense was removed. But because Bill worked on this, it really cannot have appeared in BSD later than 4.1 (and the original was probably correct - 4BSD.) The actual shutdown was always a "target in init", through all of this, shutdown's job was to notify users of the upcoming outage, install an /etc/nologin at the appropriate time, and then poke init - that is, it provided orderly planned shutdown/reboot - init on the other hand just "shutdown now, immediately". kre
CVS commit: src/sys/sys
Module Name:src Committed By: martin Date: Tue Sep 13 07:41:18 UTC 2016 Modified Files: src/sys/sys: param.h Log Message: Bump version for struct emul and do_sys_{send,recv}msg signature changes. Welcome to 7.99.37! To generate a diff of this commit: cvs rdiff -u -r1.502 -r1.503 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: martin Date: Tue Sep 13 07:41:18 UTC 2016 Modified Files: src/sys/sys: param.h Log Message: Bump version for struct emul and do_sys_{send,recv}msg signature changes. Welcome to 7.99.37! To generate a diff of this commit: cvs rdiff -u -r1.502 -r1.503 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.502 src/sys/sys/param.h:1.503 --- src/sys/sys/param.h:1.502 Sat Aug 20 12:37:09 2016 +++ src/sys/sys/param.h Tue Sep 13 07:41:18 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.502 2016/08/20 12:37:09 hannken Exp $ */ +/* $NetBSD: param.h,v 1.503 2016/09/13 07:41:18 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 799003600 /* NetBSD 7.99.36 */ +#define __NetBSD_Version__ 799003700 /* NetBSD 7.99.37 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/sys
Module Name:src Committed By: martin Date: Tue Sep 13 07:39:45 UTC 2016 Modified Files: src/sys/compat/netbsd32: netbsd32_netbsd.c netbsd32_signal.c src/sys/kern: kern_ktrace.c kern_sig.c src/sys/sys: ktrace.h proc.h Log Message: Allow emulations to override the creation of ktrace records for posting signals. In compat_netbsd32 use this to write the 32bit version of the records, so a 32bit userland kdump is happy. To generate a diff of this commit: cvs rdiff -u -r1.202 -r1.203 src/sys/compat/netbsd32/netbsd32_netbsd.c cvs rdiff -u -r1.39 -r1.40 src/sys/compat/netbsd32/netbsd32_signal.c cvs rdiff -u -r1.168 -r1.169 src/sys/kern/kern_ktrace.c cvs rdiff -u -r1.329 -r1.330 src/sys/kern/kern_sig.c cvs rdiff -u -r1.64 -r1.65 src/sys/sys/ktrace.h cvs rdiff -u -r1.331 -r1.332 src/sys/sys/proc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/netbsd32/netbsd32_netbsd.c diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.202 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.203 --- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.202 Sat Sep 10 08:21:26 2016 +++ src/sys/compat/netbsd32/netbsd32_netbsd.c Tue Sep 13 07:39:45 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_netbsd.c,v 1.202 2016/09/10 08:21:26 skrll Exp $ */ +/* $NetBSD: netbsd32_netbsd.c,v 1.203 2016/09/13 07:39:45 martin Exp $ */ /* * Copyright (c) 1998, 2001, 2008 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.202 2016/09/10 08:21:26 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.203 2016/09/13 07:39:45 martin Exp $"); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -103,6 +103,8 @@ void netbsd32_syscall_intern(struct proc void syscall(void); #endif +void netbsd32_ktrpsig(int, sig_t, const sigset_t *, const ksiginfo_t *); + #define LIMITCHECK(a, b) ((a) != RLIM_INFINITY && (a) > (b)) #ifdef COMPAT_16 @@ -162,7 +164,8 @@ struct emul emul_netbsd32 = { .e_vm_default_addr = netbsd32_vm_default_addr, .e_usertrap = NULL, .e_ucsize = sizeof(ucontext32_t), - .e_startlwp = startlwp32 + .e_startlwp = startlwp32, + .e_ktrpsig = netbsd32_ktrpsig }; /* Index: src/sys/compat/netbsd32/netbsd32_signal.c diff -u src/sys/compat/netbsd32/netbsd32_signal.c:1.39 src/sys/compat/netbsd32/netbsd32_signal.c:1.40 --- src/sys/compat/netbsd32/netbsd32_signal.c:1.39 Sat Jun 20 19:58:40 2015 +++ src/sys/compat/netbsd32/netbsd32_signal.c Tue Sep 13 07:39:45 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_signal.c,v 1.39 2015/06/20 19:58:40 martin Exp $ */ +/* $NetBSD: netbsd32_signal.c,v 1.40 2016/09/13 07:39:45 martin Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.39 2015/06/20 19:58:40 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.40 2016/09/13 07:39:45 martin Exp $"); #include #include @@ -35,6 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sig #include #include #include +#include #include #include #include @@ -51,6 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sig #include #include +void netbsd32_ktrpsig(int, sig_t, const sigset_t *, const ksiginfo_t *); int netbsd32_sigaction(struct lwp *l, const struct netbsd32_sigaction_args *uap, register_t *retval) @@ -220,6 +222,46 @@ netbsd32_ksi32_to_ksi(struct _ksiginfo * } } +static void +netbsd32_ksi_to_ksi32(struct __ksiginfo32 *si32, const struct _ksiginfo *si) +{ + memset(si32, 0, sizeof (*si32)); + si32->_signo = si->_signo; + si32->_code = si->_code; + si32->_errno = si->_errno; + + switch (si->_signo) { + case SIGILL: + case SIGBUS: + case SIGSEGV: + case SIGFPE: + case SIGTRAP: + si32->_reason._fault._addr = + NETBSD32PTR32I(si->_reason._fault._addr); + si32->_reason._fault._trap = si->_reason._fault._trap; + break; + case SIGALRM: + case SIGVTALRM: + case SIGPROF: + default: /* see sigqueue() and kill1() */ + si32->_reason._rt._pid = si->_reason._rt._pid; + si32->_reason._rt._uid = si->_reason._rt._uid; + si32->_reason._rt._value.sival_int = si->_reason._rt._value.sival_int; + break; + case SIGCHLD: + si32->_reason._child._pid = si->_reason._child._pid; + si32->_reason._child._uid = si->_reason._child._uid; + si32->_reason._child._utime = si->_reason._child._utime; + si32->_reason._child._stime = si->_reason._child._stime; + break; + case SIGURG: + case SIGIO: + si32->_reason._poll._band = si->_reason._poll._band; + si32->_reason._poll._fd = si->_reason._poll._fd; + break; + } +} + void netbsd32_si_to_si32(siginfo32_t *si32, const siginfo_t *si) { @@ -455,3 +497,47 @@ netbsd32_sigqueueinfo(struct lwp *l, return kill1(l, SCARG(uap, pid), , retval); } + +struct netbsd32_ktr_psig { + int signo; + netbsd32_pointer_t action; + sigset_t mask; + int code; + /* and optional siginfo_t */ +}; + +void
CVS commit: src/sys
Module Name:src Committed By: martin Date: Tue Sep 13 07:39:45 UTC 2016 Modified Files: src/sys/compat/netbsd32: netbsd32_netbsd.c netbsd32_signal.c src/sys/kern: kern_ktrace.c kern_sig.c src/sys/sys: ktrace.h proc.h Log Message: Allow emulations to override the creation of ktrace records for posting signals. In compat_netbsd32 use this to write the 32bit version of the records, so a 32bit userland kdump is happy. To generate a diff of this commit: cvs rdiff -u -r1.202 -r1.203 src/sys/compat/netbsd32/netbsd32_netbsd.c cvs rdiff -u -r1.39 -r1.40 src/sys/compat/netbsd32/netbsd32_signal.c cvs rdiff -u -r1.168 -r1.169 src/sys/kern/kern_ktrace.c cvs rdiff -u -r1.329 -r1.330 src/sys/kern/kern_sig.c cvs rdiff -u -r1.64 -r1.65 src/sys/sys/ktrace.h cvs rdiff -u -r1.331 -r1.332 src/sys/sys/proc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sbin/newfs
Date:Tue, 13 Sep 2016 00:50:30 +0100 From:Sevan JaniyanMessage-ID: <2d30ad57-2341-3b08-1d78-32b468cd5...@netbsd.org> | I can't seem to find the 4.3BSD-Reno release notes at the moment, but | the convention is interim releases do not count. | There are examples of that where 4.2BSD is being referenced in inherited | man pages when in-fact the tools actually showed up in 4.1{a,b,c}. I think it is reasonable to ignore 4.1a (etc) for this kind of purpose, but as I recall, 4.3 Reno & Tahoe were really full releases kre
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Tue Sep 13 07:30:32 UTC 2016 Modified Files: src/sys/dev/usb: uhub.c Log Message: tiny KNF To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 src/sys/dev/usb/uhub.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/uhub.c diff -u src/sys/dev/usb/uhub.c:1.133 src/sys/dev/usb/uhub.c:1.134 --- src/sys/dev/usb/uhub.c:1.133 Sat Apr 23 10:15:32 2016 +++ src/sys/dev/usb/uhub.c Tue Sep 13 07:30:32 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: uhub.c,v 1.133 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uhub.c,v 1.134 2016/09/13 07:30:32 skrll Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */ /* $OpenBSD: uhub.c,v 1.86 2015/06/29 18:27:40 mpi Exp $ */ @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.133 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.134 2016/09/13 07:30:32 skrll Exp $"); #include @@ -321,7 +321,7 @@ uhub_attach(device_t parent, device_t se if (USB_IS_SS(dev->ud_speed) && dev->ud_depth != 0) { aprint_debug_dev(self, "setting hub depth %u\n", - dev->ud_depth-1); + dev->ud_depth - 1); err = usbd_set_hub_depth(dev, dev->ud_depth - 1); if (err) { aprint_error_dev(self, "can't set depth\n");
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Tue Sep 13 07:30:32 UTC 2016 Modified Files: src/sys/dev/usb: uhub.c Log Message: tiny KNF To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 src/sys/dev/usb/uhub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: martin Date: Tue Sep 13 07:01:08 UTC 2016 Modified Files: src/sys/compat/common: uipc_syscalls_43.c src/sys/compat/linux/common: linux_socket.c src/sys/compat/netbsd32: netbsd32_compat_43.c netbsd32_socket.c src/sys/compat/osf1: osf1_socket.c src/sys/compat/svr4: svr4_stream.c src/sys/kern: kern_ktrace.c uipc_syscalls.c src/sys/sys: ktrace.h socketvar.h Log Message: Make the ktrace record written by do_sys_sendmsg/do_sys_recvmsg overridable by the caller. Use this in compat_netbsd32 to log the 32bit version, so the 32bit userland kdump is happy. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/compat/common/uipc_syscalls_43.c cvs rdiff -u -r1.132 -r1.133 src/sys/compat/linux/common/linux_socket.c cvs rdiff -u -r1.53 -r1.54 src/sys/compat/netbsd32/netbsd32_compat_43.c cvs rdiff -u -r1.43 -r1.44 src/sys/compat/netbsd32/netbsd32_socket.c cvs rdiff -u -r1.21 -r1.22 src/sys/compat/osf1/osf1_socket.c cvs rdiff -u -r1.86 -r1.87 src/sys/compat/svr4/svr4_stream.c cvs rdiff -u -r1.167 -r1.168 src/sys/kern/kern_ktrace.c cvs rdiff -u -r1.182 -r1.183 src/sys/kern/uipc_syscalls.c cvs rdiff -u -r1.63 -r1.64 src/sys/sys/ktrace.h cvs rdiff -u -r1.140 -r1.141 src/sys/sys/socketvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/common/uipc_syscalls_43.c diff -u src/sys/compat/common/uipc_syscalls_43.c:1.46 src/sys/compat/common/uipc_syscalls_43.c:1.47 --- src/sys/compat/common/uipc_syscalls_43.c:1.46 Sun Nov 9 17:48:07 2014 +++ src/sys/compat/common/uipc_syscalls_43.c Tue Sep 13 07:01:07 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_syscalls_43.c,v 1.46 2014/11/09 17:48:07 maxv Exp $ */ +/* $NetBSD: uipc_syscalls_43.c,v 1.47 2016/09/13 07:01:07 martin Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1990, 1993 @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.46 2014/11/09 17:48:07 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.47 2016/09/13 07:01:07 martin Exp $"); #include #include @@ -216,7 +216,7 @@ compat_43_sys_recvmsg(struct lwp *l, con msg.msg_iov = omsg.msg_iov; msg.msg_flags = (SCARG(uap, flags) & MSG_USERFLAGS) | MSG_IOVUSRSPACE; - error = do_sys_recvmsg(l, SCARG(uap, s), , , + error = do_sys_recvmsg(l, SCARG(uap, s), , NULL, 0, , omsg.msg_accrights != NULL ? : NULL, retval); if (error != 0) return error; @@ -361,7 +361,8 @@ compat_43_sys_sendmsg(struct lwp *l, con if (error != 0) goto bad; - return do_sys_sendmsg(l, SCARG(uap, s), , SCARG(uap, flags), retval); + return do_sys_sendmsg(l, SCARG(uap, s), , SCARG(uap, flags), + NULL, 0, retval); bad: if (nam != NULL) Index: src/sys/compat/linux/common/linux_socket.c diff -u src/sys/compat/linux/common/linux_socket.c:1.132 src/sys/compat/linux/common/linux_socket.c:1.133 --- src/sys/compat/linux/common/linux_socket.c:1.132 Mon Aug 1 03:15:30 2016 +++ src/sys/compat/linux/common/linux_socket.c Tue Sep 13 07:01:07 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socket.c,v 1.132 2016/08/01 03:15:30 ozaki-r Exp $ */ +/* $NetBSD: linux_socket.c,v 1.133 2016/09/13 07:01:07 martin Exp $ */ /*- * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.132 2016/08/01 03:15:30 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.133 2016/09/13 07:01:07 martin Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -428,7 +428,8 @@ linux_sys_sendto(struct lwp *l, const st aiov.iov_base = __UNCONST(SCARG(uap, msg)); aiov.iov_len = SCARG(uap, len); - return do_sys_sendmsg(l, SCARG(uap, s), , bflags, retval); + return do_sys_sendmsg(l, SCARG(uap, s), , bflags, + NULL, 0, retval); } static void @@ -617,7 +618,8 @@ linux_sys_sendmsg(struct lwp *l, const s } skipcmsg: - error = do_sys_sendmsg(l, SCARG(uap, s), , bflags, retval); + error = do_sys_sendmsg(l, SCARG(uap, s), , bflags, + NULL, 0, retval); /* Freed internally */ ctl_mbuf = NULL; @@ -779,7 +781,7 @@ linux_sys_recvmsg(struct lwp *l, const s } msg.msg_flags |= MSG_IOVUSRSPACE; - error = do_sys_recvmsg(l, SCARG(uap, s), , , + error = do_sys_recvmsg(l, SCARG(uap, s), , NULL, 0, , msg.msg_control != NULL ? : NULL, retval); if (error != 0) return error; Index: src/sys/compat/netbsd32/netbsd32_compat_43.c diff -u src/sys/compat/netbsd32/netbsd32_compat_43.c:1.53 src/sys/compat/netbsd32/netbsd32_compat_43.c:1.54 --- src/sys/compat/netbsd32/netbsd32_compat_43.c:1.53 Fri Apr 23 23:05:40 2010 +++ src/sys/compat/netbsd32/netbsd32_compat_43.c Tue Sep 13 07:01:07 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_43.c,v 1.53 2010/04/23 23:05:40 joerg Exp $ */ +/* $NetBSD: netbsd32_compat_43.c,v 1.54 2016/09/13 07:01:07 martin Exp $ */ /* * Copyright (c) 1998,