34c34
< __FBSDID("$FreeBSD: head/contrib/pf/pflogd/pflogd.c 130617 2004-06-16 23:39:33Z mlaier $");
---
> __FBSDID("$FreeBSD: head/contrib/pf/pflogd/pflogd.c 134578 2004-08-31 18:04:34Z mlaier $");
327a328,330
> #ifdef __FreeBSD__
> struct pcap_sf_pkthdr ph;
> #else
328a332
> #endif
397a402,404
> #ifdef __FreeBSD__
> struct pcap_sf_pkthdr sh;
> #endif
403a411,418
> #ifdef __FreeBSD__
> sh.ts.tv_sec = (bpf_int32)h->ts.tv_sec;
> sh.ts.tv_usec = (bpf_int32)h->ts.tv_usec;
> sh.caplen = h->caplen;
> sh.len = h->len;
>
> if (fwrite((char *)&sh, sizeof(sh), 1, f) != 1) {
> #else
404a420
> #endif
406a423,426
> #ifdef __FreeBSD__
> if (pos < sizeof(sh) ||
> ftruncate(fileno(f), pos - sizeof(sh))) {
> #else
408a429
> #endif
476a498,501
> #ifdef __FreeBSD__
> struct pcap_sf_pkthdr sh;
> size_t len = sizeof(sh) + h->caplen;
> #else
477a503
> #endif
504a531,539
> #ifdef __FreeBSD__
> sh.ts.tv_sec = (bpf_int32)h->ts.tv_sec;
> sh.ts.tv_usec = (bpf_int32)h->ts.tv_usec;
> sh.caplen = h->caplen;
> sh.len = h->len;
>
> memcpy(bufpos, &sh, sizeof(sh));
> memcpy(bufpos + sizeof(sh), sp, h->caplen);
> #else
506a542
> #endif