Added a pcap_pkthdr field to the pcap structure. It is needed by pcap_next_ex().

sf_next_packet(), which was used by pcap_read_ex(), is no more exported under Win32.

diff --git a/pcap-int.h b/pcap-int.h
index 61c247b8fa06fcb518982f1ffe0b18b60a236a39..c2a4cd08b8118f31701d9c1c85e6ff7eb84341b6 100644 (file)
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.44 2003-03-11 06:23:54 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.45 2003-04-09 10:06:44 risso Exp $ (LBL)
  */
 
 #ifndef pcap_int_h
@@ -117,6 +117,8 @@ struct pcap {
        char errbuf[PCAP_ERRBUF_SIZE + 1];
        int dlt_count;
        int *dlt_list;
+
+       struct pcap_pkthdr pcap_header; /* This is needed for the pcap_next_ex() to work */
 };
 
 /*
@@ -191,10 +193,6 @@ int        yylex(void);
 int    pcap_offline_read(pcap_t *, int, pcap_handler, u_char *);
 int    pcap_read(pcap_t *, int cnt, pcap_handler, u_char *);
 
-#ifdef WIN32
-/* sf_next_packet must be exported for pcap_read_ex */
-int sf_next_packet(pcap_t *, struct pcap_pkthdr *, u_char *, int);
-#endif
 
 /*
  * Ultrix, DEC OSF/1^H^H^H^H^H^H^H^H^HDigital UNIX^H^H^H^H^H^H^H^H^H^H^H^H
@@ -211,8 +209,6 @@ int sf_next_packet(pcap_t *, struct pcap_pkthdr *, u_char *, int);
         strlen((y)))
 #endif
 
-int    pcap_strcasecmp(const char *, const char *);
-
 /*
  * Internal interface for "pcap_set_datalink()".  Attempts to set the
  * link-layer type to the specified type; if that fails, returns -1.