diff options
| author | glebius <glebius@FreeBSD.org> | 2014-03-12 10:45:58 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2014-03-12 10:45:58 +0000 |
| commit | f937dcf2bd0584087acec5d8dc92dd5dba177113 (patch) | |
| tree | 8cbef21f45f26a80647ff8a0604c3c9c65c2bb40 /sbin | |
| parent | eeff801556700aefbd569ad4bac5acdebcc3b9a8 (diff) | |
| download | FreeBSD-src-f937dcf2bd0584087acec5d8dc92dd5dba177113.zip FreeBSD-src-f937dcf2bd0584087acec5d8dc92dd5dba177113.tar.gz | |
Bulk sync of pf changes from head, in attempt to fixup broken build I
made in r263029.
Merge r257186,257215,257349,259736,261797.
These changesets split pfvar.h into several smaller headers and make
userland utilities to include only some of them.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ifconfig/Makefile | 2 | ||||
| -rw-r--r-- | sbin/ipfw/Makefile | 10 | ||||
| -rw-r--r-- | sbin/ipfw/ipfw2.h | 5 |
3 files changed, 15 insertions, 2 deletions
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile index a98840d..a10d1fb 100644 --- a/sbin/ifconfig/Makefile +++ b/sbin/ifconfig/Makefile @@ -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 diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile index b25f38c..6aea26b 100644 --- a/sbin/ipfw/Makefile +++ b/sbin/ipfw/Makefile @@ -1,8 +1,16 @@ # $FreeBSD$ +.include <bsd.own.mk> + PROG= ipfw -SRCS= ipfw2.c dummynet.c ipv6.c main.c nat.c altq.c +SRCS= ipfw2.c dummynet.c ipv6.c main.c nat.c WARNS?= 2 + +.if ${MK_PF} != "no" +SRCS+= altq.c +CFLAGS+=-DPF +.endif + DPADD= ${LIBUTIL} LDADD= -lutil MAN= ipfw.8 diff --git a/sbin/ipfw/ipfw2.h b/sbin/ipfw/ipfw2.h index d592930..9abe6ee 100644 --- a/sbin/ipfw/ipfw2.h +++ b/sbin/ipfw/ipfw2.h @@ -266,11 +266,14 @@ void ipfw_flush(int force); void ipfw_zero(int ac, char *av[], int optname); void ipfw_list(int ac, char *av[], int show_counters); +#ifdef PF /* altq.c */ void altq_set_enabled(int enabled); u_int32_t altq_name_to_qid(const char *name); - void print_altq_cmd(struct _ipfw_insn_altq *altqptr); +#else +#define NO_ALTQ +#endif /* dummynet.c */ void dummynet_list(int ac, char *av[], int show_counters); |
