| pf.c (226938) | pf.c (228150) |
|---|---|
| 1/* $OpenBSD: pf.c,v 1.634 2009/02/27 12:37:45 henning Exp $ */ 2 3/* 4 * Copyright (c) 2001 Daniel Hartmeier 5 * Copyright (c) 2002 - 2008 Henning Brauer 6 * All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 26 unchanged lines hidden (view full) --- 35 * 36 */ 37 38#ifdef __FreeBSD__ 39#include "opt_inet.h" 40#include "opt_inet6.h" 41 42#include <sys/cdefs.h> | 1/* $OpenBSD: pf.c,v 1.634 2009/02/27 12:37:45 henning Exp $ */ 2 3/* 4 * Copyright (c) 2001 Daniel Hartmeier 5 * Copyright (c) 2002 - 2008 Henning Brauer 6 * All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 26 unchanged lines hidden (view full) --- 35 * 36 */ 37 38#ifdef __FreeBSD__ 39#include "opt_inet.h" 40#include "opt_inet6.h" 41 42#include <sys/cdefs.h> |
| 43__FBSDID("$FreeBSD: head/sys/contrib/pf/net/pf.c 226938 2011-10-30 14:55:00Z kevlo $"); | 43__FBSDID("$FreeBSD: head/sys/contrib/pf/net/pf.c 228150 2011-11-30 08:47:17Z glebius $"); |
| 44#endif 45 46#ifdef __FreeBSD__ 47#include "opt_bpf.h" 48#include "opt_pf.h" 49 50#ifdef DEV_BPF 51#define NBPFILTER DEV_BPF --- 3713 unchanged lines hidden (view full) --- 3765#endif 3766 /* 3767 * We want the state created, but we dont 3768 * want to send this in case a partner 3769 * firewall has to know about it to allow 3770 * replies through it. 3771 */ 3772#ifdef __FreeBSD__ | 44#endif 45 46#ifdef __FreeBSD__ 47#include "opt_bpf.h" 48#include "opt_pf.h" 49 50#ifdef DEV_BPF 51#define NBPFILTER DEV_BPF --- 3713 unchanged lines hidden (view full) --- 3765#endif 3766 /* 3767 * We want the state created, but we dont 3768 * want to send this in case a partner 3769 * firewall has to know about it to allow 3770 * replies through it. 3771 */ 3772#ifdef __FreeBSD__ |
| 3773 if (pfsync_defer_ptr != NULL) 3774 pfsync_defer_ptr(*sm, m); | 3773 if (pfsync_defer_ptr != NULL && 3774 pfsync_defer_ptr(*sm, m)) |
| 3775#else 3776 if (pfsync_defer(*sm, m)) 3777#endif 3778 return (PF_DEFER); 3779 } 3780#endif 3781 3782 return (PF_PASS); --- 3847 unchanged lines hidden --- | 3775#else 3776 if (pfsync_defer(*sm, m)) 3777#endif 3778 return (PF_DEFER); 3779 } 3780#endif 3781 3782 return (PF_PASS); --- 3847 unchanged lines hidden --- |