| bpf.c (111119) | bpf.c (111741) |
|---|---|
| 1/* 2 * Copyright (c) 1990, 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from the Stanford/CMU enet packet filter, 6 * (net/enet.c) distributed as part of 4.3BSD, and code contributed 7 * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence 8 * Berkeley Laboratory. --- 23 unchanged lines hidden (view full) --- 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)bpf.c 8.4 (Berkeley) 1/9/95 39 * | 1/* 2 * Copyright (c) 1990, 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from the Stanford/CMU enet packet filter, 6 * (net/enet.c) distributed as part of 4.3BSD, and code contributed 7 * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence 8 * Berkeley Laboratory. --- 23 unchanged lines hidden (view full) --- 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)bpf.c 8.4 (Berkeley) 1/9/95 39 * |
| 40 * $FreeBSD: head/sys/net/bpf.c 111119 2003-02-19 05:47:46Z imp $ | 40 * $FreeBSD: head/sys/net/bpf.c 111741 2003-03-02 15:50:23Z des $ |
| 41 */ 42 43#include "opt_bpf.h" 44#include "opt_mac.h" 45#include "opt_netgraph.h" 46 47#include <sys/param.h> 48#include <sys/systm.h> --- 174 unchanged lines hidden (view full) --- 223 if (hlen != 0) { 224 m->m_pkthdr.len -= hlen; 225 m->m_len -= hlen; 226#if BSD >= 199103 227 m->m_data += hlen; /* XXX */ 228#else 229 m->m_off += hlen; 230#endif | 41 */ 42 43#include "opt_bpf.h" 44#include "opt_mac.h" 45#include "opt_netgraph.h" 46 47#include <sys/param.h> 48#include <sys/systm.h> --- 174 unchanged lines hidden (view full) --- 223 if (hlen != 0) { 224 m->m_pkthdr.len -= hlen; 225 m->m_len -= hlen; 226#if BSD >= 199103 227 m->m_data += hlen; /* XXX */ 228#else 229 m->m_off += hlen; 230#endif |
| 231 error = uiomove((caddr_t)sockp->sa_data, hlen, uio); | 231 error = uiomove(sockp->sa_data, hlen, uio); |
| 232 if (error) 233 goto bad; 234 } | 232 if (error) 233 goto bad; 234 } |
| 235 error = uiomove(mtod(m, caddr_t), len - hlen, uio); | 235 error = uiomove(mtod(m, void *), len - hlen, uio); |
| 236 if (!error) 237 return (0); 238bad: 239 m_freem(m); 240 return (error); 241} 242 243/* --- 1313 unchanged lines hidden --- | 236 if (!error) 237 return (0); 238bad: 239 m_freem(m); 240 return (error); 241} 242 243/* --- 1313 unchanged lines hidden --- |