Commit Graph

51235 Commits

Author SHA1 Message Date
Evan Huus 396c028eb7 Make sure we have a dissector table before calling dissector_try_uint_new. Fixes
a null-ptr deref found while fuzzing.

svn path=/trunk/; revision=54574
2014-01-03 06:03:28 +00:00
Jörg Mayer 75dbaf5830 Check flags that might be supported by both C and C++ still
separately.

svn path=/trunk/; revision=54573
2014-01-03 00:40:21 +00:00
Jörg Mayer 0752f22af1 As discussed on wireshark-dev: follow autotools to use
-Wshorten-64-to-32 for c only

svn path=/trunk/; revision=54572
2014-01-03 00:14:46 +00:00
Jeff Morriss ef5e9fd6b4 Don't try to build asn1/asn1/Makefile either (see r54561).
svn path=/trunk/; revision=54571
2014-01-02 20:48:33 +00:00
Guy Harris 9d41c658fe No seek-read routines use the length argument, so eliminate it from
wtap_seek_read().

svn path=/trunk/; revision=54570
2014-01-02 20:47:21 +00:00
Alexis La Goutte 5acabc99b0 It is AUTHORS-SHORT.txt in Windows
Kept comment about dev release (and change logo)
Use the some order like Wireshark GTK (Authors before Folders)

svn path=/trunk/; revision=54569
2014-01-02 20:21:09 +00:00
Guy Harris 11e4e670a4 Don't use the length argument to the seek-read routine; no other
seek-read routine does that.

Pass the length we just filled in to buffer_assure_space() in the
seek-read routine, and use that in the memcpy() as well.

svn path=/trunk/; revision=54568
2014-01-02 20:17:24 +00:00
Jeff Morriss d91261a53b Don't try to build asn1/gnm/Makefile (see r54561).
svn path=/trunk/; revision=54567
2014-01-02 19:48:26 +00:00
Jeff Morriss 24b377b51f Don't try to distribute asn1.dll since we no longer build it.
svn path=/trunk/; revision=54566
2014-01-02 19:47:03 +00:00
Guy Harris ac0f903dfa Don't pass the wtap * to a routine if it's not needed.
svn path=/trunk/; revision=54565
2014-01-02 19:39:20 +00:00
Guy Harris e9730c89af Fill in the struct wtap_pkthdr in the seek-read routine.
svn path=/trunk/; revision=54564
2014-01-02 19:33:47 +00:00
Jeff Morriss a56494a526 Fix wireshark-qt startup coredump under autofoo and Windows: make cmake's
VERSION_* macros integers instead of numbers (and treat them as such in
ui/qt/about_dialog.cpp).

svn path=/trunk/; revision=54563
2014-01-02 19:11:06 +00:00
Jeff Morriss bbcd2dcc12 Set SVN properties.
svn path=/trunk/; revision=54562
2014-01-02 18:32:58 +00:00
Anders Broman b22d9ab940 Disabling building of the gnm dissector, I don't tink it was ever used.
svn path=/trunk/; revision=54561
2014-01-02 18:01:33 +00:00
Jörg Mayer 0a5f6f4a5b Actually enable building filetap library.
NEWS changed

svn path=/trunk/; revision=54560
2014-01-02 17:59:04 +00:00
Anders Broman 643b572665 Stop building and distributing the asn1 plugin. I bleleve it to be obsolete.
svn path=/trunk/; revision=54559
2014-01-02 17:47:34 +00:00
Anders Broman 61c72710a7 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54558
2014-01-02 17:42:02 +00:00
Alexis La Goutte f5c6f39201 Add About window for Wireshark Qt
svn path=/trunk/; revision=54557
2014-01-02 17:04:10 +00:00
Alexis La Goutte 5490a6636d Fix icon in top of Wireshark Qt main window
svn path=/trunk/; revision=54556
2014-01-02 16:52:56 +00:00
Bill Meier 8ef3e2fad3 For getopt() arg processing:
- Use exit(0) for -h option as per convention;

For g_option...() arg processing (when USE_GOPTION is set):
 - Fix bug: 'capinfos x' doesn't print any info about x;
   (bug introduced in SVN #48481);
 - Use stderr for error messages related to cmd-line arg parsing;


svn path=/trunk/; revision=54555
2014-01-02 15:41:45 +00:00
Jörg Mayer be849dcaad rename filetap/file_wrappers.[hc] -> filetap/ft_file_wrappers.[hc]
to avoid colliding include file names with wiretap/file_wrappers.h

svn path=/trunk/; revision=54554
2014-01-02 15:17:14 +00:00
Alexis La Goutte 2db085d864 Fix indent always use tab
svn path=/trunk/; revision=54553
2014-01-02 11:46:58 +00:00
Anders Broman 3cb2c58eaf Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54552
2014-01-02 11:27:10 +00:00
Guy Harris 558c885d6d Have a routine that reads and processes the record header, and use it in
both the read and seek-read routines.

Use the packet length read from the packet header when reading packets
randomly.

svn path=/trunk/; revision=54549
2014-01-02 09:23:45 +00:00
Guy Harris ce4d667efe Process the packet header and data in common code, shared by the read
and seek-read routines.

svn path=/trunk/; revision=54548
2014-01-02 02:18:04 +00:00
Guy Harris abda7cd1af Read the packet header in the seek-read routines as well as the read
routines.

svn path=/trunk/; revision=54547
2014-01-02 02:16:22 +00:00
Guy Harris 492883cbf1 If the uncompression buffers are empty, they have no data; set the count
of bytes in them to 0, as there's no data in them, and set the offset in
that buffer of the stream's current position, to 0, as we're currently
at the beginning of the file in both streams.

This fixes some tricky-to-reproduce errors (which show up only if the
ngsniffer_t structure is allocated from data that's been allocated,
written to in those variables, and freed).

#BACKPORT 1.8, 1.10

svn path=/trunk/; revision=54544
2014-01-01 23:22:53 +00:00
Guy Harris f878016d6b Back out r54523 - more work is needed on it, and some testing found an
unrelated uninitialized-data bug that I want to fix in the next commit,
and then backport.

svn path=/trunk/; revision=54543
2014-01-01 23:19:17 +00:00
Bill Meier 10ebce27dc Add svn:keywords property
svn path=/trunk/; revision=54542
2014-01-01 18:14:16 +00:00
Bill Meier 2bd1b5486a Remove incorrect property 'svn:keyword'
svn path=/trunk/; revision=54541
2014-01-01 18:11:38 +00:00
Bill Meier c228237fac Change incorrect property 'keywords' to 'svn:keywords'
svn path=/trunk/; revision=54540
2014-01-01 18:08:30 +00:00
Bill Meier fa353bcfc1 Remove incorrect property 'svn:kywords'
svn path=/trunk/; revision=54539
2014-01-01 18:02:11 +00:00
Bill Meier b602491f2b Remove incorrect property 'eol-style'
svn path=/trunk/; revision=54538
2014-01-01 17:58:19 +00:00
Bill Meier d193a13c1c Fix property name: svn:eol_style ==> svn:eol-style
svn path=/trunk/; revision=54537
2014-01-01 17:54:44 +00:00
Michael Mann c3dce3be6b Fix compile issue
svn path=/trunk/; revision=54536
2014-01-01 14:55:20 +00:00
Pascal Quantin 998bbfb9e1 Try to pacify OSX-10.6-x64 buildbot
svn path=/trunk/; revision=54535
2014-01-01 14:51:58 +00:00
Pascal Quantin 6ebc058f47 Add proto_tree_add_ts_23_038_7bits_item() / tvb_get_ts_23_038_7bits_string() functions and update dissectors to use it.
Remove gsm_sms_char_7bit_unpack() / gsm_sms_chars_to_utf8() functions.
Update documentation a bit.

svn path=/trunk/; revision=54534
2014-01-01 14:33:19 +00:00
Pascal Quantin e504cf945b wimax_compact_ulmap_ie_decoder() is used outside of wimax_compact_ulmap_ie_decoder.c
svn path=/trunk/; revision=54533
2014-01-01 14:29:16 +00:00
Alexis La Goutte 28a2511506 Add extern C for init_wslua (for future use in Wireshark Qt)
svn path=/trunk/; revision=54532
2014-01-01 14:12:38 +00:00
Michael Mann 6daf9fd15b Filetap library, version 0.001
This is intended as the "tap library" for fileshark.  Right now its basically just a very stripped down (and renamed) copy of the wiretap library.  The goal is to remove "capture" and "wire" specific functionality out of the file handling to make it easier/simpler to support non-capture type files in the epan architecture.

svn path=/trunk/; revision=54531
2014-01-01 13:18:45 +00:00
Anders Broman 818c0fdaf8 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54530
2014-01-01 12:25:44 +00:00
Stig Bjørlykke ddda691c2b Happy new year!
svn path=/trunk/; revision=54529
2014-01-01 12:20:27 +00:00
Anders Broman 451c30ef81 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54528
2014-01-01 12:17:57 +00:00
Guy Harris 322e7272a6 Use a common code path for most of both sequential and random file
access.  We currently can't provide a time stamp when randomly reading,
so don't set WTAP_HAS_TS in that case.

svn path=/trunk/; revision=54527
2013-12-31 23:51:10 +00:00
Guy Harris 1e3f101b2e Back out a change so that we can check it in again with the correct
commit message.

svn path=/trunk/; revision=54526
2013-12-31 23:49:09 +00:00
Guy Harris d734fe4562 When reading MIME-encapsulated files, read the entire file at once,
don't break it into chunks.

This means we don't need to do reassembly in the MIME-encapsulated-data
dissector.

svn path=/trunk/; revision=54525
2013-12-31 23:48:02 +00:00
Guy Harris 8387a45fcc When reading MIME-encapsulated files, read the entire file at once,
don't break it into chunks.

This means we don't need to do reassembly in the MIME-encapsulated-data
dissector.

svn path=/trunk/; revision=54524
2013-12-31 23:47:24 +00:00
Guy Harris cdce403745 When reading sequentially, pass the packet data length to
ngsniffer_read_rec_data(), and separatelyskip extra data after that.

When reading randomly, use the packet length read from the packet
header.

svn path=/trunk/; revision=54523
2013-12-31 23:43:54 +00:00
Guy Harris 0dd01761f3 Use the packet length read from the packet header when reading packets
randomly.

svn path=/trunk/; revision=54522
2013-12-31 23:41:35 +00:00
Guy Harris 9df5acefab Trust the packet length we calculate when reading packets randomly.
svn path=/trunk/; revision=54521
2013-12-31 23:34:43 +00:00