Add FreeBSD sysctl emulation for their undocumented special OIDs rooted at
OID 0. Only OID 0.3 is implemented for now, it 0.3 is the equivalent of NetBSD's sysctlgetmibinfo(). This includes a new sysctl kern.osreldate with the value __NetBSD_Version__ for kernels with COMPAT_FREEBSD. Both of these are used by 3ware's FreeBSD tw_cli, which seems to work now.
This commit is contained in:
heas
parent
3748b0d6f7
commit
b8fe1f6779
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: files.freebsd,v 1.8 2002/12/22 00:05:59 gmcgarry Exp $
|
||||
# $NetBSD: files.freebsd,v 1.9 2005/02/22 16:14:50 heas Exp $
|
||||
#
|
||||
# Config file description for machine-independent FreeBSD compat code.
|
||||
# Included by ports that need it.
|
||||
|
|
@ -16,5 +16,6 @@ file compat/freebsd/freebsd_ipc.c compat_freebsd
|
|||
file compat/freebsd/freebsd_misc.c compat_freebsd
|
||||
file compat/freebsd/freebsd_ptrace.c compat_freebsd
|
||||
file compat/freebsd/freebsd_sched.c compat_freebsd
|
||||
file compat/freebsd/freebsd_sysctl.c compat_freebsd
|
||||
file compat/freebsd/freebsd_sysent.c compat_freebsd
|
||||
file compat/freebsd/freebsd_syscalls.c compat_freebsd
|
||||
|
|
|
|||
|
|
@ -0,0 +1,212 @@
|
|||
/* $NetBSD: freebsd_sysctl.c,v 1.1 2005/02/22 16:14:50 heas Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2005 The NetBSD Foundation, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to The NetBSD Foundation
|
||||
* by
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the NetBSD
|
||||
* Foundation, Inc. and its contributors.
|
||||
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
||||
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/*
|
||||
* FreeBSD compatibility module. Try to deal with various FreeBSD sysctl calls.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: freebsd_sysctl.c,v 1.1 2005/02/22 16:14:50 heas Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/proc.h>
|
||||
#include <sys/mount.h>
|
||||
#include <sys/signal.h>
|
||||
#include <sys/signalvar.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/mman.h>
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
#include <sys/sa.h>
|
||||
#include <sys/syscallargs.h>
|
||||
|
||||
#include <compat/freebsd/freebsd_syscallargs.h>
|
||||
#include <compat/common/compat_util.h>
|
||||
#include <compat/freebsd/freebsd_rtprio.h>
|
||||
#include <compat/freebsd/freebsd_timex.h>
|
||||
#include <compat/freebsd/freebsd_signal.h>
|
||||
#include <compat/freebsd/freebsd_mman.h>
|
||||
|
||||
static int freebsd_sysctl_name2oid(char *, int *, int *);
|
||||
|
||||
SYSCTL_SETUP(freebsd_sysctl_setup, "freebsd emulated sysctl setup")
|
||||
{
|
||||
sysctl_createv(clog, 0, NULL, NULL,
|
||||
CTLFLAG_PERMANENT,
|
||||
CTLTYPE_NODE, "kern", NULL,
|
||||
NULL, 0, NULL, 0,
|
||||
CTL_KERN, CTL_EOL);
|
||||
sysctl_createv(clog, 0, NULL, NULL,
|
||||
CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
|
||||
CTLTYPE_INT, "osreldate",
|
||||
SYSCTL_DESCR("Operating system revision"),
|
||||
NULL, __NetBSD_Version__, NULL, 0,
|
||||
CTL_KERN, CTL_CREATE, CTL_EOL);
|
||||
}
|
||||
|
||||
int
|
||||
freebsd_sys_sysctl(l, v, retval)
|
||||
struct lwp *l;
|
||||
void *v;
|
||||
register_t *retval;
|
||||
{
|
||||
struct freebsd_sys_sysctl_args /* {
|
||||
syscallarg(int *) name;
|
||||
syscallarg(u_int) namelen;
|
||||
syscallarg(void *) old;
|
||||
syscallarg(size_t *) oldlenp;
|
||||
syscallarg(void *) new;
|
||||
syscallarg(size_t) newlen;
|
||||
} */ *uap = v;
|
||||
int error, *name;
|
||||
size_t newlen, *oldlenp;
|
||||
u_int namelen;
|
||||
void *new, *old;
|
||||
|
||||
name = SCARG(uap, name);
|
||||
namelen = SCARG(uap, namelen);
|
||||
if (namelen > 0 && name[0] != 0)
|
||||
return(sys___sysctl(l, v, retval));
|
||||
|
||||
/*
|
||||
* FreeBSD sysctl uses an undocumented set of special OIDs in it's
|
||||
* sysctl MIB whose tree is rooted at oid 0. These OIDs are
|
||||
* interpretted by their sysctl to implement functions that NetBSD
|
||||
* performs in libc, such as sysctlgetmibinfo.
|
||||
*
|
||||
* From the FreeBSD kern_sysctl.c, these OIDs are:
|
||||
* {0,0} printf the entire MIB-tree.
|
||||
* {0,1,...} return the name of the "..." OID.
|
||||
* {0,2,...} return the next OID.
|
||||
* {0,3} return the OID of the name in "new"
|
||||
* {0,4,...} return the kind & format info for the "..." OID.
|
||||
* {0,5,...} return the description the "..." OID.
|
||||
*
|
||||
* Only implement {0,3} for now.
|
||||
*/
|
||||
|
||||
if (namelen < 2 || namelen > CTL_MAXNAME)
|
||||
return(EINVAL);
|
||||
|
||||
if (name[1] == 3) {
|
||||
char *locnew;
|
||||
int oid[CTL_MAXNAME];
|
||||
u_int oidlen = CTL_MAXNAME;
|
||||
|
||||
new = SCARG(uap, new);
|
||||
newlen = SCARG(uap, newlen);
|
||||
if (new == NULL || newlen < 1 ||
|
||||
newlen > (SYSCTL_NAMELEN * CTL_MAXNAME))
|
||||
return(EINVAL);
|
||||
|
||||
old = SCARG(uap, old);
|
||||
oldlenp = SCARG(uap, oldlenp);
|
||||
if (old == NULL || oldlenp == NULL || *oldlenp < sizeof(int))
|
||||
return(EINVAL);
|
||||
|
||||
if ((locnew =
|
||||
(char *) malloc(newlen + 1, M_TEMP, M_WAITOK)) == NULL)
|
||||
return(ENOMEM);
|
||||
|
||||
if ((error = copyinstr(new, locnew, newlen + 1, NULL)) ||
|
||||
(error = sysctl_lock(l, old, *oldlenp))) {
|
||||
free(locnew, M_TEMP);
|
||||
return(error);
|
||||
}
|
||||
|
||||
error = freebsd_sysctl_name2oid(locnew, oid, &oidlen);
|
||||
sysctl_unlock(l);
|
||||
free(locnew, M_TEMP);
|
||||
if (error)
|
||||
return(error);
|
||||
|
||||
oidlen *= sizeof(int);
|
||||
error = copyout(oid, SCARG(uap, old),
|
||||
MIN(oidlen, *SCARG(uap, oldlenp)));
|
||||
if (error)
|
||||
return(error);
|
||||
error = copyout(&oidlen, SCARG(uap, oldlenp), sizeof(u_int));
|
||||
|
||||
return(error);
|
||||
}
|
||||
|
||||
return(EOPNOTSUPP);
|
||||
}
|
||||
|
||||
static int
|
||||
freebsd_sysctl_name2oid(char *name, int *oid, int *oidlen)
|
||||
{
|
||||
char *dot;
|
||||
int oi, ci;
|
||||
struct sysctlnode *node, *pnode;
|
||||
|
||||
pnode = &sysctl_root;
|
||||
node = sysctl_root.sysctl_child;
|
||||
oi = 0;
|
||||
if ((dot = strchr(name, (int)'.')) != NULL)
|
||||
*dot++ = '\0';
|
||||
|
||||
next:
|
||||
while (*name != '\0' && node != NULL) {
|
||||
for (ci = 0; ci < pnode->sysctl_clen; ci++) {
|
||||
if (strcmp(name, node[ci].sysctl_name) == 0) {
|
||||
oid[oi++] = node[ci].sysctl_num;
|
||||
if ((name = dot) == NULL) {
|
||||
*oidlen = oi;
|
||||
return(0);
|
||||
}
|
||||
if ((dot = strchr(name, (int)'.')) != NULL)
|
||||
*dot++ = '\0';
|
||||
|
||||
if (SYSCTL_TYPE(node[ci].sysctl_flags) !=
|
||||
CTLTYPE_NODE)
|
||||
return(ENOTDIR);
|
||||
|
||||
pnode = &node[ci];
|
||||
node = pnode->sysctl_child;
|
||||
goto next;
|
||||
}
|
||||
}
|
||||
|
||||
/* no more nodes, it must not exist */
|
||||
break;
|
||||
}
|
||||
|
||||
return(ENOENT);
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: syscalls.master,v 1.46 2004/05/11 10:54:51 drochner Exp $
|
||||
$NetBSD: syscalls.master,v 1.47 2005/02/22 16:14:50 heas Exp $
|
||||
|
||||
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
|
||||
|
||||
|
|
@ -405,7 +405,7 @@
|
|||
200 STD { int freebsd_sys_truncate(const char *path, int pad, \
|
||||
off_t length); }
|
||||
201 NOARGS { int sys_ftruncate(int fd, int pad, off_t length); }
|
||||
202 NOARGS { int sys___sysctl(int *name, u_int namelen, \
|
||||
202 STD { int freebsd_sys_sysctl(int *name, u_int namelen, \
|
||||
void *old, size_t *oldlenp, void *new, \
|
||||
size_t newlen); }
|
||||
203 NOARGS { int sys_mlock(caddr_t addr, size_t len); }
|
||||
|
|
|
|||
Loading…
Reference in New Issue