d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipfilter: Reliably print the interface name

Browse Source 
When printing the interface name from the ipstate_t struct the interface
name in is_ifp may not always be avaiable when reading it from kmem
(tested on FreeBSD and NetBSD). However the is_ifname (the interface
name character string) is almost always available -- it is not available
when the source of the packet is a process running on the firewall
itself. Rather than print both interface name strings, print only the
one.

MFC after:	1 week
This commit is contained in:
Cy Schubert 2022-03-02 22:43:48 -08:00
parent ec793543fe
commit 93c1048a13
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sbin/ipf/libipf/printstate.c
View File

@ -184,23 +184,19 @@ printstate(ipstate_t *sp, int opts, u_long now)
PRINTF("\tis_flx %#x %#x %#x %#x\n", sp->is_flx[0][0],
sp->is_flx[0][1], sp->is_flx[1][0], sp->is_flx[1][1]);
}
PRINTF("\tinterfaces: in %s[%s", getifname(sp->is_ifp[0]),
sp->is_ifname[0]);
PRINTF("\tinterfaces: in %s", FORMAT_IF(sp->is_ifname[0]));
if (opts & OPT_DEBUG)
PRINTF("/%p", sp->is_ifp[0]);
putchar(']');
PRINTF(",%s[%s", getifname(sp->is_ifp[1]), sp->is_ifname[1]);
PRINTF(",%s", FORMAT_IF(sp->is_ifname[1]));
if (opts & OPT_DEBUG)
PRINTF("/%p", sp->is_ifp[1]);
putchar(']');
PRINTF(" out %s[%s", getifname(sp->is_ifp[2]), sp->is_ifname[2]);
PRINTF(" out %s", FORMAT_IF(sp->is_ifname[2]));
if (opts & OPT_DEBUG)
PRINTF("/%p", sp->is_ifp[2]);
putchar(']');
PRINTF(",%s[%s", getifname(sp->is_ifp[3]), sp->is_ifname[3]);
PRINTF(",%s", FORMAT_IF(sp->is_ifname[3]));
if (opts & OPT_DEBUG)
PRINTF("/%p", sp->is_ifp[3]);
PRINTF("]\n");
PRINTF("\n");
PRINTF("\tSync status: ");
if (sp->is_sync != NULL) {