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 /epan/epan-int.h | |
| 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 'epan/epan-int.h')
| -rw-r--r-- | epan/epan-int.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/epan/epan-int.h b/epan/epan-int.h index 5089025c30..35e91975be 100644 --- a/epan/epan-int.h +++ b/epan/epan-int.h @@ -31,8 +31,6 @@ struct epan_session { const nstime_t *(*get_frame_ts)(void *data, guint32 frame_num); const char *(*get_interface_name)(void *data, guint32 interface_id); const char *(*get_user_comment)(void *data, const frame_data *fd); - const GArray *(*get_interface_option)(void *data, guint32 interface_id, - guint16 option_code); }; #endif |