Commit Graph

40060 Commits

Author SHA1 Message Date
Chris Maynard 1e6301fa8b Set the minimum length of the Internet Timestamp option to 4 bytes instead of 5. RFC 791 only states that the smallest legal value of the pointer is 5, not the smallest size for the option itself. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7043
Since backporting must be manually applied anyway, other changes include fixing the displaying of the EOOL and NOP options, as well as other options without a dissect routine associated with them.

svn path=/trunk/; revision=41994
2012-04-09 18:17:33 +00:00
Jakub Zawadzki 9c48f9ca96 Add missing const attribute to some char *
Fix some "assignment discards qualifiers from pointer target type", etc

svn path=/trunk/; revision=41993
2012-04-09 17:53:04 +00:00
Anders Broman 76604977ef From Nick Lowe: Minor cosmetic name changes for consistency and brevity. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7020
svn path=/trunk/; revision=41992
2012-04-09 15:18:04 +00:00
Anders Broman 54810883fc From Martin Peylo: add string for id-dsa-with-sha1 OID to pkix1explicit https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7044
svn path=/trunk/; revision=41991
2012-04-09 15:00:23 +00:00
Anders Broman d3c804e3fa From Martin Kaiser: DVB-CI: register an application for the SAS resource, new OIPF dissector for application messages https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7039
svn path=/trunk/; revision=41990
2012-04-09 14:53:42 +00:00
Anders Broman c89bdbd150 From Nick Lowe: Fix two check warnings, make consistent. (Rebased.) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7037
svn path=/trunk/; revision=41989
2012-04-09 14:45:03 +00:00
pascal a1d4d9ca7e From Michael Mann:
use suboption length instead of option length to terminate option 82 dissection in BOOTP

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7047

svn path=/trunk/; revision=41988
2012-04-09 14:43:13 +00:00
Bill Meier 70fcc43cc8 Read_Buffer, Read_Modified & Read_Modified_All are valid outbound commands.
(Fixes issue reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6854#c8)

Also: Rename 3270 "command" defines to reflect Local vs Remote.

svn path=/trunk/; revision=41987
2012-04-09 14:17:49 +00:00
Martin Mathieson 6407baee32 Obsolete a preference
svn path=/trunk/; revision=41986
2012-04-09 01:50:26 +00:00
pascal afd3998b98 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7045 :
use right bitmask to get the Z reserved bits

svn path=/trunk/; revision=41985
2012-04-08 17:17:07 +00:00
pascal 14d362a018 As suggested by Jakub, always update the digit value when the nibble is outside [0;9] range
svn path=/trunk/; revision=41984
2012-04-08 16:03:21 +00:00
Gerald Combs 4616bca9e1 [Automatic manuf, services and enterprise-numbers update for 2012-04-08]
svn path=/trunk/; revision=41981
2012-04-08 14:03:25 +00:00
pascal e599abd268 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7042 :
Handle properly filler and do not remove last digit

svn path=/trunk/; revision=41979
2012-04-08 13:10:45 +00:00
Graham Bloice eec1e3d498 Fixed checkAPI warnings for blurb matching field name
svn path=/trunk/; revision=41978
2012-04-07 20:13:27 +00:00
Anders Broman 3580063a40 From Nick Lowe:
Review use of proto_tree_add_*() in packet-eapol.c

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7037

svn path=/trunk/; revision=41977
2012-04-07 13:07:53 +00:00
Gerald Combs e5cd6c087e 1.7.1 → 1.7.2.
svn path=/trunk/; revision=41971
2012-04-06 17:27:20 +00:00
Gerald Combs b20527cb7f Build 1.7.1.
svn path=/trunk/; revision=41970
2012-04-06 16:28:33 +00:00
Guy Harris 154c0f37dd Indicate where BACnet MS/TP is specified.
Add a new WTAP_ENCAP_BACNET_MS_TP_WITH_PHDR encapsulation type, for use
by the EyeSDN file reader; unlike the pcap-encapsulated MS/TP, it
includes a direction indicator.  Don't treat WTAP_ENCAP_BACNET_MS_TP as
if it has a direction indicator, as it doesn't; instead, do that for
WTAP_ENCAP_BACNET_MS_TP_WITH_PHDR.

Add some missing entries to encap_table_base for WTAP_ENCAP_ values that
didn't get entries added.

svn path=/trunk/; revision=41969
2012-04-06 03:42:32 +00:00
Gerald Combs 1db28ae469 Clamp a value as suggested by Mike Morrin in bug 6878.
svn path=/trunk/; revision=41968
2012-04-06 00:32:26 +00:00
Gerald Combs 81334e311a Instead of loading our coordinates from a separate text file via
OpenLayers.Layer.Text, insert them into a JSON array and load them using
OpenLayers.Layer.Vector + OpenLayers.Format.GeoJSON. This should fix the
endpoint map feature on modern browsers.

Switch OpenStreetMap to a simpler map from OSGeo.

svn path=/trunk/; revision=41967
2012-04-05 22:10:53 +00:00
Guy Harris ae62dc3bdb Use tabs more uniformly.
svn path=/trunk/; revision=41966
2012-04-05 21:24:10 +00:00
Guy Harris 65915ab2a4 Clean up indentation (use 8-space tab-based indentation throughout).
svn path=/trunk/; revision=41965
2012-04-05 21:22:09 +00:00
Guy Harris 40f0c13132 Rename v52_handle to reflect that it's a handle for V5DL, not V5.2
payload.

Clean up indentation (use 8-space tab-based indentation throughout).

svn path=/trunk/; revision=41964
2012-04-05 21:20:23 +00:00
Guy Harris f691d04580 Fix the name of the variable with the handle for the V5.2 dissector, to
make it clearer that the payload isn't being dissected as uninterpreted
data.

Whether the checksum is checked should not depend n the presence of
per-frame protocol data; make it depend on the availability of the
checksum, instead.  Then #if 0 out all that code, as, at least in the
V5.2 capture attached to bug 7027, there is no checksum in any of the
packets.

Clean up indentation a bit.

svn path=/trunk/; revision=41963
2012-04-05 21:13:37 +00:00
Guy Harris a98336862a WTAP_ENCAP_MTP2 is for MTP2 *without* a pseudo-header giving direction
or other information; WTAP_ENCAP_MTP2_WITH_PHDR is for MTP2 *with* such
a pseudo-header.  Use WTAP_ENCAP_MTP2_WITH_PHDR for the EyeSDN captures,
and don't assume there's a pseudo-header if you have WTAP_ENCAP_MTP2.

svn path=/trunk/; revision=41962
2012-04-05 20:25:26 +00:00
Jakub Zawadzki cbfa8a5de6 val is unitinialized when fUnsigned32 return false.
svn path=/trunk/; revision=41961
2012-04-05 20:17:39 +00:00
Jakub Zawadzki a7420029a8 Fix invalid use of sizeof, it should be array length.
svn path=/trunk/; revision=41960
2012-04-05 20:03:49 +00:00
Guy Harris 6598c2ca0b Put the right file name into the initial comment.
svn path=/trunk/; revision=41959
2012-04-05 19:31:39 +00:00
Alexis La Goutte f4bf2b9f8f From Nick Lowe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7020
Put EAP-TLS flags in to a tree to tidy the UI.

svn path=/trunk/; revision=41958
2012-04-05 17:49:20 +00:00
Jakub Zawadzki 12c1667881 For some broken environments we need also set LC_ALL.
svn path=/trunk/; revision=41957
2012-04-05 17:36:32 +00:00
Jakub Zawadzki 5cbba4c17b Some fixes for nflog. Fix bug #7036
svn path=/trunk/; revision=41956
2012-04-05 17:08:21 +00:00
Anders Broman 6184a93a33 From Nick Lowe:
- Update eap header file to include MS-CHAP v2 definitions. 
- Convert EAP-MS-CHAP-V2 to use proto_tree_add_item() and make a few, hopefully final, changes. 

Fixed a couple of typos etc.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7020

svn path=/trunk/; revision=41955
2012-04-05 12:33:25 +00:00
Anders Broman d04de670f8 From Michael Mann:
TCP picks wrong sub-dissector if both dissector choices have the same "minimum segment size"

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7008

svn path=/trunk/; revision=41954
2012-04-05 11:18:49 +00:00
Anders Broman 3f4d248357 Use common code to have the same hf field for DSCP in IPv4 and IPv6.
svn path=/trunk/; revision=41953
2012-04-05 10:35:39 +00:00
Anders Broman 60c4bd3eeb Use common code to add ip version to the tree.
svn path=/trunk/; revision=41952
2012-04-05 08:38:26 +00:00
Anders Broman 3472f44238 Use common value string for DSCP.
svn path=/trunk/; revision=41951
2012-04-05 08:02:32 +00:00
Anders Broman d8bd751b9b From Shima:
Parsing for ALC protocol, FEC header for LDPC (RFC 5170).

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7034

svn path=/trunk/; revision=41950
2012-04-05 07:44:25 +00:00
Anders Broman 46b7949682 From Nick Lowe:
Convert EAP-LEAP to use proto_tree_add_item() and make a few fixups. 

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7020

svn path=/trunk/; revision=41949
2012-04-05 07:35:18 +00:00
Martin Mathieson 7054049bef Fix test to avoid dividing by 0.0 (was displaying as "-nan" rather than
crashing).

svn path=/trunk/; revision=41948
2012-04-05 00:53:01 +00:00
Chris Maynard d167ca91ee Fix Coverity CID 1469: UNUSED_VALUE.
svn path=/trunk/; revision=41947
2012-04-04 23:25:00 +00:00
Gerald Combs 05fe578fcc Add XML to the capture file list
svn path=/trunk/; revision=41946
2012-04-04 21:55:42 +00:00
Gerald Combs 8b3024e57c Make bit_offset in _tvb_get_bits64 and related functions unsigned. This
removes a potential buffer overflow and should fix a bunch of Coverity
errors mentioned in bug 6878.

We might want to do the same for no_of_bits.

svn path=/trunk/; revision=41945
2012-04-04 21:54:22 +00:00
Jakub Zawadzki c67d24077e Allow loading xml files (file MUST start with <?xml).
I needed it for testing (bug #7028)
if you feel like it's stupid idea give me nfo :)

svn path=/trunk/; revision=41944
2012-04-04 20:52:52 +00:00
Jeff Morriss 75c3c92f19 Add a "-build" argument to checkAPIs.pl. Use that argument when building
from makefiles (and thus from the buildbot).

The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.

As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.

svn path=/trunk/; revision=41943
2012-04-04 20:46:49 +00:00
Jeff Morriss 02e0b847f1 Replace a:
proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, tvb_get_ptr(tvb, offset, length), [...])
  
with:
   
proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, NULL, [...])

svn path=/trunk/; revision=41942
2012-04-04 20:09:21 +00:00
Guy Harris 5ef71a27ff Fix tpo.
svn path=/trunk/; revision=41941
2012-04-04 19:46:45 +00:00
Guy Harris d0039be915 Always declare getopt() with a prototype.
svn path=/trunk/; revision=41939
2012-04-04 19:36:24 +00:00
Guy Harris 43ca745bb9 Work around that WinPcap bug for another pcap_open() call.
svn path=/trunk/; revision=41938
2012-04-04 19:26:07 +00:00
Guy Harris 9c781b0939 Work around WinPcap bug wherein pcap_open() returns -1 without putting
an error message into errbuf (the bug has been reported to
winpcap-bugs).

Should fix bug 6922.

svn path=/trunk/; revision=41937
2012-04-04 19:13:39 +00:00
Gerald Combs f2977b2f97 Add more protocols and bug 6077 (Rearranging columns on Win64).
svn path=/trunk/; revision=41936
2012-04-04 18:43:37 +00:00