svn commit: r258065 - in head: contrib/mdocml lib lib/libnv share/mk
Pawel Jakub Dawidek
pjd at FreeBSD.org
Tue Nov 12 19:39:16 UTC 2013
Author: pjd
Date: Tue Nov 12 19:39:14 2013
New Revision: 258065
URL: http://svnweb.freebsd.org/changeset/base/258065
Log:
Bring in libnv library for managing name/value pairs. The following types
are currently supported:
- NV_TYPE_NULL - only name, no data;
- NV_TYPE_BOOL - boolean (true or false);
- NV_TYPE_NUMBER - 64bit unsigned integer;
- NV_TYPE_STRING - C string;
- NV_TYPE_NVLIST - nested nvlist;
- NV_TYPE_DESCRIPTOR - file descriptor;
- NV_TYPE_BINARY - binary data.
For detailed documentation and examples see nv(3) manual page.
Sponsored by: The FreeBSD Foundation
Added:
head/lib/libnv/
head/lib/libnv/Makefile (contents, props changed)
head/lib/libnv/common_impl.h (contents, props changed)
head/lib/libnv/dnv.h (contents, props changed)
head/lib/libnv/dnvlist.c (contents, props changed)
head/lib/libnv/msgio.c (contents, props changed)
head/lib/libnv/msgio.h (contents, props changed)
head/lib/libnv/nv.3 (contents, props changed)
head/lib/libnv/nv.h (contents, props changed)
head/lib/libnv/nv_impl.h (contents, props changed)
head/lib/libnv/nvlist.c (contents, props changed)
head/lib/libnv/nvlist_impl.h (contents, props changed)
head/lib/libnv/nvpair.c (contents, props changed)
head/lib/libnv/nvpair_impl.h (contents, props changed)
Modified:
head/contrib/mdocml/lib.in
head/lib/Makefile
head/share/mk/bsd.libnames.mk
Modified: head/contrib/mdocml/lib.in
==============================================================================
--- head/contrib/mdocml/lib.in Tue Nov 12 19:18:00 2013 (r258064)
+++ head/contrib/mdocml/lib.in Tue Nov 12 19:39:14 2013 (r258065)
@@ -67,6 +67,7 @@ LINE("libmemstat", "Kernel Memory Alloca
LINE("libmenu", "Curses Menu Library (libmenu, \\-lmenu)")
LINE("libnetgraph", "Netgraph User Library (libnetgraph, \\-lnetgraph)")
LINE("libnetpgp", "Netpgp signing, verification, encryption and decryption (libnetpgp, \\-lnetpgp)")
+LINE("libnv", "Name/value pairs library (libnv, \\-lnv)")
LINE("libossaudio", "OSS Audio Emulation Library (libossaudio, \\-lossaudio)")
LINE("libpam", "Pluggable Authentication Module Library (libpam, \\-lpam)")
LINE("libpcap", "Packet Capture Library (libpcap, \\-lpcap)")
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Tue Nov 12 19:18:00 2013 (r258064)
+++ head/lib/Makefile Tue Nov 12 19:39:14 2013 (r258065)
@@ -94,6 +94,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
${_libnandfs} \
libnetbsd \
${_libngatm} \
+ libnv \
libopie \
libpam \
libpcap \
Added: head/lib/libnv/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libnv/Makefile Tue Nov 12 19:39:14 2013 (r258065)
@@ -0,0 +1,161 @@
+# $FreeBSD$
+
+LIB= nv
+SHLIBDIR?= /lib
+SHLIB_MAJOR= 0
+
+SRCS= dnvlist.c
+SRCS+= msgio.c
+SRCS+= nvlist.c
+SRCS+= nvpair.c
+
+INCS= dnv.h
+INCS+= nv.h
+
+MAN+= nv.3
+
+MLINKS+=nv.3 libnv.3 \
+ nv.3 nvlist.3
+MLINKS+=nv.3 nvlist_create.3 \
+ nv.3 nvlist_destroy.3 \
+ nv.3 nvlist_error.3 \
+ nv.3 nvlist_empty.3 \
+ nv.3 nvlist_clone.3 \
+ nv.3 nvlist_dump.3 \
+ nv.3 nvlist_fdump.3 \
+ nv.3 nvlist_size.3 \
+ nv.3 nvlist_pack.3 \
+ nv.3 nvlist_unpack.3 \
+ nv.3 nvlist_send.3 \
+ nv.3 nvlist_recv.3 \
+ nv.3 nvlist_xfer.3 \
+ nv.3 nvlist_next.3 \
+ nv.3 nvlist_exists.3 \
+ nv.3 nvlist_exists_type.3 \
+ nv.3 nvlist_exists_null.3 \
+ nv.3 nvlist_exists_bool.3 \
+ nv.3 nvlist_exists_number.3 \
+ nv.3 nvlist_exists_string.3 \
+ nv.3 nvlist_exists_nvlist.3 \
+ nv.3 nvlist_exists_descriptor.3 \
+ nv.3 nvlist_exists_binary.3 \
+ nv.3 nvlist_add_null.3 \
+ nv.3 nvlist_add_bool.3 \
+ nv.3 nvlist_add_number.3 \
+ nv.3 nvlist_add_string.3 \
+ nv.3 nvlist_add_stringf.3 \
+ nv.3 nvlist_add_stringv.3 \
+ nv.3 nvlist_add_nvlist.3 \
+ nv.3 nvlist_add_descriptor.3 \
+ nv.3 nvlist_add_binary.3 \
+ nv.3 nvlist_move_string.3 \
+ nv.3 nvlist_move_nvlist.3 \
+ nv.3 nvlist_move_descriptor.3 \
+ nv.3 nvlist_move_binary.3 \
+ nv.3 nvlist_get_bool.3 \
+ nv.3 nvlist_get_number.3 \
+ nv.3 nvlist_get_string.3 \
+ nv.3 nvlist_get_nvlist.3 \
+ nv.3 nvlist_get_descriptor.3 \
+ nv.3 nvlist_get_binary.3 \
+ nv.3 nvlist_take_bool.3 \
+ nv.3 nvlist_take_number.3 \
+ nv.3 nvlist_take_string.3 \
+ nv.3 nvlist_take_nvlist.3 \
+ nv.3 nvlist_take_descriptor.3 \
+ nv.3 nvlist_take_binary.3 \
+ nv.3 nvlist_free.3 \
+ nv.3 nvlist_free_type.3 \
+ nv.3 nvlist_free_null.3 \
+ nv.3 nvlist_free_bool.3 \
+ nv.3 nvlist_free_number.3 \
+ nv.3 nvlist_free_string.3 \
+ nv.3 nvlist_free_nvlist.3 \
+ nv.3 nvlist_free_descriptor.3 \
+ nv.3 nvlist_free_binary.3
+MLINKS+=nv.3 nvlist_existsf.3 \
+ nv.3 nvlist_existsf_type.3 \
+ nv.3 nvlist_existsf_null.3 \
+ nv.3 nvlist_existsf_bool.3 \
+ nv.3 nvlist_existsf_number.3 \
+ nv.3 nvlist_existsf_string.3 \
+ nv.3 nvlist_existsf_nvlist.3 \
+ nv.3 nvlist_existsf_descriptor.3 \
+ nv.3 nvlist_existsf_binary.3 \
+ nv.3 nvlist_addf_null.3 \
+ nv.3 nvlist_addf_bool.3 \
+ nv.3 nvlist_addf_number.3 \
+ nv.3 nvlist_addf_string.3 \
+ nv.3 nvlist_addf_nvlist.3 \
+ nv.3 nvlist_addf_descriptor.3 \
+ nv.3 nvlist_addf_binary.3 \
+ nv.3 nvlist_movef_string.3 \
+ nv.3 nvlist_movef_nvlist.3 \
+ nv.3 nvlist_movef_descriptor.3 \
+ nv.3 nvlist_movef_binary.3 \
+ nv.3 nvlist_getf_bool.3 \
+ nv.3 nvlist_getf_number.3 \
+ nv.3 nvlist_getf_string.3 \
+ nv.3 nvlist_getf_nvlist.3 \
+ nv.3 nvlist_getf_descriptor.3 \
+ nv.3 nvlist_getf_binary.3 \
+ nv.3 nvlist_takef_bool.3 \
+ nv.3 nvlist_takef_number.3 \
+ nv.3 nvlist_takef_string.3 \
+ nv.3 nvlist_takef_nvlist.3 \
+ nv.3 nvlist_takef_descriptor.3 \
+ nv.3 nvlist_takef_binary.3 \
+ nv.3 nvlist_freef.3 \
+ nv.3 nvlist_freef_type.3 \
+ nv.3 nvlist_freef_null.3 \
+ nv.3 nvlist_freef_bool.3 \
+ nv.3 nvlist_freef_number.3 \
+ nv.3 nvlist_freef_string.3 \
+ nv.3 nvlist_freef_nvlist.3 \
+ nv.3 nvlist_freef_descriptor.3 \
+ nv.3 nvlist_freef_binary.3
+MLINKS+=nv.3 nvlist_existsv.3 \
+ nv.3 nvlist_existsv_type.3 \
+ nv.3 nvlist_existsv_null.3 \
+ nv.3 nvlist_existsv_bool.3 \
+ nv.3 nvlist_existsv_number.3 \
+ nv.3 nvlist_existsv_string.3 \
+ nv.3 nvlist_existsv_nvlist.3 \
+ nv.3 nvlist_existsv_descriptor.3 \
+ nv.3 nvlist_existsv_binary.3 \
+ nv.3 nvlist_addv_null.3 \
+ nv.3 nvlist_addv_bool.3 \
+ nv.3 nvlist_addv_number.3 \
+ nv.3 nvlist_addv_string.3 \
+ nv.3 nvlist_addv_nvlist.3 \
+ nv.3 nvlist_addv_descriptor.3 \
+ nv.3 nvlist_addv_binary.3 \
+ nv.3 nvlist_movev_string.3 \
+ nv.3 nvlist_movev_nvlist.3 \
+ nv.3 nvlist_movev_descriptor.3 \
+ nv.3 nvlist_movev_binary.3 \
+ nv.3 nvlist_getv_bool.3 \
+ nv.3 nvlist_getv_number.3 \
+ nv.3 nvlist_getv_string.3 \
+ nv.3 nvlist_getv_nvlist.3 \
+ nv.3 nvlist_getv_descriptor.3 \
+ nv.3 nvlist_getv_binary.3 \
+ nv.3 nvlist_takev_bool.3 \
+ nv.3 nvlist_takev_number.3 \
+ nv.3 nvlist_takev_string.3 \
+ nv.3 nvlist_takev_nvlist.3 \
+ nv.3 nvlist_takev_descriptor.3 \
+ nv.3 nvlist_takev_binary.3 \
+ nv.3 nvlist_freef.3 \
+ nv.3 nvlist_freev_type.3 \
+ nv.3 nvlist_freev_null.3 \
+ nv.3 nvlist_freev_bool.3 \
+ nv.3 nvlist_freev_number.3 \
+ nv.3 nvlist_freev_string.3 \
+ nv.3 nvlist_freev_nvlist.3 \
+ nv.3 nvlist_freev_descriptor.3 \
+ nv.3 nvlist_freev_binary.3
+
+WARNS?= 6
+
+.include <bsd.lib.mk>
Added: head/lib/libnv/common_impl.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libnv/common_impl.h Tue Nov 12 19:39:14 2013 (r258065)
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek under sponsorship from
+ * the FreeBSD Foundation.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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$
+ */
+
+#ifndef _COMMON_IMPL_H_
+#define _COMMON_IMPL_H_
+
+#define fd_is_valid(fd) (fcntl((fd), F_GETFL) != -1 || errno != EBADF)
+
+#endif /* !_COMMON_IMPL_H_ */
Added: head/lib/libnv/dnv.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libnv/dnv.h Tue Nov 12 19:39:14 2013 (r258065)
@@ -0,0 +1,106 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek under sponsorship from
+ * the FreeBSD Foundation.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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$
+ */
+
+#ifndef _DNV_H_
+#define _DNV_H_
+
+#include <sys/cdefs.h>
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifndef _NVLIST_T_DECLARED
+#define _NVLIST_T_DECLARED
+struct nvlist;
+
+typedef struct nvlist nvlist_t;
+#endif
+
+/*
+ * The dnvlist_get functions returns value associated with the given name.
+ * If it returns a pointer, the pointer represents internal buffer and should
+ * not be freed by the caller.
+ * If no element of the given name and type exists, the function will return
+ * provided default value.
+ */
+
+bool dnvlist_get_bool(const nvlist_t *nvl, const char *name, bool defval);
+uint64_t dnvlist_get_number(const nvlist_t *nvl, const char *name, uint64_t defval);
+const char *dnvlist_get_string(const nvlist_t *nvl, const char *name, const char *defval);
+const nvlist_t *dnvlist_get_nvlist(const nvlist_t *nvl, const char *name, const nvlist_t *defval);
+int dnvlist_get_descriptor(const nvlist_t *nvl, const char *name, int defval);
+const void *dnvlist_get_binary(const nvlist_t *nvl, const char *name, size_t *sizep, const void *defval, size_t defsize);
+
+bool dnvlist_getf_bool(const nvlist_t *nvl, bool defval, const char *namefmt, ...) __printflike(3, 4);
+uint64_t dnvlist_getf_number(const nvlist_t *nvl, uint64_t defval, const char *namefmt, ...) __printflike(3, 4);
+const char *dnvlist_getf_string(const nvlist_t *nvl, const char *defval, const char *namefmt, ...) __printflike(3, 4);
+const nvlist_t *dnvlist_getf_nvlist(const nvlist_t *nvl, const nvlist_t *defval, const char *namefmt, ...) __printflike(3, 4);
+int dnvlist_getf_descriptor(const nvlist_t *nvl, int defval, const char *namefmt, ...) __printflike(3, 4);
+const void *dnvlist_getf_binary(const nvlist_t *nvl, size_t *sizep, const void *defval, size_t defsize, const char *namefmt, ...) __printflike(5, 6);
+
+bool dnvlist_getv_bool(const nvlist_t *nvl, bool defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+uint64_t dnvlist_getv_number(const nvlist_t *nvl, uint64_t defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+const char *dnvlist_getv_string(const nvlist_t *nvl, const char *defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+const nvlist_t *dnvlist_getv_nvlist(const nvlist_t *nvl, const nvlist_t *defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+int dnvlist_getv_descriptor(const nvlist_t *nvl, int defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+const void *dnvlist_getv_binary(const nvlist_t *nvl, size_t *sizep, const void *defval, size_t defsize, const char *namefmt, va_list nameap) __printflike(5, 0);
+
+/*
+ * The dnvlist_take functions returns value associated with the given name and
+ * remove corresponding nvpair.
+ * If it returns a pointer, the caller has to free it.
+ * If no element of the given name and type exists, the function will return
+ * provided default value.
+ */
+
+bool dnvlist_take_bool(nvlist_t *nvl, const char *name, bool defval);
+uint64_t dnvlist_take_number(nvlist_t *nvl, const char *name, uint64_t defval);
+char *dnvlist_take_string(nvlist_t *nvl, const char *name, char *defval);
+nvlist_t *dnvlist_take_nvlist(nvlist_t *nvl, const char *name, nvlist_t *defval);
+int dnvlist_take_descriptor(nvlist_t *nvl, const char *name, int defval);
+void *dnvlist_take_binary(nvlist_t *nvl, const char *name, size_t *sizep, void *defval, size_t defsize);
+
+bool dnvlist_takef_bool(nvlist_t *nvl, bool defval, const char *namefmt, ...) __printflike(3, 4);
+uint64_t dnvlist_takef_number(nvlist_t *nvl, uint64_t defval, const char *namefmt, ...) __printflike(3, 4);
+char *dnvlist_takef_string(nvlist_t *nvl, char *defval, const char *namefmt, ...) __printflike(3, 4);
+nvlist_t *dnvlist_takef_nvlist(nvlist_t *nvl, nvlist_t *defval, const char *namefmt, ...) __printflike(3, 4);
+int dnvlist_takef_descriptor(nvlist_t *nvl, int defval, const char *namefmt, ...) __printflike(3, 4);
+void *dnvlist_takef_binary(nvlist_t *nvl, size_t *sizep, void *defval, size_t defsize, const char *namefmt, ...) __printflike(5, 6);
+
+bool dnvlist_takev_bool(nvlist_t *nvl, bool defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+uint64_t dnvlist_takev_number(nvlist_t *nvl, uint64_t defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+char *dnvlist_takev_string(nvlist_t *nvl, char *defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+nvlist_t *dnvlist_takev_nvlist(nvlist_t *nvl, nvlist_t *defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+int dnvlist_takev_descriptor(nvlist_t *nvl, int defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+void *dnvlist_takev_binary(nvlist_t *nvl, size_t *sizep, void *defval, size_t defsize, const char *namefmt, va_list nameap) __printflike(5, 0);
+
+#endif /* !_DNV_H_ */
Added: head/lib/libnv/dnvlist.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libnv/dnvlist.c Tue Nov 12 19:39:14 2013 (r258065)
@@ -0,0 +1,252 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek under sponsorship from
+ * the FreeBSD Foundation.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "nv.h"
+#include "nv_impl.h"
+
+#include "dnv.h"
+
+#define DNVLIST_GET(ftype, type) \
+ftype \
+dnvlist_get_##type(const nvlist_t *nvl, const char *name, ftype defval) \
+{ \
+ \
+ return (dnvlist_getf_##type(nvl, defval, "%s", name)); \
+}
+
+DNVLIST_GET(bool, bool)
+DNVLIST_GET(uint64_t, number)
+DNVLIST_GET(const char *, string)
+DNVLIST_GET(const nvlist_t *, nvlist)
+DNVLIST_GET(int, descriptor)
+
+#undef DNVLIST_GET
+
+const void *
+dnvlist_get_binary(const nvlist_t *nvl, const char *name, size_t *sizep,
+ const void *defval, size_t defsize)
+{
+
+ return (dnvlist_getf_binary(nvl, sizep, defval, defsize, "%s", name));
+}
+
+#define DNVLIST_GETF(ftype, type) \
+ftype \
+dnvlist_getf_##type(const nvlist_t *nvl, ftype defval, \
+ const char *namefmt, ...) \
+{ \
+ va_list nameap; \
+ ftype value; \
+ \
+ va_start(nameap, namefmt); \
+ value = dnvlist_getv_##type(nvl, defval, namefmt, nameap); \
+ va_end(nameap); \
+ \
+ return (value); \
+}
+
+DNVLIST_GETF(bool, bool)
+DNVLIST_GETF(uint64_t, number)
+DNVLIST_GETF(const char *, string)
+DNVLIST_GETF(const nvlist_t *, nvlist)
+DNVLIST_GETF(int, descriptor)
+
+#undef DNVLIST_GETF
+
+const void *
+dnvlist_getf_binary(const nvlist_t *nvl, size_t *sizep, const void *defval,
+ size_t defsize, const char *namefmt, ...)
+{
+ va_list nameap;
+ const void *value;
+
+ va_start(nameap, namefmt);
+ value = dnvlist_getv_binary(nvl, sizep, defval, defsize, namefmt,
+ nameap);
+ va_end(nameap);
+
+ return (value);
+}
+
+#define DNVLIST_GETV(ftype, type) \
+ftype \
+dnvlist_getv_##type(const nvlist_t *nvl, ftype defval, \
+ const char *namefmt, va_list nameap) \
+{ \
+ va_list cnameap; \
+ ftype value; \
+ \
+ va_copy(cnameap, nameap); \
+ if (nvlist_existsv_##type(nvl, namefmt, cnameap)) \
+ value = nvlist_getv_##type(nvl, namefmt, nameap); \
+ else \
+ value = defval; \
+ va_end(cnameap); \
+ return (value); \
+}
+
+DNVLIST_GETV(bool, bool)
+DNVLIST_GETV(uint64_t, number)
+DNVLIST_GETV(const char *, string)
+DNVLIST_GETV(const nvlist_t *, nvlist)
+DNVLIST_GETV(int, descriptor)
+
+#undef DNVLIST_GETV
+
+const void *
+dnvlist_getv_binary(const nvlist_t *nvl, size_t *sizep, const void *defval,
+ size_t defsize, const char *namefmt, va_list nameap)
+{
+ va_list cnameap;
+ const void *value;
+
+ va_copy(cnameap, nameap);
+ if (nvlist_existsv_binary(nvl, namefmt, cnameap)) {
+ value = nvlist_getv_binary(nvl, sizep, namefmt, nameap);
+ } else {
+ if (sizep != NULL)
+ *sizep = defsize;
+ value = defval;
+ }
+ va_end(cnameap);
+ return (value);
+}
+
+#define DNVLIST_TAKE(ftype, type) \
+ftype \
+dnvlist_take_##type(nvlist_t *nvl, const char *name, ftype defval) \
+{ \
+ \
+ return (dnvlist_takef_##type(nvl, defval, "%s", name)); \
+}
+
+DNVLIST_TAKE(bool, bool)
+DNVLIST_TAKE(uint64_t, number)
+DNVLIST_TAKE(char *, string)
+DNVLIST_TAKE(nvlist_t *, nvlist)
+DNVLIST_TAKE(int, descriptor)
+
+#undef DNVLIST_TAKE
+
+void *
+dnvlist_take_binary(nvlist_t *nvl, const char *name, size_t *sizep,
+ void *defval, size_t defsize)
+{
+
+ return (dnvlist_takef_binary(nvl, sizep, defval, defsize, "%s", name));
+}
+
+#define DNVLIST_TAKEF(ftype, type) \
+ftype \
+dnvlist_takef_##type(nvlist_t *nvl, ftype defval, \
+ const char *namefmt, ...) \
+{ \
+ va_list nameap; \
+ ftype value; \
+ \
+ va_start(nameap, namefmt); \
+ value = dnvlist_takev_##type(nvl, defval, namefmt, nameap); \
+ va_end(nameap); \
+ \
+ return (value); \
+}
+
+DNVLIST_TAKEF(bool, bool)
+DNVLIST_TAKEF(uint64_t, number)
+DNVLIST_TAKEF(char *, string)
+DNVLIST_TAKEF(nvlist_t *, nvlist)
+DNVLIST_TAKEF(int, descriptor)
+
+#undef DNVLIST_TAKEF
+
+void *
+dnvlist_takef_binary(nvlist_t *nvl, size_t *sizep, void *defval,
+ size_t defsize, const char *namefmt, ...)
+{
+ va_list nameap;
+ void *value;
+
+ va_start(nameap, namefmt);
+ value = dnvlist_takev_binary(nvl, sizep, defval, defsize, namefmt,
+ nameap);
+ va_end(nameap);
+
+ return (value);
+}
+
+#define DNVLIST_TAKEV(ftype, type) \
+ftype \
+dnvlist_takev_##type(nvlist_t *nvl, ftype defval, const char *namefmt, \
+ va_list nameap) \
+{ \
+ va_list cnameap; \
+ ftype value; \
+ \
+ va_copy(cnameap, nameap); \
+ if (nvlist_existsv_##type(nvl, namefmt, cnameap)) \
+ value = nvlist_takev_##type(nvl, namefmt, nameap); \
+ else \
+ value = defval; \
+ va_end(cnameap); \
+ return (value); \
+}
+
+DNVLIST_TAKEV(bool, bool)
+DNVLIST_TAKEV(uint64_t, number)
+DNVLIST_TAKEV(char *, string)
+DNVLIST_TAKEV(nvlist_t *, nvlist)
+DNVLIST_TAKEV(int, descriptor)
+
+#undef DNVLIST_TAKEV
+
+void *
+dnvlist_takev_binary(nvlist_t *nvl, size_t *sizep, void *defval,
+ size_t defsize, const char *namefmt, va_list nameap)
+{
+ va_list cnameap;
+ void *value;
+
+ va_copy(cnameap, nameap);
+ if (nvlist_existsv_binary(nvl, namefmt, cnameap)) {
+ value = nvlist_takev_binary(nvl, sizep, namefmt, nameap);
+ } else {
+ if (sizep != NULL)
+ *sizep = defsize;
+ value = defval;
+ }
+ va_end(cnameap);
+ return (value);
+}
Added: head/lib/libnv/msgio.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libnv/msgio.c Tue Nov 12 19:39:14 2013 (r258065)
@@ -0,0 +1,407 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * Copyright (c) 2013 Mariusz Zaborski <oshogbo at FreeBSD.org>
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek under sponsorship from
+ * the FreeBSD Foundation.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#ifdef HAVE_PJDLOG
+#include <pjdlog.h>
+#endif
+
+#include "common_impl.h"
+#include "msgio.h"
+
+#ifndef HAVE_PJDLOG
+#include <assert.h>
+#define PJDLOG_ASSERT(...) assert(__VA_ARGS__)
+#define PJDLOG_RASSERT(expr, ...) assert(expr)
+#define PJDLOG_ABORT(...) abort()
+#endif
+
+static int
+msghdr_add_fd(struct cmsghdr *cmsg, int fd)
+{
+
+ PJDLOG_ASSERT(fd >= 0);
+
+ if (!fd_is_valid(fd)) {
+ errno = EBADF;
+ return (-1);
+ }
+
+ cmsg->cmsg_level = SOL_SOCKET;
+ cmsg->cmsg_type = SCM_RIGHTS;
+ cmsg->cmsg_len = CMSG_LEN(sizeof(fd));
+ bcopy(&fd, CMSG_DATA(cmsg), sizeof(fd));
+
+ return (0);
+}
+
+static int
+msghdr_get_fd(struct cmsghdr *cmsg)
+{
+ int fd;
+
+ if (cmsg == NULL || cmsg->cmsg_level != SOL_SOCKET ||
+ cmsg->cmsg_type != SCM_RIGHTS ||
+ cmsg->cmsg_len != CMSG_LEN(sizeof(fd))) {
+ errno = EINVAL;
+ return (-1);
+ }
+
+ bcopy(CMSG_DATA(cmsg), &fd, sizeof(fd));
+#ifndef MSG_CMSG_CLOEXEC
+ /*
+ * If the MSG_CMSG_CLOEXEC flag is not available we cannot set the
+ * close-on-exec flag atomically, but we still want to set it for
+ * consistency.
+ */
+ (void) fcntl(fd, F_SETFD, FD_CLOEXEC);
+#endif
+
+ return (fd);
+}
+
+static void
+fd_wait(int fd, bool doread)
+{
+ fd_set fds;
+
+ PJDLOG_ASSERT(fd >= 0);
+
+ FD_ZERO(&fds);
+ FD_SET(fd, &fds);
+ (void)select(fd + 1, doread ? &fds : NULL, doread ? NULL : &fds,
+ NULL, NULL);
+}
+
+int
+msg_peek(int sock, void *buf, size_t size)
+{
+ ssize_t done;
+
+ PJDLOG_ASSERT(sock >= 0);
+ PJDLOG_ASSERT(size > 0);
+
+ do {
+ fd_wait(sock, true);
+ done = recv(sock, buf, size, MSG_PEEK | MSG_WAITALL);
+ if (done == -1) {
+ if (errno == EAGAIN || errno == EINTR)
+ continue;
+ return (-1);
+ } else if (done == 0) {
+ errno = ENOTCONN;
+ return (-1);
+ }
+ } while (done != (ssize_t)size);
+
+ return (0);
+}
+
+static int
+msg_recv(int sock, struct msghdr *msg)
+{
+ int flags;
+
+ PJDLOG_ASSERT(sock >= 0);
+
+#ifdef MSG_CMSG_CLOEXEC
+ flags = MSG_CMSG_CLOEXEC;
+#else
+ flags = 0;
+#endif
+
+ for (;;) {
+ fd_wait(sock, true);
+ if (recvmsg(sock, msg, flags) == -1) {
+ if (errno == EINTR)
+ continue;
+ return (-1);
+ }
+ break;
+ }
+
+ return (0);
+}
+
+static int
+msg_send(int sock, const struct msghdr *msg)
+{
+
+ PJDLOG_ASSERT(sock >= 0);
+
+ for (;;) {
+ fd_wait(sock, false);
+ if (sendmsg(sock, msg, 0) == -1) {
+ if (errno == EINTR)
+ continue;
+ return (-1);
+ }
+ break;
+ }
+
+ return (0);
+}
+
+int
+cred_send(int sock)
+{
+ unsigned char credbuf[CMSG_SPACE(sizeof(struct cmsgcred))];
+ struct msghdr msg;
+ struct cmsghdr *cmsg;
+ struct iovec iov;
+ uint8_t dummy;
+
+ bzero(credbuf, sizeof(credbuf));
+ bzero(&msg, sizeof(msg));
+ bzero(&iov, sizeof(iov));
+
+ /*
+ * XXX: We send one byte along with the control message, because
+ * setting msg_iov to NULL only works if this is the first
+ * packet send over the socket. Once we send some data we
+ * won't be able to send credentials anymore. This is most
+ * likely a kernel bug.
+ */
+ dummy = 0;
+ iov.iov_base = &dummy;
+ iov.iov_len = sizeof(dummy);
+
+ msg.msg_iov = &iov;
+ msg.msg_iovlen = 1;
+ msg.msg_control = credbuf;
+ msg.msg_controllen = sizeof(credbuf);
+
+ cmsg = CMSG_FIRSTHDR(&msg);
+ cmsg->cmsg_len = CMSG_LEN(sizeof(struct cmsgcred));
+ cmsg->cmsg_level = SOL_SOCKET;
+ cmsg->cmsg_type = SCM_CREDS;
+
+ if (msg_send(sock, &msg) == -1)
+ return (-1);
+
+ return (0);
+}
+
+int
+cred_recv(int sock, struct cmsgcred *cred)
+{
+ unsigned char credbuf[CMSG_SPACE(sizeof(struct cmsgcred))];
+ struct msghdr msg;
+ struct cmsghdr *cmsg;
+ struct iovec iov;
+ uint8_t dummy;
+
+ bzero(credbuf, sizeof(credbuf));
+ bzero(&msg, sizeof(msg));
+ bzero(&iov, sizeof(iov));
+
+ iov.iov_base = &dummy;
+ iov.iov_len = sizeof(dummy);
+
+ msg.msg_iov = &iov;
+ msg.msg_iovlen = 1;
+ msg.msg_control = credbuf;
+ msg.msg_controllen = sizeof(credbuf);
+
+ if (msg_recv(sock, &msg) == -1)
+ return (-1);
+
+ cmsg = CMSG_FIRSTHDR(&msg);
+ if (cmsg == NULL ||
+ cmsg->cmsg_len != CMSG_LEN(sizeof(struct cmsgcred)) ||
+ cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_CREDS) {
+ errno = EINVAL;
+ return (-1);
+ }
+ bcopy(CMSG_DATA(cmsg), cred, sizeof(*cred));
+
+ return (0);
+}
+
+int
+fd_send(int sock, const int *fds, size_t nfds)
+{
+ struct msghdr msg;
+ struct cmsghdr *cmsg;
+ unsigned int i;
+ int serrno, ret;
+
+ if (nfds == 0 || fds == NULL) {
+ errno = EINVAL;
+ return (-1);
+ }
+
+ bzero(&msg, sizeof(msg));
+ msg.msg_iov = NULL;
+ msg.msg_iovlen = 0;
+ msg.msg_controllen = nfds * CMSG_SPACE(sizeof(int));
+ msg.msg_control = calloc(1, msg.msg_controllen);
+ if (msg.msg_control == NULL)
+ return (-1);
+
+ ret = -1;
+
+ for (i = 0, cmsg = CMSG_FIRSTHDR(&msg); i < nfds && cmsg != NULL;
+ i++, cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+ if (msghdr_add_fd(cmsg, fds[i]) == -1)
+ goto end;
+ }
+
+ if (msg_send(sock, &msg) == -1)
+ goto end;
+
+ ret = 0;
+end:
+ serrno = errno;
+ free(msg.msg_control);
+ errno = serrno;
+ return (ret);
+}
+
+int
+fd_recv(int sock, int *fds, size_t nfds)
+{
+ struct msghdr msg;
+ struct cmsghdr *cmsg;
+ unsigned int i;
+ int serrno, ret;
+
+ if (nfds == 0 || fds == NULL) {
+ errno = EINVAL;
+ return (-1);
+ }
+
+ bzero(&msg, sizeof(msg));
+ msg.msg_iov = NULL;
+ msg.msg_iovlen = 0;
+ msg.msg_controllen = nfds * CMSG_SPACE(sizeof(int));
+ msg.msg_control = calloc(1, msg.msg_controllen);
+ if (msg.msg_control == NULL)
+ return (-1);
+
+ ret = -1;
+
+ if (msg_recv(sock, &msg) == -1)
+ goto end;
+
+ for (i = 0, cmsg = CMSG_FIRSTHDR(&msg); i < nfds && cmsg != NULL;
+ i++, cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+ fds[i] = msghdr_get_fd(cmsg);
+ if (fds[i] < 0)
+ break;
+ }
+
+ if (cmsg != NULL || i < nfds) {
+ int fd;
+
+ /*
+ * We need to close all received descriptors, even if we have
+ * different control message (eg. SCM_CREDS) in between.
+ */
+ for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
+ cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+ fd = msghdr_get_fd(cmsg);
+ if (fd >= 0)
+ close(fd);
+ }
+ errno = EINVAL;
+ goto end;
+ }
+
+ ret = 0;
+end:
+ serrno = errno;
+ free(msg.msg_control);
+ errno = serrno;
+ return (ret);
+}
+
+int
+buf_send(int sock, void *buf, size_t size)
+{
+ ssize_t done;
+ unsigned char *ptr;
+
+ ptr = buf;
+ do {
+ fd_wait(sock, false);
+ done = send(sock, ptr, size, 0);
+ if (done == -1) {
+ if (errno == EINTR)
+ continue;
+ return (-1);
+ } else if (done == 0) {
+ errno = ENOTCONN;
+ return (-1);
+ }
+ size -= done;
+ ptr += done;
+ } while (size > 0);
+
+ return (0);
+}
+
+int
+buf_recv(int sock, void *buf, size_t size)
+{
+ ssize_t done;
+ unsigned char *ptr;
+
+ ptr = buf;
+ do {
+ fd_wait(sock, true);
+ done = recv(sock, ptr, size, 0);
+ if (done == -1) {
+ if (errno == EINTR)
+ continue;
+ return (-1);
+ } else if (done == 0) {
+ errno = ENOTCONN;
+ return (-1);
+ }
+ size -= done;
+ ptr += done;
+ } while (size > 0);
+
+ return (0);
+}
Added: head/lib/libnv/msgio.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libnv/msgio.h Tue Nov 12 19:39:14 2013 (r258065)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-head
mailing list