metze/wireshark/wip.git
3 years agoip-over-ib description entry was missing
Rudra Rugge [Wed, 15 Jun 2016 22:22:25 +0000 (15:22 -0700)]
ip-over-ib description entry was missing

Description entry was missing in the list.

Change-Id: Ia8f8bd4608ee6800a352f4979752b5c45c4a5086
Reviewed-on: https://code.wireshark.org/review/15947
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>
3 years agoExport wtap_optionblock_copy_options() symbol
Pascal Quantin [Thu, 16 Jun 2016 01:06:04 +0000 (18:06 -0700)]
Export wtap_optionblock_copy_options() symbol

It can be useful for wiretap plugins

Change-Id: Ic56e4357ba3bfcef30d13615efc1361399c3133e
Reviewed-on: https://code.wireshark.org/review/15955
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agofile_util.c: do not search in Npcap installation folder when calling ws_load_library()
Pascal Quantin [Wed, 15 Jun 2016 20:42:56 +0000 (13:42 -0700)]
file_util.c: do not search in Npcap installation folder when calling ws_load_library()

ws_load_library() is not used to load packet.dll or wpcap.dll (we use ws_module_open() for this).
Let's not lose time checking the folder content.

Change-Id: Ibd4a71b8b0c5ffc0c4c146eca51ad9f20964515b
Reviewed-on: https://code.wireshark.org/review/15938
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agomongo: return the number of bytes we actually consumed
Martin Kaiser [Wed, 15 Jun 2016 20:02:39 +0000 (13:02 -0700)]
mongo: return the number of bytes we actually consumed

even if the document length is 0, we consumed at least 4 bytes for the
length field

bug: 12534
Change-Id: I2f1612bf575b558c1bcc0afe8202b202747846e3
Reviewed-on: https://code.wireshark.org/review/15934
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoMake some more Diameter AVP names unique.
Jeff Morriss [Wed, 15 Jun 2016 22:40:53 +0000 (18:40 -0400)]
Make some more Diameter AVP names unique.

In some cases this means using the correct (updated?) name from the
specification. In others it means prepending the application- or vendor-name
to force uniqueness.

Remove a few more "Unassigned" AVPs from the XML files.

Change-Id: I61d55ef97ff8efc3317c91bf79e73031735f740a
Reviewed-on: https://code.wireshark.org/review/15949
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoidl2wrs: fix code generation
Peter Wu [Wed, 15 Jun 2016 21:06:23 +0000 (14:06 -0700)]
idl2wrs: fix code generation

Fixes a regression from v1.99.9rc0-470-g87f2bd4 which truncated function
names to 26 characters.

Test:

    cd epan/dissectors/dcerpc/budb
    make IDL2WRS=/tmp/wsbuild/run/idl2wrs
    diff packet-dcerpc-budb.c ../../packet-dcerpc-budb.c

While at it, replace all g_strndup(X, strlen(X)) occurrences with
g_strdup(X) since that is the same thing and less redundant.

Change-Id: Id8da45792c830e2287cf8f14ff6245149751afd2
Reviewed-on: https://code.wireshark.org/review/15939
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
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>
3 years agogtk: Fix null dereference in stats
Balint Reczey [Wed, 15 Jun 2016 22:40:15 +0000 (15:40 -0700)]
gtk: Fix null dereference in stats

This fixes the bug reported to Debian:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786704

Change-Id: Iabe19c11067318d78664a17fa00d6a4d1998250c
Reviewed-on: https://code.wireshark.org/review/15948
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
3 years agoproto.c: allow calling proto_item_add_bitmask_tree() with a length set to 0
Pascal Quantin [Wed, 15 Jun 2016 21:50:03 +0000 (14:50 -0700)]
proto.c: allow calling proto_item_add_bitmask_tree() with a length set to 0

This is required for the flags from packet-frame.c

Bug: 12536
Change-Id: I60bfe671687bcd3a9b5c997ba62bed563e890548
Reviewed-on: https://code.wireshark.org/review/15945
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agocapture info (wslua): Dereference of null pointer
Alexis La Goutte [Wed, 15 Jun 2016 18:35:47 +0000 (20:35 +0200)]
capture info (wslua): Dereference of null pointer

Change-Id: Iced579d5acaefa9d1c8e3775a53916773bf87659
Reviewed-on: https://code.wireshark.org/review/15929
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
3 years agodocumentation: Suggest using prefixed public symbols
Balint Reczey [Wed, 15 Jun 2016 21:14:23 +0000 (14:14 -0700)]
documentation: Suggest using prefixed public symbols

Change-Id: I9153756b0e921fd74d7df9d119337f5484856ba0
Reviewed-on: https://code.wireshark.org/review/15940
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoQt: Adjust the search frame layout.
Gerald Combs [Wed, 15 Jun 2016 18:27:53 +0000 (11:27 -0700)]
Qt: Adjust the search frame layout.

Add padding on the left side of the search frame in order to reduce the
amount of mousing required on large screens.

Change-Id: I1dcd8c4a103f4a462f4ab60a22a93b8c0f28b055
Reviewed-on: https://code.wireshark.org/review/15928
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoMake some Diameter AVP names unique.
Jeff Morriss [Wed, 15 Jun 2016 20:01:05 +0000 (16:01 -0400)]
Make some Diameter AVP names unique.

In some cases this means using the correct (updated?) name from the
specification. In others it means prepending the application name to force
uniqueness.

Change-Id: I8301c769af2b2279c0be7c1bc65e99fe25c1cc80
Reviewed-on: https://code.wireshark.org/review/15935
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoZigBee: decode ZBOSS traffic dump and Interpan frames as ZigBee.
dsrsupport [Wed, 15 Jun 2016 16:45:50 +0000 (19:45 +0300)]
ZigBee: decode ZBOSS traffic dump and Interpan frames as ZigBee.

If decoded ZBOSS traffic dump, sure this is ZigBee, so bypass heuristic.
If decoding air sniffer dump, try to go thru heuristic by checking for ext address src mode required for interpan.

Change-Id: Iddf799400a4cf0fd73714f06b99e3d11c8cb2e60
Reviewed-on: https://code.wireshark.org/review/15921
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>
3 years agoPass "/utf-8" to Visual C++ 2015.
Gerald Combs [Fri, 10 Jun 2016 22:26:57 +0000 (15:26 -0700)]
Pass "/utf-8" to Visual C++ 2015.

Many projects (Qt[1] and GNOME[2] in particular) either recommend, use,
or at least allow for UTF-8 in source and header files. Pass /utf-8 to
Visual C++ 2015 so that it will behave itself around UTF-8 and be more
like that nice compiler down the street.

[1] https://wiki.qt.io/Strings_and_encodings_in_Qt
[2] https://bugzilla.gnome.org/show_bug.cgi?id=767218

Change-Id: Ibc90d235742134cb42dd796ba529699bcbbe3ad0
Reviewed-on: https://code.wireshark.org/review/15821
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agodiameter (3GPP): Fix Dead Store (Dead assignement/Dead increment) Warning found by...
Alexis La Goutte [Wed, 15 Jun 2016 18:14:18 +0000 (20:14 +0200)]
diameter (3GPP): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Iaa74265df66455528c86658a26812876574a904a
Reviewed-on: https://code.wireshark.org/review/15927
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoUpdate to the latest config.guess and config.sub
Jeff Morriss [Wed, 15 Jun 2016 17:31:41 +0000 (13:31 -0400)]
Update to the latest config.guess and config.sub

Change-Id: Id493fb3b79326b522a3a11c3258531683f159187
Reviewed-on: https://code.wireshark.org/review/15924
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoZigBee: add support for inter-pan transmissions.
dsrsupport [Wed, 15 Jun 2016 15:48:01 +0000 (18:48 +0300)]
ZigBee: add support for inter-pan transmissions.

Added dissection of inter-pan nwk and aps stub to be used to decode ZLL commissioning cluster.

Change-Id: I871016a93854f1caf2f14f2f84e5397de5f1e2ff
Reviewed-on: https://code.wireshark.org/review/15918
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: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoRemove Nmake build system
Pascal Quantin [Wed, 8 Jun 2016 13:57:00 +0000 (15:57 +0200)]
Remove Nmake build system

Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
Reviewed-on: https://code.wireshark.org/review/15777
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
3 years agoDon't map the interface ID for records that don't pertain to an interface.
Guy Harris [Wed, 15 Jun 2016 19:15:54 +0000 (12:15 -0700)]
Don't map the interface ID for records that don't pertain to an interface.

And revert to the previous behavior of map_phdr_interface_id(); that
change broke the mergecap tests when it was merging pcap files into a
pcapng file.

Change-Id: I2e079b0e87dce06e98faa9ab7615f9b9b2701b77
Reviewed-on: https://code.wireshark.org/review/15932
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoWin: convert atkversion.h to UTF-8
Pascal Quantin [Wed, 15 Jun 2016 18:46:53 +0000 (11:46 -0700)]
Win: convert atkversion.h to UTF-8

Change-Id: I7bfa9be11596cc9a3e1b0226c6865edf47e96782
Reviewed-on: https://code.wireshark.org/review/15931
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoqt: add initializer to ExpertPacketTreeWidgetItem (CID 1362746).
Dario Lombardo [Wed, 15 Jun 2016 18:05:32 +0000 (20:05 +0200)]
qt: add initializer to ExpertPacketTreeWidgetItem (CID 1362746).

Change-Id: I8ca154907e01fb40affb9e5f5a0aaf55921c95db
Reviewed-on: https://code.wireshark.org/review/15926
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agozbee-nwk: don't THROW() an exception from a dissector
Martin Kaiser [Wed, 15 Jun 2016 17:53:43 +0000 (10:53 -0700)]
zbee-nwk: don't THROW() an exception from a dissector

we already have an expert info, so we can just return the number of
bytes in the tvb

Change-Id: I6199760316d7ef141877bc8f65012d36e4dd357b
Reviewed-on: https://code.wireshark.org/review/15925
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agowtap: Make default_filter static
Stig Bjørlykke [Fri, 11 Mar 2016 17:42:49 +0000 (18:42 +0100)]
wtap: Make default_filter static

Address of stack memory associated with local variable 'default_filter'
is still referred to by the global variable 'filter_option' upon returning
to the caller.  This will be a dangling reference.

Change-Id: I6160a37f05b8aea245b723ec50803e4062886738
Reviewed-on: https://code.wireshark.org/review/14427
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoDisplay "IP DSCP" column as short text
João Valverde [Wed, 30 Sep 2015 13:34:39 +0000 (14:34 +0100)]
Display "IP DSCP" column as short text

Ping-Bug: 12429
Change-Id: I618b2017e161d89f0efa25ce2fb82a1808e8d315
Reviewed-on: https://code.wireshark.org/review/10701
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoandroiddump: fix leak on --extcap-interfaces
Peter Wu [Wed, 15 Jun 2016 15:45:54 +0000 (08:45 -0700)]
androiddump: fix leak on --extcap-interfaces

extcap_base_register_interface duplicates the memory, so there is no
need to keep it around.

Change-Id: I2bac8be519b659504c512d4eb29be8f7ef6dbd59
Reviewed-on: https://code.wireshark.org/review/15919
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agowin-setup.ps1: stop downloading user-guide; with CMake it is generated from source...
Pascal Quantin [Wed, 15 Jun 2016 15:24:48 +0000 (08:24 -0700)]
win-setup.ps1: stop downloading user-guide; with CMake it is generated from source code

Change-Id: I3b015594bd6a6b0c41938ba17d5690c08e04f490
Reviewed-on: https://code.wireshark.org/review/15917
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>
3 years agoproto_tree_add_boolean -> proto_tree_add_bitmask_list_value
Michael Mann [Wed, 15 Jun 2016 03:17:25 +0000 (23:17 -0400)]
proto_tree_add_boolean -> proto_tree_add_bitmask_list_value

Change-Id: Ic644042d238b5f2abcd874bca92c6dea55804ba9
Reviewed-on: https://code.wireshark.org/review/15913
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoMore Sysdig / system event support.
Gerald Combs [Sun, 24 Apr 2016 18:21:50 +0000 (11:21 -0700)]
More Sysdig / system event support.

Add REC_TYPE_SYSCALL to wiretap and use it for Sysdig events. Call the
Sysdig event dissector from the frame dissector. Create a "syscall"
protocol for system calls, but add "frame" items to it for now.

Add the ability to write Sysdig events. This lets us merge packet
capture and syscall capture files.

Change-Id: I12774ec69c89d8e329b6130c67f29aade4e3d778
Reviewed-on: https://code.wireshark.org/review/15078
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoLet the calculated window scale be 16 bit wide.
Jaap Keuter [Wed, 15 Jun 2016 06:53:14 +0000 (08:53 +0200)]
Let the calculated window scale be 16 bit wide.

Even though TCP window scale shift is only 8 bits, the scale
calculated from it is max 16384. therefor a 16 bit value.
Let the tree item map to the single byte in the TVB, while
allowing the value to be 16 bit.

Bug: 12525
Change-Id: I41cebc62f6b8b09e13efa5f3b7432001e8d994e1
Reviewed-on: https://code.wireshark.org/review/15914
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoAllow control of individual columns to be (un)writable.
Michael Mann [Tue, 14 Jun 2016 15:55:08 +0000 (11:55 -0400)]
Allow control of individual columns to be (un)writable.

Most protocols just want to limit COL_INFO or COL_PROTOCOL
so give that level of granularity.

Bug: 12144
Bug: 5117
Bug: 11144
Change-Id: I8de9b7d2c69e90d3fbfc0a52c2bd78c3de58e2f8
Reviewed-on: https://code.wireshark.org/review/15894
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agocmake: fix ENABLE_ASAN detection
Peter Wu [Tue, 14 Jun 2016 21:52:01 +0000 (14:52 -0700)]
cmake: fix ENABLE_ASAN detection

Do not add -fsanitize=undefined when ASAN is requested, UBSAN is a
different feature (which could be added later as desired). This makes
the -DENABLE_ASAN=1 option match the autotools --enable-asan option.

Fail hard if ASAN support is requested but not supported, this avoids
surprises when something is wrong. Fix ASAN detection by setting the
linker option too.

Note: if you have previously set ENABLE_ASAN=1 with the broken ASAN
detection, you have to clear your CMakeCache.txt file to redo the
detection.

Change-Id: Iba6ca0da0336eccedd0cf31a251baad9d1aff5b4
Reviewed-on: https://code.wireshark.org/review/15908
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoChange how dissectors do late-field-registration to avoid a double-registration
Jeff Morriss [Mon, 13 Jun 2016 19:28:16 +0000 (15:28 -0400)]
Change how dissectors do late-field-registration to avoid a double-registration
assertion.

If a dissector forces registration of fields during dissection it needs to do
so in a way that clears the prefix registration.  Otherwise epan will call the
registration routine a 2nd time (which will cause us to assert out) if a user
types a display filter (with the dissector's prefix) that doesn't exist.

Update the proto_register_prefix() comments to reflect this.

Change-Id: I3ce29243395fb55192bb5dfd950baa88410ac136
Reviewed-on: https://code.wireshark.org/review/15881
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
3 years agomount: fix a memory leak
Martin Kaiser [Tue, 14 Jun 2016 01:05:11 +0000 (18:05 -0700)]
mount: fix a memory leak

don't copy the wmem-buffer from address_to_str() into a g_malloc()ed one
that is never freed

instead, realloc the wmem-buffer and add the nfs path to it

(nfs_name_snoop_add_name() will make a copy internally)

Change-Id: I4274a4a413c09f3f1d78beba65d94748ce185413
Reviewed-on: https://code.wireshark.org/review/15902
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoClean up some messages.
Guy Harris [Wed, 15 Jun 2016 00:35:51 +0000 (17:35 -0700)]
Clean up some messages.

We're checking for more than just a 64-bit off_t; we're checking for the
ability to do 64-bit seeks in files, even if, as on Windows, the APIs
are different.

Remove trailing white space and clean up some comments while we're at
it.

Change-Id: I6122b6d6b44ff5dd3a4d8268f9793193e65817ce
Reviewed-on: https://code.wireshark.org/review/15912
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoFix OSX buildbot
Pascal Quantin [Tue, 14 Jun 2016 23:11:18 +0000 (16:11 -0700)]
Fix OSX buildbot

Dirty CORBA IDL dissectors must be compiled without -Werror option

Change-Id: I46431c635274399cd6d365a608cdc0aecbc59c95
Reviewed-on: https://code.wireshark.org/review/15911
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agodns_stats: generate stats just for pure dns (not mDNS, not LLMR).
Dario Lombardo [Tue, 14 Jun 2016 17:35:32 +0000 (19:35 +0200)]
dns_stats: generate stats just for pure dns (not mDNS, not LLMR).

The stats for mDNS and llmnr are pending. The change just resolves a bug
in the stats that are wrongly generated when the traffic is mDNS or LLMR.

Bug: 12492
Change-Id: Ie772e204d0ddea997dd8cbf609725605c8a507c8
Reviewed-on: https://code.wireshark.org/review/15897
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoproto(.h): fix '@return' command used in a comment that is attached to a function...
Alexis La Goutte [Tue, 14 Jun 2016 21:43:15 +0000 (23:43 +0200)]
proto(.h): fix '@return' command used in a comment that is attached to a function returning void [-Wdocumentation]

Change-Id: Ie0e502adcc8eb00f65ffa6c018d5b9d79655ddb7
Reviewed-on: https://code.wireshark.org/review/15907
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoFIX dissector - Improve Message info
Michael Mann [Tue, 14 Jun 2016 21:23:58 +0000 (17:23 -0400)]
FIX dissector - Improve Message info

Bug: 5350
Change-Id: I4b2d60549f9680bbc008a2abba5d7ec108f6bf22
Reviewed-on: https://code.wireshark.org/review/15905
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoCORBA IDL: compile dissectors with /Ox when using MSVC2013 x64
Pascal Quantin [Mon, 13 Jun 2016 22:11:55 +0000 (15:11 -0700)]
CORBA IDL: compile dissectors with /Ox when using MSVC2013 x64

By default Windows files are compiled with /O2 optimization flag (that brings the best performance).
But MSVC2013 x64 compiler generates buggy code for CORBA IDL dissectors.
Let's downgrade the optimization to /Ox for those files specifically.

Bug: 12495
Change-Id: Ibbb532653808d915c82bd20b55dd9e68d86b1207
Reviewed-on: https://code.wireshark.org/review/15884
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
3 years agoDon't list "AVP" as a possible member of a grouped AVP.
Jeff Morriss [Tue, 14 Jun 2016 21:38:17 +0000 (17:38 -0400)]
Don't list "AVP" as a possible member of a grouped AVP.

There's no AVP named "AVP".  And there's no need to tell Wireshark that any AVP
may put in the group (the RFC lists "AVP" for that purpose).

Change-Id: I3591af725ebe089e13eae7b712ef4404cb7924a2
Reviewed-on: https://code.wireshark.org/review/15906
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agopacket.c: remove const compiler warning.
Dario Lombardo [Tue, 5 Apr 2016 16:24:25 +0000 (18:24 +0200)]
packet.c: remove const compiler warning.

Change-Id: Ida9384dccb0e8bacbc9aad39515c3dae9c5ce563
Reviewed-on: https://code.wireshark.org/review/14768
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoQt: fix crash when opening Expert Info dialog
Pascal Quantin [Tue, 14 Jun 2016 18:31:10 +0000 (11:31 -0700)]
Qt: fix crash when opening Expert Info dialog

g6ff19ff tried to access cinfo by following a chain of pointers from
expert_info. Access cinfo from cap_file_, which is more reliable. While
we are at it, let's explicitly check the pointer validity.

Change-Id: I0da72c5b1d2230a49c125a1b57c81c3115c4f2fb
Reviewed-on: https://code.wireshark.org/review/15901
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoGive unique names to a bunch of reserved, experimental, etc., AVPs.
Jeff Morriss [Tue, 14 Jun 2016 14:52:28 +0000 (10:52 -0400)]
Give unique names to a bunch of reserved, experimental, etc., AVPs.

Also remove a bunch of AVPs that are unassigned/unallocated--there's no
real benefit to telling users that...

Change-Id: I1b18a11a1b65189d21520c74aae3dde77688e592
Reviewed-on: https://code.wireshark.org/review/15895
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoReplace wlan_ignore_wep_ by wlan_ignore_prot_ and WLAN_IGNORE_WEP_ by WLAN_IGNORE_PROT_
Joerg Mayer [Tue, 14 Jun 2016 19:45:53 +0000 (21:45 +0200)]
Replace wlan_ignore_wep_ by wlan_ignore_prot_ and WLAN_IGNORE_WEP_ by WLAN_IGNORE_PROT_

Change-Id: I870cc1e5293dd6e1a1b71157987e27399e080a73
Reviewed-on: https://code.wireshark.org/review/15904
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
3 years agotvbparse: change g_hash_table to wmem_map.
Dario Lombardo [Mon, 2 May 2016 15:21:57 +0000 (17:21 +0200)]
tvbparse: change g_hash_table to wmem_map.

Change-Id: I245595051617f6d6333314240825a526adf19339
Reviewed-on: https://code.wireshark.org/review/15244
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoaddr_resolv: change g_hash to wmem_map.
Dario Lombardo [Thu, 21 Apr 2016 16:04:16 +0000 (18:04 +0200)]
addr_resolv: change g_hash to wmem_map.

Change-Id: Ice7533fbeac700dae0a46766838818a32b0d5736
Reviewed-on: https://code.wireshark.org/review/15051
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agodcm: remove g_malloc
Dario Lombardo [Tue, 12 Apr 2016 16:14:14 +0000 (18:14 +0200)]
dcm: remove g_malloc

Change-Id: I3d00b710c6fc6e5798ecc5eca9af11ccac920e5a
Reviewed-on: https://code.wireshark.org/review/14913
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agotvbparse: change g_malloc to wmem_alloc.
Dario Lombardo [Mon, 2 May 2016 15:50:38 +0000 (17:50 +0200)]
tvbparse: change g_malloc to wmem_alloc.

Change-Id: I6a6363400d9fd1d76b9de0c5deea83dfc7cea1e2
Reviewed-on: https://code.wireshark.org/review/15245
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoAdd Aerohive gre tunnel between APs.
Joerg Mayer [Tue, 14 Jun 2016 19:12:16 +0000 (21:12 +0200)]
Add Aerohive gre tunnel between APs.

Change-Id: I24d0320cd164ead2802af37d07016c9c46d18e9e
Reviewed-on: https://code.wireshark.org/review/15903
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
3 years agowslua: remove FAIL_ON_NULL_MEMBER_OR_EXPIRED
Peter Wu [Sun, 3 Apr 2016 09:10:02 +0000 (11:10 +0200)]
wslua: remove FAIL_ON_NULL_MEMBER_OR_EXPIRED

Ensure that the member cannot be NULL at initialization, simplifies
checkCaptureInfo and checkCaptureInfoConst logic.

Change-Id: I2d9caa4a235310569ebbf0b30199dd3df7a4c093
Reviewed-on: https://code.wireshark.org/review/14791
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agowslua: Drop unused "push_code" macro parameter
Peter Wu [Sun, 3 Apr 2016 08:58:44 +0000 (10:58 +0200)]
wslua: Drop unused "push_code" macro parameter

Reduce noise, no caller has used this parameter since its introduction.
Msotly automated regex search and replace.

Change-Id: I4b1180bfee8544b38d19c9c440ff5b9b0dc080b2
Reviewed-on: https://code.wireshark.org/review/14790
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoAdd dissector for Real Time Location System (RTLS)
Alexis La Goutte [Fri, 3 Jun 2016 15:56:54 +0000 (17:56 +0200)]
Add dissector for Real Time Location System (RTLS)

Change-Id: I494cbb8c3c6da18dfd7901d098dde6448226f67e
Reviewed-on: https://code.wireshark.org/review/15711
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoFix SCTP analysis broken
Irene Ruengeler [Mon, 13 Jun 2016 15:39:42 +0000 (17:39 +0200)]
Fix SCTP analysis broken

Bug: 12513
Change-Id: I3fdf79106ed007aadf528f0b373fb7a487f3d9a9
Reviewed-on: https://code.wireshark.org/review/15870
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agogtk: Allow restoring maximized windows as maximized
Balint Reczey [Tue, 23 Jun 2015 20:51:32 +0000 (13:51 -0700)]
gtk: Allow restoring maximized windows as maximized

without losing window decorations on GNOME on the secondary monitor.

Bug: 11303
Change-Id: Ie8f541dba9d49f9fe5d4892a8dc1cd42091afe1d
Reviewed-on: https://code.wireshark.org/review/9077
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoAdded XML proper decoding for XML CDATASection
Binh Trinh [Tue, 14 Jun 2016 04:37:53 +0000 (00:37 -0400)]
Added XML proper decoding for XML CDATASection

Bug: 11755
Change-Id: Iecf7ce4bfad45d0c49f3af205e8489e53077198b
Reviewed-on: https://code.wireshark.org/review/15889
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>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoRevert "Move inclusion of CmakeListsCustom to the end of the file in order to have...
Anders Broman [Tue, 14 Jun 2016 15:37:33 +0000 (15:37 +0000)]
Revert "Move inclusion of CmakeListsCustom to the end of the file in order to have all defines in place."

This reverts commit bcbcad1e597f89e64389b6cc25b2fdbe9f89d960.

This change breaks building of custom plugins.

Change-Id: I63e88ceb922ca23ead9784705ad8ba088a504fd1
Reviewed-on: https://code.wireshark.org/review/15893
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agobrowser (dcerpc): Fix Dead Store (Dead assignement/Dead increment) Warning found...
Alexis La Goutte [Tue, 14 Jun 2016 13:40:57 +0000 (15:40 +0200)]
browser (dcerpc): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I158a5fd8a645cd4d58565a6a4ee64371d271eb8e
Reviewed-on: https://code.wireshark.org/review/15892
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
3 years agoGTK: Disable liboverlay-scrollbar that crashed wireshark on Ubuntu
Balint Reczey [Tue, 14 Jun 2016 03:01:08 +0000 (20:01 -0700)]
GTK: Disable liboverlay-scrollbar that crashed wireshark on Ubuntu

Bug: 11400
Change-Id: I40d901ab3ef43a61ef984014dabc0547605ef77c
Reviewed-on: https://code.wireshark.org/review/15888
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agomount: don't THROW() an exception from a dissector
Martin Kaiser [Mon, 13 Jun 2016 22:50:33 +0000 (15:50 -0700)]
mount: don't THROW() an exception from a dissector

if the length is too large, we can simply skip nfs_name_snoop_add_name()
and the code to prepare its input

Change-Id: I30c9a89edf7b48c45b52e7dad099ac4151f7f4a7
Reviewed-on: https://code.wireshark.org/review/15883
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoDon't register Wireshark for .pfx (IPFIX) files.
Jeff Morriss [Mon, 13 Jun 2016 23:51:29 +0000 (19:51 -0400)]
Don't register Wireshark for .pfx (IPFIX) files.

(As pointed out by Gerald) .pfx files are (more commonly) PKCS#12 files.
People may be upset if we start grabbing them.

Change-Id: Iecf857d082b7f2a0ad4fdd1a932332fc3c9d9498
Reviewed-on: https://code.wireshark.org/review/15886
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>
3 years agoAdjust the Diameter DTD to accept applications and vendors in any order.
Jeff Morriss [Tue, 14 Jun 2016 00:14:41 +0000 (20:14 -0400)]
Adjust the Diameter DTD to accept applications and vendors in any order.

Change-Id: I301a138b7f6db2d1a9ce1a20ebecf94e100bf831
Reviewed-on: https://code.wireshark.org/review/15887
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
3 years agoextcap: Check libssh >= 0.6.0 for sshdump, ciscodump
John A. Thacker [Mon, 13 Jun 2016 20:36:07 +0000 (16:36 -0400)]
extcap: Check libssh >= 0.6.0 for sshdump, ciscodump

sshdump and ciscodump require libssh >= 0.6.0. Check for this version and
only build them if a sufficient version is present. (The other checks
stay; in particular, ssh_userauth_agent doesn't exist on Windows and
must be checked separately.)

Bug: 12507
Change-Id: Ibe42b0cbb597cd9c4aab51f44d48185940ad954b
Reviewed-on: https://code.wireshark.org/review/15882
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoFix Custom.xml so it can be (correctly) included into the main dictionary.
Jeff Morriss [Mon, 13 Jun 2016 23:28:04 +0000 (19:28 -0400)]
Fix Custom.xml so it can be (correctly) included into the main dictionary.

This file is included into dictionary.xml so it doesn't need all the DOCTYPE
stuff.

Change-Id: I8397b3babe45c28706867be3169ce6ed566930e6
Reviewed-on: https://code.wireshark.org/review/15885
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
3 years agoAdd missing const to inet_ipv6.h
João Valverde [Mon, 13 Jun 2016 04:35:14 +0000 (05:35 +0100)]
Add missing const to inet_ipv6.h

Make it simpler too.

Change-Id: I97dc79d7ac536089c1fa6ec2c20f19754d47a9d4
Reviewed-on: https://code.wireshark.org/review/15866
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
3 years agodcerpc: don't THROW() an exception from a dissector
Martin Kaiser [Sat, 11 Jun 2016 11:56:33 +0000 (13:56 +0200)]
dcerpc: don't THROW() an exception from a dissector

remove the checks in dissect_ndr_ucarray_core() where a block or bytes
dissection function is called and an exception is thrown if the offset
wraps around, i.e. the final offset is lower than the initial one

the block functions eventually call proto_tree_add_item(), which throws
an exception if necessary

the bytes functions end up calling functions to dissect basic types.
insert calls to tvb_ensure_bytes_exist() if those functions increase our
offset without reading data.  thus, an exception is thrown if there's an
overflow.

remove some unnecessary if (tree) checks while at it

Change-Id: I8006399ae20934daeec231246debe247f8dedbf0
Reviewed-on: https://code.wireshark.org/review/15832
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoAdd proto_tree_add_bitmask_list_value.
Michael Mann [Mon, 13 Jun 2016 19:34:16 +0000 (15:34 -0400)]
Add proto_tree_add_bitmask_list_value.

Ran across enough situations that proto_tree_add_bitmask_list couldn't
solve that it seemed necessary.

Change-Id: I6a540ac6efca76cae7c4571a84bb400538652784
Reviewed-on: https://code.wireshark.org/review/15880
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>
3 years agoUpdates on AVB IEEE 1722 protocol to support more 1722 subtypes.
Andreas Leibold [Fri, 10 Jun 2016 08:41:19 +0000 (10:41 +0200)]
Updates on AVB IEEE 1722 protocol to support more 1722 subtypes.

packet-ieee1722.c now contains the entire protocol.
packet-ieee1722a.c file was removed, because the term 1722a is outdated
and now part of 1722 protocol.

Change-Id: Ic2f44a2752f9254cde62d878dc971f09cddc5adc
Reviewed-on: https://code.wireshark.org/review/15810
Petri-Dish: Anders Broman <a.broman58@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>
3 years agouse #include <file.h> for generated include files
Martin Kaiser [Sun, 12 Jun 2016 23:31:57 +0000 (16:31 -0700)]
use #include <file.h> for generated include files

the same mechanism as described in
7c40de5c38ac71323455c51dcc14a5eb385ce718
could trick us into using the wrong config.h

fix this for some occassions where config.h is included before we
include zlib.h

I saw compile errors on windows where we picked up config.h from a linux
build and zlib failed because of a mission unistd.h

Change-Id: I91cf73b96c9e1b6f009fb2376fabfe973d1ac941
Reviewed-on: https://code.wireshark.org/review/15874
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoqt: use #include <file.h> for generated include files
Martin Kaiser [Sun, 12 Jun 2016 21:00:21 +0000 (14:00 -0700)]
qt: use #include <file.h> for generated include files

make sure that generated include files are picked up only from the
directories set by -I (or /I), not from the current directory

if we use #include "file.h", Visual Studio searches for file.h in the
same diretory as the source file that includes file.h

if we do an out-of-tree build with cmake and the source directory
contains files from an in-tree build (done with autotools), we might end
up including the wrong file

Change-Id: Iaaed2626258b6ff0c12485fe3f436bd03bbb5adf
Reviewed-on: https://code.wireshark.org/review/15873
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoIPv6: Add text marker for SRH next segment
João Valverde [Sat, 11 Jun 2016 22:15:01 +0000 (23:15 +0100)]
IPv6: Add text marker for SRH next segment

Change-Id: If13ffe4ddb9ae08e738ccf0c715dc12ce7a076e8
Reviewed-on: https://code.wireshark.org/review/15834
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agosip: remove some unnecessary if (tree) checks
Martin Kaiser [Mon, 13 Jun 2016 18:36:10 +0000 (11:36 -0700)]
sip: remove some unnecessary if (tree) checks

which shouldn't have any impact on performance

we should not remove the chcks around blocks where
vb_format_text() is called

Change-Id: Idc191cc70e7458225bbc5dfececb3c88c83ab5f1
Reviewed-on: https://code.wireshark.org/review/15879
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoMove inclusion of CmakeListsCustom to the end of the file in order to have
AndersBroman [Mon, 13 Jun 2016 18:51:48 +0000 (20:51 +0200)]
Move inclusion of CmakeListsCustom to the end of the file in order to have
all defines in place.

Change-Id: I190257e9b833c409921bbca74c8ab531b632c60d
Reviewed-on: https://code.wireshark.org/review/15878
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoisns: fix dead code
Martin Kaiser [Mon, 13 Jun 2016 16:30:30 +0000 (09:30 -0700)]
isns: fix dead code

do the special handling for len==0 and tag==ISNS_ATTR_TAG_PORTAL_GROUP_TAG
before going into the different attributes

Bug: 12503
Change-Id: I4dd6dcea25aba2e4963811a7a85f1eed1b906bcd
Reviewed-on: https://code.wireshark.org/review/15875
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>
3 years agotvbparse: change g_strdup_printf to wmem_strdup_printf.
Dario Lombardo [Tue, 3 May 2016 14:51:45 +0000 (16:51 +0200)]
tvbparse: change g_strdup_printf to wmem_strdup_printf.

Change-Id: I57ff604d23967eb1f6481c7019e3eab0389dc3a5
Reviewed-on: https://code.wireshark.org/review/15257
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
3 years agoQt: Fix a Windows version check.
Gerald Combs [Mon, 13 Jun 2016 18:17:48 +0000 (11:17 -0700)]
Qt: Fix a Windows version check.

Fetch the version using QSysInfo::windowsVersion.

Ping-Bug: 12010
Change-Id: If63c576ec4f56f34b76f320cdd927bee427c8cb7
Reviewed-on: https://code.wireshark.org/review/15876
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoQt: Main window tab behavior.
Gerald Combs [Sun, 12 Jun 2016 23:07:30 +0000 (16:07 -0700)]
Qt: Main window tab behavior.

Make the main window tab order more closely match the GTK+ UI. Draw a
focus rect in the byte view text while we're here.

Change-Id: I04212c14ea7f0d6865b709533246760adc02f45a
Reviewed-on: https://code.wireshark.org/review/15862
Petri-Dish: Anders Broman <a.broman58@gmail.com>
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>
3 years agoCisco Diameter: move the XML declaration to the top of the file.
Jeff Morriss [Mon, 13 Jun 2016 18:29:22 +0000 (14:29 -0400)]
Cisco Diameter: move the XML declaration to the top of the file.

... That's where it's supposed to be.

Change-Id: I0ec68dc8757776bf757b52e75bc156acc7264ee5
Reviewed-on: https://code.wireshark.org/review/15877
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
3 years agoDiameter (NSN): the attribute name is 'mandatory' not 'mandatory-flag'.
Jeff Morriss [Mon, 13 Jun 2016 17:52:19 +0000 (13:52 -0400)]
Diameter (NSN): the attribute name is 'mandatory' not 'mandatory-flag'.

Change-Id: Ifa19b59e23278abf332d8ab06dd5ad2059f3e679
Reviewed-on: https://code.wireshark.org/review/15872
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
3 years agoDiameter: close command elements.
Jeff Morriss [Mon, 13 Jun 2016 17:37:08 +0000 (13:37 -0400)]
Diameter: close command elements.

... in order to make the XML (more) valid.

Change-Id: Iefffff3208c98d6ea55d509ed35b57abd268baf3
Reviewed-on: https://code.wireshark.org/review/15871
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
3 years agoConvert AT_SS7PC to a "dissector address type"
Michael Mann [Sun, 12 Jun 2016 16:28:02 +0000 (12:28 -0400)]
Convert AT_SS7PC to a "dissector address type"

The formatting of the address type is determined by a preference in
packet-mtp3.c, so just make MTP3 register the address type.
Use address_type_get_by_name in other dissectors (and export_pdu)
to use the address type.

Change-Id: Ifb32d7de27aeaa23cee8e803e25ffb3c905547b5
Reviewed-on: https://code.wireshark.org/review/15856
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>
3 years agoUse getc_unlocked in a few places.
Gerald Combs [Fri, 18 Mar 2016 20:13:44 +0000 (13:13 -0700)]
Use getc_unlocked in a few places.

Use getc_unlocked or _fgetc_nolock instead of getc in a few places. This
reduces startup time by about 100ms here.

Change-Id: I59ceb09678457c871cce79fcc3ce71998fe4f5af
Reviewed-on: https://code.wireshark.org/review/14518
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>
3 years agoGSM RLC/MAC: add dissection of EC-GSM-IoT control messages
Anton Thomasson [Fri, 10 Jun 2016 14:12:24 +0000 (16:12 +0200)]
GSM RLC/MAC: add dissection of EC-GSM-IoT control messages

Change-Id: Ib7096039aa9761fda96ed8552899833597ba70a6
Reviewed-on: https://code.wireshark.org/review/15812
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoGSM RR: add dissection of EC-GSM-IoT ccch control messages
Anton Thomasson [Fri, 10 Jun 2016 14:13:44 +0000 (16:13 +0200)]
GSM RR: add dissection of EC-GSM-IoT ccch control messages

Change-Id: Ib40f78a0d1822bf216af0911f9672c750a78b265
Reviewed-on: https://code.wireshark.org/review/15813
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoDiameter: free the diameter directory variable.
Jeff Morriss [Sun, 12 Jun 2016 23:00:37 +0000 (19:00 -0400)]
Diameter: free the diameter directory variable.

It's only needed for a few milliseconds--there's no need for it to stick around
until the epan scope ends.

As discussed on I51813815babb4c40722c38459139ab9e3e3ccb42.

Change-Id: I81fef351ef2d700cc5ec5866340605704173fbdb
Reviewed-on: https://code.wireshark.org/review/15861
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoQt: Make the capture filter read-only only in main welcome.
Gerald Combs [Sun, 12 Jun 2016 22:10:02 +0000 (15:10 -0700)]
Qt: Make the capture filter read-only only in main welcome.

As noted in gb7897dd, CaptureFilterCombo needs to be read-only until the
app is initialized. Move the code to do so to MainWelcome, otherwise the
capture filter entry in CaptureInterfacesDialog starts out read-only and
stays that way. Disable / enable the entire CaptureFilterCombo instead
of setting its lineEdit read-only status, which provides a stronger
visual indicator.

Change-Id: Ic7bf5b5631b861ecf4dc8cca67beb5bf4ed27510
Reviewed-on: https://code.wireshark.org/review/15859
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoQt: Add the Info column contents to Expert Info.
Gerald Combs [Fri, 10 Jun 2016 16:57:17 +0000 (09:57 -0700)]
Qt: Add the Info column contents to Expert Info.

When "group by summary" is enabled, packet items contain a packet number
followed by a lot of empty space. Fill it with the contents of the Info
column.

Set the first column title to "Severity" or "Packet" depending on the
item selection.

Change-Id: Iff96ab2ec631300ec8f08e55019e191e88cff84a
Reviewed-on: https://code.wireshark.org/review/15814
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoIndent register.c and other cosmetic changes
João Valverde [Wed, 27 Apr 2016 14:07:03 +0000 (15:07 +0100)]
Indent register.c and other cosmetic changes

Change-Id: I06e863e0b87118047f4c3b7618df02b9c7384a34
Reviewed-on: https://code.wireshark.org/review/15836
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoAdded Diameter 3GPP decoding of AVP 1404 - QoS-Subscribed
Binh Trinh [Sun, 12 Jun 2016 18:21:12 +0000 (14:21 -0400)]
Added Diameter 3GPP decoding of AVP 1404 - QoS-Subscribed
(removed spaces)
(removed C++ style comments)

Change-Id: I0f6c7586486b48eab8659a048be451ce3fe1c72b
Reviewed-on: https://code.wireshark.org/review/15850
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoQt: Multi line import from hex dump without offsets
Stig Bjørlykke [Mon, 13 Jun 2016 08:00:28 +0000 (10:00 +0200)]
Qt: Multi line import from hex dump without offsets

Fix importing hex dump without offsets with multiple lines.

Change-Id: I7a7339e375b3125688f5b5d29f493704c7b9944a
Reviewed-on: https://code.wireshark.org/review/15868
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
3 years agoRADIUS: Add Sangoma dictionary
Alexis La Goutte [Sat, 11 Jun 2016 04:14:35 +0000 (06:14 +0200)]
RADIUS: Add Sangoma dictionary

From FreeRADIUS master

commit ba4b4402588ae87497a0b7c87e26eb5cb433c8a7
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Fri Jun 10 14:38:55 2016 -0400

    Added dictionary.sangoma

    from http://wiki.sangoma.com/files/NSC-Radius-Support/dictionary.sangoma.txt

Change-Id: Ie51ea6343a2a8a5b286d70451abce81ca920261f
Reviewed-on: https://code.wireshark.org/review/15823
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoAdd address_type_get_by_name
Michael Mann [Sun, 12 Jun 2016 15:12:15 +0000 (11:12 -0400)]
Add address_type_get_by_name

This allows the decoupling of a dissector registering an address type
so it doesn't need to export the returned registered type.

Change-Id: I49c913d042e70bd4b7ea1e964ba9511bb27304f5
Reviewed-on: https://code.wireshark.org/review/15855
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoCompletely remove dissector_add_handle.
Michael Mann [Sun, 12 Jun 2016 13:38:55 +0000 (09:38 -0400)]
Completely remove dissector_add_handle.

It has been deprecated and replaced with dissector_add_for_decode_as.

Change-Id: I5a4976f83951f749e70b5267570fca188daa7a07
Reviewed-on: https://code.wireshark.org/review/15854
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoUSB: fix dissection of URB setup when the payload was claimed by a sub dissector
Pascal Quantin [Sun, 12 Jun 2016 21:50:04 +0000 (14:50 -0700)]
USB: fix dissection of URB setup when the payload was claimed by a sub dissector

Bug: 12511
Change-Id: Ic9af8358e2a8110f53c587201cafc337630c302a
Reviewed-on: https://code.wireshark.org/review/15858
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
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>
3 years agoUSB HID: add dissector to USB Device 'Decode As' list
Pascal Quantin [Sun, 12 Jun 2016 21:49:04 +0000 (14:49 -0700)]
USB HID: add dissector to USB Device 'Decode As' list

Ping-Bug: 12511
Change-Id: I6193e3bb084adf9925bb6800a756804164030630
Reviewed-on: https://code.wireshark.org/review/15857
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoRename a variable
João Valverde [Mon, 13 Jun 2016 02:49:37 +0000 (03:49 +0100)]
Rename a variable

Change-Id: Ie5d859e166fbc8073be88cbbd96bffa877e6b654
Reviewed-on: https://code.wireshark.org/review/15865
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoFinish moving the parenthesis.
Guy Harris [Mon, 13 Jun 2016 02:15:40 +0000 (19:15 -0700)]
Finish moving the parenthesis.

Change-Id: I02f099ef198e360663b03857bdf9538bb63a7de8
Reviewed-on: https://code.wireshark.org/review/15864
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoFix a compile error.
Guy Harris [Mon, 13 Jun 2016 01:45:45 +0000 (18:45 -0700)]
Fix a compile error.

(Perhaps the Petri dish buildbots should, if a build fails, immediately
mark the change as failing the Petri dish build, without waiting for the
other build(s), so that you don't have to, for example, wait for the
Ubuntu buildbot to finish doing a test build for a change that doesn't
affect code built on UN*X.)

Change-Id: I89ee1616d35c186fcabc0ec989936fa94116df70
Reviewed-on: https://code.wireshark.org/review/15863
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoDon't assume we can get a module handle for kernel32.dll.
Guy Harris [Sun, 12 Jun 2016 22:30:35 +0000 (15:30 -0700)]
Don't assume we can get a module handle for kernel32.dll.

A failure "shouldn't happen", but check anyway; if nothing else, that
squelches some complaining from the VS Code Analysis tool.

Change-Id: I9b06db399741176d0e9f859eb650bed8a2f96d9c
Reviewed-on: https://code.wireshark.org/review/15860
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoQt: Add import from hex dump without offsets
Stig Bjørlykke [Sun, 5 Jun 2016 19:06:51 +0000 (21:06 +0200)]
Qt: Add import from hex dump without offsets

Added support for importing from hex dump without offsets.
This will create one packet with all hex values found in the file.

Change-Id: I0414441721078befeb59aa6a87b9412646cfcf5c
Reviewed-on: https://code.wireshark.org/review/15743
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoFix typo in dissector doc
Léo Gaspard [Sun, 12 Jun 2016 20:35:16 +0000 (22:35 +0200)]
Fix typo in dissector doc

Change-Id: I5ca20080f99905ab23d484d0be054a89c406c583
Reviewed-on: https://code.wireshark.org/review/15852
Reviewed-by: Anders Broman <a.broman58@gmail.com>