Move platform-dependent pcap_t data out of the pcap_t structure.

Put the private data right after the pcap_t structure, with a pointer to
it in the pcap_t.

The initial goal is to allow new pcap modules to be added without having
to hack pcap-int.h.

In the longer term, we may want to freeze the pcap_t structure, except
possibly for adding new method pointers at the end, and provide an ABI
for adding modules.

We also put the stuff used by the read path at the beginning of the
pcap_t structure, to try to keep it on the same set of cache lines.

1 files changed, 2 insertions, 1 deletions

diff --git a/sf-pcap.h b/sf-pcap.h
index 3b3fbe89..fce6ee58 100644
--- a/sf-pcap.h
+++ b/sf-pcap.h
@@ -31,6 +31,7 @@
 #ifndef sf_pcap_h
 #define	sf_pcap_h
 
-extern int pcap_check_header(pcap_t *, bpf_u_int32, FILE *, char *);
+extern pcap_t *pcap_check_header(bpf_u_int32 magic, FILE *fp, char *errbuf,
+    int *err);
 
 #endif