Commit Graph

55912 Commits

Author SHA1 Message Date
Michael Mann 9681bddaa6 Eliminate proto_tree_add_text from packet-ppp.c.
Some of the conversions to proto_tree_add_xxx calls involved using explicit sizes instead of the "option length", so there is skipping of the "byte highlighting" of the type + length bytes.

Change-Id: Ibfe09a089fb33ba43121de079aca81742d48db4c
Reviewed-on: https://code.wireshark.org/review/5636
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com>
2014-12-09 18:59:20 +00:00
Pascal Quantin 74172aee0b LTE: Update MAC and RLC dissectors to Release 12
Change-Id: I036a0d1180b6481e8cc27210ed44eda4ba078a27
Reviewed-on: https://code.wireshark.org/review/5659
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-09 09:49:49 +00:00
Guy Harris 58fc89a83b Fix copy-and-pasteo.
Change-Id: I181129595c7259f5c0af5308f0ca0190dce67eb7
Reviewed-on: https://code.wireshark.org/review/5687
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-09 08:55:23 +00:00
Irene Ruengeler e5757d1dcc Fix GTK warning in EXTCAP parts
Change-Id: I3a4d9baf3592db1394d1177a19014cbef9140759
Reviewed-on: https://code.wireshark.org/review/5628
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Irene Ruengeler <iruengeler@googlemail.com>
2014-12-09 07:18:06 +00:00
Michael Mann 301a5b7cea Eliminate proto_tree_add_text from some dissectors.
Change-Id: I44cc6b70ec4dfc565934da499f46fca60a4ded93
Reviewed-on: https://code.wireshark.org/review/5524
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-09 05:57:41 +00:00
Alexis La Goutte 1952fefb8d SCTP: Missing break in switch (CID 1135556)
Change-Id: I00939bb9699493fe7af21497d9e9c013cc3d2e62
Reviewed-on: https://code.wireshark.org/review/5650
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-09 05:56:35 +00:00
Alexis La Goutte 283e5c1c1e GVSP: Missing break in switch (CID 1247683 & 1247684)
Change-Id: Ibd3aef4101126f02453bab10cd5ca31e716334de
Reviewed-on: https://code.wireshark.org/review/5617
Reviewed-by: W Moxam <warrenm@ptgrey.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-09 05:55:42 +00:00
Guy Harris fbf08cffec Nothing to free there.
pcapng_read_block() never sets *err_info if it returns
PCAPNG_BLOCK_NOT_SHB - that happens on an EOF, a short read, or on a
successful read of something that doesn't look like an SHB.

Change-Id: I23ad6aa1c95d800b068a798a4aad1d70d07ac281
Reviewed-on: https://code.wireshark.org/review/5686
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-09 04:04:54 +00:00
Guy Harris 7b1c3abca3 Manually fix a pidl bug - that field should be an FT_STRING.
No, I don't know why it's making it FT_NONE; it's a bit of a weird data
type, with a string inside a structure.

Change-Id: I27a6d7577ef4a9f4da8ddad2cad97ad097135e90
Reviewed-on: https://code.wireshark.org/review/5685
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-09 03:57:50 +00:00
Guy Harris 5c29704151 LDAP's DirSyncFlags are a bitfield, so show it as an unsigned integer in hex.
Change-Id: I2a06b13528ad7dfc587bfb9c1333d4f7a497614e
Reviewed-on: https://code.wireshark.org/review/5684
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-09 03:25:02 +00:00
Guy Harris 3d95c623a8 Don't try to look in a non-existent hash table.
We only create hash tables if somebody puts a handler in one, so we need
to check whether the hash table exists first, to avoid run-time warnings.

Change-Id: I739d2d808935e651b11bd44b258f168a42ca4b7c
Reviewed-on: https://code.wireshark.org/review/5683
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-09 01:30:41 +00:00
Guy Harris f34bcb7947 Don't put bitmasks under an FT_NONE.
Change-Id: I172c68d233e3887a94c0835234613dfd483ee5af
Reviewed-on: https://code.wireshark.org/review/5682
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-09 00:14:03 +00:00
Guy Harris 260af599de Values in a value_string_ext *must* be sorted.
Change-Id: I0c2bcd81955375abf3af24e42c70bea0bb960083
Reviewed-on: https://code.wireshark.org/review/5681
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-09 00:07:28 +00:00
Guy Harris 32e1ff9bf3 Don't put bitmasks under an FT_NONE.
proto_tree_add_bitmask() requires that the field under which it's
putting the bitmasks be an FT_INTn or FT_UINTn, so that it can determine
the length of the field.

Arguably, proto_tree_add_bitmask() should, instead, take a length
argument, just as other proto_tree_add_ routines do, and, arguably, we
should perhaps not even have FT_UINTn and FT_INTn, just FT_UINT and
FT_INT, with the display width for hex and octal (leading zeroes)
determined by the actual length of the field or something such as that,
or as part of the field that also contains the base.

But, even with that, we might want to require an FT_UINTn or FT_INTn
anyway, at least in cases where the value of the field as a whole is
interesting.

Change-Id: I4dff8fb1686a30b7d145c089dd1be7f96ecf23e0
Reviewed-on: https://code.wireshark.org/review/5680
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-08 23:36:58 +00:00
Guy Harris ffcacae8b3 Have different MTP2 dissectors for different metadata and CRC.
Have separate MTP2 dissectors for:

	MTP2 frames with no pseudo-header and no CRC;

	MTP2 frames with a pseudo-header and no CRC;

	MTP2 frames with no pseudo-header and a CRC;

and call the appropriate dissector in the appropriate places.

While we're at it, get rid of a global variable - pass the "use extended
sequence numbers" flag down through the dissection code path, rather
than having it as a global.

Change-Id: Id8da1fbe3529e3ffadd5c30646cbc922f506a01f
Reviewed-on: https://code.wireshark.org/review/5679
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-08 23:26:45 +00:00
Balint Reczey 8a446e9b7a Add missing build-dependencies for the Debian package
They are libparse-yapp-perl and libsbc-dev.

Change-Id: I474179bb805acb87f8bf316730d63eb294e10a69
Reviewed-on: https://code.wireshark.org/review/5322
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-12-08 23:21:32 +00:00
Gerald Combs d87a9527ee It's a reasonable expectation that we will have C++ style comments in
ui/qt.

Change-Id: Iedbf2a2d3cbfee00912e6e883928836932dea566
Reviewed-on: https://code.wireshark.org/review/5678
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-08 22:14:00 +00:00
Gerald Combs 08e624f95d Remove an unnecessary include.
Change-Id: I55332c21ea66ee7d564c2b338cba524ea774b19c
Reviewed-on: https://code.wireshark.org/review/5677
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-08 21:42:51 +00:00
Guy Harris d5f771cfd8 Use correct expression in a "length too short" message.
Doesn't change the behavior of the code, but makes it more consistent.

Change-Id: I6f07fbbb4c7d14d8a46ecfd1c419d951c356fd77
Reviewed-on: https://code.wireshark.org/review/5672
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-08 19:41:13 +00:00
Hannes Mezger 0bd79c548e Fix full name of NodeId namespace index field, was a copy&pase error
Change-Id: I7b1eea9965880e35c65f04406ff756d245b568d4
Reviewed-on: https://code.wireshark.org/review/5668
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-08 10:43:43 +00:00
AndersBroman 52df6efa68 Try to improve reassembly when SIP PDU starts in the middle of a segment
and continues trough the next segment(s).

Change-Id: I8efe69361fda0c60ec6544cc6bbe28c91f07207c
Reviewed-on: https://code.wireshark.org/review/5583
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-08 08:53:02 +00:00
Maarten Bezemer f16376ed7b Fix showing error dialog when calling vsimple_error_message_box()
SimpleDialog requires a parent, when none is provided (as there is no parent available during startup), the error message is queued and displayed after MainWindow is available.
Calling SimpleDialog::exec() directly returns if no parent is set (hence the dialog is not shown)

This resulted in silently ignoring error messages that were shown using vsimple_error_message_box(), as this function did not provide a parent (and the queue messages were not dequeued anymore as the MainWindow was already available)

Change-Id: I2f4c1b4926c196ab40b035161cec530105396537
Reviewed-on: https://code.wireshark.org/review/5519
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 01:15:22 +00:00
Michael Mann e172ebb3b4 Add proto_tree_add_bitmask_with_flags.
It's proto_tree_add_bitmask with the ability to control the data appended to header.

Change-Id: Icce97437ba7cfc9158ec204a837da8db8138424a
Reviewed-on: https://code.wireshark.org/review/5533
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 01:13:02 +00:00
Alexis La Goutte 75cdf9201e 802.11: fix indent (use 2 spaces) and modelines for 802.11 h file
Change-Id: If886809d9eeb900bb94c045413ff1295519b8311
Reviewed-on: https://code.wireshark.org/review/5641
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 01:00:50 +00:00
Alexis La Goutte f47bc26bc1 CAPWAP: Add some IEE802.11 Message Element Type (RFC5416)
* IEEE 802.11 Antenna (1025)
* IEEE 802.11 Direct Sequence Control (1028)
* IEEE 802.11 MAC Operation (1030)
* IEEE 802.11 MIC Countermeasures (1031)
* IEEE 802.11 Multi-Domain Capability (1032)
* IEEE 802.11 Station (1036)
* IEEE 802.11 Supported Rates (1040)
* IEEE 802.11 Tx Power (1041)
* IEEE 802.11 Tx Power Level (1042)
* IEEE 802.11 WTP Radio Configuration (1046)

Enhance 802.11 Rate Set (1034)

Change-Id: Ib37bc4081e75af051d80d023ddba689ecd9bf9ff
Reviewed-on: https://code.wireshark.org/review/5481
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 00:54:44 +00:00
Alexis La Goutte 58b7277cb4 802.11: Add ieee80211_supported_rates_vals_ext to be exported
It will be reused by CAPWAP dissector (* Rates Message Element)

Change-Id: I60ce12f382a35cdc2747baf23e2e3c30a305a8bd
Reviewed-on: https://code.wireshark.org/review/5640
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 00:48:53 +00:00
Guy Harris 212ba58fdc Add checks for non-null-terminated strings.
Change-Id: Iaad2d2f76e5d554800ba2c79d5c01f4b9da6fa0b
Reviewed-on: https://code.wireshark.org/review/5660
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-07 20:18:26 +00:00
Alexis La Goutte 5f79940d6c Endpoint: wrong filter when select a SCTP endpoint (INVALID == a.x.y.z ...)
Change-Id: I396e9af7971ee8be6fc9548162ff37fe704f0289
Reviewed-on: https://code.wireshark.org/review/5651
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-07 19:20:30 +00:00
Alexis La Goutte 42cdc2bc9b dcerpc: Missing break in switch (CID 280449 & 280450 & 284051)
Change-Id: I68fa9650c234c0f1fb8464b464a781b54f2c728c
Reviewed-on: https://code.wireshark.org/review/5657
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-07 19:15:11 +00:00
Alexis La Goutte 9d8cb74abf iec104: Missing break in switch (CID 280459)
Change-Id: I6abc157368a78e1abfde672728b88a36ba6e76cc
Reviewed-on: https://code.wireshark.org/review/5656
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-07 19:10:19 +00:00
Alexis La Goutte fd087fb644 AFS: Missing break in switch (CID 280434 & 280435)
Change-Id: Ia0a39f7e4670d74325ddc40b34cd56ca018c0bde
Reviewed-on: https://code.wireshark.org/review/5655
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-07 19:07:02 +00:00
Martin Kaiser a68a3daa01 make our counting a bit clearer
Change-Id: Ie64573f5a0b6e921a5011e487eea8e55f72b9a0b
Reviewed-on: https://code.wireshark.org/review/5653
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-07 18:53:41 +00:00
Martin Kaiser e456dec48b don't initialize variables if the first thing we do is assign a
different value to them

Change-Id: I719db9180b2ba5f21653086f2697ca9bac68d6b1
Reviewed-on: https://code.wireshark.org/review/5652
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-07 18:53:22 +00:00
Martin Kaiser ade2beffeb make sure that we don't read past the end of the compressed buffer
Bug: 10757
Change-Id: I30054c4a75ec86ea603cf78b702be5255c35f549
Reviewed-on: https://code.wireshark.org/review/5642
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-07 18:52:30 +00:00
Michael Mann 1bc8791fe6 Eliminate proto_tree_add_text from packet-telnet.c
Change-Id: I0e8610f381e650f2c5b3f78ea927b727ec9ac62a
Reviewed-on: https://code.wireshark.org/review/5637
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-07 16:17:15 +00:00
Gerald Combs afa5558479 [Automatic manuf, services and enterprise-numbers update for 2014-12-07]
Change-Id: Ice8195b09120fb21144e504289a64fd5af84775b
Reviewed-on: https://code.wireshark.org/review/5647
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-07 16:05:16 +00:00
Guy Harris de61f0684d The packet encapsulation is in pkt_encap, not rec_type.
rec_type is the type of record (which isn't necessarily a packet; future
work on libwiretap will let it return non-packet data); if it's a packet
(REC_TYPE_PACKET), then pkt_encap contains the "link-layer"
encapsulation for the packet (in quotes because it may contain metadata
not transmitted over the network).

Change-Id: I6f32b02f4466df6d7b07dbdc9d77e881830ac749
Reviewed-on: https://code.wireshark.org/review/5645
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-07 00:00:07 +00:00
Michael Mann 22da8a38ef Remove annex_a_used from packet_info structure.
Change-Id: I660caa8283aecff5060c6ed476f316bc5793373e
Reviewed-on: https://code.wireshark.org/review/5643
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-12-06 21:42:43 +00:00
Guy Harris 6d4c0edc06 Don't go past the end of the "extra data".
The "extra data", according to the RF5 API manual I have, is "hardware
parameters", so change some names.

Report an error if the variable parts of the configuration event record
run past the record length.

Report an error if the hardware parameters are too short.

For the purportedly DS0 hardware parameters, don't assume they'll be
long enough for the mask; they might not be.

Change-Id: Ib63d042e4ede32216fb474c4ecdba84db1387abc
Reviewed-on: https://code.wireshark.org/review/5638
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-06 04:54:31 +00:00
Alexis La Goutte 8c190d6db2 RPKI-RTR: Missing break in switch (CID 1233099)
Change-Id: I01f01ce51fb1c9deb857ef01696b406b97dca3a9
Reviewed-on: https://code.wireshark.org/review/5616
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-06 02:08:33 +00:00
Alexis La Goutte 646d52ed21 PCEP: Missing break in switch (CID 1247685)
Change-Id: Id001a6c1e116fdabfd51c354832ca68f50e65e7d
Reviewed-on: https://code.wireshark.org/review/5618
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-06 01:22:35 +00:00
Alexis La Goutte a5fe0d401c BT obex: Missing break in switch (CID 1132031)
Change-Id: I6b8fc8db006bc3b8f8f4bac019cb7e240931d3b5
Reviewed-on: https://code.wireshark.org/review/5619
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-06 01:20:48 +00:00
Guy Harris bb005704e2 Fix some copy-and-pasteos in error messages.
Change-Id: I1fe3434e69a08aae3d7413067275b3d7ee1552f5
Reviewed-on: https://code.wireshark.org/review/5634
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-05 23:47:43 +00:00
Guy Harris 45103068ff Get rid of a trailing blank.
Change-Id: I0cf6d04f5075ba1f064c40f4b39b32b6976b54c7
Reviewed-on: https://code.wireshark.org/review/5633
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-05 21:14:53 +00:00
Guy Harris b98c570969 Fix varargs handling in col_{add,append}_lstr().
We do multiple va_start() calls using the first string in the list of
strings; do *not* use the first-string argument to iterate over all the
argument strings, as that means that only the first va_start() call will
do the right thing, use a separate variable.

Bug: 10755
Change-Id: Ic4a6c24f911e335d147883a25d30289628836875
Reviewed-on: https://code.wireshark.org/review/5630
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-05 21:05:51 +00:00
Jeff Morriss 18fabb4733 Strengthen association matching when we haven't seen the INIT/INIT-ACK.
The fact that the vtag matches the initiate tag doesn't mean much if both are 0
(uninitialized).

Also leave in some (commented-out) debug to make debugging this stuff easier
in the future.

Change-Id: Id007de8bf9d2d4e0bb18309ed3e2572fedda45f1
Reviewed-on: https://code.wireshark.org/review/5571
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-05 14:14:55 +00:00
Stephen Fisher 086734456d Look for python3 in addition to python in configure script.
Change-Id: I77ff22aabdbbbf7376483b53d8795e7fbf0c0433
Reviewed-on: https://code.wireshark.org/review/5627
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-05 00:00:42 +00:00
Stephen Fisher d5a4cc34ec Make autogen.sh look for "python3" if "python" isn't found before
giving up.

Change-Id: Id109c78f90da71c54c7b4fd6df20cc153248f46f
Reviewed-on: https://code.wireshark.org/review/5623
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-04 23:54:47 +00:00
Martin Kaiser 3b7c165e20 use the same data types as in i2c_phdr
Change-Id: Ic0abcf8173a690a1dc0cd250f5e8770eb92a5aa9
Reviewed-on: https://code.wireshark.org/review/5626
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-04 22:06:21 +00:00
Martin Kaiser 5d95067bd5 simplify dissect_i2c()
Change-Id: I67dd6ae5dc48b297e5c04aba2fe53e3e159d2611
Reviewed-on: https://code.wireshark.org/review/5625
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-04 22:05:57 +00:00