mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-04 09:09:56 +00:00
Make userland tools honor WITHOUT_PF build option.
Tested by: dt71@gmx.com
This commit is contained in:
parent
9da19cd746
commit
3e4d5cd37b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=257349
@ -483,9 +483,11 @@ ip_print_demux(netdissect_options *ndo,
|
||||
pgm_print(ipds->cp, ipds->len, (const u_char *)ipds->ip);
|
||||
break;
|
||||
|
||||
#if defined(HAVE_NET_PFVAR_H)
|
||||
case IPPROTO_PFSYNC:
|
||||
pfsync_ip_print(ipds->cp, ipds->len);
|
||||
break;
|
||||
#endif
|
||||
|
||||
default:
|
||||
if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL)
|
||||
|
@ -40,7 +40,9 @@ LDADD+= -lbsdxml -lsbuf
|
||||
|
||||
SRCS+= carp.c # SIOC[GS]VH support
|
||||
SRCS+= ifgroup.c # ...
|
||||
.if ${MK_PF} != "no"
|
||||
SRCS+= ifpfsync.c # pfsync(4) support
|
||||
.endif
|
||||
|
||||
SRCS+= ifbridge.c # bridge support
|
||||
SRCS+= iflagg.c # lagg support
|
||||
|
@ -26,6 +26,10 @@ CFLAGS+=-DINET6
|
||||
CFLAGS+=-DSDP
|
||||
.endif
|
||||
|
||||
.if ${MK_PF} != "no"
|
||||
CFLAGS+=-DPF
|
||||
.endif
|
||||
|
||||
BINGRP= kmem
|
||||
BINMODE=2555
|
||||
DPADD= ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
|
||||
|
@ -48,13 +48,15 @@ __FBSDID("$FreeBSD$");
|
||||
#include <net/if_dl.h>
|
||||
#include <net/if_types.h>
|
||||
#include <net/ethernet.h>
|
||||
#include <net/pfvar.h>
|
||||
#include <net/if_pfsync.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/in_var.h>
|
||||
#include <netipx/ipx.h>
|
||||
#include <netipx/ipx_if.h>
|
||||
#include <arpa/inet.h>
|
||||
#ifdef PF
|
||||
#include <net/pfvar.h>
|
||||
#include <net/if_pfsync.h>
|
||||
#endif
|
||||
|
||||
#include <err.h>
|
||||
#include <errno.h>
|
||||
@ -80,6 +82,7 @@ static void sidewaysintpr(int);
|
||||
static char addr_buf[NI_MAXHOST]; /* for getnameinfo() */
|
||||
#endif
|
||||
|
||||
#ifdef PF
|
||||
static const char* pfsyncacts[] = {
|
||||
/* PFSYNC_ACT_CLR */ "clear all request",
|
||||
/* PFSYNC_ACT_INS */ "state insert",
|
||||
@ -154,6 +157,7 @@ pfsync_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
|
||||
p(pfsyncs_oerrors, "\t\t%ju send error%s\n");
|
||||
#undef p
|
||||
}
|
||||
#endif /* PF */
|
||||
|
||||
/*
|
||||
* Display a formatted value, or a '-' in the same space.
|
||||
|
@ -214,8 +214,10 @@ struct protox {
|
||||
pim_stats, NULL, "pim", 1, IPPROTO_PIM },
|
||||
{ -1, N_CARPSTAT, 1, NULL,
|
||||
carp_stats, NULL, "carp", 1, 0 },
|
||||
#ifdef PF
|
||||
{ -1, N_PFSYNCSTAT, 1, NULL,
|
||||
pfsync_stats, NULL, "pfsync", 1, 0 },
|
||||
#endif
|
||||
{ -1, N_ARPSTAT, 1, NULL,
|
||||
arp_stats, NULL, "arp", 1, 0 },
|
||||
{ -1, -1, 0, NULL,
|
||||
|
@ -89,7 +89,6 @@ SRCS= addrtoname.c \
|
||||
print-olsr.c \
|
||||
print-ospf.c \
|
||||
print-otv.c \
|
||||
print-pfsync.c \
|
||||
print-pgm.c \
|
||||
print-pim.c \
|
||||
print-ppi.c \
|
||||
@ -171,7 +170,8 @@ CFLAGS+= -DHAVE_LIBCRYPTO -DHAVE_OPENSSL_EVP_H
|
||||
.endif
|
||||
|
||||
.if ${MK_PF} != "no"
|
||||
SRCS+= print-pflog.c
|
||||
SRCS+= print-pflog.c \
|
||||
print-pfsync.c
|
||||
CFLAGS+= -DHAVE_NET_PFVAR_H
|
||||
.endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user