path: root/cfile.h
diff options
authorAnders Broman <a.broman58@gmail.com>2014-03-20 12:22:39 +0000
committerAnders Broman <a.broman58@gmail.com>2014-03-20 12:25:21 +0000
commit0513b29b8b61dba15b7f8c23d9304938206e71fb (patch)
treed7178277a7e645c222a52ded482a88962bcf3262 /cfile.h
parent7b13a3b0f6a5617e0e352f87cc5a20afea226aa8 (diff)
Revert "Allow pcapng interface options to be available to dissectors."
This patch causes Wireshark/tshark to segfault if the file is reread(open a file and press reload). The test suite also fails on 2.1.1 Step: Exit status for existing file: "/home/wireshark/builders/trunk/sol10sparc/build/test/captures/dhcp.pcap" must be 0/home/wireshark/builders/trunk/sol10sparc/build/test/suite-clopts.sh: line 149: 6646 Segmentation Fault (core dumped) $TSHARK -r "${CAPTURE_DIR}dhcp.pcap" > ./testout.txt 2>&1 OSX build bot chokes on pcapng.c: In function 'pcapng_destroy_option_value': pcapng.c:377: warning: implicit declaration of function 'g_byte_array_unref' pcapng.c:379: warning: implicit declaration of function 'g_array_unref' pcapng.c: In function 'pcapng_collect_block_option': pcapng.c:419: warning: implicit declaration of function 'g_byte_array_new_take' pcapng.c:419: warning: initialization makes pointer from integer without a cast these functions are glib 2.22 This reverts commit 7b13a3b0f6a5617e0e352f87cc5a20afea226aa8. Change-Id: Ia82fdb2d08287bc2cd2841e1e941ae68cbc2e009 Reviewed-on: https://code.wireshark.org/review/749 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'cfile.h')
1 files changed, 0 insertions, 2 deletions
diff --git a/cfile.h b/cfile.h
index f164303f18..f34c34ee14 100644
--- a/cfile.h
+++ b/cfile.h
@@ -133,8 +133,6 @@ extern void cap_file_init(capture_file *cf);
extern const char *cap_file_get_interface_name(void *data, guint32 interface_id);
-extern const GArray *cap_file_get_interface_option(void *data, guint32 interface_id, guint16 option_code);
#ifdef __cplusplus
#endif /* __cplusplus */