 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtsock.c,v 1.202 2017/02/21 04:00:01 ozaki-r Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.203 2017/03/14 04:23:15 ozaki-r Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * 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.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)rtsock.c	8.7 (Berkeley) 10/12/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.202 2017/02/21 04:00:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.203 2017/03/14 04:23:15 ozaki-r Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_mpls.h"
 #include "opt_compat_netbsd.h"
 #include "opt_sctp.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
 @@ -1054,51 +1054,51 @@ rt_getlen(int type)
 	CTASSERT(__alignof(struct ifa_msghdr) >= sizeof(uint64_t));
 	CTASSERT(__alignof(struct if_msghdr) >= sizeof(uint64_t));
 	CTASSERT(__alignof(struct if_announcemsghdr) >= sizeof(uint64_t));
 	CTASSERT(__alignof(struct rt_msghdr) >= sizeof(uint64_t));
 #endif
 	switch (type) {
 	case RTM_ODELADDR:
 	case RTM_ONEWADDR:
 	case RTM_OCHGADDR:
 #ifdef COMPAT_70
 		return sizeof(struct ifa_msghdr70);
 #else
-#ifdef DIAGNOSTIC
+#ifdef RTSOCK_DEBUG
-		printf("RTM_ONEWADDR\n");
+		printf("%s: unsupported RTM type %d\n", __func__, type);
 #endif
 		return -1;
 #endif
 	case RTM_DELADDR:
 	case RTM_NEWADDR:
 	case RTM_CHGADDR:
 		return sizeof(struct ifa_xmsghdr);
 	case RTM_OOIFINFO:
 #ifdef COMPAT_14
 		return sizeof(struct if_msghdr14);
 #else
-#ifdef DIAGNOSTIC
+#ifdef RTSOCK_DEBUG
-		printf("RTM_OOIFINFO\n");
+		printf("%s: unsupported RTM type RTM_OOIFINFO\n", __func__);
 #endif
 		return -1;
 #endif
 	case RTM_OIFINFO:
 #ifdef COMPAT_50
 		return sizeof(struct if_msghdr50);
 #else
-#ifdef DIAGNOSTIC
+#ifdef RTSOCK_DEBUG
-		printf("RTM_OIFINFO\n");
+		printf("%s: unsupported RTM type RTM_OIFINFO\n", __func__);
 #endif
 		return -1;
 #endif
 	case RTM_IFINFO:
 		return sizeof(struct if_xmsghdr);
 	case RTM_IFANNOUNCE:
 	case RTM_IEEE80211:
 		return sizeof(struct if_xannouncemsghdr);
 	default:
 		return sizeof(struct rt_xmsghdr);
 @@ -1661,28 +1661,28 @@ sysctl_iflist(int af, struct rt_walkarg
 		cmd = RTM_OIFINFO;
 		iflist_if = compat_50_iflist;
 		iflist_addr = compat_70_iflist_addr;
 		break;
 #endif
 #ifdef COMPAT_70
 	case NET_RT_OIFLIST:
 		cmd = RTM_IFINFO;
 		iflist_if = sysctl_iflist_if;
 		iflist_addr = compat_70_iflist_addr;
 		break;
 #endif
 	default:
-#ifdef DIAGNOSTIC
+#ifdef RTSOCK_DEBUG
-		printf("sysctl_iflist\n");
+		printf("%s: unsupported IFLIST type %d\n", __func__, type);
 #endif
 		return EINVAL;
+	}
 	memset(&info, 0, sizeof(info));
 	s = pserialize_read_enter();
 	IFNET_READER_FOREACH(ifp) {
 		if (w->w_arg && w->w_arg != ifp->if_index)
 			continue;
 		if (IFADDR_READER_EMPTY(ifp))
 			continue;