Module Name: src
Committed By: thorpej
Date: Wed Jan 29 04:35:13 UTC 2020
Modified Files:
src/sys/net: rtsock.c rtsock_shared.c
Log Message:
Do not reference ifp->if_data directly; use if_export_if_data().
To generate a diff of this commit:
cvs rdiff -u -r1.252 -r1.253 src/sys/net/rtsock.c
cvs rdiff -u -r1.11 -r1.12 src/sys/net/rtsock_shared.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.252 src/sys/net/rtsock.c:1.253
--- src/sys/net/rtsock.c:1.252 Sun Sep 1 18:54:38 2019
+++ src/sys/net/rtsock.c Wed Jan 29 04:35:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock.c,v 1.252 2019/09/01 18:54:38 roy Exp $ */
+/* $NetBSD: rtsock.c,v 1.253 2020/01/29 04:35:13 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.252 2019/09/01 18:54:38 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.253 2020/01/29 04:35:13 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -239,7 +239,7 @@ sysctl_iflist_if(struct ifnet *ifp, stru
ifm = (struct if_xmsghdr *)w->w_tmem;
ifm->ifm_index = ifp->if_index;
ifm->ifm_flags = ifp->if_flags;
- ifm->ifm_data = ifp->if_data;
+ if_export_if_data(ifp, &ifm->ifm_data, false);
ifm->ifm_addrs = info->rti_addrs;
if ((error = copyout(ifm, w->w_where, len)) == 0)
w->w_where = (char *)w->w_where + len;
Index: src/sys/net/rtsock_shared.c
diff -u src/sys/net/rtsock_shared.c:1.11 src/sys/net/rtsock_shared.c:1.12
--- src/sys/net/rtsock_shared.c:1.11 Mon Oct 14 16:43:04 2019
+++ src/sys/net/rtsock_shared.c Wed Jan 29 04:35:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_shared.c,v 1.11 2019/10/14 16:43:04 maxv Exp $ */
+/* $NetBSD: rtsock_shared.c,v 1.12 2020/01/29 04:35:13 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.11 2019/10/14 16:43:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.12 2020/01/29 04:35:13 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1348,7 +1348,7 @@ COMPATNAME(rt_ifmsg)(struct ifnet *ifp)
(void)memset(&ifm, 0, sizeof(ifm));
ifm.ifm_index = ifp->if_index;
ifm.ifm_flags = ifp->if_flags;
- ifm.ifm_data = ifp->if_data;
+ if_export_if_data(ifp, &ifm.ifm_data, false);
ifm.ifm_addrs = 0;
m = COMPATNAME(rt_msg1)(RTM_IFINFO, &info, &ifm, sizeof(ifm));
if (m == NULL)
