diff options
| author | darrenr <darrenr@FreeBSD.org> | 2005-04-26 14:27:12 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2005-04-26 14:27:12 +0000 |
| commit | 6941302010fa1392cfb1ec245202456b2c51fb1f (patch) | |
| tree | 8cdeaf87e61f69c36d198a746b8ea0f60d242e79 /contrib/ipfilter/lib | |
| parent | 97a7651af8ad42b6f47e50ff43d50319422a7a8e (diff) | |
| download | FreeBSD-src-6941302010fa1392cfb1ec245202456b2c51fb1f.zip FreeBSD-src-6941302010fa1392cfb1ec245202456b2c51fb1f.tar.gz | |
Fix problems with building libipf:
ipf_dontuning.c - change the include to look in netinet for ipl.h
ipft_tx.c - make the private use of arrays with tcp flags info in them more
not use names that can be "confusing"
Diffstat (limited to 'contrib/ipfilter/lib')
| -rw-r--r-- | contrib/ipfilter/lib/ipf_dotuning.c | 2 | ||||
| -rw-r--r-- | contrib/ipfilter/lib/ipft_tx.c | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/contrib/ipfilter/lib/ipf_dotuning.c b/contrib/ipfilter/lib/ipf_dotuning.c index fb5af2d..d9f5f75 100644 --- a/contrib/ipfilter/lib/ipf_dotuning.c +++ b/contrib/ipfilter/lib/ipf_dotuning.c @@ -1,7 +1,7 @@ /* $FreeBSD$ */ #include "ipf.h" -#include "ipl.h" +#include "netinet/ipl.h" #include <sys/ioctl.h> void ipf_dotuning(fd, tuneargs, iocfn) diff --git a/contrib/ipfilter/lib/ipft_tx.c b/contrib/ipfilter/lib/ipft_tx.c index f69aab0..2f9cff9 100644 --- a/contrib/ipfilter/lib/ipft_tx.c +++ b/contrib/ipfilter/lib/ipft_tx.c @@ -31,8 +31,8 @@ static int text_open __P((char *)), text_close __P((void)); static int text_readip __P((char *, int, char **, int *)); static int parseline __P((char *, ip_t *, char **, int *)); -static char _tcp_flagset[] = "FSRPAUEC"; -static u_char _tcp_flags[] = { TH_FIN, TH_SYN, TH_RST, TH_PUSH, +static char myflagset[] = "FSRPAUEC"; +static u_char myflags[] = { TH_FIN, TH_SYN, TH_RST, TH_PUSH, TH_ACK, TH_URG, TH_ECN, TH_CWR }; struct ipread iptext = { text_open, text_close, text_readip, R_DO_CKSUM }; @@ -280,14 +280,12 @@ int *out; ip->ip_dst.s_addr = tx_hostnum(*cpp, &r); cpp++; if (*cpp && ip->ip_p == IPPROTO_TCP) { - extern char _tcp_flagset[]; - extern u_char _tcp_flags[]; char *s, *t; tcp->th_flags = 0; for (s = *cpp; *s; s++) - if ((t = strchr(_tcp_flagset, *s))) - tcp->th_flags |= _tcp_flags[t - _tcp_flagset]; + if ((t = strchr(myflagset, *s))) + tcp->th_flags |= myflags[t - myflagset]; if (tcp->th_flags) cpp++; if (tcp->th_flags == 0) |
