Commit Graph

58416 Commits

Author SHA1 Message Date
Peter Lemenkov 3ddbda55e8 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>
2015-05-22 09:10:55 +00:00
Peter Lemenkov 5addf12c5f 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>
2015-05-22 09:08:48 +00:00
Jeff Morriss 4dfc5a7204 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>
2015-05-22 08:07:36 +00:00
Andreas Stieger 8f462b0737 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>
2015-05-22 07:00:50 +00:00
Guy Harris 2aea664d60 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>
2015-05-22 03:14:59 +00:00
Gerald Combs fe7c5ea0c1 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>
2015-05-21 19:18:19 +00:00
Anders 0289d5c2b5 [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>
2015-05-21 15:33:23 +00:00
Anders 8999634b17 [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>
2015-05-21 13:43:17 +00:00
Tatsuhiro Tsujikawa 3e8c9a4c1a 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>
2015-05-21 11:23:34 +00:00
Guy Harris 353e4a3b3c 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
2015-05-21 08:43:10 +00:00
Guy Harris 29aeea744d Remove trailing whitespace.
Change-Id: Ibc6620f489ae5d956b03ee61dc6f08dfc0a93371
Reviewed-on: https://code.wireshark.org/review/8562
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-21 07:29:05 +00:00
Guy Harris 5a54d69b72 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
2015-05-21 07:27:58 +00:00
Alexis La Goutte 90a1303846 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>
2015-05-21 06:11:13 +00:00
Pascal Quantin 22aa241eff 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>
2015-05-20 20:41:36 +00:00
Guy Harris 9ac0337157 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>
2015-05-20 20:34:32 +00:00
Pascal Quantin af3cb5e06b 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>
2015-05-20 20:20:57 +00:00
Oscar Gonzalez de Dios 734032a38f 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>
2015-05-20 17:33:02 +00:00
Pascal Quantin 2acb57d703 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>
2015-05-20 17:21:31 +00:00
Gerald Combs a30000a805 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>
2015-05-20 16:21:03 +00:00
Michael Mann 344c990159 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>
2015-05-20 14:57:51 +00:00
Alexis La Goutte 67159be03d 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>
2015-05-20 14:54:55 +00:00
Alexis La Goutte 390299c953 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>
2015-05-20 14:53:33 +00:00
Michael Mann feb47cf936 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>
2015-05-20 11:03:58 +00:00
cbontje 713ed3f817 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>
2015-05-20 09:07:42 +00:00
Benjamin Roch efe3486f83 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>
2015-05-20 09:06:00 +00:00
Martin Kaiser b687f719a3 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>
2015-05-20 07:54:44 +00:00
Gerald Combs af054591c3 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>
2015-05-20 03:03:58 +00:00
Guy Harris fd985194f5 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>
2015-05-20 02:55:33 +00:00
Martin Kaiser 2b68570100 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>
2015-05-19 21:16:08 +00:00
Anders 1f34e047e4 [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>
2015-05-19 19:53:18 +00:00
Gerald Combs ea3537fb32 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>
2015-05-19 19:30:05 +00:00
Guy Harris c19b8eb7db 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>
2015-05-19 19:06:27 +00:00
Alexis La Goutte adc05f4f74 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>
2015-05-19 14:16:36 +00:00
Stig Bjørlykke f1ea2fae57 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>
2015-05-19 12:13:48 +00:00
Alexis La Goutte cff7bcd90b 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>
2015-05-19 11:50:00 +00:00
Andreas Gruenbacher 75be35d8e3 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>
2015-05-19 11:34:02 +00:00
Graham Bloice d64d87f44e 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>
2015-05-19 09:32:56 +00:00
Michael Mann a80c88a10f 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>
2015-05-19 02:35:08 +00:00
Guy Harris 47cc0238b8 Fix typo.
Change-Id: Idde2f4771b42714561f65f712e680f9609aeaa57
Reviewed-on: https://code.wireshark.org/review/8535
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-19 01:46:42 +00:00
Guy Harris a273d9dd91 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>
2015-05-19 01:40:46 +00:00
Martin Kaiser 376ba916d4 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>
2015-05-18 21:10:33 +00:00
Martin Kaiser b4f895ced7 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>
2015-05-18 21:10:00 +00:00
Martin Kaiser fcb284db97 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>
2015-05-18 21:09:30 +00:00
Martin Kaiser f33aa0c6d4 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 e597acdc48

Change-Id: I076a0c9f0ea124e11edbb7a0bc0e41d1ab6f374a
Reviewed-on: https://code.wireshark.org/review/8527
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-18 21:08:57 +00:00
Guy Harris 9d5a9fb1ff 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>
2015-05-18 17:18:26 +00:00
Guy Harris 65b17d4323 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>
2015-05-18 17:01:36 +00:00
Michal Labedzki 930f5b5402 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>
2015-05-18 12:03:10 +00:00
Alexis La Goutte 9b99bdb09f 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>
2015-05-18 11:18:22 +00:00
Alexis La Goutte 89b2e087cb 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>
2015-05-18 11:16:54 +00:00
Alexis La Goutte 0215ad2bd4 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>
2015-05-18 08:16:54 +00:00