D47106.id144821.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D47106.id144821.diff
View Options

	diff --git a/sys/netpfil/ipfilter/netinet/ip_compat.h b/sys/netpfil/ipfilter/netinet/ip_compat.h
	--- a/sys/netpfil/ipfilter/netinet/ip_compat.h
	+++ b/sys/netpfil/ipfilter/netinet/ip_compat.h
	@@ -696,7 +696,7 @@
	#define IPMINLEN(i, h) ((i)->ip_len >= (IP_HL(i) * 4 + sizeof(struct h)))

	#define TCPF_ALL (TH_FIN\|TH_SYN\|TH_RST\|TH_PUSH\|TH_ACK\|TH_URG\|\
	- TH_ECN\|TH_CWR)
	+ TH_ECN\|TH_CWR\|TH_AE)

	#if !SOLARIS && !defined(m_act)
	# define m_act m_nextpkt
	@@ -1128,7 +1128,10 @@
	#ifndef TH_CWR
	# define TH_CWR 0x80
	#endif
	-#define TH_ECNALL (TH_ECN\|TH_CWR)
	+#ifndef TH_AE
	+# define TH_AE 0x100
	+#endif
	+#define TH_ECNALL (TH_ECN\|TH_CWR\|TH_AE)

	/*
	* TCP States
	diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
	--- a/sys/netpfil/pf/pf.c
	+++ b/sys/netpfil/pf/pf.c
	@@ -2891,7 +2891,7 @@
	}

	void
	-pf_print_flags(u_int8_t f)
	+pf_print_flags(uint16_t f)
	{
	if (f)
	printf(" ");
	@@ -2911,6 +2911,8 @@
	printf("E");
	if (f & TH_CWR)
	printf("W");
	+ if (f & TH_AE)
	+ printf("e");
	}

	#define PF_SET_SKIP_STEPS(i) \
	diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c
	--- a/usr.sbin/ppp/ip.c
	+++ b/usr.sbin/ppp/ip.c
	@@ -561,7 +561,7 @@
	{
	char logbuf[200];
	static const char *const TcpFlags[] = {
	- "FIN", "SYN", "RST", "PSH", "ACK", "URG"
	+ "FIN", "SYN", "RST", "PSH", "ACK", "URG", "ECE", "CWR", "AE"
	};
	const struct tcphdr *th;
	const struct udphdr *uh;