| pf_norm.c (171168) | pf_norm.c (222529) |
|---|---|
| 1/* $OpenBSD: pf_norm.c,v 1.107 2006/04/16 00:59:52 pascoe Exp $ */ 2 3/* 4 * Copyright 2001 Niels Provos <provos@citi.umich.edu> 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 17 unchanged lines hidden (view full) --- 26 */ 27 28#ifdef __FreeBSD__ 29#include "opt_inet.h" 30#include "opt_inet6.h" 31#include "opt_pf.h" 32 33#include <sys/cdefs.h> | 1/* $OpenBSD: pf_norm.c,v 1.107 2006/04/16 00:59:52 pascoe Exp $ */ 2 3/* 4 * Copyright 2001 Niels Provos <provos@citi.umich.edu> 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 17 unchanged lines hidden (view full) --- 26 */ 27 28#ifdef __FreeBSD__ 29#include "opt_inet.h" 30#include "opt_inet6.h" 31#include "opt_pf.h" 32 33#include <sys/cdefs.h> |
| 34__FBSDID("$FreeBSD: head/sys/contrib/pf/net/pf_norm.c 171168 2007-07-03 12:16:07Z mlaier $"); | 34__FBSDID("$FreeBSD: head/sys/contrib/pf/net/pf_norm.c 222529 2011-05-31 15:05:29Z bz $"); |
| 35 36#ifdef DEV_PFLOG 37#define NPFLOG DEV_PFLOG 38#else 39#define NPFLOG 0 40#endif 41#else 42#include "pflog.h" --- 901 unchanged lines hidden (view full) --- 944 h->ip_id)); 945 (*frag)->fr_flags |= PFFRAG_DROP; 946 } 947 948 m_freem(m); 949 return (NULL); 950} 951 | 35 36#ifdef DEV_PFLOG 37#define NPFLOG DEV_PFLOG 38#else 39#define NPFLOG 0 40#endif 41#else 42#include "pflog.h" --- 901 unchanged lines hidden (view full) --- 944 h->ip_id)); 945 (*frag)->fr_flags |= PFFRAG_DROP; 946 } 947 948 m_freem(m); 949 return (NULL); 950} 951 |
| 952#ifdef INET |
|
| 952int 953pf_normalize_ip(struct mbuf **m0, int dir, struct pfi_kif *kif, u_short *reason, 954 struct pf_pdesc *pd) 955{ 956 struct mbuf *m = *m0; 957 struct pf_rule *r; 958 struct pf_frent *frent; 959 struct pf_fragment *frag = NULL; --- 233 unchanged lines hidden (view full) --- 1193 pf_free_fragment(frag); 1194 1195 REASON_SET(reason, PFRES_FRAG); 1196 if (r != NULL && r->log) 1197 PFLOG_PACKET(kif, h, m, AF_INET, dir, *reason, r, NULL, NULL, pd); 1198 1199 return (PF_DROP); 1200} | 953int 954pf_normalize_ip(struct mbuf **m0, int dir, struct pfi_kif *kif, u_short *reason, 955 struct pf_pdesc *pd) 956{ 957 struct mbuf *m = *m0; 958 struct pf_rule *r; 959 struct pf_frent *frent; 960 struct pf_fragment *frag = NULL; --- 233 unchanged lines hidden (view full) --- 1194 pf_free_fragment(frag); 1195 1196 REASON_SET(reason, PFRES_FRAG); 1197 if (r != NULL && r->log) 1198 PFLOG_PACKET(kif, h, m, AF_INET, dir, *reason, r, NULL, NULL, pd); 1199 1200 return (PF_DROP); 1201} |
| 1202#endif |
|
| 1201 1202#ifdef INET6 1203int 1204pf_normalize_ip6(struct mbuf **m0, int dir, struct pfi_kif *kif, 1205 u_short *reason, struct pf_pdesc *pd) 1206{ 1207 struct mbuf *m = *m0; 1208 struct pf_rule *r; --- 852 unchanged lines hidden --- | 1203 1204#ifdef INET6 1205int 1206pf_normalize_ip6(struct mbuf **m0, int dir, struct pfi_kif *kif, 1207 u_short *reason, struct pf_pdesc *pd) 1208{ 1209 struct mbuf *m = *m0; 1210 struct pf_rule *r; --- 852 unchanged lines hidden --- |