ip_proto.h now requires expert.h.

[metze/wireshark/wip.git] / summary.h

diff --git a/summary.h b/summary.h
index 21df0c0de89515a3b93ab4a14361532ae0aecf62..b1cf07ea8c510defc051fa2f9f572fc98a5ba75d 100644 (file)
--- a/summary.h
+++ b/summary.h
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef __SUMMARY_H__
@@ -29,6 +29,10 @@
 #include "capture.h"
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 typedef struct iface_options_tag {
     char    *name;
     char    *descr;
@@ -65,7 +69,8 @@ typedef struct _summary_tally {
     gint64        file_length;      /**< file length in bytes */
     int           file_type;        /**< wiretap file type */
     int           iscompressed;     /**< TRUE if file is compressed */
-    int           encap_type;       /**< wiretap encapsulation type */
+    int           file_encap_type;  /**< wiretap encapsulation type for file */
+    GArray       *packet_encap_types; /**< wiretap encapsulation types for packets */
     gboolean      has_snap;         /**< TRUE if maximum capture packet length is known */
     int           snap;             /**< Maximum captured packet length */
     gboolean      drops_known;      /**< TRUE if number of packet drops is known */
@@ -76,7 +81,7 @@ typedef struct _summary_tally {
     gchar        *opt_comment;      /**< comment from SHB block */
     gchar        *shb_hardware;     /**< Capture HW from SHB block */
     gchar        *shb_os;           /**< The OS the capture was made on from SHB block */
-    gchar        *shb_user_appl;    /**< The application that made the capture from SHB block */
+    const gchar  *shb_user_appl;    /**< The application that made the capture from SHB block */
     /* capture related, use summary_fill_in_capture() to get values */
     GArray       *ifaces;
     gboolean      legacy;
@@ -90,4 +95,8 @@ extern void
 summary_fill_in_capture(capture_file *cf, capture_options *capture_opts, summary_tally *st);
 #endif
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* summary.h */