D46894.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D46894.diff
View Options

	diff --git a/contrib/pf/pflogd/pflogd.h b/contrib/pf/pflogd/pflogd.h
	--- a/contrib/pf/pflogd/pflogd.h
	+++ b/contrib/pf/pflogd/pflogd.h
	@@ -40,19 +40,6 @@
	int priv_move_log(void);
	pcap_t pcap_open_live_fd(int fd, int snaplen, char ebuf);

	-/* XXX TODO: Investigate a permanent solution, rather than defining these two
	- structures here. */
	-struct pcap_timeval {
	- bpf_u_int32 tv_sec; /* seconds */
	- bpf_u_int32 tv_usec; /* microseconds */
	-};
	-
	-struct pcap_sf_pkthdr {
	- struct pcap_timeval ts; /* time stamp */
	- bpf_u_int32 caplen; /* length of portion present */
	- bpf_u_int32 len; /* length of this packet (off wire) */
	-};
	-
	void set_pcap_filter(void);
	/* File descriptor send/recv */
	void send_fd(int, int);
	diff --git a/contrib/pf/pflogd/pflogd.c b/contrib/pf/pflogd/pflogd.c
	--- a/contrib/pf/pflogd/pflogd.c
	+++ b/contrib/pf/pflogd/pflogd.c
	@@ -74,6 +74,17 @@
	int log_debug = 0;
	unsigned int delay = FLUSH_DELAY;

	+struct pcap_timeval {
	+ bpf_u_int32 tv_sec; /* seconds */
	+ bpf_u_int32 tv_usec; /* microseconds */
	+};
	+
	+struct pcap_sf_pkthdr {
	+ struct pcap_timeval ts; /* time stamp */
	+ bpf_u_int32 caplen; /* length of portion present */
	+ bpf_u_int32 len; /* length of this packet (off wire) */
	+};
	+
	char copy_argv(char const *);
	void dump_packet(u_char , const struct pcap_pkthdr , const u_char *);
	void dump_packet_nobuf(u_char , const struct pcap_pkthdr , const u_char *);