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.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.h')
| -rw-r--r-- | epan/epan.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/epan.h b/epan/epan.h index da00026bb7..faf8e3a448 100644 --- a/epan/epan.h +++ b/epan/epan.h @@ -18,6 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + #ifndef __EPAN_H__ #define __EPAN_H__ @@ -123,7 +124,7 @@ void epan_circuit_cleanup(void); /** A client will create one epan_t for an entire dissection session. * A single epan_t will be used to analyze the entire sequence of packets, * sequentially, in a single session. A session corresponds to a single - * packet trace file. The reason epan_t exists is that some packets in + * packet trace file. The reaons epan_t exists is that some packets in * some protocols cannot be decoded without knowledge of previous packets. * This inter-packet "state" is stored in the epan_t. */ @@ -135,8 +136,6 @@ const char *epan_get_user_comment(const epan_t *session, const frame_data *fd); const char *epan_get_interface_name(const epan_t *session, guint32 interface_id); -const GArray *epan_get_interface_option(const epan_t *session, guint32 interface_id, guint16 option_code); - const nstime_t *epan_get_frame_ts(const epan_t *session, guint32 frame_num); WS_DLL_PUBLIC void epan_free(epan_t *session); |