Deleted Added
sdiff udiff text old ( 133574 ) new ( 135615 )
full compact
pfvar.h (133574) pfvar.h (135615)
1/* $FreeBSD: head/sys/contrib/pf/net/pfvar.h 133574 2004-08-12 13:59:44Z mlaier $ */
1/* $FreeBSD: head/sys/contrib/pf/net/pfvar.h 135615 2004-09-23 12:44:40Z mlaier $ */
2/* $OpenBSD: pfvar.h,v 1.187 2004/03/22 04:54:18 mcbride Exp $ */
3/* add $OpenBSD: pfvar.h,v 1.194 2004/05/11 07:34:11 dhartmei Exp $ */
4
5/*
6 * Copyright (c) 2001 Daniel Hartmeier
7 * All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without

--- 34 unchanged lines hidden (view full) ---

44#include <net/if_clone.h>
45#include <vm/uma.h>
46#else
47#include <netinet/ip_ipsp.h>
48#endif
49
50#ifdef __FreeBSD__
51#include <netinet/in.h>
2/* $OpenBSD: pfvar.h,v 1.187 2004/03/22 04:54:18 mcbride Exp $ */
3/* add $OpenBSD: pfvar.h,v 1.194 2004/05/11 07:34:11 dhartmei Exp $ */
4
5/*
6 * Copyright (c) 2001 Daniel Hartmeier
7 * All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without

--- 34 unchanged lines hidden (view full) ---

44#include <net/if_clone.h>
45#include <vm/uma.h>
46#else
47#include <netinet/ip_ipsp.h>
48#endif
49
50#ifdef __FreeBSD__
51#include <netinet/in.h>
52/*
53 * XXX
54 * If we include <netipsec/keydb.h>, we need _KERNEL definition.
55 * This makes pfctl compilation difficult.
56 */
57union sockaddr_union {
58 struct sockaddr sa;
59 struct sockaddr_in sin;
60 struct sockaddr_in6 sin6;
61};
62#endif
63
64#include <netinet/tcp_fsm.h>
65
66struct ip;
67
68#define PF_TCPS_PROXY_SRC ((TCP_NSTATES)+0)
69#define PF_TCPS_PROXY_DST ((TCP_NSTATES)+1)

--- 756 unchanged lines hidden (view full) ---

826 u_int64_t pfrts_nomatch;
827 long pfrts_tzero;
828 int pfrts_cnt;
829 int pfrts_refcnt[PFR_REFCNT_MAX];
830};
831#define pfrts_name pfrts_t.pfrt_name
832#define pfrts_flags pfrts_t.pfrt_flags
833
52#endif
53
54#include <netinet/tcp_fsm.h>
55
56struct ip;
57
58#define PF_TCPS_PROXY_SRC ((TCP_NSTATES)+0)
59#define PF_TCPS_PROXY_DST ((TCP_NSTATES)+1)

--- 756 unchanged lines hidden (view full) ---

816 u_int64_t pfrts_nomatch;
817 long pfrts_tzero;
818 int pfrts_cnt;
819 int pfrts_refcnt[PFR_REFCNT_MAX];
820};
821#define pfrts_name pfrts_t.pfrt_name
822#define pfrts_flags pfrts_t.pfrt_flags
823
824#ifndef _SOCKADDR_UNION_DEFINED
825#define _SOCKADDR_UNION_DEFINED
826union sockaddr_union {
827 struct sockaddr sa;
828 struct sockaddr_in sin;
829 struct sockaddr_in6 sin6;
830};
831#endif /* _SOCKADDR_UNION_DEFINED */
832
834SLIST_HEAD(pfr_kentryworkq, pfr_kentry);
835struct pfr_kentry {
836 struct radix_node pfrke_node[2];
837 union sockaddr_union pfrke_sa;
838 u_int64_t pfrke_packets[PFR_DIR_MAX][PFR_OP_ADDR_MAX];
839 u_int64_t pfrke_bytes[PFR_DIR_MAX][PFR_OP_ADDR_MAX];
840 SLIST_ENTRY(pfr_kentry) pfrke_workq;
841 long pfrke_tzero;

--- 792 unchanged lines hidden --- 		833SLIST_HEAD(pfr_kentryworkq, pfr_kentry);
834struct pfr_kentry {
835 struct radix_node pfrke_node[2];
836 union sockaddr_union pfrke_sa;
837 u_int64_t pfrke_packets[PFR_DIR_MAX][PFR_OP_ADDR_MAX];
838 u_int64_t pfrke_bytes[PFR_DIR_MAX][PFR_OP_ADDR_MAX];
839 SLIST_ENTRY(pfr_kentry) pfrke_workq;
840 long pfrke_tzero;

--- 792 unchanged lines hidden ---