25 files changed, 678 insertions, 2 deletions

diff --git a/sys/Makefile b/sys/Makefile
index 7ea7ccbf235a..f2f2bfc23ac3 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/02 19:48:21 christos Exp $
 
 .include <bsd.own.mk>
 
 TESTSDIR=	${TESTSBASE}/sys
 
-TESTS_SUBDIRS+= 	rc
+TESTS_SUBDIRS+= 	net netatalk netinet netinet6 rc
 
 .include <bsd.test.mk>
diff --git a/sys/net/CVS/Entries b/sys/net/CVS/Entries
new file mode 100644
index 000000000000..3dd6c2a6b282
--- /dev/null
+++ b/sys/net/CVS/Entries
@@ -0,0 +1,3 @@
+/Makefile/1.2/Wed Dec  3 08:14:26 2014//D2016.08.12.00.58.30
+/t_print.c/1.1/Tue Dec  2 19:48:21 2014//D2016.08.12.00.58.30
+D
diff --git a/sys/net/CVS/Repository b/sys/net/CVS/Repository
new file mode 100644
index 000000000000..47c58ac79b1d
--- /dev/null
+++ b/sys/net/CVS/Repository
@@ -0,0 +1 @@
+src/tests/sys/net
diff --git a/sys/net/CVS/Root b/sys/net/CVS/Root
new file mode 100644
index 000000000000..e69f2e32ce2d
--- /dev/null
+++ b/sys/net/CVS/Root
@@ -0,0 +1 @@
+anoncvs@anoncvs.NetBSD.org:/cvsroot
diff --git a/sys/net/CVS/Tag b/sys/net/CVS/Tag
new file mode 100644
index 000000000000..abf4ef6daefc
--- /dev/null
+++ b/sys/net/CVS/Tag
@@ -0,0 +1 @@
+D2016.08.12.00.58.30
diff --git a/sys/net/Makefile b/sys/net/Makefile
new file mode 100644
index 000000000000..f043cad5c209
--- /dev/null
+++ b/sys/net/Makefile
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.2 2014/12/03 08:14:26 ozaki-r Exp $
+#
+WARNS?=6
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/sys/net
+CPPFLAGS+=	-I${NETBSDSRCDIR}/sys -D_TEST
+
+TESTS_C=	t_print
+
+.include <bsd.test.mk>
diff --git a/sys/net/t_print.c b/sys/net/t_print.c
new file mode 100644
index 000000000000..0aaeb3070f98
--- /dev/null
+++ b/sys/net/t_print.c
@@ -0,0 +1,172 @@
+/*	$NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $");
+
+#include "net/dl_print.c"
+
+#include <atf-c.h>
+
+static const struct {
+	struct dl_addr ia;
+	const char *str;
+	int len;
+} tst[] = {
+	{
+		{
+			.dl_type = 6,
+			.dl_nlen = 0,
+			.dl_alen = 6,
+			.dl_slen = 0,
+			.dl_data = {
+			    (char)0x01, (char)0xa2, (char)0x03,
+			    (char)0xc4, (char)0x05, (char)0xf6,
+			},
+		},
+		"/6#01:a2:03:c4:05:f6",
+		20,
+	},
+	{
+		{
+			.dl_type = 24,
+			.dl_nlen = 3,
+			.dl_alen = 6,
+			.dl_slen = 0,
+			.dl_data = {
+			    'l', 'o', '0',
+			    (char)0x11, (char)0x22, (char)0x33,
+			    (char)0x44, (char)0x55, (char)0x66,
+			},
+		},
+		"lo0/24#11:22:33:44:55:66",
+		24,
+	},
+	{
+		{
+			.dl_type = 24,
+			.dl_nlen = 7,
+			.dl_alen = 1,
+			.dl_slen = 0,
+			.dl_data = {
+			    'n', 'p', 'f', 'l', 'o', 'g', '0', (char)0xa5,
+			},
+		},
+		"npflog0/24#a5",
+		13,
+	},
+	{
+		{
+			.dl_type = 0,
+			.dl_nlen = 0,
+			.dl_alen = 0,
+			.dl_slen = 0,
+			.dl_data = {
+			    '\0'
+			},
+		},
+		"/0#",
+		3,
+	},
+};
+
+
+ATF_TC(dl_print);
+ATF_TC_HEAD(dl_print, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "printing of link address");
+}
+
+ATF_TC_BODY(dl_print, tc)
+{
+	char buf[LINK_ADDRSTRLEN];
+	int r;
+	size_t l = sizeof(buf);
+
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		r = dl_print(buf, l, &tst[i].ia);
+		ATF_REQUIRE_STREQ(buf, tst[i].str);
+		ATF_REQUIRE_EQ(r, tst[i].len);
+	}
+
+	l = 4;
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		r = dl_print(buf, l, &tst[i].ia);
+		ATF_CHECK(strncmp(buf, tst[i].str, l - 1) == 0);
+		if (r > (int)l)
+			ATF_REQUIRE_EQ(buf[l - 1], '\0');
+		ATF_REQUIRE_EQ(r, tst[i].len);
+	}
+}
+
+ATF_TC(sdl_print);
+ATF_TC_HEAD(sdl_print, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "printing of sockaddr_dl");
+}
+
+ATF_TC_BODY(sdl_print, tc)
+{
+	char buf[1024];
+	char res[1024];
+	int r, e;
+	size_t l = sizeof(buf);
+	struct sockaddr_dl sdl;
+
+	memset(&sdl, 0, sizeof(sdl));
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		memcpy(&sdl.sdl_addr, &tst[i].ia, sizeof(sdl.sdl_addr));
+		sdl.sdl_index = (uint16_t)i;
+		r = sdl_print(buf, l, &sdl);
+		e = snprintf(res, l, "[%s]:%zu", tst[i].str, i);
+		ATF_REQUIRE_STREQ(buf, res);
+		ATF_REQUIRE_EQ(r, e);
+	}
+
+	l = 8;
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		memcpy(&sdl.sdl_addr, &tst[i].ia, sizeof(sdl.sdl_addr));
+		sdl.sdl_index = (uint16_t)i;
+		r = sdl_print(buf, l, &sdl);
+		e = snprintf(res, l, "[%s]:%zu", tst[i].str, i);
+		ATF_REQUIRE_STREQ(buf, res);
+		ATF_REQUIRE_EQ(r, e);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, dl_print);
+	ATF_TP_ADD_TC(tp, sdl_print);
+	return atf_no_error();
+}
diff --git a/sys/netatalk/CVS/Entries b/sys/netatalk/CVS/Entries
new file mode 100644
index 000000000000..2c5e38b3d321
--- /dev/null
+++ b/sys/netatalk/CVS/Entries
@@ -0,0 +1,3 @@
+/Makefile/1.1/Tue Dec  2 19:48:21 2014//D2016.08.12.00.58.30
+/t_print.c/1.1/Tue Dec  2 19:48:21 2014//D2016.08.12.00.58.30
+D
diff --git a/sys/netatalk/CVS/Repository b/sys/netatalk/CVS/Repository
new file mode 100644
index 000000000000..258305da2fcc
--- /dev/null
+++ b/sys/netatalk/CVS/Repository
@@ -0,0 +1 @@
+src/tests/sys/netatalk
diff --git a/sys/netatalk/CVS/Root b/sys/netatalk/CVS/Root
new file mode 100644
index 000000000000..e69f2e32ce2d
--- /dev/null
+++ b/sys/netatalk/CVS/Root
@@ -0,0 +1 @@
+anoncvs@anoncvs.NetBSD.org:/cvsroot
diff --git a/sys/netatalk/CVS/Tag b/sys/netatalk/CVS/Tag
new file mode 100644
index 000000000000..abf4ef6daefc
--- /dev/null
+++ b/sys/netatalk/CVS/Tag
@@ -0,0 +1 @@
+D2016.08.12.00.58.30
diff --git a/sys/netatalk/Makefile b/sys/netatalk/Makefile
new file mode 100644
index 000000000000..c17dd15950f3
--- /dev/null
+++ b/sys/netatalk/Makefile
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2014/12/02 19:48:21 christos Exp $
+#
+WARNS?=6
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/sys/netatalk
+CPPFLAGS+=	-I${NETBSDSRCDIR}/sys -D_TEST
+
+TESTS_C=	t_print
+
+.include <bsd.test.mk>
diff --git a/sys/netatalk/t_print.c b/sys/netatalk/t_print.c
new file mode 100644
index 000000000000..2e506c635bc1
--- /dev/null
+++ b/sys/netatalk/t_print.c
@@ -0,0 +1,135 @@
+/*	$NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $");
+
+#include "netatalk/at_print.c"
+
+#include <atf-c.h>
+
+static const struct {
+	struct at_addr ia;
+	const char *str;
+	int len;
+} tst[] = {
+	{
+		{ 0, 0 },
+		"0.0",
+		3,
+	},
+	{
+		{ htons(3), 255 },
+		"3.255",
+		5,
+	},
+};
+
+
+ATF_TC(at_print);
+ATF_TC_HEAD(at_print, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "printing of struct at_addr");
+}
+
+ATF_TC_BODY(at_print, tc)
+{
+	char buf[ATALK_ADDRSTRLEN];
+	int r;
+	size_t l = sizeof(buf);
+
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		r = at_print(buf, l, &tst[i].ia);
+		ATF_REQUIRE_STREQ(buf, tst[i].str);
+		ATF_REQUIRE_EQ(r, tst[i].len);
+	}
+
+	l = 4;
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		r = at_print(buf, l, &tst[i].ia);
+		ATF_CHECK(strncmp(buf, tst[i].str, l - 1) == 0);
+		if (r > (int)l)
+			ATF_REQUIRE_EQ(buf[l - 1], '\0');
+		ATF_REQUIRE_EQ(r, tst[i].len);
+	}
+}
+
+ATF_TC(sat_print);
+ATF_TC_HEAD(sat_print, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "printing of sockaddr_at");
+}
+
+ATF_TC_BODY(sat_print, tc)
+{
+	char buf[1024];
+	char res[1024];
+	int r, e;
+	size_t l = sizeof(buf);
+	struct sockaddr_at sat;
+
+	memset(&sat, 0, sizeof(sat));
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		sat.sat_addr = tst[i].ia;
+		sat.sat_port = (uint8_t)i;
+		r = sat_print(buf, l, &sat);
+		if (i == 0)
+			e = snprintf(res, sizeof(res), "%s", tst[i].str);
+		else
+			e = snprintf(res, sizeof(res), "%s:%zu", tst[i].str, i);
+
+		ATF_REQUIRE_STREQ(buf, res);
+		ATF_REQUIRE_EQ(r, e);
+	}
+
+	l = 8;
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		sat.sat_addr = tst[i].ia;
+		sat.sat_port = (uint8_t)i;
+		r = sat_print(buf, l, &sat);
+		if (i == 0)
+			e = snprintf(res, l, "%s", tst[i].str);
+		else
+			e = snprintf(res, l, "%s:%zu", tst[i].str, i);
+
+		ATF_REQUIRE_STREQ(buf, res);
+		ATF_REQUIRE_EQ(r, e);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, at_print);
+	ATF_TP_ADD_TC(tp, sat_print);
+	return atf_no_error();
+}
diff --git a/sys/netinet/CVS/Entries b/sys/netinet/CVS/Entries
new file mode 100644
index 000000000000..9e7315638498
--- /dev/null
+++ b/sys/netinet/CVS/Entries
@@ -0,0 +1,3 @@
+/Makefile/1.1/Tue Dec  2 19:48:21 2014//D2016.08.12.00.58.30
+/t_print.c/1.2/Wed Dec  3 13:10:49 2014//D2016.08.12.00.58.30
+D
diff --git a/sys/netinet/CVS/Repository b/sys/netinet/CVS/Repository
new file mode 100644
index 000000000000..35820eb91196
--- /dev/null
+++ b/sys/netinet/CVS/Repository
@@ -0,0 +1 @@
+src/tests/sys/netinet
diff --git a/sys/netinet/CVS/Root b/sys/netinet/CVS/Root
new file mode 100644
index 000000000000..e69f2e32ce2d
--- /dev/null
+++ b/sys/netinet/CVS/Root
@@ -0,0 +1 @@
+anoncvs@anoncvs.NetBSD.org:/cvsroot
diff --git a/sys/netinet/CVS/Tag b/sys/netinet/CVS/Tag
new file mode 100644
index 000000000000..abf4ef6daefc
--- /dev/null
+++ b/sys/netinet/CVS/Tag
@@ -0,0 +1 @@
+D2016.08.12.00.58.30
diff --git a/sys/netinet/Makefile b/sys/netinet/Makefile
new file mode 100644
index 000000000000..6ef518fab7f3
--- /dev/null
+++ b/sys/netinet/Makefile
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2014/12/02 19:48:21 christos Exp $
+#
+WARNS?=6
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/sys/netinet
+CPPFLAGS+=	-I${NETBSDSRCDIR}/sys -D_TEST
+
+TESTS_C=	t_print
+
+.include <bsd.test.mk>
diff --git a/sys/netinet/t_print.c b/sys/netinet/t_print.c
new file mode 100644
index 000000000000..6a0d913ac2bb
--- /dev/null
+++ b/sys/netinet/t_print.c
@@ -0,0 +1,144 @@
+/*	$NetBSD: t_print.c,v 1.2 2014/12/03 13:10:49 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_print.c,v 1.2 2014/12/03 13:10:49 christos Exp $");
+
+#include "netinet/in_print.c"
+
+#include <atf-c.h>
+
+static const struct {
+	struct in_addr ia;
+	const char *str;
+	int len;
+} tst[] = {
+	{
+		{	.s_addr = ntohl(INADDR_LOOPBACK)	},
+		"127.0.0.1",
+		9,
+	},
+	{
+		{	.s_addr = ntohl(INADDR_ANY)		},
+		"0.0.0.0",
+		7,
+	},
+	{
+		{	.s_addr = ntohl(IN_CLASSC_NET)		},
+		"255.255.255.0",
+		13,
+	},
+	{
+		{	.s_addr = ntohl(INADDR_ALLHOSTS_GROUP)	},
+		"224.0.0.1",
+		9,
+	},
+};
+
+
+ATF_TC(in_print);
+ATF_TC_HEAD(in_print, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "printing of struct in_addr");
+}
+
+ATF_TC_BODY(in_print, tc)
+{
+	char buf[INET_ADDRSTRLEN];
+	int r;
+	size_t l = sizeof(buf);
+
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		r = in_print(buf, l, &tst[i].ia);
+		ATF_REQUIRE_STREQ(buf, tst[i].str);
+		ATF_REQUIRE_EQ(r, tst[i].len);
+	}
+
+	l = 8;
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		r = in_print(buf, l, &tst[i].ia);
+		ATF_CHECK(strncmp(buf, tst[i].str, l - 1) == 0);
+		ATF_REQUIRE_EQ(buf[l - 1], '\0');
+		ATF_REQUIRE_EQ(r, tst[i].len);
+	}
+}
+
+ATF_TC(sin_print);
+ATF_TC_HEAD(sin_print, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "printing of sockaddr_in");
+}
+
+ATF_TC_BODY(sin_print, tc)
+{
+	char buf[1024];
+	char res[1024];
+	int r, e;
+	size_t l = sizeof(buf);
+	struct sockaddr_in sin;
+	memset(&sin, 0, sizeof(sin));
+
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		sin.sin_addr = tst[i].ia;
+		sin.sin_port = (in_port_t)htons(i);
+		r = sin_print(buf, l, &sin);
+		if (i == 0)
+			e = snprintf(res, sizeof(res), "%s", tst[i].str);
+		else
+			e = snprintf(res, sizeof(res), "%s:%zu", tst[i].str, i);
+
+		ATF_REQUIRE_STREQ(buf, res);
+		ATF_REQUIRE_EQ(r, e);
+	}
+
+	l = 14;
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		sin.sin_addr = tst[i].ia;
+		sin.sin_port = (in_port_t)htons(i);
+		r = sin_print(buf, l, &sin);
+		if (i == 0)
+			e = snprintf(res, l, "%s", tst[i].str);
+		else
+			e = snprintf(res, l, "%s:%zu", tst[i].str, i);
+
+		ATF_REQUIRE_STREQ(buf, res);
+		ATF_REQUIRE_EQ(r, e);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, in_print);
+	ATF_TP_ADD_TC(tp, sin_print);
+	return atf_no_error();
+}
diff --git a/sys/netinet6/CVS/Entries b/sys/netinet6/CVS/Entries
new file mode 100644
index 000000000000..9e7315638498
--- /dev/null
+++ b/sys/netinet6/CVS/Entries
@@ -0,0 +1,3 @@
+/Makefile/1.1/Tue Dec  2 19:48:21 2014//D2016.08.12.00.58.30
+/t_print.c/1.2/Wed Dec  3 13:10:49 2014//D2016.08.12.00.58.30
+D
diff --git a/sys/netinet6/CVS/Repository b/sys/netinet6/CVS/Repository
new file mode 100644
index 000000000000..7fcec3e61518
--- /dev/null
+++ b/sys/netinet6/CVS/Repository
@@ -0,0 +1 @@
+src/tests/sys/netinet6
diff --git a/sys/netinet6/CVS/Root b/sys/netinet6/CVS/Root
new file mode 100644
index 000000000000..e69f2e32ce2d
--- /dev/null
+++ b/sys/netinet6/CVS/Root
@@ -0,0 +1 @@
+anoncvs@anoncvs.NetBSD.org:/cvsroot
diff --git a/sys/netinet6/CVS/Tag b/sys/netinet6/CVS/Tag
new file mode 100644
index 000000000000..abf4ef6daefc
--- /dev/null
+++ b/sys/netinet6/CVS/Tag
@@ -0,0 +1 @@
+D2016.08.12.00.58.30
diff --git a/sys/netinet6/Makefile b/sys/netinet6/Makefile
new file mode 100644
index 000000000000..59833a8ae27d
--- /dev/null
+++ b/sys/netinet6/Makefile
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2014/12/02 19:48:21 christos Exp $
+#
+WARNS?=6
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/sys/netinet6
+CPPFLAGS+=	-I${NETBSDSRCDIR}/sys -D_TEST
+
+TESTS_C=	t_print
+
+.include <bsd.test.mk>
diff --git a/sys/netinet6/t_print.c b/sys/netinet6/t_print.c
new file mode 100644
index 000000000000..629c23f31615
--- /dev/null
+++ b/sys/netinet6/t_print.c
@@ -0,0 +1,154 @@
+/*	$NetBSD: t_print.c,v 1.2 2014/12/03 13:10:49 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_print.c,v 1.2 2014/12/03 13:10:49 christos Exp $");
+
+#include "netinet6/in6_print.c"
+#include "netinet/in_print.c"
+
+#include <atf-c.h>
+
+static const struct {
+	struct in6_addr ia;
+	const char *str;
+	int len;
+} tst[] = {
+	{
+		IN6ADDR_ANY_INIT,
+		"::",
+		2,
+	},
+	{
+		IN6ADDR_LOOPBACK_INIT,
+		"::1",
+		3,
+	},
+	{
+		IN6ADDR_NODELOCAL_ALLNODES_INIT,
+		"ff01::1",
+		7,
+	},
+	{
+		{{{ 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80,
+		    0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 }}},
+		"1020:3040:5060:7080:102:304:506:708",
+		35,
+	},
+	{
+		{{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		    0x00, 0x00, 0xff, 0xff, 0x88, 0x44, 0x22, 0x11 }}},
+		"::ffff:136.68.34.17",
+		19,
+	},
+};
+
+
+ATF_TC(in6_print);
+ATF_TC_HEAD(in6_print, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "printing of struct in6_addr");
+}
+
+ATF_TC_BODY(in6_print, tc)
+{
+	char buf[INET6_ADDRSTRLEN];
+	int r;
+	size_t l = sizeof(buf);
+
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		r = in6_print(buf, l, &tst[i].ia);
+		ATF_REQUIRE_STREQ(buf, tst[i].str);
+		ATF_REQUIRE_EQ(r, tst[i].len);
+	}
+
+	l = 12;
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		r = in6_print(buf, l, &tst[i].ia);
+		ATF_CHECK(strncmp(buf, tst[i].str, l - 1) == 0);
+		if (r > (int)l)
+			ATF_REQUIRE_EQ(buf[l - 1], '\0');
+		ATF_REQUIRE_EQ(r, tst[i].len);
+	}
+}
+
+ATF_TC(sin6_print);
+ATF_TC_HEAD(sin6_print, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "printing of sockaddr_in6");
+}
+
+ATF_TC_BODY(sin6_print, tc)
+{
+	char buf[1024];
+	char res[1024];
+	int r, e;
+	size_t l = sizeof(buf);
+	struct sockaddr_in6 sin6;
+	memset(&sin6, 0, sizeof(sin6));
+
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		sin6.sin6_addr = tst[i].ia;
+		sin6.sin6_port = (in_port_t)htons(i);
+		r = sin6_print(buf, l, &sin6);
+		if (i == 0)
+			e = snprintf(res, sizeof(res), "%s", tst[i].str);
+		else
+			e = snprintf(res, sizeof(res), "[%s]:%zu",
+			    tst[i].str, i);
+
+		ATF_REQUIRE_STREQ(buf, res);
+		ATF_REQUIRE_EQ(r, e);
+	}
+
+	l = 14;
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		sin6.sin6_addr = tst[i].ia;
+		sin6.sin6_port = (in_port_t)htons(i);
+		r = sin6_print(buf, l, &sin6);
+		if (i == 0)
+			e = snprintf(res, l, "%s", tst[i].str);
+		else
+			e = snprintf(res, l, "[%s]:%zu", tst[i].str, i);
+
+		ATF_REQUIRE_STREQ(buf, res);
+		ATF_REQUIRE_EQ(r, e);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, in6_print);
+	ATF_TP_ADD_TC(tp, sin6_print);
+	return atf_no_error();
+}