Commit Graph

60593 Commits

Author SHA1 Message Date
Graham Bloice 25e3a6c021 docs: Windows CMake builds
Updated the WSDG Windows build instructions to use CMake.

Change-Id: I5006c07e09ec6f628e8bc44006a3f1086e831a3c
Reviewed-on: https://code.wireshark.org/review/11485
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
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-11-05 21:24:14 +00:00
Dario Lombardo 4ea610a54a dcerpc: add check for mutually exclusive function pointers
Found by clang analyzer.

Change-Id: Idb2e80edbb5b264fd257a7b4208ff75bd543df88
Reviewed-on: https://code.wireshark.org/review/10970
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-05 19:57:35 +00:00
Alexis La Goutte 52970ef9f8 DNS: Register dissector by name
Change-Id: I0eb03f2452c4f7fef0f527c7ce7154d479fcc3fd
Reviewed-on: https://code.wireshark.org/review/11544
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>
2015-11-05 17:16:57 +00:00
AndersBroman 2eec154561 [IPsec] Hand the subdissector the payload data only,
not including the padding and auth data.

Change-Id: Ib883fcb44def8d6fbdde19729519b40b32d78577
Reviewed-on: https://code.wireshark.org/review/11563
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>
2015-11-05 09:50:23 +00:00
Stig Bjørlykke 9c0d550a4a extcap: Provide capture filter to extcap binary
Added the option --extcap-capture-filter to extcap to send the capture filter
from the main screen to the extcap binary.

Change-Id: I75f0d7dbec810551225377f9221053298488cdd5
Reviewed-on: https://code.wireshark.org/review/11423
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-05 07:42:35 +00:00
Stefan Metzmacher 51dcd59d2d packet-dcerpc: let dcerpc_get_proto_name() handle unknown uuids
This fixes a regression in commit e0e574d167.

Change-Id: I447001a84e17a76ec77c48f736bbfcd8cc6324a1
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/11574
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-11-05 02:53:41 +00:00
Stefan Metzmacher ea0e29f3e6 packet-dcerpc: fix dissecting of decrypted payload
This fixes a regression in commit e0e574d167.

Change-Id: Iccdeeb488ec70727fc637ca548637e5a5e54ef1c
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/11573
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-11-05 02:01:23 +00:00
Dario Lombardo ca69e8e3f0 randpkt: code restyle.
Code has been restyled towards a more modular approach. This will allow
the split of the code into a core and an app. Once splitted the code can
be reused by other apps, useful for testing.

Change-Id: I96083a7cc1a3417d10961700e5c7c27d32e350e8
Reviewed-on: https://code.wireshark.org/review/11355
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: Michael Mann <mmann78@netscape.net>
2015-11-05 00:42:59 +00:00
Dario Lombardo 0e01c018fa gssapi: add init in wrap_dissect_gssapi_payload().
Found by clang analyzer.

Change-Id: I1c5cb13e174df588c8834508b10790d3fd5b272a
Reviewed-on: https://code.wireshark.org/review/11564
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-11-04 22:22:33 +00:00
Guy Harris a892e9ba71 Declaring volatile pointers to functions is hard, let's go shopping!
Change-Id: I9686f0c2be43df7a00a00ad2f6aadf6db464d809
Reviewed-on: https://code.wireshark.org/review/11570
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-04 18:42:48 +00:00
Guy Harris 283e63c7e0 Squelch a "setjmp/longjump may clobber" warning.
Clean up indentation while we're at it.

Change-Id: If2068fe17664d78c8fc9747b0ee63bac0213d174
Reviewed-on: https://code.wireshark.org/review/11567
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-04 17:54:54 +00:00
Pascal Quantin 87aca409dc SSL: fix SCTP port association so as to match what is done for UDP/TCP
Change-Id: I84f85b7b87ecd9e7801559f7eae2cc98f5a12ab7
Reviewed-on: https://code.wireshark.org/review/11560
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-04 17:26:59 +00:00
Pascal Quantin df487145ee Skinny: fix dissector registration for SSL
Change-Id: Ia3f29b703b8271f52dfed9d8b46e18f405785d3a
Reviewed-on: https://code.wireshark.org/review/11559
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-04 17:24:26 +00:00
Michael Mann 02dcf3cc72 Don't allow DCE/RPC dissector table to have duplicates
Add "placeholders" in Profinet dissector to make that possible.

Change-Id: I000069ec72b5810c5675a30df1c121aa179000b3
Reviewed-on: https://code.wireshark.org/review/11557
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-11-04 15:51:07 +00:00
Pascal Quantin bd44ceebd5 Diameter: fix a typo in dictionary.xml
Change-Id: I8a91c9303e9b650380d188be5028e238fc7f2890
Reviewed-on: https://code.wireshark.org/review/11561
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-04 14:42:53 +00:00
Michael Mann 676e7ec427 (Temporarily) Allow DCE/RPC dissector table to have duplicates.
Change-Id: I0df81ce03b567e75566fc0969f49d54488604c16
Reviewed-on: https://code.wireshark.org/review/11555
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 13:15:30 +00:00
Michael Mann e0e574d167 Refactor DCE/RPC dissection to include a real dissector table.
This is hopefully just the first step in getting DCE/RPC dissection to use "standard" APIs instead of homegrown ones.
For starters, it allows Decode As functionality to be less hacky (although incomplete in Qt)

Change-Id: Ia0923a3d8d514ab7acce32e26ee7e08f6e24feca
Reviewed-on: https://code.wireshark.org/review/11468
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-11-04 12:43:35 +00:00
Michael Mann 74541a9596 Don't allow multiple registrations of a protocol in dissector tables.
The target here is the Decode As dialog where protocols have multiple registrations into a dissector table and that shows up as multiple entries in the Decode As dialog list with the same name so users are unsure which "dissector" they are choosing.

The "default" behavior (done in this commit) is to not allow duplicates for a dissector table, whether its part of Decode As or not.  It's just ENFORCED for Decode As.

Bug: 3949
Change-Id: Ibe14fa61aaeca0881f9cc39b78799e314b5e8127
Reviewed-on: https://code.wireshark.org/review/11405
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 12:39:40 +00:00
Alexis La Goutte 0ccab3c0b5 Dictionary (diameter): fix indent (use tabs)
Follow gc7c33b0c8

Change-Id: I54d101f561d4f03dd6e972c8dda3cd6516128de5
Reviewed-on: https://code.wireshark.org/review/11553
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 12:37:06 +00:00
Dhiru Kholia 58528f6d91 Fix AddressSanitizer (./configure --enable-asan) builds
"./configure --enable-asan" currently fails to detect installed libraries
because aclocal-fallback/* built programs have memory leaks in them.

configure:34516: checking for GTK+ - version >= 3.0.0
configure:34626: gcc -o conftest ...
...
configure:34626: $? = 0
configure:34626: ./conftest

=================================================================
==29007==ERROR: LeakSanitizer: detected memory leaks

Direct leak of 6 byte(s) in 1 object(s) allocated from:
    #0 0x7fa5c95dd9aa in malloc (/usr/lib/x86_64-linux-gnu/libasan.so.2+0x989aa)
    #1 0x7fa5c8995578 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x4f578)

SUMMARY: AddressSanitizer: 6 byte(s) leaked in 1 allocation(s).
configure:34626: $? = 23
configure: program exited with status 23
...
configure:34649: result: no
configure:34699: error: GTK+ 3 is not available

...

This system is running 64-bit Ubuntu Linux 15.10 with GCC 5.2.1
compiler.

The glib-2-0.m4 leak, and the gtk-3.0.m4 leak are fixed by updating
"glib-2.0.m4" to the latest upstream version.

Whitespace errors are fixed locally to keep the BuildBot happy.

Change-Id: I01a5f4c494a59ae6d0ee19cd2611fab163ebf9b4
Reviewed-on: https://code.wireshark.org/review/11283
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-04 12:16:17 +00:00
Pavlos Antoniou cde99ec535 [OpenFlow] Use correct name for flag OFPMPF_REPLY_MORE in v5 dissector
Change-Id: Ia8cb88d4d884be95814f4a144a4c3b07b32ffca7
Reviewed-on: https://code.wireshark.org/review/11543
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-04 11:38:12 +00:00
Pascal Quantin ccca843a57 Activate word wrap for hintLabel defined as QLabel
Without this, a long hint string (like a wrong protocol name in the SSL UAT preference) will resize the window to match the string.
With this change, instead the hintLabel string is continuing on a new line to match currently configured window size

Change-Id: Ib8fcc7bd96585717f122b0921165c4d916442cb0
Reviewed-on: https://code.wireshark.org/review/11529
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
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>
2015-11-04 11:34:30 +00:00
Branislav Makan c7c33b0c85 Updated Diameter dictionary.xml with AVP values.
Diameter dictionary has been updated with the following AVP values:
1031 Rule-Failure-Code: adden new enum codes.
1082 Credit-Management-Status
1091 TDF-IP-Address
1098 Application-Detection-Information

Change-Id: I2c5c438fa48b9deda4bdc2a046c19b583b5c7763
Reviewed-on: https://code.wireshark.org/review/11524
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-04 11:32:33 +00:00
Guy Harris eebbd0ab5a One more file that now needs wsutil/str_util.h for plurality().
Change-Id: I19ccff96d590002a170fb0e477d53acb71d1680d
Reviewed-on: https://code.wireshark.org/review/11547
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-04 09:17:59 +00:00
Guy Harris 6704c8a5e9 Don't include stuff from libwireshark.
Dumpcap captures packets, and supports the usual capture options, so it
needs this, but it does *not* link with libwireshark (deliberately, so
that the libwireshark code isn't linked into a program that might run
with special privileges), so we must not depend on anything in
libwireshark.

Change-Id: Id975fd6a83a4b2a493c67493e41e69b784a050aa
Reviewed-on: https://code.wireshark.org/review/11546
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-04 09:13:32 +00:00
Guy Harris ff9f9fc431 Don't include "file.h" if you don't need it.
It ends up dragging in libwireshark headers, which programs not linking
with libwireshark shouldn't do.  In particular, including
<epan/address.h> causes some functions that refer to libwireshark
functions to be defined if the compiler doesn't handle "static inline"
the way GCC does, and you end up requiring libwireshark even though you
shouldn't require it.

Move plurality() to wsutil/str_util.h, so that non-libwireshark code can
get it without include epan/packet.h.  Fix includes as necessary.

Change-Id: Ie4819719da4c2b349f61445112aa419e99b977d3
Reviewed-on: https://code.wireshark.org/review/11545
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-04 08:46:30 +00:00
João Valverde 321934f2ff MPTCP: Use copy_address_wmem() instead of copy_address()
Change-Id: I9f53ecf1971c96d06c1c8e3be6e5481cc453f96a
Reviewed-on: https://code.wireshark.org/review/11533
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 02:49:33 +00:00
Michael Mann 795b5c1963 Refactor some GSS-API dissectors to accept dissector data instead of using packet_info.
This can hopefully lead to the removal of the GSS-API specific members of the packet_info structure.

Change-Id: I7622d66e9f02c6e4cb76adcf0737b35c6ec88cdd
Reviewed-on: https://code.wireshark.org/review/11509
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 02:45:58 +00:00
Guy Harris 58431e2f6a Don't include libwireshark headers from libwiretap.
Move the definitions of hashipv4_t and hashipv6_t to wiretap/wtap.h, as
that's the main place they're used.  Change them a bit not to depend on
other stuff from libwireshark, and change the code as required by those
changes.

This should fix the Solaris build; apparently, the Sun^WOracle compiler
is generating code for static inline functions even if they're never
called, so that libwiretap ends up including code that calls tvbuff and
wmem functions.

There's probably further cleanup that could be done here, but this
should at least fix the build, as well as getting rid of a dependency
between two libraries that are at least somewhat independent (libwiretap
should *not* depend on libwireshark, as some programs use libwiretap but
not libwireshark, and, ultimately, we probably want it to be possible to
use libwireshark without libwiretap but that'd be more work).

Change-Id: I91c745282f17d7c8bff7809aa277eab2b3cf47c1
Reviewed-on: https://code.wireshark.org/review/11537
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-04 00:56:44 +00:00
Lotte Steenbrink 40b45dfb6e packetbb; display Addressblock Tail as Tail
when displaying the contents of a RFC5444 message containing an address block
with a tail, the tail's value is incorrectly displayed as:

Head: <value of tail>

while it should say:

Tail: <value of tail>

This commit fixes that.

Bug: 11673
Change-Id: Ibeb921cb712f98c9651970529e5240f871b85c0b
Reviewed-on: https://code.wireshark.org/review/11538
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 00:49:12 +00:00
Stig Bjørlykke 86320fdee6 Qt: Turn off WindowModified when closing a file.
When closing a capture file the main window will never be modified,
so ensure we turn this off when the file is closed.

Change-Id: I3e6a62c931330a75d32f46fc32524d8de8734485
Reviewed-on: https://code.wireshark.org/review/11497
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-03 21:00:08 +00:00
Guy Harris 688f2e8768 Include packet-dcerpc-witness.h, so it's in the source tarball.
Change-Id: I3b0cc7cec85fb94776fae66e8c8f20710b3508e8
Reviewed-on: https://code.wireshark.org/review/11531
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-03 19:21:46 +00:00
Stephen Fisher 2244c6d8d5 Update .mailmap with my new e-mail address
Change-Id: Ia3a0634e27db42373e491815a236e7a8ee002058
Reviewed-on: https://code.wireshark.org/review/11527
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-03 18:13:50 +00:00
Alexis La Goutte 657c55e862 GTPv2: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I6b2ddc2f84e954194260b956b6f46f0747d8a66a
Reviewed-on: https://code.wireshark.org/review/11504
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>
2015-11-03 14:35:21 +00:00
AndersBroman 6c64a41017 [SIP] Rework how the length of the diagnostic string is determined, it did
not work with multiple SIP packages in one frame.

Change-Id: Ie142aeea0c6ad28cfdd6206738a6f147094c479f
Reviewed-on: https://code.wireshark.org/review/11516
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-03 14:33:45 +00:00
Gregor Beck f528f55cd5 packet-dcerpc-witness: initial implementation based on the idl file from samba
See [MS-SWN], https://msdn.microsoft.com/en-us/library/hh536748.aspx

Change-Id: Ie92dad2c229ec08e7f7e31be9422450305b3908a
Signed-off-by: Gregor Beck <gbeck@sernet.de>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-on: https://code.wireshark.org/review/11366
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-11-03 12:38:01 +00:00
Martin Kaiser eafc94c9ac [Qt recent files menu] make sure that the "Clear Menu" item is retranslated
this item is created along with the list of recent files
it looks like our only option to update its translation is to rebuild the
list of recent files

Change-Id: If740571fb9c939d65ca4f1f432aadf22c38dcb27
Reviewed-on: https://code.wireshark.org/review/11462
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: Michael Mann <mmann78@netscape.net>
2015-11-03 12:21:36 +00:00
João Valverde 3df2333155 Remaining ADDRESS macro to address function conversions
Change-Id: I8bc9af431e70243b05f4f0ce8c2b8ee451383788
Reviewed-on: https://code.wireshark.org/review/11463
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-11-03 12:20:34 +00:00
Michael Mann 8571dbb908 Document dissector "Decode As" functionality in README.dissector
Change-Id: I82d97a9fb770455d57d47cef8c616d2d4ff41d3c
Reviewed-on: https://code.wireshark.org/review/11488
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-11-03 12:19:54 +00:00
Guy Harris 6375df2da4 Put a newline at the end of the file.
Change-Id: Ic04e9a4afdceb1e36ad8367dd0d7bf6bd0674844
Reviewed-on: https://code.wireshark.org/review/11514
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-03 01:46:41 +00:00
Gerald Combs 5c5cc228fc Revert the last two CMake changes.
get_filename_component returns "/regstry" if the query is unsuccessful.
We'll have to add a check for that if we query "Add Paths".

Revert "CMake: Pass ABSOLUTE to get_filename_component."

This reverts commit 4c03f4be00.

Revert "CMake: Look for Python using the "App Paths" key."

This reverts commit 6d1b6cd39d.

Change-Id: Ida17608467fa3652f4219e4eaf01edfa48120b1d
Reviewed-on: https://code.wireshark.org/review/11512
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-03 01:35:28 +00:00
Gerald Combs 4c03f4be00 CMake: Pass ABSOLUTE to get_filename_component.
Change-Id: Iecfc4aabe332cac930a7fa5bb6e342a55e7bc7b3
Reviewed-on: https://code.wireshark.org/review/11510
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-03 01:09:23 +00:00
Alexis La Goutte dd17c69ed9 RADIUS: Fix length of display data for Ascend-Data-Filter
Change-Id: I5fd1f82ff193cfface0b5d1e5be227dfc3e04f9a
Ping-Bug:11630
Reviewed-on: https://code.wireshark.org/review/11292
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: Michael Mann <mmann78@netscape.net>
2015-11-03 01:03:58 +00:00
Gerald Combs 6d1b6cd39d CMake: Look for Python using the "App Paths" key.
Query HKLM\Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe
and HKCU\Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe
first before trying other methods.

Change-Id: I83f54f6833149c68f1626c3c17f25ffe54d8ea5d
Reviewed-on: https://code.wireshark.org/review/11506
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-11-03 00:37:29 +00:00
Stephen Fisher 0f4d139437 Update my e-mail address in the AUTHORS file
(Source files all reference this file, so they don't need updating)

Change-Id: Ib78c081d00e093119eab7d4d97c74944b3a46cfd
Reviewed-on: https://code.wireshark.org/review/11507
Reviewed-by: Stephen Fisher <sfisher@panix.com>
2015-11-02 23:49:39 +00:00
Pascal Quantin 332b9cef51 PDCP LTE: fix dissection of signalling PDUs sent on common control channels
For those crazy enough to try to decode PDUs sent in transparent mode ;)

Change-Id: Iab0a1325a6764846e23d8f04bd3147625b970638
Reviewed-on: https://code.wireshark.org/review/11498
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>
2015-11-02 21:29:22 +00:00
Stig Bjørlykke 22a9376bb4 BER: Removed erroneous callback from dissect_ber_external_U
This callback was added by a mistake when adding support for
P3 over RTSE in commit 0a6d1f98.

Change-Id: Ifff0bed3b2a2a0fd2354f9c6b7072de3303dae27
Reviewed-on: https://code.wireshark.org/review/11500
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-11-02 18:19:27 +00:00
Gregor Beck 3dd5e255c0 packet-dcerpc: add proto_tree_add_dcerpc_drep()
Change-Id: I1d3515371f50454acbcbdde75f2f1a3e614a5512
Signed-off-by: Gregor Beck <gbeck@sernet.de>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/11495
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-11-02 17:45:33 +00:00
Alexis La Goutte 8fdeb61ab6 packet(.h): fix api reference / -Wdocumentation
From api ref :
warning: argument 'uint_val' of command @param is not found in the argument list of dissector_get_guid_handle(dissector_table_t const sub_dissectors, guid_key *guid_val)
The following parameters of dissector_get_guid_handle(dissector_table_t const sub_dissectors, guid_key *guid_val) are not documented:
  parameter 'guid_val'

From -Wdocumentation
parameter 'uint_val' not found in the function declaration [-Wdocumentation]

Change-Id: I9c7b82e4ecb5a126cb96c7d6c057440eb5d24bdd
Reviewed-on: https://code.wireshark.org/review/11499
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-02 17:41:49 +00:00
Alexis La Goutte 307443cbbc funnel_string_dialog(.h): fix extra ‘;’ [-Wpedantic]
Change-Id: Ia11bfa225327c1cd19da70878e69be60da073a79
Reviewed-on: https://code.wireshark.org/review/11489
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-11-02 16:15:44 +00:00