metze/wireshark/wip.git
9 years agoRevert "[AIM] Fix string length"
Michael Mann [Mon, 25 May 2015 12:05:21 +0000 (08:05 -0400)]
Revert "[AIM] Fix string length"

It's a FT_UINT_STRING field type

This reverts commit dc14e3ce0df78da52da95e7356c6e15390b191ec.

Change-Id: I1185efbad459887fb9c16fb01e670bc43e6f2d84
Reviewed-on: https://code.wireshark.org/review/8623
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoFix variable that needs to survive a longjmp().
Guy Harris [Tue, 26 May 2015 08:53:38 +0000 (01:53 -0700)]
Fix variable that needs to survive a longjmp().

Pointed out by a warning in a compilation for ARM.

Change-Id: Iab2748adbdc88c9e6749da1c3835896683a1a091
Reviewed-on: https://code.wireshark.org/review/8648
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agojpeg: remove some more unnecessary initialisations
Martin Kaiser [Mon, 25 May 2015 16:24:27 +0000 (18:24 +0200)]
jpeg: remove some more unnecessary initialisations

Change-Id: If66a3951037d01c1aa502c0695ea11c62cc4d208
Reviewed-on: https://code.wireshark.org/review/8633
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agojpeg: replace an empty switch-case with a todo comment
Martin Kaiser [Mon, 25 May 2015 16:21:48 +0000 (18:21 +0200)]
jpeg: replace an empty switch-case with a todo comment

Change-Id: I656fa2f69453916dd5466265220e2b4590d3631c
Reviewed-on: https://code.wireshark.org/review/8632
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agojpeg: some more code cleanup
Martin Kaiser [Mon, 25 May 2015 15:50:53 +0000 (17:50 +0200)]
jpeg: some more code cleanup

delete unnecessary initialisations
declare variables at the start of a function

Change-Id: Ib427790c51c1fc7433d0f3c17dc9fa4748585180
Reviewed-on: https://code.wireshark.org/review/8631
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoDVB-CI: clean up the expert info definitions
Martin Kaiser [Mon, 25 May 2015 15:21:02 +0000 (17:21 +0200)]
DVB-CI: clean up the expert info definitions

sort them by layer
wrap long lines
make the filter strings consistent

Change-Id: Ibbeb405c6356abe61dd9a0194af1c072d2c1c971
Reviewed-on: https://code.wireshark.org/review/8630
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years ago[GTP] Dissect eNodeB ID IE
Anders [Mon, 25 May 2015 15:30:54 +0000 (17:30 +0200)]
[GTP] Dissect eNodeB ID IE

Change-Id: I7b6800ca71c9a0d2be4f30be55b49eec237ac908
Reviewed-on: https://code.wireshark.org/review/8629
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoDVB-CI: kill the last two proto_tree_add_text() calls
Martin Kaiser [Mon, 25 May 2015 14:32:54 +0000 (16:32 +0200)]
DVB-CI: kill the last two proto_tree_add_text() calls

Change-Id: I53f9df7bf193551e786ad4ece368f3de702ce8de
Reviewed-on: https://code.wireshark.org/review/8628
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoiso7816: remove one proto_tree_add_text() call
Martin Kaiser [Mon, 25 May 2015 14:11:03 +0000 (16:11 +0200)]
iso7816: remove one proto_tree_add_text() call

Change-Id: I3905fb83f5f70ee80e54fba479c0e8caca5baa6c
Reviewed-on: https://code.wireshark.org/review/8627
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoDVB-CI: remove NULL-checks for proto_item_append_text()'s first argument
Martin Kaiser [Mon, 25 May 2015 13:57:02 +0000 (15:57 +0200)]
DVB-CI: remove NULL-checks for proto_item_append_text()'s first argument

Change-Id: I6648c20a003392a7435ca0461d2b004a1d415d51
Reviewed-on: https://code.wireshark.org/review/8626
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agojpeg: clean up the sos header dissection
Martin Kaiser [Mon, 25 May 2015 13:53:56 +0000 (15:53 +0200)]
jpeg: clean up the sos header dissection

Change-Id: Id3e6258036112a64e4111d0483c572697681eb89
Reviewed-on: https://code.wireshark.org/review/8625
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoFix out of tree builds
Graham Bloice [Sun, 26 Apr 2015 17:21:09 +0000 (18:21 +0100)]
Fix out of tree builds

Stop out of tree builds picking up the in-tree version and config.h

Change-Id: Icadc46cab66db72af2d475eac31b28d0ca10df90
Reviewed-on: https://code.wireshark.org/review/8204
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>
9 years ago[AIM] Fix string length
Anders [Mon, 25 May 2015 07:38:11 +0000 (09:38 +0200)]
[AIM] Fix string length

Change-Id: I64f73bd5cb131ad6efc64eea6a7eb66af9cee5c4
Reviewed-on: https://code.wireshark.org/review/8622
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoreload-framing: add range checks before bit-shifts
Stephane Bryant [Tue, 12 May 2015 15:13:31 +0000 (17:13 +0200)]
reload-framing: add range checks before bit-shifts

Change-Id: I1422b581157ffa389f121306de4dc9241ffb4061
Reviewed-on: https://code.wireshark.org/review/7595
Petri-Dish: Alexis La Goutte <alexis.lagoutte@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>
9 years agoNFS: Remove the hidden acl, dacl, and sacl items
Andreas Gruenbacher [Tue, 19 May 2015 21:18:13 +0000 (23:18 +0200)]
NFS: Remove the hidden acl, dacl, and sacl items

These attributes are already represented by hf_nfs4_reco_attr items.

Change-Id: Ib3804e2d30921764913f483863c003ffb55118ca
Reviewed-on: https://code.wireshark.org/review/8586
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoRemove proto_tree_add_text from AIM dissectors.
Michael Mann [Sun, 24 May 2015 15:31:14 +0000 (11:31 -0400)]
Remove proto_tree_add_text from AIM dissectors.

Change-Id: Ic7385d0555d72aa8ea2b9beb284ca1f6a115b174
Reviewed-on: https://code.wireshark.org/review/8616
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoRemove proto_tree_add_text from packet-osi-options.c and packet-esis.c
Michael Mann [Sun, 24 May 2015 19:11:26 +0000 (15:11 -0400)]
Remove proto_tree_add_text from packet-osi-options.c and packet-esis.c

Change-Id: Ifb404f5bab58d06d7e1f0106f284c7ae9858a502
Reviewed-on: https://code.wireshark.org/review/8617
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoceph: remove an unnecessary DISSECTOR_ASSERT
Evan Huus [Sun, 24 May 2015 22:38:16 +0000 (18:38 -0400)]
ceph: remove an unnecessary DISSECTOR_ASSERT

coverity picked up on this being effectively dead code, and it's trivial to
prove it will never trigger

Change-Id: I5a2893671a764914f483d4ff6bcc835c9b0d3b28
Reviewed-on: https://code.wireshark.org/review/8615
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoRemove proto_tree_add_text from packet-ehs.c
Michael Mann [Mon, 25 May 2015 02:53:54 +0000 (22:53 -0400)]
Remove proto_tree_add_text from packet-ehs.c

Change-Id: Ia56d41d3591f759619f13d6df679579f9d9888f7
Reviewed-on: https://code.wireshark.org/review/8621
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoMake protocol name/key combo string filterable.
Michael Mann [Mon, 25 May 2015 00:46:49 +0000 (20:46 -0400)]
Make protocol name/key combo string filterable.

Change-Id: I1ff863d0a4e114223b8fe283b1dc894e39fcefd7
Reviewed-on: https://code.wireshark.org/review/8618
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoproto.h: fix clang++ 3.6 warning
Luke Mewburn [Sun, 24 May 2015 09:27:21 +0000 (19:27 +1000)]
proto.h: fix clang++ 3.6 warning

Add spaces around literals to avoid warnings when compiling ui/qt
with clang++ 3.6 -Wreserved-user-defined-literal (on Mac OS X).

Change-Id: Ia2703dd8c914e8ffb299c4a6c44bba3aa674acb8
Reviewed-on: https://code.wireshark.org/review/8607
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>
9 years agoCreate a PTP/IP preference for "vendors" to break up the duplicate values in the...
Michael Mann [Sat, 23 May 2015 02:43:53 +0000 (22:43 -0400)]
Create a PTP/IP preference for "vendors" to break up the duplicate values in the ptp_opcode_names and ptp_respcode_names value_strings.

Bug: 8573
Change-Id: I65a71a2c12cda61ed4c4b52a8ea0441261782942
Reviewed-on: https://code.wireshark.org/review/8597
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>
9 years agoQt: Update the status bar when saving.
Gerald Combs [Fri, 22 May 2015 22:33:38 +0000 (15:33 -0700)]
Qt: Update the status bar when saving.

Plumb in more capture file callbacks. Add common functions for setting
the status bar file information. Add and update code to match the GTK+
status bar behavior.

Make sure we update the capture file length when rescanning.

Bug: 10943

Change-Id: Ie84c7a57ee421d57ba3477f8dde3847aaafa1cd1
Reviewed-on: https://code.wireshark.org/review/8594
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoQt: Add a "[closed]" hint to the packet dialog.
Gerald Combs [Fri, 22 May 2015 21:01:31 +0000 (14:01 -0700)]
Qt: Add a "[closed]" hint to the packet dialog.

Try to make it more obvious that the file has closed.

Ping-Bug: 11044
Change-Id: I76ae5724316c6fd9e7efdd817c39ac268b7d4dd0
Reviewed-on: https://code.wireshark.org/review/8593
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoQt: Don't crash after "Save As".
Gerald Combs [Fri, 22 May 2015 19:57:44 +0000 (12:57 -0700)]
Qt: Don't crash after "Save As".

Rename "stay_closed" to "dont_reopen" to match cf_save_records and its
GTK+ equivalent. Set "dont_reopen" to FALSE when we "Save As", otherwise
we crash on Windows.

Bug: 10904
Change-Id: I4bb10abc230439e10cc55ffbd5595bfbc0a34b6f
Reviewed-on: https://code.wireshark.org/review/8592
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agop1: Fixed do_address for extension attributes
Stig Bjørlykke [Fri, 22 May 2015 12:18:19 +0000 (14:18 +0200)]
p1: Fixed do_address for extension attributes

This is not an optimal solution, but fixes the reported problem.
The do_address functionality should probably be rewritten to
only use pinfo for storing data.

Bug: 11210
Ping-Bug: 8515
Change-Id: I2625cc4044ab93b6e943a3c2d2ffd1b26149da29
Reviewed-on: https://code.wireshark.org/review/8585
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoNetscaler: Add support to read MTCP record.
anilkumar911 [Fri, 22 May 2015 09:51:40 +0000 (15:21 +0530)]
Netscaler: Add support to read MTCP record.

Change-Id: I73aadb10e44aa64c6f4c9cc2145a63f5bd9c74e5
Reviewed-on: https://code.wireshark.org/review/8580
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years ago[Diameter] Show Visited-PLMN-Id
Anders [Fri, 22 May 2015 16:06:48 +0000 (18:06 +0200)]
[Diameter] Show Visited-PLMN-Id

Change-Id: If528f459535fde03bd936445113a3b12f34d42e5
Reviewed-on: https://code.wireshark.org/review/8590
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoISAKMP: Add recent notify message types to range_string, and show names in notificati...
Martin Mathieson [Fri, 22 May 2015 14:33:12 +0000 (15:33 +0100)]
ISAKMP: Add recent notify message types to range_string, and show names in notification root node

Change-Id: I3849868f6fbc8c5243757f6a39806365ca7a3609
Reviewed-on: https://code.wireshark.org/review/8587
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
9 years agoFix packet-ieee80211-radiotap-iter.c:159:36: runtime error:
Joerg Mayer [Fri, 22 May 2015 14:28:03 +0000 (16:28 +0200)]
Fix packet-ieee80211-radiotap-iter.c:159:36: runtime error:
    left shift of 1 by 31 places cannot be represented in type 'int'

Change-Id: I0135b73c14bab05153a9ba2f5477f8651388037d
Reviewed-on: https://code.wireshark.org/review/8588
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
9 years agoNFS: Fix NFSv4 attribute offsets and lengths
Andreas Gruenbacher [Tue, 19 May 2015 09:43:06 +0000 (11:43 +0200)]
NFS: Fix NFSv4 attribute offsets and lengths

NFSv4 attributes are transferred as a bitmask, followed by each of the
attributes in the bitmask.  The offset and length of the dissected attribute
values should point at where the attribute values are; instead, they were
pointing at the bitmap. Fix that.

Change-Id: I4f93b7fffd7497306ae828a2fbd3c0e9b0accd1c
Reviewed-on: https://code.wireshark.org/review/8536
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoNFS: Dissect NFSv4.1 dacl and sacl attributes
Andreas Gruenbacher [Mon, 18 May 2015 14:39:59 +0000 (16:39 +0200)]
NFS: Dissect NFSv4.1 dacl and sacl attributes

The NFSv4.1 dacl and sacl attributes consist of a 32-bit acl flags field,
followed by an access control list in the same format as the acl attribute.

Bug: 11208
Change-Id: I5fb08f9764c21cd6abb4ee02265e4e6b4ed54f01
Reviewed-on: https://code.wireshark.org/review/8526
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoDiameter: fix indent (Use 4 spaces)
Alexis La Goutte [Fri, 22 May 2015 12:09:10 +0000 (14:09 +0200)]
Diameter: fix indent (Use 4 spaces)

Change-Id: Ie82f243af15f6851021d297018005c672a3fb28b
Reviewed-on: https://code.wireshark.org/review/8584
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years ago[Diameter] Added feature list dissection for 3GPP Sh interface
Anders [Fri, 22 May 2015 11:05:06 +0000 (13:05 +0200)]
[Diameter] Added feature list dissection for 3GPP Sh interface

Bug: 11218
Change-Id: I83838cc4af1d3eeaed04032c3127f2d4707d0fd3
Reviewed-on: https://code.wireshark.org/review/8583
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years ago[Diamater] Sub dissect Suported-Vendor-Id
Anders [Fri, 22 May 2015 10:29:53 +0000 (12:29 +0200)]
[Diamater] Sub dissect Suported-Vendor-Id

Change-Id: I5c0014449ef9886ba74abdf8f609860ef37a7831
Reviewed-on: https://code.wireshark.org/review/8582
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years ago[SIP] Add hf for header Session-Id
Anders [Fri, 22 May 2015 10:13:45 +0000 (12:13 +0200)]
[SIP] Add hf for header Session-Id

Change-Id: I9b1dc7822fd1753d9b5af9c00a7eda928f423a67
Reviewed-on: https://code.wireshark.org/review/8581
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoCosmetic - adjust comments according to the proto
Peter Lemenkov [Thu, 21 May 2015 13:39:43 +0000 (16:39 +0300)]
Cosmetic - adjust comments according to the proto

Change-Id: I75b422d3181e93e12d6758d891538fa9fea7d1f7
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8574
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>
9 years agoTypo
Peter Lemenkov [Thu, 21 May 2015 11:53:50 +0000 (14:53 +0300)]
Typo

Change-Id: Ib50768ccca6e0354d287793ce639e28bee2c9865
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8573
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoDon't treat packets w/o line feed differently
Peter Lemenkov [Thu, 21 May 2015 11:50:50 +0000 (14:50 +0300)]
Don't treat packets w/o line feed differently

Change-Id: I7ddd0ecf5e4f02f66b9fea528725a5e29c1062ea
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8572
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoChange unofficial extension parameter
Peter Lemenkov [Tue, 5 May 2015 10:17:03 +0000 (13:17 +0300)]
Change unofficial extension parameter

A character "v" was mapped to a different command parameter. So we
should replace it.

Change-Id: Ia668b0b0bead7bb4c4ba0a60f51f53daf2095a36
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8571
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoMSRP has a registered port now, register the dissector for it.
Jeff Morriss [Thu, 21 May 2015 18:14:28 +0000 (14:14 -0400)]
MSRP has a registered port now, register the dissector for it.

Presumably it got the port when it became an RFC.

Change-Id: I0afb815bcfe4b36b896fa6f7e62f93047a36b05b
Reviewed-on: https://code.wireshark.org/review/8576
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoallow use of deprecated gdk-pixbuf functions
Andreas Stieger [Wed, 3 Dec 2014 00:09:42 +0000 (00:09 +0000)]
allow use of deprecated gdk-pixbuf functions

gdk-pixbuf 2.31.2 marked GdkPixdata including as deprecated,
including gdk_pixbuf_new_from_inline. Wireshark builds with
deprecated functions turned off by default, in this case
GDK_PIXBUF_DISABLE_DEPRECATED. Patch to configure.ac to allow use of
deprecated function until upstream has ported the code, or a
replacement patch is available.

Bug: 10750

gdk-pixbuf change:
https://git.gnome.org/browse/gdk-pixbuf/commit/?id=48d76fb7f2d059013f5781b199245274998f05c9

Initial warning:
ui_utils.c: In function 'window_icon_realize_cb':
ui_utils.c:115:5: warning: implicit declaration of function 'gdk_pixbuf_new_from_inline' [-Wimplicit-function-declaration]
    icon = gdk_pixbuf_new_from_inline(-1, wsicon_16_pb_data, FALSE, NULL);
    ^
Causes these warnings due to the implicit declaration:
gui_utils.c:115:10: warning: assignment makes pointer from integer without a cast [enabled by default]
    icon = gdk_pixbuf_new_from_inline(-1, wsicon_16_pb_data, FALSE, NULL);
    ^
Fails the package checks in these lines:
E: wireshark 64bit-portability-issue gui_utils.c:115, 117, 119, 121, 512
E: wireshark 64bit-portability-issue main.c:1513, 1519, 1525, 1531
E: wireshark 64bit-portability-issue prefs_layout.c:346, 347, 348, 349, 350, 351
E: wireshark 64bit-portability-issue stock_icons.c:413, 425

Change-Id: I85092753058cd2e5cda527e4321a7d92ac38facd
Reviewed-on: https://code.wireshark.org/review/8578
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
9 years agoExpand a comment.
Guy Harris [Fri, 22 May 2015 03:13:22 +0000 (20:13 -0700)]
Expand a comment.

As either Grace Hopper or Andrew Tanenbaum, depending on which claim you
read, said, "The {wonderful,good} thing about standards is that there
are so many to choose from." Which standard for Lawful Intercept headers
do you want?

Change-Id: I8633e3d3e3d9a205f643d63980a80986e59d43f4
Reviewed-on: https://code.wireshark.org/review/8579
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFixup capture filter completion logic.
Gerald Combs [Thu, 21 May 2015 19:12:40 +0000 (12:12 -0700)]
Fixup capture filter completion logic.

Don't add the current word to the completion list.

Change-Id: Ia475520092f461c9e7b03f82cc3427585e095162
Reviewed-on: https://code.wireshark.org/review/8577
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years ago[NSIP GPRS-NS] Fix a crash due to not NULL terminated hf arrays for
Anders [Thu, 21 May 2015 15:27:12 +0000 (17:27 +0200)]
[NSIP GPRS-NS] Fix a crash due to not NULL terminated hf arrays for
proto_tree_add_bitmask().

Change-Id: I65adad6a33b3d6b199d54160bce85759a35607d6
Reviewed-on: https://code.wireshark.org/review/8575
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years ago[GTP] Add a couple of new IEs as "Not dissected yet"
Anders [Thu, 21 May 2015 13:31:29 +0000 (15:31 +0200)]
[GTP] Add a couple of new IEs as "Not dissected yet"

Change-Id: If7a083ab3a56801168853a43dff85e1066d6bec5
Reviewed-on: https://code.wireshark.org/review/8570
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoInclude stdint.h instead of inttypes.h when compiled with MSVC < 2013
Tatsuhiro Tsujikawa [Thu, 21 May 2015 08:36:47 +0000 (10:36 +0200)]
Include stdint.h instead of inttypes.h when compiled with MSVC < 2013

Backport by Alexis La Goutte from upstream

Bug:11216
Change-Id: Ia269adce607ebc5a31ac9ef119dc2d4248173d62
Reviewed-on: https://code.wireshark.org/review/8568
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>
9 years agoInclude <sys/param.h> to get MAXPATHLEN.
Guy Harris [Thu, 21 May 2015 08:42:15 +0000 (01:42 -0700)]
Include <sys/param.h> to get MAXPATHLEN.

Change-Id: Ibf40b75eb224262c4d5a571e56e2575bca787b91
Reviewed-on: https://code.wireshark.org/review/8565
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit eb93c661c5c5f368ee0288193cdf3a7ce7102bd7)
Reviewed-on: https://code.wireshark.org/review/8567

9 years agoRemove trailing whitespace.
Guy Harris [Thu, 21 May 2015 07:28:34 +0000 (00:28 -0700)]
Remove trailing whitespace.

Change-Id: Ibc6620f489ae5d956b03ee61dc6f08dfc0a93371
Reviewed-on: https://code.wireshark.org/review/8562
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoDon't just blindly tell application X11 to do anything.
Guy Harris [Thu, 21 May 2015 07:25:55 +0000 (00:25 -0700)]
Don't just blindly tell application X11 to do anything.

Determine what type of X11 (bundled from Apple, unbundled XQuartz) we
should have and what type we do have.

If we don't have any installed, don't tell X11 to do anything, as that
just pops up a "where is X11?" dialog; that's information the user
shouldn't need to tell the system if it is installed, and it's
information for which the user shouldn't be asked if it's not installed
- and if they're asked, they might answer incorrectly, leaving a system
that doesn't properly launch X11 for Wireshark.  (See various
ask.wireshark.org questions about this, for example.)

Pick up some changes from newer versions of Inkscape, such as using
unsigned char *, not using FSSpecs, and adding some comments, while
we're at it.

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

9 years ago802.11: Remove duplicate RIC Descriptor display
Alexis La Goutte [Wed, 20 May 2015 11:49:48 +0000 (13:49 +0200)]
802.11: Remove duplicate RIC Descriptor display

Change-Id: I0fa523dd0e62f94e478ad35b216fc3dc5651718c
Reviewed-on: https://code.wireshark.org/review/8547
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoMBIM: fix GSM SMS transmitted PDU length
Pascal Quantin [Wed, 20 May 2015 20:36:25 +0000 (22:36 +0200)]
MBIM: fix GSM SMS transmitted PDU length

Change-Id: I5568d6048f620f5332577e2cf0d36ffa20200ebf
Reviewed-on: https://code.wireshark.org/review/8556
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoGet rid of XML step for adding menubar items.
Guy Harris [Wed, 20 May 2015 20:34:04 +0000 (13:34 -0700)]
Get rid of XML step for adding menubar items.

And don't create extra action groups; just add them to the main
menubar's action group.  Rename add_menu_item() to
add_menu_item_to_main_menubar() to make that clearer.

Change-Id: I6b564620decd8d0c9c4a2cb79b1a03df5ff27a4b
Reviewed-on: https://code.wireshark.org/review/8555
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoPCEP: reorder pcep_class_vals extended value string
Pascal Quantin [Wed, 20 May 2015 20:16:10 +0000 (22:16 +0200)]
PCEP: reorder pcep_class_vals extended value string

Change-Id: Iaa270bc085cbee41be9881eab2749c0ed26ef359
Reviewed-on: https://code.wireshark.org/review/8554
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoAdded support to RFC 6006, in particular, SERO and SSRO Objects and P2MP Endpoints...
Oscar Gonzalez de Dios [Mon, 18 May 2015 22:46:40 +0000 (00:46 +0200)]
Added support to RFC 6006, in particular, SERO and SSRO Objects and P2MP Endpoints Object.
Trailing whitespaces, indent and typo fixed, used value_string.
Fixed EOF Problem (Ubuntu Petri Dish failed)

Bug:11213

Change-Id: I4ecc11b17c34dd993a72903ad4314c51ada64e02
Reviewed-on: https://code.wireshark.org/review/8532
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoGSM SMS: update some (value|range)_string tables for MTC Device Trigger feature
Pascal Quantin [Wed, 20 May 2015 13:45:20 +0000 (15:45 +0200)]
GSM SMS: update some (value|range)_string tables for MTC Device Trigger feature

Change-Id: Iffc62744310688d2f5f4d6689ff2f9d96fd4f6f1
Reviewed-on: https://code.wireshark.org/review/8552
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoAutocompleting "and" and "or" probably isn't useful.
Gerald Combs [Wed, 20 May 2015 16:17:38 +0000 (09:17 -0700)]
Autocompleting "and" and "or" probably isn't useful.

Change-Id: Ia16a02a616fd052eeaa9eceff76bc1b20ee8d82e
Reviewed-on: https://code.wireshark.org/review/8553
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoImprove VN-Tag dissector.
Michael Mann [Wed, 20 May 2015 11:51:00 +0000 (07:51 -0400)]
Improve VN-Tag dissector.

Bug: 7496
Change-Id: Ic1648f1c111913b7370b2eaf5557c4d8ea078033
Reviewed-on: https://code.wireshark.org/review/8546
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
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: Anders Broman <a.broman58@gmail.com>
9 years agoRADIUS: Sync with FreeRADIUS Master
Alexis La Goutte [Fri, 15 May 2015 16:17:39 +0000 (18:17 +0200)]
RADIUS: Sync with FreeRADIUS Master

commit 917d8af3bbb3d9f4bea4aa437d244a655cc69291
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Wed May 13 12:38:42 2015 -0400

    formatting

commit 0b0c515fa8facbca66f31fbb18dd4ad632e2c200
Author: skids <bri@abrij.org>
Date:   Wed May 13 12:25:14 2015 -0400

    Add new port bounce attribute from Aruba

    This attribute was added in ArubaOS 7.4.0.3 for the Aruba Mobility Access Switch

commit 17547a39413af58a7e4622d9d74af87ce2f52630
Author: Jorge Pereira <jpereiran@gmail.com>
Date:   Thu May 7 19:51:24 2015 -0300

    Updating the Alcatel 7750 dictionary based on "9304720101_V1_7750 SR-OSRADIUS ATTRIBUTE.pdf" document.

commit ba4682aee27bd0aa87f67dbd8af4242c86e33015
Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date:   Wed Apr 22 22:06:01 2015 +0100

    Update ericsson.ab dictionary to include new accounting VSAs

commit a1c76e847ad0058fcd924ed7f3974ac65e06695d
Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date:   Sat Apr 18 09:50:41 2015 +0100

    If it's binary in radiator, it should be octets in FreeRADIUS

From me: Add also some missing VSA on ericson.ab dicto

Change-Id: I440c9006dc72388a45ba9a13225ecddf4773ae97
Reviewed-on: https://code.wireshark.org/review/8471
Petri-Dish: Alexis La Goutte <alexis.lagoutte@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>
9 years agoAruba ERM: fix typo
Alexis La Goutte [Wed, 20 May 2015 12:01:25 +0000 (14:01 +0200)]
Aruba ERM: fix typo

Double space between Signal Strength and [percent]

Change-Id: Ibf645a9e44d2e642df8fd53afd0a6ccbbb2adde0
Reviewed-on: https://code.wireshark.org/review/8549
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoStart exposing the filter field of a tap listener to the RTP GUI APIs.
Michael Mann [Fri, 15 May 2015 02:53:16 +0000 (22:53 -0400)]
Start exposing the filter field of a tap listener to the RTP GUI APIs.

A tap listener has the ability to apply a filter (typically the display filter).  Add a parameter to RTP GUI API functions to allow them to pass in a filter.

Bug: 996
Change-Id: Ib184dfb023be5d1d24a0d842b4039311426b5293
Reviewed-on: https://code.wireshark.org/review/8468
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>
9 years agoFixed Modbus RTU Serial message direction detection.
cbontje [Tue, 19 May 2015 14:09:29 +0000 (08:09 -0600)]
Fixed Modbus RTU Serial message direction detection.

("And that, children, is why we always test different message types before submitting").

Change-Id: I29c730c01db4596a2326dcadfcffa3a20758569a
Reviewed-on: https://code.wireshark.org/review/8539
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoEnhanced info output of packet-tte dissector.
Benjamin Roch [Tue, 24 Feb 2015 17:42:07 +0000 (18:42 +0100)]
Enhanced info output of packet-tte dissector.

Change-Id: I2df393e9913d3a52db632778410d7b8932f78f8b
Reviewed-on: https://code.wireshark.org/review/7637
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoDVB-CI: change two proto_tree_add_text() calls into expert info
Martin Kaiser [Tue, 19 May 2015 21:29:29 +0000 (23:29 +0200)]
DVB-CI: change two proto_tree_add_text() calls into expert info

Change-Id: Ic5f87480273e0a097900ace6a7538c34b2a89444
Reviewed-on: https://code.wireshark.org/review/8545
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoAdd capture filter autocompletion.
Gerald Combs [Tue, 19 May 2015 17:18:54 +0000 (10:18 -0700)]
Add capture filter autocompletion.

Autocomplete on recent and saved capture filters along with the
primitives in gencode.l in the libpcap sources.

Move common autocomplete code to SyntaxLineEdit.
Change-Id: I0931a6775bacf9c917c294befbbdaade51d19b93
Reviewed-on: https://code.wireshark.org/review/8542
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoHave an add_menu_item() to add items to the menu bar, and use it.
Guy Harris [Wed, 20 May 2015 02:55:00 +0000 (19:55 -0700)]
Have an add_menu_item() to add items to the menu bar, and use it.

Have it contain all the code to add an item to the menu bar; we may be
able to get rid of the "construct the XML"/"have GTK+ parse the UI" code
in favor of code that directly does the actions to add the item to the
menu without the intermediate XML.

Use it for both the items registered with register_menu_bar_menu_items()
and for the items registered with the new external menu mechanism.

Change-Id: Ibcac03173580bb83ae46cde1d1435f71767d8355
Reviewed-on: https://code.wireshark.org/review/8544
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoDVB-CI: remove some more proto_tree_add_text() calls
Martin Kaiser [Tue, 19 May 2015 21:00:27 +0000 (23:00 +0200)]
DVB-CI: remove some more proto_tree_add_text() calls

Change-Id: I02349c2e7aa00c1b105ab069a9fe9b66d130bc7d
Reviewed-on: https://code.wireshark.org/review/8543
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years ago[GTP]Target identification can have a length of 0.
Anders [Tue, 19 May 2015 19:37:04 +0000 (21:37 +0200)]
[GTP]Target identification can have a length of 0.

Change-Id: Ica74dc4ce891f226c05d031c29465d386957edf4
Reviewed-on: https://code.wireshark.org/review/8541
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoAutocomplete saved display filters.
Gerald Combs [Mon, 18 May 2015 23:56:57 +0000 (16:56 -0700)]
Autocomplete saved display filters.

Add saved display filters to the completion list. Fix a complex filter
completion bug.

Change-Id: I035923882fd8d6232d0b69e464bb1517f261dbd9
Reviewed-on: https://code.wireshark.org/review/8533
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoApparently "H" stands for "HOSC", not "HSC", at least these days.
Guy Harris [Tue, 19 May 2015 19:05:49 +0000 (12:05 -0700)]
Apparently "H" stands for "HOSC", not "HSC", at least these days.

Change-Id: I90807b5b40afa53fbfd31b48a322918ef4a7cc27
Reviewed-on: https://code.wireshark.org/review/8540
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoHTTP2: Update to libnghttp2 1.0.0
Alexis La Goutte [Fri, 15 May 2015 17:03:34 +0000 (19:03 +0200)]
HTTP2: Update to libnghttp2 1.0.0

Change-Id: I77ae40b4c5643e3cb71242e27a00de151db0d83c
Reviewed-on: https://code.wireshark.org/review/8477
Petri-Dish: Alexis La Goutte <alexis.lagoutte@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>
9 years agop1: Handle OrganizationalUnitName
Stig Bjørlykke [Tue, 19 May 2015 10:57:55 +0000 (12:57 +0200)]
p1: Handle OrganizationalUnitName

Added back code removed in commit for bug 8515.

Bug: 11210
Change-Id: I23bf56f88d8a1320da8404a82a8d9d3aacc3dace
Reviewed-on: https://code.wireshark.org/review/8537
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoBGP: Remove proto_tree_add_text call
Alexis La Goutte [Sat, 16 May 2015 16:19:52 +0000 (18:19 +0200)]
BGP: Remove proto_tree_add_text call

Part 2
Update VPLS-BGP and BGP-AD

Change-Id: I6a311bfc69d9666be6f83e38042745162701aaac
Reviewed-on: https://code.wireshark.org/review/8485
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoNFS: Move attribute definitions higher up in the nfs dissector
Andreas Gruenbacher [Mon, 18 May 2015 14:46:31 +0000 (16:46 +0200)]
NFS: Move attribute definitions higher up in the nfs dissector

The next commit will use some of these definitions before their (previous)
point of definition.

Change-Id: Ic7c96bc48d338bb7b44bf295af3fadc3e7bec370
Reviewed-on: https://code.wireshark.org/review/8525
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoFix CMake warnings
Graham Bloice [Mon, 18 May 2015 14:31:24 +0000 (15:31 +0100)]
Fix CMake warnings

Rename a local CMake variable to prevent CMP0054 warnings in
CheckTypeSize and CheckStructHasMember modules.

Change-Id: Ida0df954c81333ad37455db90e0d72ca9df8c6f1
Reviewed-on: https://code.wireshark.org/review/8522
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
9 years agoImprove Firebird/Interbase dissector.
Michael Mann [Sun, 17 May 2015 03:08:34 +0000 (23:08 -0400)]
Improve Firebird/Interbase dissector.

Inspired by the patch in bug 3749, added better dissection of opcodes and better (but not complete) support of multiple messages in a frame.

Provided links to firebird source.

Bug: 3749
Change-Id: I403728d32d634c23e1af7ce842f9aaca4014ed78
Reviewed-on: https://code.wireshark.org/review/8494
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoFix typo.
Guy Harris [Tue, 19 May 2015 01:43:14 +0000 (18:43 -0700)]
Fix typo.

Change-Id: Idde2f4771b42714561f65f712e680f9609aeaa57
Reviewed-on: https://code.wireshark.org/review/8535
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoPass the executable path to CreateProcess(), and end it with ".exe".
Guy Harris [Tue, 19 May 2015 01:40:13 +0000 (18:40 -0700)]
Pass the executable path to CreateProcess(), and end it with ".exe".

On Windows, 1) pass the path of the executable as the first argument to
CreateProcess(), which requires that we 2) have that path end with
".exe.

Maybe it'll fix the searching-for-dumpcap that showed up in bug 11196.

Change-Id: I9d06c07c3513fd42b98d3f8d9a1d2d545f651fe2
Reviewed-on: https://code.wireshark.org/review/8534
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoDVB-CI: remove proto_tree_add_text() calls from the appmmi resource
Martin Kaiser [Sun, 17 May 2015 15:20:32 +0000 (17:20 +0200)]
DVB-CI: remove proto_tree_add_text() calls from the appmmi resource

Change-Id: I422e8644445d7bb8a8ae43f426183db6b8974839
Reviewed-on: https://code.wireshark.org/review/8530
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoDVB-CI: remove proto_tree_add_text() calls from the operator profile resource
Martin Kaiser [Sun, 17 May 2015 14:26:45 +0000 (16:26 +0200)]
DVB-CI: remove proto_tree_add_text() calls from the operator profile resource

rename some variables and remove obsolete comments while we're at it

Change-Id: Ib400c371ea52c3681fbc1d25ef42791e4aeff9e4
Reviewed-on: https://code.wireshark.org/review/8529
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoDVB-CI: remove proto_tree_add_text() calls from the transport layer
Martin Kaiser [Sun, 17 May 2015 12:44:13 +0000 (14:44 +0200)]
DVB-CI: remove proto_tree_add_text() calls from the transport layer

Change-Id: I593527fafa38312d5d4e8f778e9af0d6294bb3f8
Reviewed-on: https://code.wireshark.org/review/8528
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoDVB-CI: fix a TPDU parsing error
Martin Kaiser [Sun, 17 May 2015 13:58:17 +0000 (15:58 +0200)]
DVB-CI: fix a TPDU parsing error

if the response TPDU starts with 0x80 (T_SB), this is not an unknown
tag, it simply indicates that the optional header and body are absent

this bug was introduced in e597acdc4827ef62bc9597fdd248366411533a36

Change-Id: I076a0c9f0ea124e11edbb7a0bc0e41d1ab6f374a
Reviewed-on: https://code.wireshark.org/review/8527
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoDon't put the NTLMv2 ChallengeFromClient into the protocol tree twice.
Guy Harris [Mon, 18 May 2015 17:17:19 +0000 (10:17 -0700)]
Don't put the NTLMv2 ChallengeFromClient into the protocol tree twice.

It's already put there by dissect_ntlmv2_response(); no need to do it
again.

Also, rename "NTLM Client Challenge" to "LMv2 Client Challenge", as
that's what it is (ChallengeFromClient from 2.2.2.4 LMv2_RESPONSE), and
rename "Client Challenge" to "NTLMv2 Client Challenge", as that's what
*it* is (ChallengeFromClient from 2.2.2.7 NTLM v2:
NTLMv2_CLIENT_CHALLENGE).

Change-Id: If95e2c77323cb597df7e400bf9ffc045d94c60e2
Reviewed-on: https://code.wireshark.org/review/8524
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoReorganize the NTLMSSP blob and AUTHENTICATE message parsing.
Guy Harris [Mon, 18 May 2015 17:00:58 +0000 (10:00 -0700)]
Reorganize the NTLMSSP blob and AUTHENTICATE message parsing.

The "result" argument to dissect_ntlmssp_blob() is never null, so don't
check for it being null.

Have separate clauses for LmChallengeResponse and NtChallengeResponse,
and do the checks for NTLMv1 vs. NTLMv2 inside those clauses.

Do the copy to client_challenge within the AUTHENTICATE message parsing
only if we've already determined that it's an NTLMv2 message.

Add some comments to better explain what's being done and to ask some
questions.

Change-Id: I52345eaeac4252d928b2e477751817084bf4e363
Reviewed-on: https://code.wireshark.org/review/8523
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoBluetooth: OBEX: Fix crash when there is no Type/Name header in request
Michal Labedzki [Mon, 18 May 2015 10:15:43 +0000 (12:15 +0200)]
Bluetooth: OBEX: Fix crash when there is no Type/Name header in request

Not all requests have them, so check for them to avoid crash.

Change-Id: I265fb8ad9f63132bee6eeb1aa521cae8b8df82b9
Reviewed-on: https://code.wireshark.org/review/8521
Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoIPDR: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Mon, 18 May 2015 09:08:51 +0000 (11:08 +0200)]
IPDR: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: Icf1686e9f1530a602ec5b03572be53d4f245d70c
Reviewed-on: https://code.wireshark.org/review/8520
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoIPDR: fix comma at end of enumerator list [-Wpedantic]
Alexis La Goutte [Mon, 18 May 2015 09:03:08 +0000 (11:03 +0200)]
IPDR: fix comma at end of enumerator list [-Wpedantic]

Change-Id: I4f78a3a15aa04c52042f7461d11b31c95f7e9590
Reviewed-on: https://code.wireshark.org/review/8519
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agofix make distcheck (add packet-bthci_sco.h to list of distributed file)
Alexis La Goutte [Mon, 18 May 2015 08:15:45 +0000 (10:15 +0200)]
fix make distcheck (add packet-bthci_sco.h to list of distributed file)

Don't forget to add *.h files to distributed file

Change-Id: I37459a4836e495f66185fd4d07306bb8963667f6
Reviewed-on: https://code.wireshark.org/review/8518
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoFix a comment.
Guy Harris [Mon, 18 May 2015 07:31:02 +0000 (00:31 -0700)]
Fix a comment.

Change-Id: I0f777121a4897983a48794fcdfb13efc26266bdc
Reviewed-on: https://code.wireshark.org/review/8517
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoandroiddump: Case-insensitive for option and add verbose mode
Michal Labedzki [Sun, 3 May 2015 15:24:10 +0000 (17:24 +0200)]
androiddump: Case-insensitive for option and add verbose mode

If verbose mode is off, then androiddump is quite.

Change-Id: Ib0b2d10acf05487a971e2bf7cbc27fd2666ec262
Reviewed-on: https://code.wireshark.org/review/8516
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoUbertooth: Add WriteRegister command
Michal Labedzki [Sun, 3 May 2015 16:34:31 +0000 (18:34 +0200)]
Ubertooth: Add WriteRegister command

Change-Id: Ie1cea754bcf732bf3985b777245e8b08606757f0
Reviewed-on: https://code.wireshark.org/review/8515
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: HCI: Add command-event tracking
Michal Labedzki [Sun, 3 May 2015 11:50:42 +0000 (13:50 +0200)]
Bluetooth: HCI: Add command-event tracking

HCI Commands in most cases generate response in Event queue, so try
to map event to command and give user response time information.

Change-Id: Ib4956829b7d0064ab528aa3202f8f959d8d371b7
Reviewed-on: https://code.wireshark.org/review/8514
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: HCI: Add new LE Event numbers
Michal Labedzki [Sun, 10 May 2015 17:07:19 +0000 (19:07 +0200)]
Bluetooth: HCI: Add new LE Event numbers

New event will be added later, for now all number are useful.

Change-Id: I83b77627dfb0c511710c3080aaac0f6857f76137
Reviewed-on: https://code.wireshark.org/review/8513
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: BTLE: Fix data handling from previous dissector
Michal Labedzki [Fri, 8 May 2015 07:10:35 +0000 (09:10 +0200)]
Bluetooth: BTLE: Fix data handling from previous dissector

Check previous dissector before cast data parameter.
That also causes Head overflow too.

Change-Id: I8f6ce2ec183e4c757613fd7e1959d9d0e4cfc89e
Reviewed-on: https://code.wireshark.org/review/8512
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: Remove duplicates by default for ATT Server Attributes dialog
Michal Labedzki [Mon, 4 May 2015 09:46:19 +0000 (11:46 +0200)]
Bluetooth: Remove duplicates by default for ATT Server Attributes dialog

Change-Id: Ic833c800f599eed465eddc3d17ca07bdf3e83aba
Reviewed-on: https://code.wireshark.org/review/8511
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: SCO: Add Stream Number generated field
Michal Labedzki [Mon, 4 May 2015 10:54:29 +0000 (12:54 +0200)]
Bluetooth: SCO: Add Stream Number generated field

It is used to distinguish SCO streams.
Stream Number increase any time when new SCO connection is created.

Change-Id: I6cf68914112980cdbad345e52469bf2baf214551
Reviewed-on: https://code.wireshark.org/review/8510
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: SCO: Add Connect/Disconnect tracking
Michal Labedzki [Fri, 1 May 2015 13:13:13 +0000 (15:13 +0200)]
Bluetooth: SCO: Add Connect/Disconnect tracking

Change-Id: I4db44628d60ec8ae22b625649e971b344f450ed9
Reviewed-on: https://code.wireshark.org/review/8509
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: SCO: Add Missing fields
Michal Labedzki [Thu, 30 Apr 2015 13:44:42 +0000 (15:44 +0200)]
Bluetooth: SCO: Add Missing fields

Missing fields are: Reserved, Packet Status.

Change-Id: Ia9edb23e3fc8c45d12931200dd02f0d3eef87c48
Reviewed-on: https://code.wireshark.org/review/8508
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: ATT: Enable UUID128 field
Michal Labedzki [Mon, 20 Apr 2015 11:46:01 +0000 (13:46 +0200)]
Bluetooth: ATT: Enable UUID128 field

API used by this field is implemented, so field can be enabled now.

Change-Id: Ifc8de81157c9b125ba769d14ec57a498d9810c5f
Reviewed-on: https://code.wireshark.org/review/8507
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: OBEX: Add DecodeAs by Type aka MIME Type
Michal Labedzki [Sun, 19 Apr 2015 17:08:13 +0000 (19:08 +0200)]
Bluetooth: OBEX: Add DecodeAs by Type aka MIME Type

Also map some Types to Dissector Table dissectors.

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