pytest.ini: declare minimum version requirement

[metze/wireshark/wip.git] / epan / packet_info.h

diff --git a/epan/packet_info.h b/epan/packet_info.h
index 0f7f2012b1126aa94bfbc30b2aa8a3902e43b12a..0c71af8ede0ec6a6db0a9b6c763d0745a61e88f5 100644 (file)
--- a/epan/packet_info.h
+++ b/epan/packet_info.h
@@ -50,7 +50,7 @@ typedef struct _packet_info {
   nstime_t rel_ts;                  /**< Relative timestamp (yes, it can be negative) */
   frame_data *fd;
   union wtap_pseudo_header *pseudo_header;
-  struct wtap_pkthdr *phdr;         /**< Record metadata */
+  wtap_rec *rec;                    /**< Record metadata */
   GSList *data_src;                 /**< Frame data sources */
   address dl_src;                   /**< link-layer source address */
   address dl_dst;                   /**< link-layer destination address */
@@ -64,7 +64,6 @@ typedef struct _packet_info {
   struct {
     guint32 in_error_pkt:1;         /**< TRUE if we're inside an {ICMP,CLNP,...} error packet */
     guint32 in_gre_pkt:1;           /**< TRUE if we're encapsulated inside a GRE packet */
-    guint32 in_erspan_i:1;          /**< TRUE if we're encapsulated inside an ERSPAN type I packet */
   } flags;
   port_type ptype;                  /**< type of the following two port numbers */
   guint32 srcport;                  /**< source port */