git.samba.org - metze/wireshark/wip.git/log

Make --help and --version information a bit more uniform.

Have --version print the version number, the copyright information, the
"compiled with" information, the "running on/with" information, and the
compiler information.

Have --help print the version number, a one-line summary of what the
program does, a reference to http://www.wireshark.org for more
information, a Usage: line, and a list of command-line options.

This means programs doing that don't need to include version.h; that's
left up to get_ws_vcs_version_info() to do.

Change-Id: Idac641bc10e4dfd04c9914d379b3a3e0cc5ca8cb
Reviewed-on: https://code.wireshark.org/review/2794
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Revert to 3ms if we don't have the handshake

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

GTP: add dissection of Extended End User Address

Bug: 10251
Change-Id: I174b5a2b3e2ec8ff2ead9f290b452ee468f6fe66
Reviewed-on: https://code.wireshark.org/review/2783
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

More getopt_long(), for --help and --version.

Change-Id: Ia02d7b1fbeaa8e581e85ad8b87afabd576515434
Reviewed-on: https://code.wireshark.org/review/2792
Reviewed-by: Guy Harris <guy@alum.mit.edu>

More getopt_long, to add --help and --version support.

Change-Id: I946067b972a70154f02ab561bc0fd029a7a5abc4
Reviewed-on: https://code.wireshark.org/review/2791
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Add long-option support.

That way, --help and --version, as well as -h and -v, work.

Change-Id: I095e0dcef9f6181d6fbe6337f9f33e80bc44f11a
Reviewed-on: https://code.wireshark.org/review/2790
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Regularize the help output of programs.

Only print to the standard output, and only give the version
information, if a "print help" command-line option is specified.
Otherwise, leave out the version information, and print to the standard
error.

Leave out the copyright information; it's extra cruft, and

http://www.gnu.org/prep/standards/html_node/_002d_002dhelp.html

doesn't say anything about it (and bash, at least, doesn't print it).

Change-Id: Ic5029ccf96e096453f3bd38383cc2dd355542e8a
Reviewed-on: https://code.wireshark.org/review/2789
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Regularize the first line of version output.

For Wireshark, say "Wireshark", not "wireshark".

For other programs, put "(Wireshark)" after the program name, as per

http://www.gnu.org/prep/standards/html_node/_002d_002dversion.html

("If the program is a subsidiary part of a larger package, mention the
package name in parentheses, like this").

Change-Id: I68558f64cfa6ee4423e42f3d6b120633ef1b2716
Reviewed-on: https://code.wireshark.org/review/2788
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Add license information to the copyright information.

See

http://www.gnu.org/prep/standards/html_node/_002d_002dversion.html

Change-Id: I19c1cf560a1bb7ed7d7312bea727550977d66120
Reviewed-on: https://code.wireshark.org/review/2787
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Manage Interfaces

- Add dialog to manage interfaces
- Add and delete pipes
- Hide local interfaces

Change-Id: I08323c306c2ea736f99e57c28e2fe3170a0c2216
Reviewed-on: https://code.wireshark.org/review/2613
Tested-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>

Fail if any of the install-exec-hook commands fails.

Hopefully, this will mean that somebody doing a set-UID/set-GID/setcap
installation as themselves rather than as root will not "succeed" but
leave dumpcap installed without enhanced privileges, so the underlying
problem in bugs such as bug 10247 will be more obvious.

Change-Id: I34393bc2c9ea4dc59854a08524edb4f65e79730b
Reviewed-on: https://code.wireshark.org/review/2781
Reviewed-by: Guy Harris <guy@alum.mit.edu>

NDPS dissector is the poster child for proto_tree_add_subtree[_format].

NDPS dissector is also the poster child for not being considered "that naughty" by checkAPIs because most of its proto_tree_add_text calls don't have printf-style arguments (which is what checkAPIs really keys off of)

Fixed both cases and removed about 370 proto_tree_add_text calls from the dissector.

Change-Id: I721678c39d4a0544e5e7212e622c0c2eebfd04f7
Reviewed-on: https://code.wireshark.org/review/2775
Reviewed-by: Evan Huus <eapache@gmail.com>

kafka: fully dissect offset request/response messages

Change-Id: I641a3dbece6f822144f6740dde6801b1be202db5
Reviewed-on: https://code.wireshark.org/review/2777
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>

Make the flag testing logic for linker flags work like the compiler flag testing.

Change-Id: I2478417cbcd395247215f149978c5f0c874c9b3a
Reviewed-on: https://code.wireshark.org/review/2779
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

Allow overriding C/C++ flags from CMake command line

Append user's flags to our flags instead of prepending them to make
user flags higher priority.

Change-Id: I3ead33ee5fa06a2395d9197a027306ef99a704a2
Reviewed-on: https://code.wireshark.org/review/2722
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

RSVP checksum is not required if integrity object is present

Bug: 10219
Change-Id: I2da62ee184327b2bc42a264e1782db927460f5cf
Reviewed-on: https://code.wireshark.org/review/2773
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Update WSDG win32/win64 quick start guide to include dependencies and
instructions for building QtShark; note alternate cygwin package for
'patch' utility; update example setup script to add Qt bin directory to PATH,
and extract out paths as variables.

Change-Id: Id404b8757dbfd0dc1119b89e01bbe2fa139e2b38
Reviewed-on: https://code.wireshark.org/review/2751
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Optimize sip dissector: avoid calling tvb_get_string_enc()

Fetch header value, only when we need to parse it.

Change-Id: I3c170ef8ab03985c8111a1b84ac1afc87bc8b5ca
Reviewed-on: https://code.wireshark.org/review/2767
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Add a note to Doc/docbook-xml42 requirement in docbook/README.txt indicating
that a later version may be required; e.g. my a2x (from cygwin64) generates a
developer-guide.xml that needs docbook-xml45.

Change-Id: Iea9d4b45e32157a9317e3fcf6794668e3a810c54
Reviewed-on: https://code.wireshark.org/review/2750
Reviewed-by: Evan Huus <eapache@gmail.com>

See if this forces version.h to be built.

(It's not being built by the Ubuntu buildboth when it's building the
Debian package.)

Change-Id: Id7866e13ce72cdda4bb7d5cf0362ba7295ff766b
Reviewed-on: https://code.wireshark.org/review/2772
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Make some inconsistent configuration options errors.

This way, if you ask for both setuid and setcap installation of dumpcap,
it will fail, rather than silently (other than a message you might miss)
ignoring the request for setuid installation. See bug 10246.

Also:

if you ask for setuid or setcap installation of dumpcap, but
dumpcap isn't built, it'll let you know that there's nothing to
make setuid/setcap, and fail;

if you ask for setcap installation of dumpcap, but setcap wasn't
found, it'll let you know that it can't install it setcap, and
fail;

so that it won't silently (other than a message you might miss) ignore
those requests, either.

Change-Id: Ibc01593e59fd1cd1be8c68d8cdacbfdca863efa0
Reviewed-on: https://code.wireshark.org/review/2771
Reviewed-by: Guy Harris <guy@alum.mit.edu>

AUTHORS-SHORT is build in ${CMAKE_BINARY_DIR}, not ${CMAKE_SOURCE_DIR}.

Make the dependencies list indicate that.

Change-Id: I88416e1239130b7661bbd9deccfb289e0b0fd627
Reviewed-on: https://code.wireshark.org/review/2770
Reviewed-by: Guy Harris <guy@alum.mit.edu>

If -fvisibility=hidden isn't supported, try -xldscope=hidden.

That's the option for newer versions of Sun^WOracle C.

Change-Id: I62c12d5870d84587f81a8789732675021523e9ed
Reviewed-on: https://code.wireshark.org/review/2769
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Bump (again) the amount of work we do for wmem's timing test

Apparently the new win8 vm has a *very* low-resolution timer, and the allocators
are indistinguishable at the previous amount of work.

Change-Id: If4e5bb8f85b1f0d39658f54001c88f42ffddfc47
Reviewed-on: https://code.wireshark.org/review/2768
Reviewed-by: Evan Huus <eapache@gmail.com>

For Sun C with linker scoping specifiers, define WS_DLL_PUBLIC_DEF.

This may let us, at least for those compilers, make the default "hidden"
with -xldscope=hidden.

Change-Id: I94e10733c2aba0ff8d77a8bf4f1dc8ecc8b2a47f
Reviewed-on: https://code.wireshark.org/review/2766
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Get rid of rpath when we're building RPMs.

Fedora prohibits it, we don't need it, and it gets in the way some times.

Change-Id: I92cee959f471866ff90efe9f96e4fa519c357dd9
Reviewed-on: https://code.wireshark.org/review/2763
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

Fix buildroot.

Change-Id: I902db6c69ae5966da1102e4fbcfd9f46867c0b4f
Reviewed-on: https://code.wireshark.org/review/2762
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

Fix for Bug 10240.
Include padding length in calculation of correct attribute length

Change-Id: I569c6a9e1be39e3bb997e797a094b80cdcba6b07
Reviewed-on: https://code.wireshark.org/review/2747
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Use G_GNUC_PRINTF() for simple_message_box().

We don't need to do the right __attribute__ magic ourselves; GLib does
it for us.

Change-Id: Id31943a8413f0272237be4f868659b5bd5e70626
Reviewed-on: https://code.wireshark.org/review/2758
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Remove executable bit, from not executable files.

Change-Id: I36b303b9c2bf4d6bb717261cdbf39ea16532fe06
Reviewed-on: https://code.wireshark.org/review/2757
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Fix the checks for the Cygwin path.

I.e., do

if we have 32-bit Cygwin
CYGWIN_PATH=path to it
else if we have 64-bit Cygwin
CYGWIN_PATH=path to it
else
fail
endif

rather than

CYGWIN_PATH=standard path for 32-bit Cygwin
if we don't have 32-bit cygwin and we do have 64-bit Cygwin
CYGWIN_PATH=path to 64-bit cygwin
else
fail
endif

as the latter will fail if we *do* have 32-bit Cygwin.

Change-Id: I42d607a1319263edcc1d6e546b813862b7d33ffa
Reviewed-on: https://code.wireshark.org/review/2756
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Don't check for -Wl,{option} support.

Not all AC_WIRESHARK_LDFLAGS_CHECK flags are -Wl,{option} flags, so
don't check for that first. If we want to check for specific compilers
and linkers, we should do that, not for -Wl,{option} support.

Change-Id: Ib9581d4a1573a1ffa2493ce08e6d5845d2601352
Reviewed-on: https://code.wireshark.org/review/2755
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Fix comments to reflect reality.

Change-Id: Id56f5844932371a89785f4ddce87eb66789acdc8
Reviewed-on: https://code.wireshark.org/review/2754
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Pick up stuff from GLib to hide symbols with Sun C.

Note why we don't use G_GNUC_INTERNAL, but duplicate what GLib does, and
don't use G_HAVE_GNUC_VISIBILITY to determine whether we can use
__attribute__ ((visibility (...))).

Change-Id: I0b8d40f40d04e821352522320626173806787214
Reviewed-on: https://code.wireshark.org/review/2753
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Add logic to config.nmake to find 64-bit cygwin, and a note warning
about forward slashes in the QT5_BASE_PATH if the recommended qmake
command is used; both of these issues will cause annoyingly non-
obvious errors.

Change-Id: I6f9a662969d1fc1887e75e8b0fde3520bbbea416
Reviewed-on: https://code.wireshark.org/review/2749
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Fix the QT build on Qt 5.3 or later to use the windeployqt tool
to copy the rquired Qt files into the runtime directory

Qt 5.2 is broken as windeployqt doesn't take the required --release flag

Also fix the passing of GCC_DLL and GPGERROR_DLL into config.pri so
that the Qt build copies the required files instead of the entire
gnutls bin dir twice (the variables expanded to nothing).

Add support for autodetection of Qt 5.3.0 with msvc2013

Change-Id: I1e9c70a5ff5d1fdfdce88ba15d324f1899c8129c
Reviewed-on: https://code.wireshark.org/review/2734
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Keep VS Code Analysis happy

Change-Id: I4ef92f715d7a0a1449f1b509ce7ed59651cd1a6a
Reviewed-on: https://code.wireshark.org/review/2745
Reviewed-by: Evan Huus <eapache@gmail.com>

Remove debugging info from protocol tree for frame

Change-Id: Id7f02087e536964bfa6d01a3646c20035a3ab6cb
Reviewed-on: https://code.wireshark.org/review/2746
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Log2() and exp2() are missing on Windows

Change-Id: I8a970f9030fafd8fdcb4e2a24620033ec8005da7
Reviewed-on: https://code.wireshark.org/review/2744
Reviewed-by: Balint Reczey <balint@balintreczey.hu>

Drop privileges even earlier.

Do it at the same point at which Wireshark does so. Do some other
things in the same order as well.

Change-Id: I2925366d49d14271ceffa1a938b5e3450337c772
Reviewed-on: https://code.wireshark.org/review/2743
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Add a comment that appears in other programs.

Change-Id: Ife885779d339fbb706c9d6cfd931833afba25277
Reviewed-on: https://code.wireshark.org/review/2742
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Squelch some warnings.

Make some arguments and structure members gsize, as that's what stored
into them or passed to them. (And move a newly-widened-on-LP64 item, to
avoid extra structure padding.)

Add a cast, which also appears necessary to squelch a warning.

Clean up indentation while we're at it.

Change-Id: I0cc92e7d2904c5af1f3f3d93f51b6ecb3aed464d
Reviewed-on: https://code.wireshark.org/review/2741
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Increase space allocated for IO Graph slower after 1 million items

Change-Id: I691070b572e519f412a80db5d7415331f07e8e50
Reviewed-on: https://code.wireshark.org/review/2689
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>

GTK: Unlimited, dynamically allocated IO Graph

Bug: 8460
Change-Id: Id9aad3f5f69bee9e5a62601ecac28a6a7019e623
Reviewed-on: https://code.wireshark.org/review/2672
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>

Generate version.h before adding subdirs (especially wsutil). Otherwise
build could fail in wsutil because of missing version.h

Change-Id: If6fdf1080c6de9ca1581bcc126506e78ec03a1d8
Reviewed-on: https://code.wireshark.org/review/2740
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

Optimize epan_new/init_dissection

As Anders correctly pointed out in I7d8f84b2e, constantly resetting state will
turn init_dissection into a bit of a hot path. Especially as we will already
bear the overhead of switching files, we don't want to fall any further behind
than we have to.

This change includes three unrelated optimizations that reduce the cost of
init_dissection by about 40% as measured by callgrind:
- only initialize ares/ADNS if that preference is enabled (this of course only
applies if you specify -n to tshark or otherwise disable the preference)
- use memcpy instead of a loop in sigcomp UDVM init
- use memcpy instead of a loop in bootp dissector

The only remaining obvious hot spot in this path is reassembly_table_init since
it is called by so many dissectors. Suggestions (perhaps to get rid of the
GPtrArray) welcome.

Oh, and one other change to use g_strerror instead of strerror as insisted
upon by the API pre-commit hook.

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

sip optimization: avoid calling tvb_get_guint8.

Use tvb_pbrk_guint8, tvb_find_guint8 when possible.

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

Put each option on a line of its own.

Change-Id: Ibec60300306e8af7ee230080b113111f93d850dc
Reviewed-on: https://code.wireshark.org/review/2739
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

Init session id to avoid warning using GCC 4.9

Change-Id: I2091f7eb86c64fd086f44a7cf15e7c5483f9b44c
Reviewed-on: https://code.wireshark.org/review/2716
Reviewed-by: Evan Huus <eapache@gmail.com>

Fix access to uninitialised value

Change-Id: I4c8a15fce631051edd39e7d29c8f0a5e00fcde26
Reviewed-on: https://code.wireshark.org/review/2724
Reviewed-by: Evan Huus <eapache@gmail.com>

Fix access to uninitialised values

Change-Id: Id3592fed0cca5133d493f26d3b8ce27a3cf8505c
Reviewed-on: https://code.wireshark.org/review/2723
Reviewed-by: Evan Huus <eapache@gmail.com>

Reflect the move of filters.c to libui.

Change-Id: Ic1099927e3fb63c020c622e0a92e99a376908f4e
Reviewed-on: https://code.wireshark.org/review/2737
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Drop privileges very early on.

TShark relies on dumpcap to capture packets, and TFShark doesn't even do
packet capturing (it dissects files, not network traffic), so neither of
them need, or should run with, special privileges. If you *must* run
with special privileges in order to capture, grant those privileges to
dumpcap, which has a *lot* fewer lines of code than libwireshark and
TShark/TFShark.

Change-Id: I8f8fedead355ca163895e025df37240d2f232ba4
Reviewed-on: https://code.wireshark.org/review/2736
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Clean up a comment.

SetProcessDEPPolicy() is the API; PSetProcessDEPPolicy is just a local
pointer variable that either points to that API's implementation (if
it's available) or is null (if it isn't).

Change-Id: I676fbb75019e32af511cefa6f1c7b7124ac9d8e8
Reviewed-on: https://code.wireshark.org/review/2735
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Do startup things in an order more like that of gtkshark.

Get credential information and drop privileges *very* early on. Get the
pathname of the executable right after that, then initialize the 802.11
decryption, then, on Windows, load WinPcap and, if available, AirPcap.
*Then* we can get the version information and set the crash information.

We should drop privileges as early as possible.

We have to load WinPcap and AirPcap before getting the run-time
information, as the run-time information includes the *pcap versions.

Change-Id: Ib40e5a848cc7f42fcb424faa15a91868eaa0b9a4
Reviewed-on: https://code.wireshark.org/review/2733
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Always set the crash information.

There's no reason to do it only on Windows - and, in fact, the only
platform where we currently do anything with the information is OS X.
Every other program in the Wireshark suite that does it at all does it
on all platforms.

Change-Id: I8ab29fd86656dd44322991d0d7263c6bb4fcd425
Reviewed-on: https://code.wireshark.org/review/2730
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Add echld_test to the list of files we ignore (built with --enable-echld).

Change-Id: Idca036db408e4caf6c84a67b4c36145568921ca5
Reviewed-on: https://code.wireshark.org/review/2729
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Get rid of trailing blank line.

Change-Id: Id7d134b1d217ef319e3162ae007432fdbe87d0c1
Reviewed-on: https://code.wireshark.org/review/2728
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Move filters.[ch] to libui.

Change-Id: I32f04016498dfe8f54b0480f30a84ffe5ef7868f
Reviewed-on: https://code.wireshark.org/review/2727
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Move stat_menu.h to libui.

Change-Id: I7bed7f7931845bc41035535cc62e1fe17c71047d
Reviewed-on: https://code.wireshark.org/review/2726
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Warn about unencrypted HTTP traffic over port 443

At the suggestion of Toralf Förster. This includes an expert info, as well as
making SSL a new-style dissector and rejecting traffic that looks like
unencrypted text.

Change-Id: Ib09ea0d97952330f092590ff3fc6488807cdbb81
Reviewed-on: https://code.wireshark.org/review/2693
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Evan Huus <eapache@gmail.com>

Move proto_hier_stats.[ch] to libui.

Change-Id: Ib7c0617d88bf92cad0ac877176001d29960f1cd8
Reviewed-on: https://code.wireshark.org/review/2725
Reviewed-by: Guy Harris <guy@alum.mit.edu>

From Johan Whahl:
Added dissection of the SIP Service-Route header.

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

Fix the display of AVP:s that are not fully dissected
fixes Bug #10237

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

Logcat: Remove commented code

"g_strlcpy" guarante that "dest" to be null-terminated.

Also cosmetic change from file_subtype to encap.

Change-Id: If188a08cf34dd9def4203404962571c273740636
Reviewed-on: https://code.wireshark.org/review/2718
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>

Bluetooth: Add missing connection_handle

This initialize previously uninitialized variable (and nice fixing everything)

Change-Id: I943102510fc45735f40db7899884d2c0fe6ffb40
Reviewed-on: https://code.wireshark.org/review/2717
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>

Fix Bug #10238: Display filter expression dialog items do not expand/display properly.

    Unfortunately, certain proto_hier_tree_model.c functions
    assume/require that a cookie generated by
    proto_(first|next)_protocol_field() will never have a NULL value.

    Bug introduced in gd47ae54.

Change-Id: I42763d02f700e15ca9b3ab9980943d4f8d933ca9
Reviewed-on: https://code.wireshark.org/review/2712
Reviewed-by: Evan Huus <eapache@gmail.com>

Get rid of another unused routine.

Change-Id: I58943faaf6e77023ab1fb7bd7a22324a713659da
Reviewed-on: https://code.wireshark.org/review/2714
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Get rid of unused routine.

Change-Id: Iaf12ba7f13804a6d351ea85c0daa52d4489e8c57
Reviewed-on: https://code.wireshark.org/review/2713
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Move capture.[ch] to libui.

Change-Id: I86e7e781cc9e14abab0374a18b95438529b046f0
Reviewed-on: https://code.wireshark.org/review/2711
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Make a routine unused outside capture_ui_utils.c static.

Change-Id: I63f1e5fb119a44edf4ee489683e79cb39a746c08
Reviewed-on: https://code.wireshark.org/review/2710
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Windows: fix update of version information in wireshark and tshark

Broken since gc46329c

Change-Id: I00146675d16db021e2cbb7b16841ea9ecb1439b9
Reviewed-on: https://code.wireshark.org/review/2703
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Move capture_session.h to capchild; what it declares is defined there.

Change-Id: I8b1407839390b7ac0b45bf6f583c1a509073f002
Reviewed-on: https://code.wireshark.org/review/2709
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Move capture_ui_utils.[ch] to libui.

Change-Id: Id0f3d4d60a1acc7aa64fd3737b8f16df5bca4e5a
Reviewed-on: https://code.wireshark.org/review/2708
Reviewed-by: Guy Harris <guy@alum.mit.edu>

clopts_common.c is now part of wsutil.

Change-Id: I474443567e83cab83e4859a4d89a19a8904e08f8
Reviewed-on: https://code.wireshark.org/review/2707
Reviewed-by: Guy Harris <guy@alum.mit.edu>

clopts_common.c is now part of wsutil.

Change-Id: I0fa773bfc6364689d6e4f97ee89a6508622d2b2a
Reviewed-on: https://code.wireshark.org/review/2706
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Put in missing forward declaration.

Change-Id: I734b07beaecf0c180f4423a6e59c8040207e0c31
Reviewed-on: https://code.wireshark.org/review/2705
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Move some more stuff into wsutil.

Move the routines to parse numerical command-line arguments there.

Make cmdarg_err() and cmdarg_err_cont() routines in wsutil that just
call routines specified by a call to cmdarg_err_init(), and have
programs supply the appropriate routines to it.

Change-Id: Ic24fc758c0e647f4ff49eb91673529bcb9587b01
Reviewed-on: https://code.wireshark.org/review/2704
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

proto_tree_add_subtree[_format]

Change-Id: Id00f456479415adf0a219af6c9a2108d4b3642d0
Reviewed-on: https://code.wireshark.org/review/2702
Reviewed-by: Michael Mann <mmann78@netscape.net>

GSM MAP: ensure that p2p_dir is always initialized before calling GSM SMS dissector

Bug: 10234
Change-Id: Ie340b849015febe46f91836440d44d4cfde005a4
Reviewed-on: https://code.wireshark.org/review/2695
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Fix compile error when building w/o GNUTLS

Specifically: <wsutil/file_util.h> is aleays needed (for create_app_running_mutex())

Change-Id: I78e5a767f62bc2af67b6407539742dc245259f56
Reviewed-on: https://code.wireshark.org/review/2699
Reviewed-by: Bill Meier <wmeier@newsguy.com>

[Automatic manuf, services and enterprise-numbers update for 2014-06-29]

Change-Id: Ife61b2e2c53f1faba34940035ac84a2b5ced3b71
Reviewed-on: https://code.wireshark.org/review/2696
Reviewed-by: Gerald Combs <gerald@wireshark.org>

proto_tree_add_subtree[_format]

Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332
Reviewed-on: https://code.wireshark.org/review/2694
Reviewed-by: Michael Mann <mmann78@netscape.net>

convert to proto_tree_add_subtree[_format]

Change-Id: If110de1e0555637264f86f1508858d569871a9c7
Reviewed-on: https://code.wireshark.org/review/2675
Reviewed-by: Michael Mann <mmann78@netscape.net>

Standardize the names of, and document, the taps and heuristic dissector tables made avaialble by these dissectors.

Change-Id: If3a143eb9546c9de63cd32b2347000b09e0e3c93
Reviewed-on: https://code.wireshark.org/review/2688
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Fix missing g_list_next() with GLib < 2.32

Change-Id: I825e74de378acc9d35e4b620a3eeb4807fe7accd
Reviewed-on: https://code.wireshark.org/review/2690
Reviewed-by: Evan Huus <eapache@gmail.com>

Remove unused variables post commit 7bf6862ecf0d0a508bf097f3b52d07bd19128272

Change-Id: Id583ab1742241deb9325dcb1dbba8a8cb3df3b90
Reviewed-on: https://code.wireshark.org/review/2691
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>

convert to proto_tree_add_subtree[_format]

Change-Id: Ia7014003a3cff5181295172978d6c613c3b83b0b
Reviewed-on: https://code.wireshark.org/review/2676
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Fix several GTK warnings in Windows.

Change-Id: I300137319129c3e188884e1240c025d92e34e410
Reviewed-on: https://code.wireshark.org/review/2687
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Have the makefile run windepoyqt if it exists to copy the required dlls to the install dir.

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

Use g_queue_free_full() only on GLib > 2.32

Change-Id: I7a72fe8243fc809b444f1b026ed872cd2aa92245
Reviewed-on: https://code.wireshark.org/review/2686
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>

Use GQueue for generating statistics

This makes reversing the list back and forth to keep adding data
at O(n) complexity obsolete.

Bug: 9696

Change-Id: Ice77328b8f6c5bf72bbfcfd82e08d09d4f986d3f
Reviewed-on: https://code.wireshark.org/review/2571
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>

Report more information on a sync_xxx_open() call failure.

Trying to get more information for

http://ask.wireshark.org/questions/34057/waitpid-error-starting

Change-Id: Ifc0eb58f5b69c2c4a4638aa95f6b5f8f628bef02
Reviewed-on: https://code.wireshark.org/review/2685
Reviewed-by: Guy Harris <guy@alum.mit.edu>

We're not currently using dissect_rtcp_psfb_remb(); #if 0 it out.

Also, note that we need to determine how to handle Application Layer
Feedback messages based on the SDP setup traffic for the session; recent
changes disabled dissection of REMB Application Layer Feedback messages
in favor of MS-RTP Application Layer Feedback messages. (This is why we
shouldn't remove dissect_rtcp_psfb_remb() unless REMB isn't being used
any more.)

Change-Id: Ib320bdf4a64263fdef29fc4ea2583eaae1cc4bee
Reviewed-on: https://code.wireshark.org/review/2684
Reviewed-by: Guy Harris <guy@alum.mit.edu>

In function 'dissect_rtcp_psfb':
packet-rtcp.c:1232: warning: unused parameter 'top_item'

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

RTCP: Add support for MS-RTP
Support for Profile Specific Extensions from MS-RTP
Support for RTCP Feedback Messages
Support for Application Layer Feedback Messages.
MS-RTP: Real-time Transport Protocol (RTP) Extensions
http://msdn.microsoft.com/en-us/library/office/cc431492.aspx

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

Tighten the dump-glossary test.

1. The only indication we get of an out-of-order value string is a message on
STDERR, so check that and fail the test if STDERR wasn't empty.

2. This exposes an out-of-order value string in packet-stun.c; fix it.

3. This triggered the pre-commit hook on packet-stun.c, which noticed an API
error (ENC_ASCII -> ENC_ASCII|ENC_NA); fix that too.

Change-Id: I36f87a2a87b40537119562f22a7e3012716ff239
Lesson: automated testing/tooling is both wonderful and scary.
Reviewed-on: https://code.wireshark.org/review/2682
Reviewed-by: Evan Huus <eapache@gmail.com>

If we have no fields, don't try to iterate through them.

Otherwise glib throws an assertion since the array we pass it is NULL.

Change-Id: I9159c1f5ad99b280c040cd790df3cf352738601f
Reviewed-on: https://code.wireshark.org/review/2680
Reviewed-by: Evan Huus <eapache@gmail.com>

show an expert info if a non-control urb contains a setup packet

Change-Id: I9339869defa47a862b6174d8821cdd8e6186f5c5
Reviewed-on: https://code.wireshark.org/review/2678
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>