svn commit: r311673 - stable/10/sys/cam/ctl
Author: mav
Date: Sun Jan 8 08:52:53 2017
New Revision: 311673
URL: https://svnweb.freebsd.org/changeset/base/311673
Log:
MFC r311446: Fix bootverbose affecting code logic in r294558.
Reported by:Jilles Tjoelker
Modified:
stable/10/sys/cam/ctl/ctl_ha.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl_ha.c
==
--- stable/10/sys/cam/ctl/ctl_ha.c Sun Jan 8 08:52:16 2017
(r311672)
+++ stable/10/sys/cam/ctl/ctl_ha.c Sun Jan 8 08:52:53 2017
(r311673)
@@ -443,8 +443,9 @@ ctl_ha_connect(struct ha_softc *softc)
memcpy(&sa, &softc->ha_peer_in, sizeof(sa));
error = soconnect(so, (struct sockaddr *)&sa, td);
- if (error != 0 && bootverbose) {
- printf("%s: soconnect() error %d\n", __func__, error);
+ if (error != 0) {
+ if (bootverbose)
+ printf("%s: soconnect() error %d\n", __func__, error);
goto out;
}
return (0);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r311687 - stable/10/sys/vm
Author: kib
Date: Sun Jan 8 16:59:07 2017
New Revision: 311687
URL: https://svnweb.freebsd.org/changeset/base/311687
Log:
MFC r267546 (by alc):
Tidy up the early parts of vm_map_insert().
MFC r267645 (by alc):
When MAP_STACK_GROWS_{DOWN,UP} are passed to vm_map_insert() set the
corresponding flag(s) in the new map entry.
Pass MAP_STACK_GROWS_DOWN to vm_map_insert() from vm_map_growstack() when
extending the stack in the downward direction.
MFC r267850 (by alc):
Place the check that blocks map entry coalescing on stack entries in
vm_map_simplify_entry().
MFC r267917 (by alc):
Delay the call to crhold() in vm_map_insert() until we know that we won't
have to undo it by calling crfree().
Eliminate an unnecessary variable from vm_map_insert().
MFC r311014:
Style fixes for vm_map_insert().
Tested by:pho
Modified:
stable/10/sys/vm/vm_map.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/vm/vm_map.c
==
--- stable/10/sys/vm/vm_map.c Sun Jan 8 16:55:59 2017(r311686)
+++ stable/10/sys/vm/vm_map.c Sun Jan 8 16:59:07 2017(r311687)
@@ -1130,24 +1130,24 @@ vm_map_lookup_entry(
*/
int
vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
- vm_offset_t start, vm_offset_t end, vm_prot_t prot, vm_prot_t max,
- int cow)
+vm_offset_t start, vm_offset_t end, vm_prot_t prot, vm_prot_t max, int cow)
{
- vm_map_entry_t new_entry;
- vm_map_entry_t prev_entry;
- vm_map_entry_t temp_entry;
- vm_eflags_t protoeflags;
+ vm_map_entry_t new_entry, prev_entry, temp_entry;
struct ucred *cred;
+ vm_eflags_t protoeflags;
vm_inherit_t inheritance;
- boolean_t charge_prev_obj;
VM_MAP_ASSERT_LOCKED(map);
+ KASSERT((object != kmem_object && object != kernel_object) ||
+ (cow & MAP_COPY_ON_WRITE) == 0,
+ ("vm_map_insert: kmem or kernel object and COW"));
+ KASSERT(object == NULL || (cow & MAP_NOFAULT) == 0,
+ ("vm_map_insert: paradoxical MAP_NOFAULT request"));
/*
* Check that the start and end points are not bogus.
*/
- if ((start < map->min_offset) || (end > map->max_offset) ||
- (start >= end))
+ if (start < map->min_offset || end > map->max_offset || start >= end)
return (KERN_INVALID_ADDRESS);
/*
@@ -1162,26 +1162,22 @@ vm_map_insert(vm_map_t map, vm_object_t
/*
* Assert that the next entry doesn't overlap the end point.
*/
- if ((prev_entry->next != &map->header) &&
- (prev_entry->next->start < end))
+ if (prev_entry->next != &map->header && prev_entry->next->start < end)
return (KERN_NO_SPACE);
protoeflags = 0;
- charge_prev_obj = FALSE;
-
if (cow & MAP_COPY_ON_WRITE)
- protoeflags |= MAP_ENTRY_COW|MAP_ENTRY_NEEDS_COPY;
-
- if (cow & MAP_NOFAULT) {
+ protoeflags |= MAP_ENTRY_COW | MAP_ENTRY_NEEDS_COPY;
+ if (cow & MAP_NOFAULT)
protoeflags |= MAP_ENTRY_NOFAULT;
-
- KASSERT(object == NULL,
- ("vm_map_insert: paradoxical MAP_NOFAULT request"));
- }
if (cow & MAP_DISABLE_SYNCER)
protoeflags |= MAP_ENTRY_NOSYNC;
if (cow & MAP_DISABLE_COREDUMP)
protoeflags |= MAP_ENTRY_NOCOREDUMP;
+ if (cow & MAP_STACK_GROWS_DOWN)
+ protoeflags |= MAP_ENTRY_GROWS_DOWN;
+ if (cow & MAP_STACK_GROWS_UP)
+ protoeflags |= MAP_ENTRY_GROWS_UP;
if (cow & MAP_VN_WRITECOUNT)
protoeflags |= MAP_ENTRY_VN_WRITECNT;
if (cow & MAP_INHERIT_SHARE)
@@ -1190,23 +1186,17 @@ vm_map_insert(vm_map_t map, vm_object_t
inheritance = VM_INHERIT_DEFAULT;
cred = NULL;
- KASSERT((object != kmem_object && object != kernel_object) ||
- ((object == kmem_object || object == kernel_object) &&
- !(protoeflags & MAP_ENTRY_NEEDS_COPY)),
- ("kmem or kernel object and cow"));
if (cow & (MAP_ACC_NO_CHARGE | MAP_NOFAULT))
goto charged;
if ((cow & MAP_ACC_CHARGED) || ((prot & VM_PROT_WRITE) &&
((protoeflags & MAP_ENTRY_NEEDS_COPY) || object == NULL))) {
if (!(cow & MAP_ACC_CHARGED) && !swap_reserve(end - start))
return (KERN_RESOURCE_SHORTAGE);
- KASSERT(object == NULL || (protoeflags & MAP_ENTRY_NEEDS_COPY)
||
+ KASSERT(object == NULL ||
+ (protoeflags & MAP_ENTRY_NEEDS_COPY) != 0 ||
object->cred == NULL,
- ("OVERCOMMIT: vm_map_insert o %p", object));
+ ("overcommit: vm_map_insert o %p", object));
cred = curthread->td_ucred;
svn commit: r311708 - in stable: 10/sys/sys 10/usr.bin/kdump 11/sys/sys 11/usr.bin/kdump
Author: jhb
Date: Mon Jan 9 00:09:19 2017
New Revision: 311708
URL: https://svnweb.freebsd.org/changeset/base/311708
Log:
MFC 306564: Expose kernel-only errno values if _WANT_KERNEL_ERRNO is defined.
The kernel uses a few negative errno values for internal conditions
such as requesting a system call restart. Normally these errno values
are not exposed to userland. However, kdump needs access to these
values as some of then can be present in a ktrace system call return
record. Previously kdump was defining _KERNEL to gain access to ehse
values, but was then having to manually declare 'errno' (and doing it
incorrectly). Now, kdump uses _WANT_KERNEL_ERRNO instead of _KERNEL
and uses the system-provided declaration of errno.
Modified:
stable/10/sys/sys/errno.h
stable/10/usr.bin/kdump/kdump.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/sys/errno.h
stable/11/usr.bin/kdump/kdump.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/10/sys/sys/errno.h
==
--- stable/10/sys/sys/errno.h Sun Jan 8 23:41:17 2017(r311707)
+++ stable/10/sys/sys/errno.h Mon Jan 9 00:09:19 2017(r311708)
@@ -184,7 +184,7 @@ __END_DECLS
#defineELAST 96 /* Must be equal largest errno
*/
#endif /* _POSIX_SOURCE */
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_WANT_KERNEL_ERRNO)
/* pseudo-errors returned inside kernel to modify return to process */
#defineERESTART(-1)/* restart syscall */
#defineEJUSTRETURN (-2)/* don't modify regs, just
return */
Modified: stable/10/usr.bin/kdump/kdump.c
==
--- stable/10/usr.bin/kdump/kdump.c Sun Jan 8 23:41:17 2017
(r311707)
+++ stable/10/usr.bin/kdump/kdump.c Mon Jan 9 00:09:19 2017
(r311708)
@@ -41,10 +41,7 @@ static char sccsid[] = "@(#)kdump.c 8.1
#include
__FBSDID("$FreeBSD$");
-#define _KERNEL
-extern int errno;
-#include
-#undef _KERNEL
+#define _WANT_KERNEL_ERRNO
#include
#include
#include
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r311718 - stable/10/lib/libc/net
Author: ngie Date: Mon Jan 9 01:05:02 2017 New Revision: 311718 URL: https://svnweb.freebsd.org/changeset/base/311718 Log: MFC r310984,r311102: r310984: Use calloc instead of malloc + memset(.., 0, ..) r311102 (by pfg): Cleanup inelegant calloc(3) introduced in r310984. Modified: stable/10/lib/libc/net/getaddrinfo.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/net/getaddrinfo.c == --- stable/10/lib/libc/net/getaddrinfo.cMon Jan 9 01:02:16 2017 (r311717) +++ stable/10/lib/libc/net/getaddrinfo.cMon Jan 9 01:05:02 2017 (r311718) @@ -673,9 +673,8 @@ reorder(struct addrinfo *sentinel) return(n); /* allocate a temporary array for sort and initialization of it. */ - if ((aio = malloc(sizeof(*aio) * n)) == NULL) + if ((aio = calloc(n, sizeof(*aio))) == NULL) return(n); /* give up reordering */ - memset(aio, 0, sizeof(*aio) * n); /* retrieve address selection policy from the kernel */ TAILQ_INIT(&policyhead); @@ -1454,9 +1453,8 @@ copy_ai(const struct addrinfo *pai) size_t l; l = sizeof(*ai) + pai->ai_addrlen; - if ((ai = (struct addrinfo *)malloc(l)) == NULL) + if ((ai = calloc(1, l)) == NULL) return NULL; - memset(ai, 0, l); memcpy(ai, pai, sizeof(*ai)); ai->ai_addr = (struct sockaddr *)(void *)(ai + 1); memcpy(ai->ai_addr, pai->ai_addr, pai->ai_addrlen); @@ -1876,8 +1874,7 @@ addrinfo_unmarshal_func(char *buffer, si size = new_ai.ai_addrlen + sizeof(struct addrinfo) + _ALIGNBYTES; - sentinel = (struct addrinfo *)malloc(size); - memset(sentinel, 0, size); + sentinel = calloc(1, size); memcpy(sentinel, &new_ai, sizeof(struct addrinfo)); sentinel->ai_addr = (struct sockaddr *)_ALIGN((char *)sentinel + @@ -1890,8 +1887,7 @@ addrinfo_unmarshal_func(char *buffer, si memcpy(&size, p, sizeof(size_t)); p += sizeof(size_t); - sentinel->ai_canonname = (char *)malloc(size + 1); - memset(sentinel->ai_canonname, 0, size + 1); + sentinel->ai_canonname = calloc(1, size + 1); memcpy(sentinel->ai_canonname, p, size); p += size; ___ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r311720 - stable/10/usr.sbin/bsnmpd/modules/snmp_hostres
Author: ngie
Date: Mon Jan 9 01:07:16 2017
New Revision: 311720
URL: https://svnweb.freebsd.org/changeset/base/311720
Log:
MFC r311393:
OS_getSystemUptime: use nitems for calculating the number of elements
in a sysctl mib instead of hardcoding the number 2
Modified:
stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c
==
--- stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.cMon Jan
9 01:05:44 2017(r311719)
+++ stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.cMon Jan
9 01:07:16 2017(r311720)
@@ -33,7 +33,7 @@
* Host Resources MIB scalars implementation for SNMPd.
*/
-#include
+#include
#include
#include
@@ -85,7 +85,7 @@ OS_getSystemUptime(uint32_t *ut)
int mib[2] = { CTL_KERN, KERN_BOOTTIME };
size_t len = sizeof(kernel_boot_timestamp);
- if (sysctl(mib, 2, &kernel_boot_timestamp,
+ if (sysctl(mib, nitems(mib), &kernel_boot_timestamp,
&len, NULL, 0) == -1) {
syslog(LOG_ERR, "sysctl KERN_BOOTTIME failed: %m");
return (SNMP_ERR_GENERR);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r311721 - stable/10/contrib/bsnmp/snmpd
Author: ngie
Date: Mon Jan 9 01:08:43 2017
New Revision: 311721
URL: https://svnweb.freebsd.org/changeset/base/311721
Log:
MFC r311382:
Use calloc instead of malloc + memset(.., 0, ..)
Modified:
stable/10/contrib/bsnmp/snmpd/trans_lsock.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/bsnmp/snmpd/trans_lsock.c
==
--- stable/10/contrib/bsnmp/snmpd/trans_lsock.c Mon Jan 9 01:07:16 2017
(r311720)
+++ stable/10/contrib/bsnmp/snmpd/trans_lsock.c Mon Jan 9 01:08:43 2017
(r311721)
@@ -143,16 +143,14 @@ lsock_open_port(u_char *name, size_t nam
return (SNMP_ERR_BADVALUE);
}
- if ((port = malloc(sizeof(*port))) == NULL)
+ if ((port = calloc(1, sizeof(*port))) == NULL)
return (SNMP_ERR_GENERR);
- memset(port, 0, sizeof(*port));
if (!is_stream) {
- if ((peer = malloc(sizeof(*peer))) == NULL) {
+ if ((peer = calloc(1, sizeof(*peer))) == NULL) {
free(port);
return (SNMP_ERR_GENERR);
}
- memset(peer, 0, sizeof(*peer));
}
if ((port->name = malloc(namelen + 1)) == NULL) {
free(port);
@@ -258,12 +256,11 @@ lsock_listen_input(int fd, void *udata)
struct lsock_port *p = udata;
struct lsock_peer *peer;
- if ((peer = malloc(sizeof(*peer))) == NULL) {
+ if ((peer = calloc(1, sizeof(*peer))) == NULL) {
syslog(LOG_WARNING, "%s: peer malloc failed", p->name);
(void)close(accept(fd, NULL, NULL));
return;
}
- memset(peer, 0, sizeof(*peer));
peer->port = p;
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r311723 - stable/10/contrib/bsnmp/snmp_usm
Author: ngie Date: Mon Jan 9 01:11:38 2017 New Revision: 311723 URL: https://svnweb.freebsd.org/changeset/base/311723 Log: MFC r311384: op_usm_users: fix indentation in SNMP_OP_SET block Modified: stable/10/contrib/bsnmp/snmp_usm/usm_snmp.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/bsnmp/snmp_usm/usm_snmp.c == --- stable/10/contrib/bsnmp/snmp_usm/usm_snmp.c Mon Jan 9 01:09:00 2017 (r311722) +++ stable/10/contrib/bsnmp/snmp_usm/usm_snmp.c Mon Jan 9 01:11:38 2017 (r311723) @@ -167,7 +167,7 @@ op_usm_users(struct snmp_context *ctx, s if ((uuser = usm_get_user(&val->var, sub)) == NULL && val->var.subs[sub - 1] != LEAF_usmUserStatus && val->var.subs[sub - 1] != LEAF_usmUserCloneFrom) - return (SNMP_ERR_NOSUCHNAME); + return (SNMP_ERR_NOSUCHNAME); if (community != COMM_INITIALIZE && uuser->type == StorageType_readOnly) ___ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r311725 - stable/10/contrib/bsnmp/snmp_mibII
Author: ngie
Date: Mon Jan 9 01:12:32 2017
New Revision: 311725
URL: https://svnweb.freebsd.org/changeset/base/311725
Log:
MFC r311505:
Remove unnecessary __unused attribute attached to `ctx` in
op_begemot_mibII(..)
Modified:
stable/10/contrib/bsnmp/snmp_mibII/mibII_begemot.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/bsnmp/snmp_mibII/mibII_begemot.c
==
--- stable/10/contrib/bsnmp/snmp_mibII/mibII_begemot.c Mon Jan 9 01:11:42
2017(r311724)
+++ stable/10/contrib/bsnmp/snmp_mibII/mibII_begemot.c Mon Jan 9 01:12:32
2017(r311725)
@@ -37,7 +37,7 @@
* Scalars
*/
int
-op_begemot_mibII(struct snmp_context *ctx __unused, struct snmp_value *value,
+op_begemot_mibII(struct snmp_context *ctx, struct snmp_value *value,
u_int sub, u_int idx __unused, enum snmp_op op)
{
switch (op) {
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r311729 - in stable/10/kerberos5: . lib
Author: ngie
Date: Mon Jan 9 01:29:20 2017
New Revision: 311729
URL: https://svnweb.freebsd.org/changeset/base/311729
Log:
MFC r32,r35:
r32:
libgssapi_{krb5,ntlm,spnego} requires MK_GSSAPI != no; conditionalize
their building on the knob
r35:
Conditionalize adding ${KRB5DIR}/lib/gssapi/krb5/gkrb5_err.et to ETSRCS
if MK_GSSAPI != "no"
Modified:
stable/10/kerberos5/Makefile.inc
stable/10/kerberos5/lib/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/kerberos5/Makefile.inc
==
--- stable/10/kerberos5/Makefile.incMon Jan 9 01:22:46 2017
(r311728)
+++ stable/10/kerberos5/Makefile.incMon Jan 9 01:29:20 2017
(r311729)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include
+
NO_LINT=
KRB5DIR= ${.CURDIR}/../../../crypto/heimdal
@@ -27,11 +29,14 @@ ETSRCS= \
${KRB5DIR}/lib/krb5/k524_err.et \
${KRB5DIR}/lib/krb5/krb5_err.et \
${KRB5DIR}/lib/krb5/krb_err.et \
- ${KRB5DIR}/lib/gssapi/krb5/gkrb5_err.et \
${KRB5DIR}/lib/hx509/hx509_err.et \
${KRB5DIR}/lib/wind/wind_err.et \
${KRB5DIR}/lib/ntlm/ntlm_err.et
+.if ${MK_GSSAPI} != "no"
+ETSRCS+= ${KRB5DIR}/lib/gssapi/krb5/gkrb5_err.et
+.endif
+
.for ET in ${ETSRCS}
.for _ET in ${ET:T:R}
.if ${SRCS:M${_ET}.[ch]} != ""
Modified: stable/10/kerberos5/lib/Makefile
==
--- stable/10/kerberos5/lib/MakefileMon Jan 9 01:22:46 2017
(r311728)
+++ stable/10/kerberos5/lib/MakefileMon Jan 9 01:29:20 2017
(r311729)
@@ -1,10 +1,17 @@
-
# $FreeBSD$
-SUBDIR=libasn1 libgssapi_krb5 libgssapi_ntlm libgssapi_spnego libhdb \
+.include
+
+SUBDIR=libasn1 libhdb \
libheimntlm libhx509 libkadm5clnt libkadm5srv libkafs5 libkrb5 \
libroken libsl libvers libkdc libwind libheimsqlite libheimbase
libheimipcc libheimipcs
SUBDIR_DEPEND_libkafs5=libkrb5
+.if ${MK_GSSAPI} != "no"
+SUBDIR+= libgssapi_krb5
+SUBDIR+= libgssapi_ntlm
+SUBDIR+= libgssapi_spnego
+.endif
+
.include
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r311730 - stable/10/kerberos5/libexec
Author: ngie
Date: Mon Jan 9 01:31:12 2017
New Revision: 311730
URL: https://svnweb.freebsd.org/changeset/base/311730
Log:
MFC r34:
Build libexec/kadmind when MK_GSSAPI != no because it requires gssapi
Modified:
stable/10/kerberos5/libexec/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/kerberos5/libexec/Makefile
==
--- stable/10/kerberos5/libexec/MakefileMon Jan 9 01:29:20 2017
(r311729)
+++ stable/10/kerberos5/libexec/MakefileMon Jan 9 01:31:12 2017
(r311730)
@@ -1,7 +1,13 @@
# $FreeBSD$
-SUBDIR=digest-service ipropd-master ipropd-slave hprop hpropd kadmind
kdc \
+.include
+
+SUBDIR=digest-service ipropd-master ipropd-slave hprop hpropd kdc \
kdigest kfd kimpersonate kpasswdd kcm
SUBDIR_PARALLEL=
+.if ${MK_GSSAPI} != "no"
+SUBDIR+= kadmind
+.endif
+
.include
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r311747 - stable/10/libexec/talkd
Author: delphij
Date: Mon Jan 9 05:44:19 2017
New Revision: 311747
URL: https://svnweb.freebsd.org/changeset/base/311747
Log:
MFC r310608: Avoid use after free.
Modified:
stable/10/libexec/talkd/table.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/libexec/talkd/table.c
==
--- stable/10/libexec/talkd/table.c Mon Jan 9 05:41:47 2017
(r311746)
+++ stable/10/libexec/talkd/table.c Mon Jan 9 05:44:19 2017
(r311747)
@@ -82,14 +82,15 @@ static TABLE_ENTRY *table = NIL;
CTL_MSG *
find_match(CTL_MSG *request)
{
- TABLE_ENTRY *ptr;
+ TABLE_ENTRY *ptr, *next;
time_t current_time;
gettimeofday(&tp, NULL);
current_time = tp.tv_sec;
if (debug)
print_request("find_match", request);
- for (ptr = table; ptr != NIL; ptr = ptr->next) {
+ for (ptr = table; ptr != NIL; ptr = next) {
+ next = ptr->next;
if ((ptr->time - current_time) > MAX_LIFE) {
/* the entry is too old */
if (debug)
@@ -115,7 +116,7 @@ find_match(CTL_MSG *request)
CTL_MSG *
find_request(CTL_MSG *request)
{
- TABLE_ENTRY *ptr;
+ TABLE_ENTRY *ptr, *next;
time_t current_time;
gettimeofday(&tp, NULL);
@@ -126,7 +127,8 @@ find_request(CTL_MSG *request)
*/
if (debug)
print_request("find_request", request);
- for (ptr = table; ptr != NIL; ptr = ptr->next) {
+ for (ptr = table; ptr != NIL; ptr = next) {
+ next = ptr->next;
if ((ptr->time - current_time) > MAX_LIFE) {
/* the entry is too old */
if (debug)
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r311751 - stable/10/libexec/talkd
Author: delphij
Date: Mon Jan 9 05:52:30 2017
New Revision: 311751
URL: https://svnweb.freebsd.org/changeset/base/311751
Log:
MFC r310609: Don't use high precision clock for expiration as only second
portion is used.
Modified:
stable/10/libexec/talkd/table.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/libexec/talkd/table.c
==
--- stable/10/libexec/talkd/table.c Mon Jan 9 05:51:38 2017
(r311750)
+++ stable/10/libexec/talkd/table.c Mon Jan 9 05:52:30 2017
(r311751)
@@ -60,7 +60,7 @@ static const char rcsid[] =
#define NIL ((TABLE_ENTRY *)0)
-static struct timeval tp;
+static struct timespec ts;
typedef struct table_entry TABLE_ENTRY;
@@ -85,8 +85,8 @@ find_match(CTL_MSG *request)
TABLE_ENTRY *ptr, *next;
time_t current_time;
- gettimeofday(&tp, NULL);
- current_time = tp.tv_sec;
+ clock_gettime(CLOCK_MONOTONIC_FAST, &ts);
+ current_time = ts.tv_sec;
if (debug)
print_request("find_match", request);
for (ptr = table; ptr != NIL; ptr = next) {
@@ -119,8 +119,8 @@ find_request(CTL_MSG *request)
TABLE_ENTRY *ptr, *next;
time_t current_time;
- gettimeofday(&tp, NULL);
- current_time = tp.tv_sec;
+ clock_gettime(CLOCK_MONOTONIC_FAST, &ts);
+ current_time = ts.tv_sec;
/*
* See if this is a repeated message, and check for
* out of date entries in the table while we are it.
@@ -157,8 +157,8 @@ insert_table(CTL_MSG *request, CTL_RESPO
TABLE_ENTRY *ptr;
time_t current_time;
- gettimeofday(&tp, NULL);
- current_time = tp.tv_sec;
+ clock_gettime(CLOCK_MONOTONIC_FAST, &ts);
+ current_time = ts.tv_sec;
request->id_num = new_id();
response->id_num = htonl(request->id_num);
/* insert a new entry into the top of the list */
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r311753 - stable/10/usr.sbin/pstat
Author: delphij
Date: Mon Jan 9 05:58:48 2017
New Revision: 311753
URL: https://svnweb.freebsd.org/changeset/base/311753
Log:
MFC r310611:
- pstat(8) does not accept any arguments other than getopt() args,
so don't bother to adjust argc/argv after getopt() loop.
- Make a string pointer constant.
Modified:
stable/10/usr.sbin/pstat/pstat.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/pstat/pstat.c
==
--- stable/10/usr.sbin/pstat/pstat.cMon Jan 9 05:57:31 2017
(r311752)
+++ stable/10/usr.sbin/pstat/pstat.cMon Jan 9 05:58:48 2017
(r311753)
@@ -174,8 +174,6 @@ main(int argc, char *argv[])
default:
usage();
}
- argc -= optind;
- argv += optind;
/*
* Initialize symbol names list.
@@ -339,7 +337,7 @@ static void
ttyprt(struct xtty *xt)
{
int i, j;
- char *name;
+ const char *name;
if (xt->xt_size != sizeof *xt)
errx(1, "struct xtty size mismatch");
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r311756 - stable/10/usr.sbin/jail
Author: delphij
Date: Mon Jan 9 06:07:44 2017
New Revision: 311756
URL: https://svnweb.freebsd.org/changeset/base/311756
Log:
MFC r310614: Don't assign rtjp twice.
Modified:
stable/10/usr.sbin/jail/jail.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/jail/jail.c
==
--- stable/10/usr.sbin/jail/jail.c Mon Jan 9 06:05:57 2017
(r311755)
+++ stable/10/usr.sbin/jail/jail.c Mon Jan 9 06:07:44 2017
(r311756)
@@ -806,8 +806,7 @@ rdtun_params(struct cfjail *j, int dofai
if (jailparam_get(rtparams, nrt,
bool_param(j->intparams[IP_ALLOW_DYING]) ? JAIL_DYING : 0) > 0) {
rtjp = rtparams + 1;
- for (jp = j->jp, rtjp = rtparams + 1; rtjp < rtparams + nrt;
-jp++) {
+ for (jp = j->jp; rtjp < rtparams + nrt; jp++) {
if (JP_RDTUN(jp) && strcmp(jp->jp_name, "jid")) {
if (!((jp->jp_flags & (JP_BOOL | JP_NOBOOL)) &&
jp->jp_valuelen == 0 &&
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
