Commit Graph

55662 Commits

Author SHA1 Message Date
Guy Harris 25f950eca9 Add tshark -G dissector-tables to dump a list of dissector tables.
That list doesn't show the entries in the dissector tables, just
information about the tables themselves.

Clean up some tshark man page issues while we're at it.

Change-Id: I70beee34110f5c0d58105944dd71105a8400f5ca
Reviewed-on: https://code.wireshark.org/review/5360
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-17 02:26:57 +00:00
Michael Mann 57b72275b7 Eliminate proto_tree_add_text by formatting field hf_opcua_ByteString in a few places.
Change-Id: I9606aa36b7d7b6bb2ef2e7685e6629163ca83ef7
Reviewed-on: https://code.wireshark.org/review/5312
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: Evan Huus <eapache@gmail.com>
2014-11-17 01:04:57 +00:00
Jeff Morriss 14bc6d88b1 Remove some ununused/unmatched <resources/> tags.
Change-Id: I0f8e4381b27d1defeb5980692823d297d2f48bab
Reviewed-on: https://code.wireshark.org/review/5349
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-17 00:59:40 +00:00
Pascal Quantin cacbffe085 PortableApps: ensure that the personal folder is set to the App directory
Otherwise the portable version ends up loading the user local personal profile

Change-Id: Ib670c065319b0dd9673f239ae9459f6ee530f69e
Reviewed-on: https://code.wireshark.org/review/5351
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-17 00:58:34 +00:00
Alexis La Goutte e26e1dc543 BATMAN: fix indent and encoding args
use tabs for indent and use fix-encoding-args tools

Change-Id: I5e066c6cbc429021cf21a55d5ffd5b60718ad5f8
Reviewed-on: https://code.wireshark.org/review/5340
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-17 00:55:42 +00:00
Guy Harris 9d0085f2cc Make sure the NLPID appears in the protocol tree.
For protocols for which the NLPID is not considered part of the PDU, put
the NLPID into the protocol tree ourselves.

Bug: 10706
Change-Id: I2676d1934dd468ec755a6f94d95a23f025ba0f25
Reviewed-on: https://code.wireshark.org/review/5358
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-16 23:24:31 +00:00
Guy Harris 08a9478b90 Fix a comment to reflect reality.
Change-Id: I812b0246368266c76f7fe9ef355619603c5d37b0
Reviewed-on: https://code.wireshark.org/review/5357
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-16 23:00:16 +00:00
Alexis La Goutte 7b558dd105 Add unused-const-variable (enable by default on new clang release)
Change-Id: I1d882e02188ba38ec1b5583c5933d0c92f0539e4
Reviewed-on: https://code.wireshark.org/review/5068
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-11-16 17:25:58 +00:00
Alexis La Goutte 05acb679aa mcast_stream: fix indent (use 4 spaces)
Add also modelines info

Change-Id: Idea65bfa25ce8a379c590074ab89a06f935c6648
Reviewed-on: https://code.wireshark.org/review/5344
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-16 17:23:56 +00:00
Alexis La Goutte 7213ad53f8 rtp_stream: fix indent (use 4 spaces)
Add also modelines info

Change-Id: I4c4c6d7e292ba387aacb3f71afcac756b2875847
Reviewed-on: https://code.wireshark.org/review/5345
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-16 17:23:08 +00:00
Alexis La Goutte b867baf800 BATMAN: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I6cfabc18921397002a2303f3511fa51bf5b41956
Reviewed-on: https://code.wireshark.org/review/5341
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-16 17:18:35 +00:00
Alexis La Goutte 9f0fb57a43 RADIUS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I5127b737c0d9db08c61a70bb6c16fef030d39f83
Reviewed-on: https://code.wireshark.org/review/5339
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-16 17:16:30 +00:00
Gerald Combs 0cc6a7e057 [Automatic manuf, services and enterprise-numbers update for 2014-11-16]
Change-Id: Ie677285f75a7ef0390d93469a4f97eaad813fdc0
Reviewed-on: https://code.wireshark.org/review/5346
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-16 16:06:54 +00:00
Alexis La Goutte 7f7d566518 btavdtp: Add missing break;
Issue found by Clang Analyzer:
Value stored to 'codec_dissector' is never read

Change-Id: I7a9fc5e3ffd04c77cbbb8d5e5b885d8a29468cfd
Reviewed-on: https://code.wireshark.org/review/5330
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-11-16 14:56:25 +00:00
Michael Mann b12be8486f Remove file_type_subtype member from packet_info.
Just pass the necessary data to the frame dissector.

Change-Id: I1a4bab32f7b5e28f4e7707794d71b04dab388908
Reviewed-on: https://code.wireshark.org/review/5328
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-16 13:46:59 +00:00
Michael Mann d1696a6569 "Bubble up" the use of pinfo->circuit_id and pinfo->ctype to make it more obvious where in used in hopes that it can be eliminated through passing dissector data (or methods other than using packet_info)
Change-Id: Ib0e7efc123a3f9c06f58b5579c3c25b18818205c
Reviewed-on: https://code.wireshark.org/review/5326
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-16 13:46:07 +00:00
Michael Mann f92ed4df2d Remove ipproto member of packet_info.
All situations can be handled with "shimmed" dissector functions.

Change-Id: Ic85483b32d99d3270b193c9f6b29574d8fad46a8
Reviewed-on: https://code.wireshark.org/review/5327
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-16 13:45:18 +00:00
Alexis La Goutte 3b8ed366dd DNS: NAPTR RR Replacement Length is incorrect
It seems the Replacement Length field calculated by Wireshark (which Wireshark calls "rReplacement Length"), is the length of the first label of the DNS name in the Replacement, instead of the entire DNS name length.

Issue found by Boaz

Bug:10700
Change-Id: I8b726f3a3bf316d688a40c3ade100d255ca3be42
Reviewed-on: https://code.wireshark.org/review/5300
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-16 11:03:58 +00:00
Gerald Combs 4960171c3a VoIP calls: Fixup whitespace.
Set modelines and reindent to match the files in the top-level ui
directory.

Change-Id: I7ea221e76a4b0ad3b6bcf7a3c8b4645c16aecbba
Reviewed-on: https://code.wireshark.org/review/5325
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-15 18:39:11 +00:00
Gerald Combs 51c5b7a937 VoIP calls: Start separating common and GTK+-dependent code.
Remove more calls to voip_calls_get_info. Get rid of the global cfile.
Lowercase more function names.

Change-Id: Ieda779779cce9f05e07c54314bceab4a18bae22f
Reviewed-on: https://code.wireshark.org/review/5324
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-15 18:14:08 +00:00
Robert Grange 7f3f4a5307 paquet-mq: Eliminiate proto_tree_add_text
Eliminate proto_tree_add_text for Expert Info
Improve PCF Parameters numeric value display

Change-Id: Ibc259ba05d0591d434e7638d91d6943101d45305
Reviewed-on: https://code.wireshark.org/review/5080
Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
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-15 15:56:38 +00:00
Gerald Combs d550b17984 VoIP calls: Use our tap offsets.
Add convenience functions to convert between tap IDs and tapinfo
pointers. Use them to get rid of some calls to voip_calls_get_info().

Lowercase function names. Remove more exit()s.

Change-Id: I187fdc505bc22cc05edafed9e97ede8279ea53f9
Reviewed-on: https://code.wireshark.org/review/5321
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-15 05:23:41 +00:00
Guy Harris 0be9e7d3da 0.0 is a double, 0.0f is a float.
Change-Id: I882bbda2c579cfd7a1b96ce190541262193405e0
Reviewed-on: https://code.wireshark.org/review/5320
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-15 03:38:20 +00:00
Gerald Combs 3428361a26 Fix a pointer type.
Change-Id: I5cc67fa320b3241d6793575d59e49160ef40b260
Reviewed-on: https://code.wireshark.org/review/5319
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-15 03:31:11 +00:00
Gregor Miernik 3275ba2653 LLDP: Dissector for Hytec specific extensions added
It provides dissection of objects with additional neighbor and link information
defined by Hytec (pcap example available on wiki.wireshark.org/HYTEC).
Also OUI of "Hytec Geraetebau GmbH" added.

Change-Id: I92119e46fd5f4c4b385ac3df3170a4766fe056b7
Reviewed-on: https://code.wireshark.org/review/5107
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-15 03:19:17 +00:00
Gerald Combs 1e2a3dcb94 VoIP calls: Clean up tap registration and removal.
Start moving away from a global voip_calls_tapinfo_t. Pass the
voip_calls_tapinfo_t struct address to each registration and removal
routine.

All of the tap registration and removal routines are called at the same
time. Replace the individual registration tracking booleans with a
central one.

Calling exit() from the GUI is rude. Don't do that.

Change-Id: I9535002e2905a45a8cfc9643590b5d2d360ffc24
Reviewed-on: https://code.wireshark.org/review/5318
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-15 01:33:41 +00:00
Michael Mann 62fd2acc96 Eliminate proto_tree_add_text from some plugin dissector files.
Change-Id: Ib2d900833a8763307be6b1cfc8df20d7019d2706
Reviewed-on: https://code.wireshark.org/review/5313
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-15 00:41:10 +00:00
Gerald Combs ba3bc1e726 VoIP calls tap ID cleanup.
Remove all of the public dummy members from voip_calls_tapinfo_t. Use
pointer arithmetic to generate private, unique IDs instead.

We weren't removing the SUA listener. Do so. Use the correct M3UA ID.

Change-Id: I8e8cdb6addbc4868aebc004be20a2f57b4acf75b
Reviewed-on: https://code.wireshark.org/review/5315
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-15 00:31:19 +00:00
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