Deleted Added
full compact
0a1
> /* $FreeBSD: head/sys/contrib/pf/net/pfvar.h 126261 2004-02-26 02:34:12Z mlaier $ */
40a42,44
> #if defined(__FreeBSD__)
> #include <vm/uma.h>
> #else
41a46,61
> #endif
>
> #if defined(__FreeBSD__)
> #include <netinet/in.h>
> /*
> * XXX
> * If we include <netipsec/keydb.h>, we need _KERNEL definition.
> * This makes pfctl compilation difficult.
> */
> union sockaddr_union {
> struct sockaddr sa;
> struct sockaddr_in sin;
> struct sockaddr_in6 sin6;
> };
> #endif
>
121a142,144
> #if defined(__FreeBSD__) && defined(HOOK_HACK)
> eventhandler_tag hook_cookie;
> #else
122a146
> #endif
131a156,215
> #if defined(__FreeBSD__)
> #define splsoftnet() splnet()
>
> #define PF_NAME "pf"
>
> #define PR_NOWAIT M_NOWAIT
> #define pool_get(p, f) uma_zalloc(*(p), (f))
> #define pool_put(p, o) uma_zfree(*(p), (o))
>
> #define UMA_CREATE(var, type, desc) \
> var = uma_zcreate(desc, sizeof(type), \
> NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); \
> if (var == NULL) break
> #define UMA_DESTROY(var) \
> if(var) uma_zdestroy(var)
>
> extern struct mtx pf_task_mtx;
> #if defined(ALTQ)
> extern struct mtx pf_altq_mtx;
> extern int pfaltq_ref;
> #endif
>
> #define PF_ASSERT(h) mtx_assert(&pf_task_mtx, (h))
>
> #define PF_LOCK() do { \
> PF_ASSERT(MA_NOTOWNED); \
> mtx_lock(&pf_task_mtx); \
> } while(0)
> #define PF_UNLOCK() do { \
> PF_ASSERT(MA_OWNED); \
> mtx_unlock(&pf_task_mtx); \
> } while(0)
>
> #define PF_COPYIN(uaddr, kaddr, len, r) do { \
> PF_UNLOCK(); \
> r = copyin((uaddr), (kaddr), (len)); \
> PF_LOCK(); \
> } while(0)
>
> #define PF_COPYOUT(kaddr, uaddr, len, r) do { \
> PF_UNLOCK(); \
> r = copyout((kaddr), (uaddr), (len)); \
> PF_LOCK(); \
> } while(0)
>
> extern void init_pf_mutex(void);
> extern void destroy_pf_mutex(void);
>
> #define PF_MODVER 1
> #define PFLOG_MODVER 1
> #define PFSYNC_MODVER 1
>
> #define PFLOG_MINVER 1
> #define PFLOG_PREFVER PFLOG_MODVER
> #define PFLOG_MAXVER 1
> #define PFSYNC_MINVER 1
> #define PFSYNC_PREFVER PFSYNC_MODVER
> #define PFSYNC_MAXVER 1
> #endif
>
1103a1188,1194
> #if defined(__FreeBSD__)
> struct pf_ifspeed {
> char ifname[IFNAMSIZ];
> u_int32_t baudrate;
> };
> #define DIOCGIFSPEED _IOWR('D', 81, struct pf_ifspeed)
> #endif
1137a1229,1235
> #if defined(__FreeBSD__)
> extern uma_zone_t pf_tree_pl, pf_rule_pl, pf_addr_pl;
> extern uma_zone_t pf_state_pl, pf_altq_pl, pf_pooladdr_pl;
> extern uma_zone_t pfr_ktable_pl, pfr_kentry_pl;
> extern uma_zone_t pf_cache_pl, pf_cent_pl;
> extern uma_zone_t pf_state_scrub_pl;
> #else
1140a1239
> #endif
1236a1336,1339
>
> #if defined(__FreeBSD__)
> extern uma_zone_t pf_frent_pl, pf_frag_pl;
> #else
1237a1341
> #endif
1244a1349,1380
> #if defined(__FreeBSD__)
> struct pf_frent {
> LIST_ENTRY(pf_frent) fr_next;
> struct ip *fr_ip;
> struct mbuf *fr_m;
> };
>
> struct pf_frcache {
> LIST_ENTRY(pf_frcache) fr_next;
> uint16_t fr_off;
> uint16_t fr_end;
> };
>
> struct pf_fragment {
> RB_ENTRY(pf_fragment) fr_entry;
> TAILQ_ENTRY(pf_fragment) frag_next;
> struct in_addr fr_src;
> struct in_addr fr_dst;
> u_int8_t fr_p; /* protocol of this fragment */
> u_int8_t fr_flags; /* status flags */
> u_int16_t fr_id; /* fragment id for reassemble */
> u_int16_t fr_max; /* fragment data max */
> u_int32_t fr_timeout;
> #define fr_queue fr_u.fru_queue
> #define fr_cache fr_u.fru_cache
> union {
> LIST_HEAD(pf_fragq, pf_frent) fru_queue; /* buffering */
> LIST_HEAD(pf_cacheq, pf_frcache) fru_cache; /* non-buf */
> } fr_u;
> };
> #endif /* (__FreeBSD__) */
>
1257a1394,1397
> #if defined(__FreeBSD__)
> int pf_osfp_initialize(void);
> void pf_osfp_cleanup(void);
> #else
1258a1399
> #endif