Commit Graph

55634 Commits

Author SHA1 Message Date
Guy Harris 225c86f7a2 Do the "-z help" processing separately, and do it for Wireshark as well.
Yes, Wireshark does a bunch of GUI stuff, and then takes the window down
before printing the help, but the same is true for some command-line
error messages as well.

Change-Id: Id501468416c83308e4c0a9e7a66116d8d33a9d84
Reviewed-on: https://code.wireshark.org/review/5317
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-15 00:27:48 +00:00
Guy Harris 355458061a It's not missing, it's passed on.
Change-Id: Id1b1c7501f357667abb961948afdd816e13a7ad3
Reviewed-on: https://code.wireshark.org/review/5314
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 20:29:31 +00:00
Guy Harris 1b4d51e9a7 Update Debian symbol files.
Change-Id: Iee66cf87d742780740b572b39c8ecf94f93dc142
Reviewed-on: https://code.wireshark.org/review/5310
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 20:25:20 +00:00
Guy Harris 99b6afbc28 Add a name field to tap_param, for use in error messages.
Change-Id: Ia4317b61ff30e269eba0ee2ea2c46f1668544b1b
Reviewed-on: https://code.wireshark.org/review/5309
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 20:21:57 +00:00
Guy Harris 04ab731933 The registered -z parameter string shouldn't end with a comma.
If it ends with a comma, then, if you don't provide any parameters, you
get a "no such -z statistic" message followed by a list of available
statistics.

If it doesn't end with a comma, then, if you don't provide any
parameters *and* a parameter is required, you get a usage message, which
is more useful - and, in many of those cases, a parameter *isn't*
required.

Change-Id: I81275ea41ad4611d8210ca3cb07c09f0abde58f2
Reviewed-on: https://code.wireshark.org/review/5308
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 20:06:02 +00:00
Guy Harris 4729e13df7 Add an optional flag and a type for UUID parameters for stat taps.
For future use, with common code to parse the -z argument.

Change-Id: Ib2a11bd5c91b5ac48ced2cd2d112b97c301ff72a
Reviewed-on: https://code.wireshark.org/review/5307
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 19:25:42 +00:00
Stephen Fisher 42c6e57891 Update my e-mail address again.
Change-Id: I0083bbf84658dbb0d4cef91e9e8f5855b8a2ba4f
Reviewed-on: https://code.wireshark.org/review/5306
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-11-14 19:19:21 +00:00
Guy Harris c3582a6945 There's nothing GTK+ about TShark.
Remove gtk from routine names in CLI taps.

Change-Id: I0846da9b1e8119ed966b441cb1ca0ce1820fd1c8
Reviewed-on: https://code.wireshark.org/review/5305
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 18:56:12 +00:00
Guy Harris 4d3c4c4f12 Rename stat_cmd_args.[ch] to stat_tap_ui.[ch].
The intent is to handle more than just command-line arguments; reflect that.

Change-Id: Ia10efda85a9d11c6579d1bec6f789cee30d9e825
Reviewed-on: https://code.wireshark.org/review/5304
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 18:52:06 +00:00
Irene Ruengeler 0dae81b6d5 Allow SCTP graphs to resize with the window they're in.
Bug: 10698
Change-Id: I3304bd36945619aeb405c74917f21de3faa3fcbb
Reviewed-on: https://code.wireshark.org/review/5284
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-11-14 18:51:50 +00:00
Guy Harris a21436eaed tap_ui -> stat_tap_ui.
The old routine had stat_ in the name, as the expectation was that they
were for statistics taps; that's still the expectation, so have stat_ in
the data structure and routine names.

Change-Id: Ic98d011012b8641173d41fa0ec4f4e625614370a
Reviewed-on: https://code.wireshark.org/review/5303
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 18:42:50 +00:00
Guy Harris 0e64efc81a Use G_GUINT64_FORMAT to format a guint64.
A 64-bit integer isn't necessarily a long, it might be a long long.  Use
G_GUINT64_FORMAT to format it.

Make it a guint64 while we're at it - the field is a FT_GUINT64.

Change-Id: I7ee855905ea77347576005441824b1c4630f5659
Reviewed-on: https://code.wireshark.org/review/5302
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 18:36:28 +00:00
Guy Harris 7390516f61 For tap UIs, register a list of parameters and some menu information.
The intent here is to centralize more UI information so that we can move
more tap UI stuff to common code.  This is a beginning.

Change-Id: Ic35ac0c01bc7b942aab88177db4065847a5e6c30
Reviewed-on: https://code.wireshark.org/review/5301
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 18:31:34 +00:00
Bill Meier 09f0d2c6c4 hiqnet: Improve dissection for hiqnet over TCP or UDP
-- Use tcp_dissect_pdus() for hiqnet over tcp so as to properly
    handle hiqnet PDUS is a TCP stream of data;

-- Handle possible multiple hiqnet PDUs in a UDP payload.

-- Add Fixme: re multiple hiqnet PDUs in a frame.

Change-Id: I3527c6ea13571d16bcf23dd3771d0a89734a7c5a
Reviewed-on: https://code.wireshark.org/review/5267
Reviewed-by: Raphaël Doursenaud <rdoursenaud@free.fr>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-14 16:02:32 +00:00
Bill Meier a55d18ed61 hiqnet: Simplify code somewhat; Adjust the "names" and display of certain fields.
Specifically: Use proto_tree_add_bitmask() to show the "flags" and
              "categories" bitfields (instead of building the fields
              display "by hand").
              The bitfield display changed as follows:
              - A bitfield with all bits=0 will have a detailed
                dissection tree; (for both 'flags' & 'categories');
              - The 'categories' individual bitfields are now
                displayed as FT_BOOLEAN (not FT_UINT32).

Change-Id: Icd35698aae492b81b340d08030e6a1563f1640ae
Reviewed-on: https://code.wireshark.org/review/5266
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-14 15:59:11 +00:00
AndersBroman 9a1df711f2 [S1AP) Wrong tree used
s1ap.cnf:547:14: error: variable 'subtree' set but not used

Change-Id: I84a345709b1ef9688f3f1a4e876a75dd575c1c2e
Reviewed-on: https://code.wireshark.org/review/5299
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-14 14:58:22 +00:00
AndersBroman 56fa29edc5 [S1AP] Let the A21 dissector do further dissection of Cdma2000SectorID
Change-Id: I8c503acf6860b34d24769cdf981dcaeea4667ffb
Reviewed-on: https://code.wireshark.org/review/5298
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-14 13:57:09 +00:00
Michal Labedzki d6f2392bc6 Fix declaration in btavrcp
Change-Id: I47e4ad2baa7ca4c48e8c0eea472e568fc06d3386
Reviewed-on: https://code.wireshark.org/review/5297
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-14 12:45:41 +00:00
Michal Labedzki d7cc1413ee Bluetooth: Ubertooth: Update to the latest firmware
Changelog:
- add some assign numbers
- implement new type of usb_rx_packet: LE_PROMISC

Change-Id: Iffe01a50f873221c695f16a76c1954d6c82d73df
Reviewed-on: https://code.wireshark.org/review/5289
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-14 12:16:33 +00:00
AndersBroman 9952e7c331 [BSSMAP] Handle vendor specific encoding of "Layer 3 Message Contents".
Change-Id: I351bc0a6a8ae636b2f888a80f61e526096a61b64
Reviewed-on: https://code.wireshark.org/review/5295
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-14 11:57:45 +00:00
Pascal Quantin e83c7f08f7 NAS EPS: fix dissection of APN AMBR IE when first byte is set to 0xFE
Bug: 10699
Change-Id: I0f359639d5836f557370ab6d6aad45faa4417b6e
Reviewed-on: https://code.wireshark.org/review/5285
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-14 11:34:09 +00:00
Michal Labedzki f1727918ab Translations: Update Polish translation
All messages are translated now.

Tłumaczenie Wiresharka jest teraz kompletne. Zachęcam do testowania
i wytykania błędów.

Change-Id: Iaffb2e581c765b5b3dff7750f878e6391539ebd6
Reviewed-on: https://code.wireshark.org/review/5293
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-14 10:29:24 +00:00
Michal Labedzki f1dee59d66 Bluetooth: A2DP: Add AVRCP song position indicator
"sbc.avrcp_song_position" can be used to determine time synchronization
between AVRCP and A2DP. It is updated on every
AVRCP PlaybackPositionChanged. Also provide version for aptx.

Change-Id: I48cd49f0fee54131a738290e2a70a24d33ba1d22
Reviewed-on: https://code.wireshark.org/review/5290
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-14 10:28:22 +00:00
Michal Labedzki ad1977bc19 Qt: Fix non-translate-able text
Change-Id: I8c2376117ca1ac92c341ba938929af2d13e23f72
Reviewed-on: https://code.wireshark.org/review/5291
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-14 10:27:34 +00:00
Michal Labedzki 6d678fffc5 Qt: Fix typo
Change-Id: Idc2b945ac3bd5de961cc9c581398dc12f6831070
Reviewed-on: https://code.wireshark.org/review/5292
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-14 10:27:08 +00:00
Michal Labedzki 38218dfc57 Bluetooth: AVRCP: Improve command/response trancing
Make command/response tracking field filterable and jumpable.

Change-Id: Ib0dfc9ea9954f8d29d06ceda3d44a7f95c94bc53
Reviewed-on: https://code.wireshark.org/review/5288
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-14 10:26:29 +00:00
Michal Labedzki 5a46f2652b Bluetooth: AVRCP: Fix swappend SongPosition and SongLength
SongPosition and SongLength are swapped in Info column. Fix it.

Change-Id: I4c9bece51dbfe62885e8426a8aef07f336670099
Reviewed-on: https://code.wireshark.org/review/5287
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-14 10:25:56 +00:00
Michal Labedzki 6e44997584 Bluetooth: AVDTP: Add possibility to force decode as APT-X
Change-Id: Id99647846c9bc7666f33938c811358576353390d
Reviewed-on: https://code.wireshark.org/review/5286
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-14 10:25:31 +00:00
Alexis La Goutte 2986388fde dtd_preparse : fix indent (Use tabs)
Change-Id: Iec6ef7109ccea8a164db4f62af9fae1dceba6ae6
Reviewed-on: https://code.wireshark.org/review/5282
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-14 09:58:18 +00:00
Alexis La Goutte 2788df9bb5 Gtk Utils: fix unknown command tag name 'parm'; did you mean 'param'? (-Wdocumentation)
Change-Id: I89f242bf916d22e0a4a665696ec3fe5ee02b8a1f
Reviewed-on: https://code.wireshark.org/review/5283
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-14 09:57:43 +00:00
Michael Mann 6e535a8b71 Multipath TCP checksum requires M flag set as well as enough option length.
Bug: 10692
Change-Id: I8d9874a2c0a6b98497d43804bcf27a8c7e152a9b
Reviewed-on: https://code.wireshark.org/review/5275
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-14 03:46:23 +00:00
Michael Mann 4a7dd62012 Always create a subtree for Mobility options, even if it doesn't have a specific dissection function.
Bug: 10618
Change-Id: Ic4d52485a6bd96f906b4a0d61b75a31bfad4e8f8
Reviewed-on: https://code.wireshark.org/review/5276
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-14 03:43:37 +00:00
Ryan Doyle c2e090f2cf Dissector for elasticsearch protocol
Provides dissection for the elasticsearch protocol. This includes full
dissection of the multicast discovery protocol, the HTTP query interface
and partial dissection of the binary protocol.

Change-Id: I738fb498976e44fa05168c2bc3a7e842a9e96df9
Reviewed-on: https://code.wireshark.org/review/4948
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-14 03:26:47 +00:00
Sven Eckelmann 4cc4315793 batadv: Add dissector support for batadv v15
The packet format for batman-adv v15 supports:

 * Complete reordered packet type ids
 * reordered flags
 * type-version-length-value data containers
 * new types for coding packets and unicast transfer of TVLVs
 * dropped packet types for vis, translation table query and roaming
 * reordered packet formats
 * transparent fragmentation of batadv packets

Change-Id: I9e6733f9dd6b54eeecda19cf570599161d28b46e
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
Reviewed-on: https://code.wireshark.org/review/5175
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-11-14 01:40:29 +00:00
Lukas Emersberger 9cc9028e36 epl: Duplicated Frames
Remake of the duplicated frames filter with
  less memory usage.

Change-Id: I7c8694b5ae69c919b866bbc661bad5e3f0a3e1d7
Reviewed-on: https://code.wireshark.org/review/4773
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-14 00:44:40 +00:00
Guy Harris ab7f35da44 hf_cc_loss is supposed to be a floating-point value, divided by 65535.
That's what the code did when it used proto_tree_add_text(); make it do
so now.  That squelches a run-time error.

Reformat the script-added hf_ values while we're at it.

Change-Id: I48d16280c523faa3b266e8df37f5e0e0b2827712
Reviewed-on: https://code.wireshark.org/review/5270
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-13 08:43:51 +00:00
Guy Harris 67f86dd8cd Get rid of spaces before tabs.
Change-Id: I70ff250a905ac578d7e3afc63a82a5fcb3983608
Reviewed-on: https://code.wireshark.org/review/5269
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-13 05:22:36 +00:00
Michael Mann d1ccc338d6 Add dissector table for sFlow header dissection.
Change-Id: I189a5b2d5f769395fa5e387f8be49b81903fb252
Reviewed-on: https://code.wireshark.org/review/5262
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-11-13 05:21:52 +00:00
Guy Harris 17798bc70b Handle duplicate attribute and TLV entries specially.
For attributes, handle them the same way we handle duplicate vendors.

For TLVs, ignore duplicates; they shouldn't happen.

Change-Id: Ie968478c40a9b7848fa8ea25b144eda8656e5874
Reviewed-on: https://code.wireshark.org/review/5268
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-13 05:20:09 +00:00
Michael Mann f8e24c9fdc Eliminate proto_tree_add_text for some dissectors.
Change-Id: Ide14bcac0b1563bee4260ac9c1a280ba99e97e71
Reviewed-on: https://code.wireshark.org/review/5261
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-11-13 05:17:36 +00:00
Guy Harris 0515087b46 Handle new vendors and changes to vendors differently.
If, when adding a new vendor, we already find a vendor with the given
ID, don't bother adding it to the vendors-by-ID table with the same ID,
and, if and only if the vendor name has changed, remove it from the
vendors-by-name table, free the old name, replace it with the new name,
and, add it back to the vendors-by-name table with the new name.

Bug: 10666
Change-Id: I43ebcb57c742563157c71b01ebc0b35797a408e1
Reviewed-on: https://code.wireshark.org/review/5265
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-13 03:02:01 +00:00
Guy Harris f598fa89eb Squelch a compiler warning.
Some compilers complain that we're casting a 16-bit integer to a
pointer; making it a standard-size integer squelches the warning.

Change-Id: Iba0e767d7801afdc369b64a1cf050bf8db37da7b
Reviewed-on: https://code.wireshark.org/review/5264
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-13 02:11:33 +00:00
Gerald Combs f7d91bd29f Qt: Flatten group boxes.
As discussed in change 5185, the "big 3" HIGs discourage the use of
traditional group boxes. Flatten our existing ones.

Change-Id: I68ef4aa9fd0f69a42750bf735df2250a468bfb2d
Reviewed-on: https://code.wireshark.org/review/5263
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-12 22:42:46 +00:00
Michael Mann 6df5252c2c Add Decode As functionality for MPLS PW Associated Channel Type.
Add CFM and MPLS dissector as possible decoders.

Bug: 10574
Change-Id: Ic39c6b8d68b965ff9d342f5ee789a8eff3134a5a
Reviewed-on: https://code.wireshark.org/review/4935
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-11-12 20:53:45 +00:00
Alexis La Goutte ae1630db71 Fix warning: no previous prototype for function ... [-Wmissing-prototypes]
warning coming after g055e4768ece and g421913b721

Change-Id: I5caeeb89c559faef8007f2946c68c7172b75dfa8
Reviewed-on: https://code.wireshark.org/review/5250
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-12 20:53:01 +00:00
AndersBroman 54aea45633 [Art-Net]
- The heuristic chek was missing "e" out of "Art-Net\0"
- tvb_length() - tvb_captured_length()

Change-Id: Iad9900f3a22e2fdbd0d6056efc1af90511cc458a
Reviewed-on: https://code.wireshark.org/review/5257
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-12 13:23:14 +00:00
Alexis La Goutte 63cf93925c ADB: fix warning: no newline at end of file [-Wnewline-eof]
Warning found by Clang

Change-Id: I7b801808aefa294e32fff560ea1a49620f0e0ea0
Reviewed-on: https://code.wireshark.org/review/5249
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-12 12:01:18 +00:00
Dario Lombardo 2043c9d0eb Updates in it translation.
Change-Id: I9e90fca521f17f4ae49e132990f77b2610807e6d
Reviewed-on: https://code.wireshark.org/review/5248
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-12 11:28:18 +00:00
Alexis La Goutte f2d94e1b2a PIM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I1540c7878692625a9e38b48f8681c07bab852a64
Reviewed-on: https://code.wireshark.org/review/5234
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-12 03:43:23 +00:00
Jeff Morriss 219cf304c1 Fix SMPP timestamp decoding when the current date/time's offset to UTC is
different from the timestamp's offset to UTC.

The fix for bug 6712 ignored the fact that daylight savings will affect the
offset from UTC--and whether daylight savings is in effect today might be
different than whether it was in effect in the timestamp we're decoding.

Bug: 10672
Change-Id: Ie513c361cff41007f2328cd9ca9ca4800ffef500
Reviewed-on: https://code.wireshark.org/review/5245
Petri-Dish: Michael Mann <mmann78@netscape.net>
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-12 03:33:15 +00:00