Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make this more type-safe for the Alpha. From the libpcap 0.0 distribution. 

(Needs more work.)
This commit is contained in:
mycroft 1995-03-06 10:56:06 +00:00
parent 2cb53ac7dc
commit 8c5b80f538
2 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/net/bpf.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bpf.h,v 1.8 1995/01/13 00:34:09 jtc Exp $ */
/* $NetBSD: bpf.h,v 1.9 1995/03/06 10:56:06 mycroft Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@ -85,7 +85,7 @@ struct bpf_version {
u_short bv_major;
u_short bv_minor;
};
/* Current version number. */
/* Current version number of filter architecture. */
#define BPF_MAJOR_VERSION 1
#define BPF_MINOR_VERSION 1
@ -131,8 +131,8 @@ struct bpf_version {
*/
struct bpf_hdr {
struct timeval bh_tstamp; /* time stamp */
u_long bh_caplen; /* length of captured portion */
u_long bh_datalen; /* original length of packet */
u_int32_t bh_caplen; /* length of captured portion */
u_int32_t bh_datalen; /* original length of packet */
u_short bh_hdrlen; /* length of bpf header (this struct
plus alignment padding) */
};
@ -147,7 +147,6 @@ struct bpf_hdr {
/*
* Data-link level type codes.
* Currently, only DLT_EN10MB and DLT_SLIP are supported.
*/
#define DLT_NULL 0 /* no link-layer encapsulation */
#define DLT_EN10MB 1 /* Ethernet (10Mb) */
@ -224,7 +223,7 @@ struct bpf_insn {
u_short code;
u_char jt;
u_char jf;
long k;
int32_t k;
};
/*

38
sys/net/bpf_filter.c
View File

@ -1,7 +1,7 @@
/* $NetBSD: bpf_filter.c,v 1.6 1994/06/29 06:35:56 cgd Exp $ */
/* $NetBSD: bpf_filter.c,v 1.7 1995/03/06 10:56:08 mycroft Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
* Copyright (c) 1990, 1991, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
* This code is derived from the Stanford/CMU enet packet filter,
@ -43,6 +43,7 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/time.h>
#include <net/bpf.h>
#ifdef sun
#include <netinet/in.h>
@ -54,17 +55,17 @@
#ifndef BPF_ALIGN
#define EXTRACT_SHORT(p) ((u_short)ntohs(*(u_short *)p))
#define EXTRACT_LONG(p) (ntohl(*(u_long *)p))
#define EXTRACT_LONG(p) (ntohl(*(u_int32_t *)p))
#else
#define EXTRACT_SHORT(p)\
((u_short)\
((u_short)*((u_char *)p+0)<<8|\
(u_short)*((u_char *)p+1)<<0))
#define EXTRACT_LONG(p)\
((u_long)*((u_char *)p+0)<<24|\
(u_long)*((u_char *)p+1)<<16|\
(u_long)*((u_char *)p+2)<<8|\
(u_long)*((u_char *)p+3)<<0)
((u_int32_t)*((u_char *)p+0)<<24|\
(u_int32_t)*((u_char *)p+1)<<16|\
(u_int32_t)*((u_char *)p+2)<<8|\
(u_int32_t)*((u_char *)p+3)<<0)
#endif
#ifdef KERNEL
@ -160,7 +161,6 @@ m_xhalf(m, k, err)
}
#endif
#include <net/bpf.h>
/*
* Execute the filter program starting at pc on the packet p
* wirelen is the length of the original packet
@ -173,9 +173,9 @@ bpf_filter(pc, p, wirelen, buflen)
u_int wirelen;
register u_int buflen;
{
register u_long A, X;
register u_int32_t A, X;
register int k;
long mem[BPF_MEMWORDS];
int32_t mem[BPF_MEMWORDS];
if (pc == 0)
/*
@ -205,7 +205,7 @@ bpf_filter(pc, p, wirelen, buflen)
case BPF_LD|BPF_W|BPF_ABS:
k = pc->k;
if (k + sizeof(long) > buflen) {
if (k + sizeof(int32_t) > buflen) {
#ifdef KERNEL
int merr;
@ -219,12 +219,7 @@ bpf_filter(pc, p, wirelen, buflen)
return 0;
#endif
}
#ifdef BPF_ALIGN
if (((int)(p + k) & 3) != 0)
A = EXTRACT_LONG(&p[k]);
else
#endif
A = ntohl(*(long *)(p + k));
A = EXTRACT_LONG(&p[k]);
continue;
case BPF_LD|BPF_H|BPF_ABS:
@ -273,7 +268,7 @@ bpf_filter(pc, p, wirelen, buflen)
case BPF_LD|BPF_W|BPF_IND:
k = X + pc->k;
if (k + sizeof(long) > buflen) {
if (k + sizeof(int32_t) > buflen) {
#ifdef KERNEL
int merr;
@ -287,12 +282,7 @@ bpf_filter(pc, p, wirelen, buflen)
return 0;
#endif
}
#ifdef BPF_ALIGN
if (((int)(p + k) & 3) != 0)
A = EXTRACT_LONG(&p[k]);
else
#endif
A = ntohl(*(long *)(p + k));
A = EXTRACT_LONG(&p[k]);
continue;
case BPF_LD|BPF_H|BPF_IND: