Commit Graph

63306 Commits

Author SHA1 Message Date
Balint Reczey f749a64280 cmake: Detect proper large file defines even with -Wno-error
Without this change large file support was detected as available
even when it was not without additional flags on 32 architectures.

As a result mergecap and other programs are built without large
file support causing mergecap not being able to write files
bigger than 2GB on i386 systems. This used to work properly
with autotools builds, but not with CMake ones.

Change-Id: Ibfd043342b2a48310d2ac9d760e6404a701c5808
Reviewed-on: https://code.wireshark.org/review/15937
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-16 04:02:43 +00:00
Dario Lombardo 4962ea601f qt: move free_stat_tables from SimpleStatisticsDialog::fillTree to ~SimpleStatisticsDialog.
Add a reference count to stat_tap_table_ui to prevent bad deallocations.

Bug: 12437
Change-Id: Ib9b1f929d08a574c306dc755ec416ab94a3fd6d3
Reviewed-on: https://code.wireshark.org/review/15920
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
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>
2016-06-16 04:01:57 +00:00
Jeff Morriss a38db78f7d Update the X11 dissector to use the latest mesa and xcbproto.
Change-Id: Ia1395cffaebbcf6585b9167861d8c3b4d86cf821
Reviewed-on: https://code.wireshark.org/review/15923
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>
2016-06-16 03:29:45 +00:00
Balint Reczey d1d27bd95a Qt: Clarify follow stream dialog's format button
The stream is not just shown, but also saved in ASCII, EBDIC, Raw, etc.

Change-Id: Ic29e3273ebb9a3eca0fe791bdd48606c4be3b828
Reviewed-on: https://code.wireshark.org/review/15957
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 03:28:35 +00:00
Alexis La Goutte 8b94a664f6 X11: Fix last indent issue on X11 generator
and regenerate X11 dissector

Change-Id: If2c781d346713f5a2a2e97de84c0fedcfd1958af
Reviewed-on: https://code.wireshark.org/review/15944
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 03:08:07 +00:00
Alexis La Goutte a9d9d4f458 x11: Regenerate dissector after indent change on g2b8caf31cca
Change-Id: Iac1522998c5983b417a0083b9c607a60e7f66e8c
Reviewed-on: https://code.wireshark.org/review/15943
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 03:07:27 +00:00
Dario Lombardo b5a8c4f729 randpktdump: fix a crash.
Randpktdump requires the init the wtap opttypes.
Fixed making the init function public and calling it.

Bug: 12539
Change-Id: I02585c41012deacff1526b51ed09ab555cbfc8ce
Reviewed-on: https://code.wireshark.org/review/15951
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 03:05:37 +00:00
AndersBroman 79aab9232b Don't call g_ascii_strcasecmp() with an NULL string.
Change-Id: I6efbdcb51efe5f2db233827e32e2105db6322d6c
Reviewed-on: https://code.wireshark.org/review/15946
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 03:05:04 +00:00
Dario Lombardo 83b2d5e00f gtk: add initializer (CID 1362745).
Change-Id: Ib1bc11e905b0a4e84302e3f9ac43f3a87afd6edf
Reviewed-on: https://code.wireshark.org/review/15954
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-06-16 02:24:02 +00:00
Jeff Morriss 66d26d701f Remove a bunch of unassigned ETSI AVPs.
These were presumably there to allow indexed search of the AVP list but it
wasn't working anyway (binary search was used).  And the expert info for
"unknown" (to Wireshark) AVPs is a good thing.

Change-Id: Id6b9e5c90b8a2a6e3cf4415cd1b6114308c74440
Reviewed-on: https://code.wireshark.org/review/15956
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 02:23:15 +00:00
Rudra Rugge 38afb1d002 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>
2016-06-16 02:00:53 +00:00
Pascal Quantin 37c40bd7cf 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>
2016-06-16 01:59:33 +00:00
Pascal Quantin 60578aa16f 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>
2016-06-16 01:59:15 +00:00
Martin Kaiser b2c7e8eb01 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>
2016-06-16 00:09:36 +00:00
Jeff Morriss c5528d0b06 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>
2016-06-15 23:41:04 +00:00
Peter Wu e551731723 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>
2016-06-15 23:39:00 +00:00
Balint Reczey 1708e2eb04 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>
2016-06-15 23:19:56 +00:00
Pascal Quantin fb38049f4d 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>
2016-06-15 22:04:09 +00:00
Alexis La Goutte c3190adc12 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>
2016-06-15 21:39:00 +00:00
Balint Reczey a8f73e92fd 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>
2016-06-15 21:21:54 +00:00
Gerald Combs 04058b8af3 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>
2016-06-15 21:17:56 +00:00
Jeff Morriss 66efbdbc01 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>
2016-06-15 20:54:48 +00:00
dsrsupport 1b0d51ffdf 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>
2016-06-15 20:52:42 +00:00
Gerald Combs 561a063fee 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>
2016-06-15 20:51:34 +00:00
Alexis La Goutte ca1c5f540a 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>
2016-06-15 20:50:37 +00:00
Jeff Morriss 6d89f3b699 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>
2016-06-15 20:50:04 +00:00
dsrsupport 64169e3a76 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>
2016-06-15 19:58:57 +00:00
Pascal Quantin 6baa1b544c 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>
2016-06-15 19:21:57 +00:00
Guy Harris 88bd50c592 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>
2016-06-15 19:16:19 +00:00
Pascal Quantin 5a73176a9d 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>
2016-06-15 18:53:30 +00:00
Dario Lombardo edf0b5cb9a 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>
2016-06-15 18:07:40 +00:00
Martin Kaiser de23fbc724 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>
2016-06-15 18:01:24 +00:00
Stig Bjørlykke ec5acbc33c 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>
2016-06-15 17:56:21 +00:00
João Valverde 9ba9a05ef0 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>
2016-06-15 17:34:34 +00:00
Peter Wu babb9e32e9 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>
2016-06-15 17:31:01 +00:00
Pascal Quantin 95a05790d2 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>
2016-06-15 16:42:30 +00:00
Michael Mann 525fd71b36 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>
2016-06-15 15:18:37 +00:00
Gerald Combs d25a60c1c1 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>
2016-06-15 13:39:29 +00:00
Jaap Keuter b26e757b31 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>
2016-06-15 13:04:48 +00:00
Michael Mann 0ef1d941ea 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>
2016-06-15 06:03:57 +00:00
Peter Wu c19e6c2406 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>
2016-06-15 06:02:51 +00:00
Jeff Morriss 3a590217ac 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>
2016-06-15 05:38:01 +00:00
Martin Kaiser 22fd85d178 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>
2016-06-15 01:56:04 +00:00
Guy Harris eb4ed5a53c 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>
2016-06-15 00:36:34 +00:00
Pascal Quantin 51dd96fbb8 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>
2016-06-14 23:40:14 +00:00
Dario Lombardo 38d08e0b6e 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>
2016-06-14 23:06:09 +00:00
Alexis La Goutte 58023e5ee9 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>
2016-06-14 22:53:30 +00:00
Michael Mann b7e32bbd46 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>
2016-06-14 22:08:28 +00:00
Pascal Quantin 581a17af40 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>
2016-06-14 21:57:41 +00:00
Jeff Morriss d74113fbfb 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>
2016-06-14 21:44:08 +00:00