ieee80211: extend DMG capabilities element

[metze/wireshark/wip.git] / capture_info.c

diff --git a/capture_info.c b/capture_info.c
index d0fed6b778ea1b10c795db2b84a8bb5ff100f304..f51f3a3fe7d597ba193a9e2880896b643bd52596 100644 (file)
--- a/capture_info.c
+++ b/capture_info.c
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
@@ -40,7 +40,7 @@ void capture_info_new_packets(int to_read, info_data_t* cap_info)
     int err;
     gchar *err_info;
     gint64 data_offset;
-    struct wtap_pkthdr *phdr;
+    wtap_rec *rec;
     union wtap_pseudo_header *pseudo_header;
     int wtap_linktype;
     const guchar *buf;
@@ -53,30 +53,23 @@ void capture_info_new_packets(int to_read, info_data_t* cap_info)
     while (to_read > 0) {
         wtap_cleareof(cap_info->wtap);
         if (wtap_read(cap_info->wtap, &err, &err_info, &data_offset)) {
-            phdr = wtap_phdr(cap_info->wtap);
-            pseudo_header = &phdr->pseudo_header;
-            wtap_linktype = phdr->pkt_encap;
-            buf = wtap_buf_ptr(cap_info->wtap);
+            rec = wtap_get_rec(cap_info->wtap);
+            if (rec->rec_type == REC_TYPE_PACKET) {
+                pseudo_header = &rec->rec_header.packet_header.pseudo_header;
+                wtap_linktype = rec->rec_header.packet_header.pkt_encap;
+                buf = wtap_get_buf_ptr(cap_info->wtap);
 
-            capture_info_packet(cap_info, wtap_linktype, buf, phdr->caplen, pseudo_header);
+                capture_info_packet(cap_info, wtap_linktype, buf, rec->rec_header.packet_header.caplen, pseudo_header);
 
-            /*g_warning("new packet");*/
-            to_read--;
+                /*g_warning("new packet");*/
+                to_read--;
+            }
         }
     }
 
     capture_info_ui_update(&cap_info->ui);
 }
 
-
-/* close the info */
-void capture_info_close(info_data_t* cap_info)
-{
-    capture_info_ui_destroy(&cap_info->ui);
-    if(cap_info->wtap)
-        wtap_close(cap_info->wtap);
-}
-
 #endif /* HAVE_LIBPCAP */
 
 /*