Commit Graph

55958 Commits

Author SHA1 Message Date
Bill Meier 2898f13a99 cip: Access FT_UINT16 hf_cip_sc_create_instance with proper encoding-arg.
Specifically: Use ENC_LITTLE_ENDIAN (not ENC_NA) to match all
              other integral fetches in the cip dissector.

Change-Id: I5d330084168493f53135dbb97674a2dba9ed7477
Reviewed-on: https://code.wireshark.org/review/5732
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-12 16:30:05 +00:00
Bill Meier 64cb5104d6 Change ENC_NA to ENC_BIG_ENDIAN for all fetches of integral type fields.
Change-Id: Ia4f5735c61eedcbe8354eabd5da05d02e167f25e
Reviewed-on: https://code.wireshark.org/review/5734
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-12 15:33:36 +00:00
Bill Meier 29c1b58f3c rsvp: Convert encoding-arg ENC_NA to ENC_BIG_ENDIAN for all integer fields
Change-Id: Ib0f863f08a3ef420832cc05e988b5bc64ff0b121
Reviewed-on: https://code.wireshark.org/review/5731
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-12 15:31:51 +00:00
Pascal Quantin 76c5568e28 Riemann: fix compilation
Change-Id: I0cf069860715fd6781a613478c29a7e7ed224733
Reviewed-on: https://code.wireshark.org/review/5735
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-12 15:31:21 +00:00
Pascal Quantin 8e96830156 LPP: avoid doing an out of bound access in case the PER decoding gives an invalid value
Bug: 10773
Change-Id: I4fcde84d7be1e42729b6ec0763064e9885951468
Reviewed-on: https://code.wireshark.org/review/5729
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-12 14:26:05 +00:00
Pascal Quantin a2a6e31532 Riemann: fix "Decode as" feature
the UDP port value check seems useless when the port is configured in the preferences, and prevents "Decode as" to work as expected

Change-Id: I5a059d05a9e980c2c60d8f84deae1b5bd9d466d3
Reviewed-on: https://code.wireshark.org/review/5727
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-12 12:56:31 +00:00
Alexis La Goutte bd4d291d1b Qt: Move Follow TCP, UDP, SSL to a Follow folder (like when right click)
Change-Id: I24213aa4f9f134a05b1344e160e5688ce9c495cf
Reviewed-on: https://code.wireshark.org/review/5508
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-11 23:15:11 +00:00
Gerald Combs 1ce64e75ab CMake: Make it easier to generate the release notes & NEWS.
Add convenience targets for generating the release notes and the NEWS
file. Make sure we don't run multiple instances of a2x + AsciiDoc at the
same time.

Add the docbook directory to the build by default unless we're running
Windows. Explain why we don't yet build docs on Windows. Make each
docbook makefile target optional.

Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and
ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on.
Remove the Debian patch that hacked around the PDF requirement.

Copy ws.css to the docbook build directory. Don't build PDF release
notes. I'm not sure we ever used them and I don't want to install Java
and FOP just to make a release.

Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553
Reviewed-on: https://code.wireshark.org/review/5712
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-11 21:41:44 +00:00
Bill Meier 425bc304fe eth,mp2t: Rename ei[] filter names duplicating hf[] filter names.
Change-Id: I1a9e8344866ce5a5bbd48b07c49baa398ce161f7
Reviewed-on: https://code.wireshark.org/review/5724
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-11 19:08:17 +00:00
Bill Meier 8f56378a79 rsvp: Fix dup display-filter name possibly leading to crash if used.
Change-Id: I8b903fb1137800a84473a82cff9c45f965cb869f
Reviewed-on: https://code.wireshark.org/review/5723
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-11 19:07:42 +00:00
Yann Lejeune 0ef1aef2df BGP: add support of RFC6368 - Internal BGP as the Provider/Customer Edge
Protocol for BGP/MPLS IP Virtual Private Networks (VPNs).

Bug: 10762
Change-Id: Ifbe2af639ee5a2d96ec3546708060cadcc349df2
Reviewed-on: https://code.wireshark.org/review/5664
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-11 13:55:22 +00:00
Yann Lejeune 9036f09335 BGP: extract the bgp path attribute dissection to a dedicated function.
Change-Id: I228f1402007d8570bfdeb0105ce5e89c48357481
Reviewed-on: https://code.wireshark.org/review/5721
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-11 13:55:13 +00:00
Alexis La Goutte 7d905beb6e GSM BSSMAP LE: fix indent (use tabs)
Change-Id: Ic05a52d095fd581150fc69ca8d2a0e05eaddf81a
Reviewed-on: https://code.wireshark.org/review/5722
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-11 12:18:45 +00:00
Alexis La Goutte 772fbfb98b GSM a BSSMAP : fix warning: no previous prototype for 'dissect_bssmap' [-Wmissing-prototypes]
Change-Id: Ibc03864498cb88e93cb3f774d1f4987aa10dd32e
Reviewed-on: https://code.wireshark.org/review/5720
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-11 12:16:21 +00:00
Alexis La Goutte 230ce3030b GSM bssmap le: fix warning: no previous prototype for 'dissect_bssmap_le' [-Wmissing-prototypes]
Change-Id: Ifa8c7a15dfb37cf1dbd2f539dd0bbc87e6da1aea
Reviewed-on: https://code.wireshark.org/review/5719
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-11 12:09:45 +00:00
Alexis La Goutte def4313380 6lowpan : fix warning: no previous prototype for 'lowpan_context_free' [-Wmissing-prototypes]
Change-Id: I3fa66aa0713a0455639b04ecf129f48baa8c096f
Reviewed-on: https://code.wireshark.org/review/5718
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-11 12:09:05 +00:00
Martin Kaiser b7f8cd8a5d skip the extra field in the gzip header
it consists of two bytes xsize + xsize bytes of data

use an unsigned type for xsize

fail gracefully if the field is present but truncated

tvb_length_remaining > tvb_captured_length_remaining

Change-Id: I7f5138743c2d88abdd4f5f18d3c0292612ddb559
Reviewed-on: https://code.wireshark.org/review/5654
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-11 09:39:18 +00:00
AndersBroman 5570f8e24b [SIP] Try to fix another corner case of reassembly.
Change-Id: I38a80ebcadf0ef6d7fada692753188f2a6c3515b
Reviewed-on: https://code.wireshark.org/review/5717
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-11 09:33:50 +00:00
Guy Harris 339df3d96d Add a heur_dissector_table_foreach() function.
This is, for heuristic dissector tables, the equivalent of
dissector_table_foreach() for keyed dissector tables.

Change-Id: I4b2f870e1c1179fda1adddd93930b83aaaaf8763
Reviewed-on: https://code.wireshark.org/review/5715
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-11 04:16:33 +00:00
Guy Harris 151164d414 Give dissector_all_heur_tables_foreach_table() a sort function.
This makes it a bit more like dissector_all_tables_foreach_table.

Improve comments and clean up whitespace while we're at it.

Change-Id: I5147427f864add285e3bb6cb35ad9fa83bea516c
Reviewed-on: https://code.wireshark.org/review/5714
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-11 03:05:22 +00:00
Guy Harris 9855beff31 Make the type of the second argument to a DATFunc_heur_table explicit.
It's always pased a heur_dissector_list_t *, so give it that type,
rather than having it be a generic pointer.

Change-Id: Ia6a045bb1b96c2f6ef3e23f27928e0b52f7cfb9f
Reviewed-on: https://code.wireshark.org/review/5713
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-11 01:51:07 +00:00
Guy Harris 144855ce6d Fix a comment.
Change-Id: I46885d028fe9ff5254baefc15283626b9bdb6bce
Reviewed-on: https://code.wireshark.org/review/5711
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-11 00:23:06 +00:00
Pascal Quantin 2f8030f85a LCSAP: fix dissection of negative longitude and latitude
Bug: 10767
Change-Id: I4ab0ffd3bd22f1884895f3118673b433d980de2f
Reviewed-on: https://code.wireshark.org/review/5704
Reviewed-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: Anders Broman <a.broman58@gmail.com>
2014-12-10 20:03:41 +00:00
Alexis La Goutte 088e5fe399 GPRSCDR: Remove from Dirty ASN1 list
Change-Id: I0d19836aa63ac77a1b19aec0ae66921bf4770005
Reviewed-on: https://code.wireshark.org/review/5707
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-10 20:02:34 +00:00
Alexis La Goutte 0980dd5102 GPRSCDR: fix warning: 'dissect_gprscdr_MBMSInformation' defined but not use
Change-Id: I4bdbaeb3c1e3327af6f5e3de22ebcd4472b9f3e7
Reviewed-on: https://code.wireshark.org/review/5706
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-10 20:02:02 +00:00
Gerald Combs dc289d77c4 Update the release notes.
Add a note about HiDPI / retina. Remove the Kerberos known problem.

Change-Id: I452bc5ed9db51f7bf32b25eab39371fafd3102aa
Reviewed-on: https://code.wireshark.org/review/5708
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-10 19:56:06 +00:00
Gerald Combs 3f08a85819 1.99.1 → 1.99.2.
Change-Id: Ie2e9e81ce1b1d876ae550fc0c17c4367aaa35d98
Reviewed-on: https://code.wireshark.org/review/5705
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-10 19:17:18 +00:00
Gerald Combs 4c229ca40d Build 1.99.1.
Change-Id: Ic6dcbfc880817ad4bcc07a21ec88d14c8c92df58
Reviewed-on: https://code.wireshark.org/review/5703
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-10 17:36:42 +00:00
Michael Mann a971768530 Refactor "color" conversation filters
Have dissectors register their desire to be part of "color" conversation filters and have the GUI use that registered list.  GUI actually using API will come in a separate commit.

Change-Id: I5ffe922d97894fe7bf3182056b76ab5839a9461a
Reviewed-on: https://code.wireshark.org/review/5658
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-10 09:04:00 +00:00
Michael Mann e050ad27a4 Eliminate some proto_tree_add_text in packet-bgp.c
Change-Id: I05fabe9786125e2167fe4010733f61000d0e7914
Reviewed-on: https://code.wireshark.org/review/5670
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Matthieu Texier <matthieu@texier.tv>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-10 08:50:27 +00:00
Guy Harris d4476b1c4e Expose find_heur_dissector_list().
We already have find_dissector_table(); expose
find_heur_dissector_list() as well, so that heuristic dissector lists
can be shared.

Change-Id: I3f50413b8b10fd3129fcdc2344cb1447f0946ce9
Reviewed-on: https://code.wireshark.org/review/5701
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-10 08:39:44 +00:00
Sergey Avseyev bd8d2f583d packet-couchbase.c: dissect more DCP commands
Change-Id: I0e06c89cdda3c1f8e98412fd20737ff6afd26666
Reviewed-on: https://code.wireshark.org/review/5694
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-10 07:23:49 +00:00
Sergey Avseyev c46fa33b41 Riemann protocol dissector
Homepage: http://riemann.io/

Sample capture:
http://files.avsej.net/riemann-sample.pcapng

Protocol definition:
https://github.com/aphyr/riemann-java-client/blob/master/src/main/proto/riemann/proto.proto

Implementor's guide:
http://riemann.io/howto.html#write-a-client

Bug: 10758
Change-Id: I28634453423127fe647eb92e48072a90a7f5d232
Reviewed-on: https://code.wireshark.org/review/5620
Reviewed-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: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-10 07:16:43 +00:00
Pascal Quantin 1f8b16e7ea ICQ: fix icq.meta_user.found_authorization field registration
Change-Id: I8c39073b8d1237f8af7f7061f331b3d59ae81142
Reviewed-on: https://code.wireshark.org/review/5699
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-10 06:43:00 +00:00
Pascal Quantin f64f7c6569 NFS: do not duplicate field name in blurb
Change-Id: I565823e2ba3c712506710f911e118cd48c895523
Reviewed-on: https://code.wireshark.org/review/5698
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-10 06:42:42 +00:00
Michael Mann 4af7482baf Eliminate proto_tree_add_text from packet-icq.c
Change-Id: I2f4bcd8c4a6cf534bb5b6b5c5aa7e21075968ee3
Reviewed-on: https://code.wireshark.org/review/5696
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-12-10 06:00:20 +00:00
Bill Meier c449b43a63 nfs: expert...() shouldn't be called under 'if(tree)'
Change-Id: I4f8c55ea4194d1246ea19368e0f5890ad1248f47
Reviewed-on: https://code.wireshark.org/review/5697
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-10 04:51:14 +00:00
Tigran Mkrtchyan dff05c9057 nfs: decode dCache NFS file handle
add support for dCache NFS/pNFS
project page: http://www.dcache.org

Bug: 10765
Change-Id: I24a88419ec070305e609d1b49b44994a464eb098
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
Reviewed-on: https://code.wireshark.org/review/5236
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-10 04:19:28 +00:00
J. Bruce Fields 8375a669f2 nfs: fix failure to parse EXCHANGE_ID arguments
The exchange_id spo_must_enforce/spo_must_allow bitmaps are exceeding
this arbitrary MAX_BITMAPS constant, causing EXCHANGE_ID parsing to
fail.

Even in the case of attributes we may need more than 4 words soon, even
if we don't I'm not sure if it's actually illegal to zero-pad them out
to something longer, and even if that is illegal I don't think it's
really helpful of wireshark to stop parsing.

Keep the constant just as a sanity check but make it really large.

Ping-Bug: 10649
Change-Id: I3dff3ebde2d7f74f8cbe60a92c853463da66ae6a
Reviewed-on: https://code.wireshark.org/review/5144
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-10 04:08:23 +00:00
Gerald Combs e4b0141769 Qt: Obey main toolbar icon preferences.
Remove the preferences for the filter toolbar and mark them GTK+-only.

Change-Id: Ie48b19aee29a1cfcea4c41ca6c08ddbba3102377
Reviewed-on: https://code.wireshark.org/review/5693
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-10 01:51:09 +00:00
Guy Harris c1d4a08777 Add media playback icons.
Change-Id: I5a9ba1314b0c93098e7b802618f73c7fca608b04
Reviewed-on: https://code.wireshark.org/review/5692
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-09 23:15:28 +00:00
Pascal Quantin 34cd063ae8 LTE RRC: upgrade dissector to v12.3.0
Change-Id: Iac974bf505bed270fc1f9409a7d61c80ebca17a5
Reviewed-on: https://code.wireshark.org/review/5691
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-09 22:48:23 +00:00
Gerald Combs 4921e55990 Qt: Initial VoIP Calls dialog.
Add Telephony menu items for VoIP Calls and SIP Flows. Put VoIP Calls at
the top, since that seems to be the primary item.

Add configure-time checks for QtMultimediaWidgets in anticipation of
adding a VoIP playback dialog.

Add an icon for the playback button. (Yes, I've been avoiding
GNOME-level gratuitous icons so far but this is one of the rare
occiasions where it makes sense.)

Add a help link define for the VoIP calls dialog.

Change-Id: I5d0799685c598ad9af76fe9667f8ea7d14b66050
Reviewed-on: https://code.wireshark.org/review/5674
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-09 21:25:33 +00:00
Gerald Combs 3147087de3 Fix ranlib "has no symbols" errors in the codecs directory.
Don't build the G.722 or G.726 codecs for now. Each are wrapped in
"#ifdef HAVE_SPANDSP", which we don't define.

Conditionally compile the SBC codec.

Change-Id: I5f09ff66514f967d4f0611c943b4e6a975b8994b
Reviewed-on: https://code.wireshark.org/review/5690
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-09 21:25:19 +00:00
Gerald Combs f66de3a749 Fix filename matching.
Change-Id: I2bdfd3ad2798ed1443d06c42b05c9962b8e8041d
Reviewed-on: https://code.wireshark.org/review/5689
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-09 19:26:02 +00:00
Gerald Combs bcaa5d84b1 Qt: Update and rename the summary dialog.
Go back to a single view similar to the GTK+ UI. Apply layouts using Qt
Designer.

Rename the menu item and class to "Capture File Properties". It's not
really a summary if it contains details such as "marked average bits
per second". We might want to move this to a "Properties" item under
the "File" menu similar to other applications.

Add the GTK+ summary icon (for now) to the toolbar and open the
properties dialog on clicking.

Singleton dialogs delenda est[1]. Let the user open as many summaries on
as many capture files as he or she wishes. Also, global cfile delenda
est[2].

Don't blindly include QtGui. Add specific components instead.

Use consistent method names, variable names, and patterns. Try to
document what "consistent" means.

Adjust the way we display some statistics to match the summary bar, e.g.
displayed = captured if we don't have a filter applied.

[1] Not really.
[2] Yes, really.

Change-Id: I11793b1d79dd0c3f70414ac8592b86181da59916
Reviewed-on: https://code.wireshark.org/review/5274
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-09 19:02:41 +00:00
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