Commit Graph

56468 Commits

Author SHA1 Message Date
Michael Mann 5d610b58c5 Remove decode_numeric_bitfield.
It was only used by 1 dissector and that dissector can just use bitmasking in the hf_ field.

Change-Id: I99179356dd7cbfab0c7be1512357a7e4c0eecde6
Reviewed-on: https://code.wireshark.org/review/6390
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08 05:46:26 +00:00
Michael Mann 4a5ca5c76e bytes_to_ep_str -> bytes_to_str
Change-Id: Ifcda8328dedec0ef4104c3a124d6246f99493750
Reviewed-on: https://code.wireshark.org/review/6389
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08 05:43:51 +00:00
Michael Mann 2209678149 ep_<protocol>_port_to_display -> <protocol>_port_to_display
Adjust any other ep_ related APIs related to the transition.

Change-Id: I961b371c2c4bda557e0f1817705c27eef0dae66c
Reviewed-on: https://code.wireshark.org/review/6388
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08 05:32:32 +00:00
David Ameiss 907d145f86 Various minor updates to the LBM dissectors.
Change-Id: I36954ea0d8b525b4d7a1b3407f9e9d0e1c9bbd67
Reviewed-on: https://code.wireshark.org/review/6378
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>
2015-01-08 02:15:26 +00:00
Bill Meier d245f38c12 packet-irda.c: Add editor modelines
Change-Id: I626b60a185e750af94306892cd41dc8729920cfd
Reviewed-on: https://code.wireshark.org/review/6393
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-08 01:52:56 +00:00
Guy Harris 6edb27b58e FT_DOUBLEs are 8 bytes; use FT_FLOAT for 4-byte floating-point values.
Change-Id: Ia39f8604229df18e1cdbbf81b78cd423e70f0f3c
Reviewed-on: https://code.wireshark.org/review/6386
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-08 00:50:56 +00:00
Luke Mewburn 8f1b82b0aa Set the (GT) address even if the message is routed by SSN.
If sccp.set_addresses is enabled, always SET_ADDRESS to the GT
if the GT is present, not just if ROUTE_ON_GT.  This fixes TCAP
session handling in some situations.

Change-Id: Ic088a4de408303a34c17c42820602ed6bf113840
Reviewed-on: https://code.wireshark.org/review/6053
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-07 23:10:33 +00:00
Guy Harris 5e8c053d68 Squelch a compiler warning.
No need for buflen to be bigger than len, which it will be on LP64 and
LLP64 platforms if it's size_t and len is guint32.

Change-Id: Iffd2940187180cde1ad55ff7d3bd7c45acf22eba
Reviewed-on: https://code.wireshark.org/review/6380
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-07 19:43:40 +00:00
Alexis La Goutte ccce7abaf4 capture file dlg (GTK): Nesting level does not match indendation (CID 1159217)
Change-Id: I9ae1862993a3a9d10bd7575295b08c91752cb77f
Reviewed-on: https://code.wireshark.org/review/6375
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-07 18:35:50 +00:00
Alexis La Goutte d3f67c16d4 S5066DTS: Nesting level does not match indendation (CID 1159211 & 1159212)
Change-Id: I8145696de995e821793e7bc1576d5a5673c7b503
Reviewed-on: https://code.wireshark.org/review/6377
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-07 18:32:22 +00:00
Alexis La Goutte a6ba632ec3 BTLE: Nesting level does not match indendation (CID 1261651)
Change-Id: I11e436ca91c766edc8e85fd2402e61a17465bee2
Reviewed-on: https://code.wireshark.org/review/6373
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 18:20:53 +00:00
Michael Mann 64a7bac641 tvb_bytes_to_ep_str -> tvb_bytes_to_str
Change-Id: I79c613cbdd8dc939dd4c29ebc477fb6eefd5bfc4
Reviewed-on: https://code.wireshark.org/review/6371
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 18:16:23 +00:00
Michael Mann 98d3b1494b Replace bytes_to_ep_str_punct with wmem equivalent.
Change-Id: I8aa7d7374db94685fd875cbf358c3bfbc83f3255
Reviewed-on: https://code.wireshark.org/review/6370
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 18:12:35 +00:00
Michael Mann 9cfe67fde6 tvb_bytes_to_ep_str_punct -> tvb_bytes_to_str_punct
Also change bytestring_to_str to match bytes_to_ep_str_punct functionality (limiting byte string size)

Change-Id: Idb958c7f0c203d103629469302b81fa922714f7e
Reviewed-on: https://code.wireshark.org/review/6369
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 18:05:35 +00:00
Michael Mann 493f03b420 Remove bytestring_to_ep_str
Use wmem equivalent bytestring_to_str

Change-Id: I1ec7509e3adb36ab0f65317459653cb3b4b11af8
Reviewed-on: https://code.wireshark.org/review/6368
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 18:01:15 +00:00
Dario Lombardo 2139110e54 Updates in it translation.
Change-Id: I3a7b71daa6e4e69ef9cc6dcb777851a8643d6684
Reviewed-on: https://code.wireshark.org/review/6367
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 16:43:50 +00:00
AndersBroman 667897c98a [MIP6] Update to handling of
Mobility Header Link-Layer Address (MH-LLA) Option
to RFC 5268 e.g no special handling of length.
Bug:10043

Change-Id: Id32789fa5e34766c5734b0be13af015473ac257c
Reviewed-on: https://code.wireshark.org/review/6372
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-07 16:39:38 +00:00
Evan Huus a479d9a262 simplify tvb_address_to_str
deduplicate most of the tvb_get_ptr calls

Change-Id: Ic95b1d545bfebf58fc64a81f816c47d63e5ddcd0
Reviewed-on: https://code.wireshark.org/review/6366
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-07 15:29:59 +00:00
Orgad Shaneh 734e4083c9 MSVC: Fix opting out of libraries
When *_DIR variables are defined (even if empty), nmake tries
to build them and fails.

Don't set them at all if not configured to.

Change-Id: I3825c16f26e45a1a3fc489633084a074838f8c34
Reviewed-on: https://code.wireshark.org/review/6365
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-07 14:37:35 +00:00
Michael Mann ed9a9be5df Use tvb_address_to_str as an optimization
Change-Id: Ic79d8bdc58b84087531b298b3b27273c1afccd4f
Reviewed-on: https://code.wireshark.org/review/6357
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 12:38:07 +00:00
Michael Mann 4088a8286d SET_ADDRESS -> TVB_SET_ADDRESS to "hide" some of the tvb_get_ptr use.
Not all changes were able to remove their corresponding tvb_get_ptr, because there are other API dependent on the (tvb_get)pointer, but future iterations optimizing those other APIs will then be able to remove it.

Change-Id: Id7cefd440b81834de1d1aace7cd0789b1c871a22
Reviewed-on: https://code.wireshark.org/review/6358
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 12:37:52 +00:00
Pascal Quantin 6252074a24 DJIUAV: small cleanups
- fix some typos
- remove a useless include
- change an obsolete API
- comment unused hf entries for now

Change-Id: I5939bc2fe9ddc6c422f35423aa22e884f20f088d
Reviewed-on: https://code.wireshark.org/review/6349
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-07 10:19:51 +00:00
Guy Harris 50a9863506 Don't run checkapi on .rc files.
Change-Id: I75879bfcd0d9706523447146b16c319d3eb56d23
Reviewed-on: https://code.wireshark.org/review/6361
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-07 10:18:01 +00:00
Martin Kaiser 9696eb66db SMB: the "encryption key" in the negotiate response is not really a key
but the data for the Challenge/Response authentication

(at least, that's my understanding of
 http://msdn.microsoft.com/en-us/library/ee441946.aspx)

rename the items and filter strings accordingly

Bug: 10777
Change-Id: I38378f0b31252d7bc8ec5e8ad7cee81a1a48cb4d
Reviewed-on: https://code.wireshark.org/review/6137
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-07 06:00:01 +00:00
Guy Harris a76559e4f0 Cast away an insignificant warning.
Change-Id: Ifd74719ced4d1ff99a2a913ad6a6797d3e80b311
Reviewed-on: https://code.wireshark.org/review/6359
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-07 04:55:02 +00:00
Michael Mann 3bb887fb62 Fix compiler error because I didn't completely amend last patch.
Change-Id: I7b8ffc4a63e69b5f50666dc1cf3482ae20124c0f
Reviewed-on: https://code.wireshark.org/review/6356
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 04:28:13 +00:00
Michael Mann 47d670d3d7 Add tvb_address_to_str.
This is intended to handle ALL address types retrieved from a tvbuff.

One of the (good) side effects of this function is that it can replace a lot of the "hidden" ep_alloc calls used to allocate memory for the address string.

A few existing "popular" helper tvb_ functions were turned into pure macros calling tvb_address_to_str.  Some of the "less used" helper tvb_ functions were just directly replaced with tvb_address_to_str.

Change-Id: I361d991c4ad90142173e63eae02a94d68af3ec43
Reviewed-on: https://code.wireshark.org/review/6333
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 04:25:07 +00:00
Joseph Huffman 0f426d6f01 Improved handling of ARDP fragmented packets.
With the AllJoyn Reliable Datagram Protocol large packets are fragmented in
a way that Wireshark doesn't desegment. The AllJoyn dissector now detects
this situation and reports things to the user in a manner which indicates
things are behaving normally rather than an error condition.

Change-Id: I1f2aa722b6e0d1ed3572ff332b4dd8c0e5c5a765
Signed-off-by: Joseph Huffman <jhuffman@codeaurora.org>
Reviewed-on: https://code.wireshark.org/review/6344
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>
2015-01-07 02:50:36 +00:00
Gerald Combs 85e69d4fca Fix GCC pragma.
Fix "error: #pragma GCC diagnostic not allowed inside functions".

Change-Id: Iaa7e39ac46975f00bc337b97875ba8b77295064a
Reviewed-on: https://code.wireshark.org/review/6355
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:45:37 +00:00
Gerald Combs e3eab8391d checkAPIs: C++ comments are allowed in Windows resource files.
Change-Id: I3885278bf293b1fd7db812ce265734bcdc904c6f
Reviewed-on: https://code.wireshark.org/review/6354
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:11:17 +00:00
Gerald Combs 6e03daf77f Try to suppress clang warnings in exntest.
Nested TRYs result in:

    warning: declaration shadows a local variable

Change-Id: Ifaa7baebde0ea4c18be5a53ab7e7964e84716496
Reviewed-on: https://code.wireshark.org/review/6347
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:11:06 +00:00
Pascal Quantin 119f564e0d MBIM: call dissector_(add|delete)_uint only when necessary
Change-Id: I12bbe9e1d81560f1874d4e575b19db1842fa0c72
Reviewed-on: https://code.wireshark.org/review/6352
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-06 21:04:19 +00:00
Gerald Combs a6e6deea7f NSIS: Quote all paths in config.nsh.
Fix the MAKEDIR substitution. Add config.nsh to .gitignore.

Change-Id: I9c5f6469569e826e4a8036b9b1b483c16558f788
Reviewed-on: https://code.wireshark.org/review/6351
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 20:41:09 +00:00
Martin Mathieson f39366bb12 NetFlow: Add Ixia 'IxFlow' fields and make some general usability improvements
- Sequence number analysis using flow sequence within an observation domain.
- Link back from data set to template frame, if have seen
- Show more information (observation domain ID, set ID, etc) in Info column and protocol roots
- Look up protocol field from ip_proto

Change-Id: I3147387a3cd0d1fc33b879b3ba226753ed2cd8dd
Reviewed-on: https://code.wireshark.org/review/6331
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-06 20:17:23 +00:00
Guy Harris 29207bff5f $(MSVCR_DLL) might contain spaces, so we need to quote that sed expression.
Change-Id: Ia3aca07a5aa8adcc99d17fa559662d79659f46ca
Reviewed-on: https://code.wireshark.org/review/6348
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-06 20:09:24 +00:00
Gerald Combs ea46a44f67 NSIS: Move definitions to their own file.
Convert the pile-o-makensis-flags to a pile-o-sed-commands which creates
a "config.nsh" file. This should hopefully make it easier to port the
"packaging" target to CMake.

Change-Id: I439fea5721c5b209a753044a8e9e8ac6fc5291c3
Reviewed-on: https://code.wireshark.org/review/6345
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 19:01:50 +00:00
Gerald Combs a70929c381 CMake: Add an ENABLE_CODE_ANALYSIS option.
Currently Visual Studio-only. Enabling it adds /analyze:WX- to
LOCAL_CFLAGS, similar to config.nmake.

Change-Id: Ida68831e85f5f04b9f84faa95a39fed24e5f490d
Reviewed-on: https://code.wireshark.org/review/6346
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 18:47:54 +00:00
Alexis La Goutte 087fea319a DJI UAV: Add dissector to autotools and add modelines info
Change-Id: I2a312af906ddf01ff05083a657f474a921ab95a3
Reviewed-on: https://code.wireshark.org/review/6337
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-06 16:01:44 +00:00
Joerg Mayer dd65274bfd Revert e65f581ffa, which
reverts commit 89291ad4f3
Protect the new macro with "m4_ifdef" instead.
Add comments to keep the old and the new flags in sync.

Change-Id: I37dea1a5c8d743f5dcf4a4d9ff38ff92200271d0
Reviewed-on: https://code.wireshark.org/review/6343
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-06 15:57:11 +00:00
Alexis La Goutte 1d7da82938 DNS: fix no previous prototype for 'qname_labels_count' [-Wmissing-prototypes]
Change-Id: I2c5b662f6b46d60a97a491ca8ec01b3f0e41fa56
Reviewed-on: https://code.wireshark.org/review/6338
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-06 15:42:54 +00:00
Gerald Combs 5fb2f27428 Qt: Add a context menu to the packet list header.
Don't carry over the sort items from the GTK+ UI (for now, at least).
Update some names. Add a column editor frame similar to the "Go to
Packet" and "Search" frames.

Change-Id: I1bd3834a26994de96894d2b7512bce2c19915c77
Reviewed-on: https://code.wireshark.org/review/6277
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 15:22:04 +00:00
Stig Bjørlykke cbca7eeb71 p_mul: Indicate if fletcher algorithm is used.
The first version of ACP 142 uses the fletcher algorithm for checksum.
Indicate if this (now old variant) checksum is used.

Change-Id: Id6f3e7ecfcde022b339bdb956cd6f642a917076a
Reviewed-on: https://code.wireshark.org/review/6342
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-01-06 13:01:31 +00:00
Stig Bjørlykke 0910b551a9 s5066ses: Fixed some missing sapid mappings.
The previous s5066ses commit added sapid value strings but missed
updating PDU type 21 and 25.

Change-Id: I5cd4dba14eacdf2f590490a95b0cc62b04193b9e
Reviewed-on: https://code.wireshark.org/review/6341
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-01-06 12:55:11 +00:00
Ricardo Cristian Ramirez e8568c83f4 s5066sis: Consume transport layer data in S5066sis
S5066 spec describes a transport layer for some
clients like Acp 142 and DMP but not for all of
them. Since RCOP/UDOP header definition are given
in S'5066 specification, consuming these header
bytes in S'5066 SIS dissector may be appropriate

Bug: 10827
Change-Id: Iffdf5d567e1a417ccbafdac919f5a5200159d31b
Reviewed-on: https://code.wireshark.org/review/6292
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-01-06 11:51:00 +00:00
Michael Mann 55de46f317 Replace ep_address_to_str with address_to_str.
Change-Id: I4f1078b20f41800f72a751612703ad0d4c2ae87b
Reviewed-on: https://code.wireshark.org/review/6323
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>
2015-01-06 07:38:18 +00:00
Anish Bhatt 124272ec09 [PROFINET] v2: Fix swapped MaintenanceRequired & MaintenanceDemanded bits
Fix the correct code path this time.
Bug: 10753

Change-Id: I7bc2e74c91868986303e8b41b25e43a665be1860
Reviewed-on: https://code.wireshark.org/review/6335
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-06 07:02:21 +00:00
Anish Bhatt eb98b04ac1 Revert "[PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bits"
This reverts commit 0452f763fb. Changes should
have been made in ChannelProperties instead of Submodule state. Current
implementation merely *appears* to be correct as we are reading it as a two bit
value but instead should be addressing it as individual bits, little endian
Bug: 10753

Change-Id: Ia3bd088aeb376b8511d64352f62c4304e4129ba6
Reviewed-on: https://code.wireshark.org/review/6334
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-06 07:02:07 +00:00
Graham Bloice a7a17047eb Minor CMake updates to better group build artefacts
Move capchild, caputils, codecs and wsutil into a Libs group
Move gtkui into UI group
Move update-sminmpec into tools group

Change-Id: Iaf2bfe4697265af2c3ed9c9d7de2d5d1ef3cafee
Reviewed-on: https://code.wireshark.org/review/6332
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-05 23:48:46 +00:00
Guy Harris 1176db2ffe Squelch harmless compiler warnings.
(Yes, we know, we're casting 16-bit integers to pointers.  That's
because various generic maps need to be able to take arbitrary values as
keys, and sometimes the arbitrary values aren't structures to which we
point, but just integral values, and that's why GUINT_TO_POINTER()
exists, but it doesn't do enough casting to suppress harmless warnings.)

Change-Id: I1a9c68b4b1007f0a38017ba3570b94efb0b6845a
Reviewed-on: https://code.wireshark.org/review/6329
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-05 21:18:56 +00:00
Joerg Mayer 318b8f81ae Beginnings of dissection of the dji drones control protocol.
Change-Id: Ifda0b97df7e25b535a5010f25c8e8e1af83cb532
Reviewed-on: https://code.wireshark.org/review/6328
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-05 19:42:45 +00:00