diff options
author | Anders Broman <a.broman58@gmail.com> | 2014-03-20 12:22:39 +0000 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2014-03-20 12:25:21 +0000 |
commit | 0513b29b8b61dba15b7f8c23d9304938206e71fb (patch) | |
tree | d7178277a7e645c222a52ded482a88962bcf3262 /cfile.c | |
parent | 7b13a3b0f6a5617e0e352f87cc5a20afea226aa8 (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.c')
-rw-r--r-- | cfile.c | 23 |
1 files changed, 2 insertions, 21 deletions
@@ -29,8 +29,8 @@ #include "cfile.h" -static const wtapng_if_descr_t * -cap_file_get_interface_desc(void *data, guint32 interface_id) +const char * +cap_file_get_interface_name(void *data, guint32 interface_id) { capture_file *cf = (capture_file *) data; wtapng_iface_descriptions_t *idb_info; @@ -42,13 +42,6 @@ cap_file_get_interface_desc(void *data, guint32 interface_id) wtapng_if_descr = &g_array_index(idb_info->interface_data, wtapng_if_descr_t, interface_id); g_free(idb_info); - return wtapng_if_descr; -} - -const char * -cap_file_get_interface_name(void *data, guint32 interface_id) -{ - const wtapng_if_descr_t *wtapng_if_descr = cap_file_get_interface_desc(data, interface_id); if (wtapng_if_descr) { if (wtapng_if_descr->if_name) @@ -59,18 +52,6 @@ cap_file_get_interface_name(void *data, guint32 interface_id) return "unknown"; } -const GArray * -cap_file_get_interface_option(void *data, guint32 interface_id, guint16 option_code) -{ - const wtapng_if_descr_t *wtapng_if_descr = cap_file_get_interface_desc(data, interface_id); - - if (wtapng_if_descr && wtapng_if_descr->if_options) { - gint code = (gint) option_code; - return (const GArray *) g_hash_table_lookup(wtapng_if_descr->if_options, &code); - } - return NULL; -} - void cap_file_init(capture_file *cf) { |