Commit Graph

1498 Commits

Author SHA1 Message Date
Guy Harris 965ecf3056 Return an error value for the new error return; it "can't happen" (but
either the VC++ analyzer can't determine that or it *can*, in fact,
happen).  Pick an error code that's not too far off.

svn path=/trunk/; revision=35957
2011-02-16 02:21:31 +00:00
Guy Harris 59f65ab815 Check the index before storing into the array.
svn path=/trunk/; revision=35956
2011-02-16 02:16:12 +00:00
Gerald Combs b2d28ce435 Fix checkapi.
svn path=/trunk/; revision=35955
2011-02-16 01:28:29 +00:00
Gerald Combs 8af7080001 Fix errors found by the Visual C++ analyzer.
svn path=/trunk/; revision=35954
2011-02-16 00:44:12 +00:00
Gerald Combs f3bbbce5e3 Fix a buffer overflow found by the Visual C++ analyzer.
svn path=/trunk/; revision=35953
2011-02-16 00:42:06 +00:00
Guy Harris a595f69ce4 The lack of _WITH_PHDR in WTAP_ENCAP_BLUETOOTH_H4 means there's no
pseudo-header, and hence there's no direction indication. Don't set
pinfo->p2p_dir for it.  Use WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR, not
WTAP_ENCAP_BLUETOOTH_H4, for capture files where we have the direction.

Don't assume pinfo->p2p_dir is either P2P_DIR_SENT or P2P_DIR_RECV when
setting the info column in various Bluetooth dissectors; it might be
unknown.

In the HCI H4 dissector, put the direction into the info column
regardless of whether we have a type match or not; the dissectors for
HCI packet types appear to assume it's been set (as they put a blank at
the beginning of the stuff they append to the direction).

svn path=/trunk/; revision=35933
2011-02-12 19:59:41 +00:00
Guy Harris d63741d566 Add some information based on a Tektronix manual whose name popped up in
an email I found when looking for some other stuff and which I then
found with a Google search.

svn path=/trunk/; revision=35898
2011-02-10 18:27:39 +00:00
Gerald Combs 6e66cae876 Check for a large packet_len. Fixes a bug reported by Huzaifa
Sidhpurwala of the Red Hat Security Response Team.

See also: bug 5661.

svn path=/trunk/; revision=35855
2011-02-07 19:39:05 +00:00
Guy Harris f5bfa67b11 Set the error code and additional information string in more cases.
svn path=/trunk/; revision=35809
2011-02-04 09:45:39 +00:00
Guy Harris 4849599a13 Set *err before *err_info - that's how it's done in most other modules.
svn path=/trunk/; revision=35807
2011-02-04 08:10:08 +00:00
Guy Harris 52638933cb Set *err before *err_info - that's how it's done in most other modules.
svn path=/trunk/; revision=35806
2011-02-04 08:09:35 +00:00
Guy Harris 5399384c29 Set *err before *err_info - that's how it's done in most other modules.
svn path=/trunk/; revision=35805
2011-02-04 08:09:17 +00:00
Guy Harris 79b01c78be Fix indentation.
svn path=/trunk/; revision=35804
2011-02-04 08:07:50 +00:00
Guy Harris 17d1226a56 Put more data into the "additional error information" messages.
Get rid of debugging printouts that are equivalent to the "additional
error information" messages.

Return additional error info for all WTAP_ERR_BAD_RECORD errors.

svn path=/trunk/; revision=35800
2011-02-04 02:24:33 +00:00
Jeff Morriss 84af13f080 (As in the Windows builds) don't have checkapi check the 'abort' group in wiretap.
svn path=/trunk/; revision=35797
2011-02-04 02:10:15 +00:00
Jeff Morriss 1587ac63d8 Use g_strdup() instead of strdup()
svn path=/trunk/; revision=35796
2011-02-04 02:08:47 +00:00
Gerald Combs 0c9649929e From Huzaifa Sidhpurwala of the Red Hat Security Response Team: Don't
free uninitialized memory.

See also: bug 5652.

svn path=/trunk/; revision=35791
2011-02-03 22:50:49 +00:00
Jaap Keuter 9e367f5cff From njohnkev:
Add support for LAPD data link type.

svn path=/trunk/; revision=35771
2011-02-02 22:49:40 +00:00
Bill Meier d3efa3ed9f A bit of Windows makefiles rework and cleanup:
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile;
  a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS;
  b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake)
      (This allows disabling "Warnings as Errors" by just changing config.nmake)
  c. CVARSDLL definitions (not usage) have been removed from the various makefiles.
     XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since:
     -DWIN32 and -DNULL=0 do not appear to be needed (any more);
     -D_MT and _D_DLL  are not needed since /MP causes these definitions.
  d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled.
     E.G., 4295: array is too small to include a terminating null character
- config.nmake: reformat some long lines for readability;
- plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile);
- dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ...

svn path=/trunk/; revision=35747
2011-02-02 01:19:53 +00:00
Martin Mathieson 9ca092db13 Return a string (even though abort is called first) to pacify gcc.
svn path=/trunk/; revision=35724
2011-01-31 16:38:40 +00:00
Bill Meier 7f0107220d Fix various instances of "unreachable code".
svn path=/trunk/; revision=35713
2011-01-30 23:27:57 +00:00
Stephen Fisher fc7b0c019b Fix the dead initialization warnings found by clang's static analysis
("Value stored to 'xxx' during its initialization is never read")


svn path=/trunk/; revision=35598
2011-01-20 18:56:11 +00:00
Martin Mathieson 7a0f12239c Support FP_R8 over ATM, plus a couple of other tidying-ups.
svn path=/trunk/; revision=35373
2011-01-05 14:36:48 +00:00
Guy Harris a22e640a8d We must always return an error code on an error; otherwise, our caller
will see random crap as the error code.

However, if we're skipping a "TCPIPTRACE-W-BUFFERSFUL" error, if the
"error" we get is an end-of-file indication, that's *not* an error.

It is, however, ultimately a "we dropped some packets" indication; add a
comment noting that we should eventually treat it as such.

svn path=/trunk/; revision=35337
2011-01-03 09:17:20 +00:00
Guy Harris c8fd1ca472 It is not guaranteed that the records in numerical (frame table) order
will be in sequential (byte offset) order in the file; don't treat the
record offset going backwards as an error.

svn path=/trunk/; revision=35291
2010-12-28 20:32:58 +00:00
Stephen Fisher a7c89cdfd6 Fix bug #5509: CommView file format now uses reserved bytes and adds a
new use for the direction field per:

  http://www.tamos.com/htmlhelp/commview/logformat.htm

Add basic support for new fields and don't reject files that fit the new
format.


svn path=/trunk/; revision=35234
2010-12-20 23:34:14 +00:00
Jaap Keuter 7e16ec5b99 Prepare for handling DLT_IPV4 and DLT_IPV6.
svn path=/trunk/; revision=35223
2010-12-19 18:46:08 +00:00
Jeff Morriss fb83d1bba8 Fill out libwiretap's DEPENDENCIES line with the rest of the dependencies (from LIBADD).
svn path=/trunk/; revision=35146
2010-12-07 14:28:28 +00:00
Balint Reczey 8b4573f705 Make libtool export only symbols listed in *.def files
svn path=/trunk/; revision=35145
2010-12-07 13:38:15 +00:00
Chris Maynard 2c5b94680c Fix typos.
svn path=/trunk/; revision=35063
2010-11-29 17:22:05 +00:00
Chris Maynard dbe63e9730 Add support for USB isochronous. From Marton Nemeth via bug #5370.
svn path=/trunk/; revision=35025
2010-11-24 17:33:58 +00:00
Anders Broman cc8992668c Try to fix the build for text_import_scanner.
Please check if the compile flags are OK...
3:d time lucky ?

svn path=/trunk/; revision=34862
2010-11-13 16:47:57 +00:00
Anders Broman 8722e8576b From Robert Bullen:
Network Instruments' trace files sometimes cannot be read with an error message of "Observer: bad record: Invalid magic number"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5330

svn path=/trunk/; revision=34783
2010-11-05 07:14:21 +00:00
Jaap Keuter d6c7ebee86 From Alexis La Goutte:
Replace all *_min()/*_max() by MIN() and MAX().

svn path=/trunk/; revision=34770
2010-11-04 06:37:58 +00:00
Anders Broman 37e8e4cde6 From Stephen Donnelly:
Wireshark tools do not detect and read some ERF files correctly
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5344

svn path=/trunk/; revision=34665
2010-10-28 14:33:55 +00:00
Jeff Morriss e80ecd628c Fix a cut-n-pasteo in a comment.
svn path=/trunk/; revision=34603
2010-10-21 14:23:22 +00:00
Bill Meier ce9f471175 From Jeff Morriss: Fix crash: WTAP_ERR_BAD_RECORD error return needs to fill in *err_info.
From me: For ipfix_open() don't actually return with *err=WTAP_ERR_BAD_RECORD.
Also: Move #define RECORDS_FOR_IPFIX_CHECK to ipfix.c from ipfix.h since
      the definition is only used in ipfix.c.

svn path=/trunk/; revision=34589
2010-10-20 17:20:56 +00:00
Bill Meier 54fa1f56da Fix bug which caused ascend_open() to return "I/O error" (instead of "not me").
(This happened if ascend_open was called with *err != 0).

svn path=/trunk/; revision=34588
2010-10-20 17:07:55 +00:00
Bill Meier c587b61e2d Fix a typo in a comment
svn path=/trunk/; revision=34586
2010-10-20 15:14:56 +00:00
Bill Meier 25130bd482 From Hadriel Kaplan: Update wiretap/README.developer
svn path=/trunk/; revision=34578
2010-10-20 01:15:12 +00:00
Bill Meier 9787a5734a From Hadriel Kaplan: IPFIX file format support.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5242

svn path=/trunk/; revision=34576
2010-10-20 00:36:53 +00:00
Guy Harris e81797342e Make it a bit clearer what's going on - ASCII '0' has the decimal value
48, and that's converting '0'-'9' to 0-9.

svn path=/trunk/; revision=34326
2010-10-02 08:04:15 +00:00
Jörg Mayer 4bfd2dfdf1 - FindGLIB2.cmake updates from
http://www.opensync.org/browser/branches/3rd-party-cmake-modules/modules
  + split out FindGMODULE2.cmake
  + contains /sw/... by default
  + supposedly tested on OSX
- Disable pcre for cmake builds by default, gregex should be
  picked up automatically if glib2 is not too old.

Should you have trouble linking due to some libgmodule... stuff
undefined, please add "${GMODULE2_LIBRARIES}" after "${GLIB2_LIBRARIES}"
an report back.

svn path=/trunk/; revision=34248
2010-09-25 15:38:12 +00:00
Jörg Mayer 79d806450f H.sivank:
Cmake fixes.

svn path=/trunk/; revision=34225
2010-09-23 21:14:23 +00:00
Jörg Mayer de68ad3066 H. Sivank <hsivank@gmail.com>
I try to configure Wireshark with cmake on macosx 10.6.
It fails with : set_target_properties called with incorrect number of arguments.
Attached a patch to fix this issue.


svn path=/trunk/; revision=34201
2010-09-23 07:02:33 +00:00
Jeff Morriss 80d78c6794 Very old versions of libz (such as the one that comes with Solaris 10) don't have gzclearerr(). Check for that function and only use it if we have it.
svn path=/trunk/; revision=34187
2010-09-22 21:51:53 +00:00
Bill Meier 5dfb597163 Fix issue which causes daintree-sna frames to be rejected with "capture length > packet length".
This fix adds back two lines of code removed in SVN #33678.

 "Define WTAP_ENCAP_IEEE802_15_4_NOFCS, for use in file formats that don't
  include the FCS, and use it for the Daintree SNA file format. [...]"

This fix just restores the discarding of two end-of-frame "pad" bytes as each frame is read
from the capture file; This seems to me to be the correct behaviour.



svn path=/trunk/; revision=33909
2010-08-24 14:59:11 +00:00
Anders Broman 95901a9b76 From Hamish Moffatt:
daintree-sna.c doesn't initialise capture_file snapshot_length.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5128

svn path=/trunk/; revision=33904
2010-08-24 05:44:55 +00:00
Guy Harris 414dadf6ba Add a note.
svn path=/trunk/; revision=33741
2010-08-08 23:32:40 +00:00
Stig Bjørlykke 166ffa49aa From Jon Smirl:
Added "IEEE 802.15.4 Wireless PAN no fcs".

svn path=/trunk/; revision=33728
2010-08-07 09:44:54 +00:00