Commit Graph

62121 Commits

Author SHA1 Message Date
Alexis La Goutte 80dda81a61 AUTHORS: sort by name
Change-Id: I01980d1ab757decb7bb84649dbd41477978104c3
Reviewed-on: https://code.wireshark.org/review/14381
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-08 18:02:01 +00:00
Alexis La Goutte e82bdcb53a AUTHORS: update .mailmap
Change-Id: Ic67b404457435c3c9d1bc54ca0c7809e71917945
Reviewed-on: https://code.wireshark.org/review/14380
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-08 18:01:40 +00:00
Alexis La Goutte bb8f3cd601 AUTHORS: Update some e-mail address from AUTHORS.src for avoid duplicate entry
Change-Id: I3ee91a0da1732f4a65c799a7b057272bf8b437f5
Reviewed-on: https://code.wireshark.org/review/14358
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-08 18:01:15 +00:00
Uli Heilmeier 48b807a364 BGP: Fix detection of additional path
When additional path index are in use there must be more remaining data bytes.
Therefore we return only 1 when the len is greater 1.

Bug has been reported by Garri.

Bug: 12240
Change-Id: Ia24311dcedc450e4208df875bc254c9744dec5dd
Reviewed-on: https://code.wireshark.org/review/14396
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-08 17:43:43 +00:00
Pascal Quantin bc59efc4e3 Add packet-metamako.c to EditorConfig file
Change-Id: I4f1a03c348e4b3e29164d90c0c1e2035eed6f2a1
Reviewed-on: https://code.wireshark.org/review/14395
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-08 11:27:37 +00:00
David Snowdon d12bd52a52 Added dissector for Metamako trailers.
Change-Id: Ib9dc712f58b9e579ad8ef027864db0a1b31ebf52
Reviewed-on: https://code.wireshark.org/review/14282
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: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-08 11:01:29 +00:00
João Valverde 6948e7ca19 generate_authors.pl: Use literal regex expression
Change-Id: I6828dc5f71930ce4121ab7ad24db5b0428cea7f3
Reviewed-on: https://code.wireshark.org/review/14383
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08 10:48:16 +00:00
João Valverde 5f8003e949 Add EditorConfig settings for most C files
Change-Id: I02e6d71290bbdf7504437b0d670955b3686b6b52
Reviewed-on: https://code.wireshark.org/review/14360
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08 10:46:35 +00:00
João Valverde e22b4008c6 Convert dissector modelines to EditorConfig file
Change-Id: I467b6ca940d2f89346fde46b7348b00eab40092e
Reviewed-on: https://code.wireshark.org/review/14353
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08 10:45:49 +00:00
Gerald Combs b63a8bdcb7 Start adding EditorConfig files.
Add EditorConfig files where we currently have consistent indentation.
This might let us get rid of our editor modeline footers at some point.

Change-Id: I156f8d25cfa0050786eb2186c4b2e6d183c3a9ce
Reviewed-on: https://code.wireshark.org/review/12383
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08 10:44:17 +00:00
João Valverde 4dae247ed2 Qt: Remove unused version.h header
Change-Id: I3f9f38b2077077aca6106e22abe337bf724f33e7
Reviewed-on: https://code.wireshark.org/review/14379
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07 22:49:28 +00:00
Stig Bjørlykke 0a6b6b09dc dmp: Report unused bits in last byte for 7bit string.
The protocol spec states that unused bits in the last byte in a
7bit string shall be null.

Change-Id: I6fa2e0af6462c87279c19e23a98bf624e46bc9c1
Reviewed-on: https://code.wireshark.org/review/14387
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-03-07 20:05:49 +00:00
Alexis La Goutte 4f3a88989e Add conflict check filter
Set ENABLE_CHECK_FILTER to 1 for get list of display filter with conflict...

Ping-Bug:2402
Change-Id: I8d56b1573120d1a29d437aae1088be242e15e9a3
Reviewed-on: https://code.wireshark.org/review/13644
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>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-07 07:57:29 +00:00
João Valverde 6ea3f3790a generate_authors: Align git log email column
Change-Id: Ic08b23e80a982805f4b512a410a1a4414afc3a8c
Reviewed-on: https://code.wireshark.org/review/14354
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07 06:34:53 +00:00
Gerald Combs 1e97b5f284 Update the Automake gen-authors target to match CMake.
Broken in g32d60ac.

Change-Id: Idf9ea0970c30c8eff8e21c3039fe47fd8a175a27
Reviewed-on: https://code.wireshark.org/review/14370
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07 06:31:26 +00:00
Dario Lombardo ef21d66edc sshdump: minor changes
Change-Id: I07bd2a95622187c6bacb3013998f93bfa07af87c
Reviewed-on: https://code.wireshark.org/review/14338
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-07 05:10:15 +00:00
Jeff Morriss 7d543a0b87 Run checkAPIs in the (epan/) wslua and crypt directories.
Don't try to run it (automake only) in dcerpc: there's no target for it there.

Change-Id: Idaf1d3d3ac27e837f484520406e604c12c4b473f
Reviewed-on: https://code.wireshark.org/review/14346
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-07 05:07:51 +00:00
Guy Harris 73ce3407a9 Fix indentation.
Change-Id: I78fd1d8e91443fa878e6c4ae05839d8a49849830
Reviewed-on: https://code.wireshark.org/review/14367
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-06 18:38:27 +00:00
Gerald Combs 96c593a9ab [Automatic update for 2016-03-06]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Ibd8571b495bc8170a5f77f7461d86a9a02c8b0b4
Reviewed-on: https://code.wireshark.org/review/14364
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-06 18:22:10 +00:00
Guy Harris 68b7b1ab57 To see whether a string equals another string, just use strcmp().
The goal here is to see whether out_filename is "-" or not; there's no
good reason to use strncmp() here.

Fixes Coverity CID 1316605.

Change-Id: I851eee869afed58ac091982b8d303b0eda276c2e
Reviewed-on: https://code.wireshark.org/review/14361
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-06 18:11:12 +00:00
Guy Harris ad3afb02c3 Properly fetch the ethertype.
The ethertype is 16 bits and big-endian, so fetch it with pntoh16() to
convert it to host byte order (and to handle unaligned values).

Fixes Coverity CID 1355352.

Change-Id: I14980e2813c3ea19c6df01681f8ed7aaad5c3f59
Reviewed-on: https://code.wireshark.org/review/14359
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-06 17:24:05 +00:00
Chris Brandson 5876dc241c 802.15.4 update handling of PAN ID Compression to 802.15.4-2015
Handling of PAN IDs in 802.15.4 has changed dramatically in
802.15.4-2015, particularly with respect to the new Frame Version
2 (0b10) frames. This update streamlines the logic in an attempt
to follow the spec as closely as possible. In doing so it fixes
some logical errors in the previous version

Change-Id: I1a2f112bbcdeb24a605167578201494823485c47
Reviewed-on: https://code.wireshark.org/review/14167
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-06 14:34:34 +00:00
Alexis La Goutte 327f732832 MAPI (dcerpc): fix no previous prototype for 'mapi_dissect_struct_request' / 'mapi_dissect_struct_EcDoRpc_MAPI_REQ' [-Wmissing-prototypes]
Change-Id: If5ff7835f931213f1b846776a3ea9dfa6a1952b1
Reviewed-on: https://code.wireshark.org/review/14352
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: João Valverde <j@v6e.pt>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-06 14:34:33 +00:00
Alexis La Goutte aea4b91b05 DCERPC: regenerate dissector after change on generator
Fix mapi/nspi/rfc dissector
Don't forget when regenerate to go on mapi/nspi/rfc and use make for regenerate

Change-Id: I74b98bf84e7786f51d4f693379186b289913ca1b
Reviewed-on: https://code.wireshark.org/review/11476
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-06 13:17:46 +00:00
Alexis La Goutte 0e80176366 PIDL (NDR): fix missing $name when regenerate MAPI dissector
Issue coming from ge41f08858b

Change-Id: Ibff382b7cbf9a89904eb87d7f3e8f56b5782a0f6
Reviewed-on: https://code.wireshark.org/review/14351
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-06 13:02:35 +00:00
Michael Mann f2de3c7778 Improve wiretap block capabilities.
Make a more formal method for registering options within a block and do it all with a single function (wtap_optionblock_add_block).
Add ability for block to be able to write itself, refactored out of pcapng.c.  This was implemented for SHB, ISB, and IDB blocks.  Name resolution (NRB), while possible, seemed a little messy for the moment.

Change-Id: Ie855c8550c7c7d96cfc188c0cd90bfbc4d5f0ee8
Reviewed-on: https://code.wireshark.org/review/14357
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-06 12:53:36 +00:00
Gerald Combs 32d60ac2f5 CMake: Avoid pipes and the `cut` command.
Dump the output of `git shortlog` directly to AUTHORS.git instead of
piping it through `cut`. Depending on our toolchain, cmake COMMANDs might
not support pipes. This appears to be the case for MSBuild. Removing the
`cut` command has the added benefit of reducing our dependency on Cygwin.

Pass HEAD to `git shortlog`, otherwise it doesn't return anything when
run under MSBuild.

Change-Id: I23e9436c007d76a700bbbc45c2772c8aba6d5749
Reviewed-on: https://code.wireshark.org/review/14349
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-06 01:12:56 +00:00
Victor Dodon e86dd03d3a usb: display correctly index/interface/endpoint in urb setup
In URB setup, wInterface is always displayed disregarding the actual
bmRequestType. Show instead: wInterface if recipient is an interface,
WEndpoint if recipient is an endpoint and wIndex when recipient is device
or other.

Change-Id: I6883dc22d80267276f9d171f39695e86e93aae83
Reviewed-on: https://code.wireshark.org/review/14283
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-05 18:50:31 +00:00
Jeff Morriss be25474c94 Check source files for broken (read: not set to 8) tabstop settings.
Change-Id: I60e77a67189e7446f8c5ffd0add803cca10b4b57
Reviewed-on: https://code.wireshark.org/review/14345
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>
2016-03-05 17:46:00 +00:00
Guy Harris 1e289cb906 That patch is gone (we changed the menu category ourselves).
Change-Id: I4a7de0e95347aa7c1085bd4c026aaef02755a98c
Reviewed-on: https://code.wireshark.org/review/14350
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-04 18:21:30 +00:00
Pino Toscano 3347e42590 Change "System" category to "Network" in desktop files
Change-Id: I39346deaa9265f9684804688c36ab42ab4eee621
Reviewed-on: https://code.wireshark.org/review/14241
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-03-04 16:07:31 +00:00
Jeff Morriss ab5614ae10 Clean up modelines and indentation.
To quote Icf0831717de10fc615971fa1cf75af2f1ea2d03d:

HT tab stops are set every 8 spaces on UN*X; UN*X tools that treat an HT
character as tabbing to 4-space tab stops, or that even are configurable
but *default* to 4-space tab stops (I'm looking at *you*, Xcode!) are
broken. tab-width: 4, tabstop=4, and tabSize=4 are errors if you ever
expect anybody to look at your file with a UN*X tool, and every text
file will probably be looked at by a UN*X tool at some point, so Don't
Do That.

Adjust indentation to reflect the mode lines.

Change-Id: Ic829541c696e0ddbc45cc109009319859c799066
Reviewed-on: https://code.wireshark.org/review/14340
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-03-04 15:30:44 +00:00
Dario Lombardo 637aefd2b3 cmake: fix gen-authors target.
Also add AUTHORS.git to .gitignore.

Change-Id: I63365816fc32b33d064ebbcae0ddb607c2b37f38
Reviewed-on: https://code.wireshark.org/review/14339
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-03-04 15:30:24 +00:00
Dario Lombardo b4f3255450 androiddump: change first error message into verbose_print()
This error occurs every run of wireshark if adb is not running.
This is a bit noisy, so androiddump is made less verbose.

Bug: 12185

Change-Id: Ia7d0b0aba95e90a7f602c2e340f6344d09205b32
Reviewed-on: https://code.wireshark.org/review/14288
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-03-04 10:10:17 +00:00
Stig Bjørlykke 25996e9e21 dmp: Show correct uncompressed user data length
Change-Id: Iac9c6434da5bdd29768fbacd2bdc9cbe2713c17b
Reviewed-on: https://code.wireshark.org/review/14336
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-03-04 09:30:24 +00:00
Dario Lombardo d8f541c89b extcap: move ssh common functions to ssh-base.
Change-Id: Ic06882a4f914b4f89d936d5d942b50552ae4abb3
Reviewed-on: https://code.wireshark.org/review/14264
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-04 07:14:09 +00:00
Dario Lombardo 68d4ba212c extcap: add local_interfaces_to_list() to wsutil.
This new function abstracts the creation of a list of the local
interfaces that will be used by future extcaps to generate specific
filters. Sshdump now uses it to create a pcap filter.

Change-Id: I5b75a266f81104b3c9bcb3e51de246b7cc8785ce
Reviewed-on: https://code.wireshark.org/review/14092
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-04 05:53:56 +00:00
Guy Harris 5a66318272 We need to include <wsutil/privileges.h> for those functions.
Change-Id: I2c51ae467e1fcfb325bfac5d6fe52ef08b4429a6
Reviewed-on: https://code.wireshark.org/review/14335
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-03 22:11:01 +00:00
Guy Harris 5ec5da3f68 Add missing initialization calls.
Do the same thing editcap does; we need to know, for example, whether we
were invoked with elevated privileges, so we know whether to pay
attention to environment variables when loading plugins.

Fix program name, and add a comment from editcap, while we're at it.

Change-Id: Ia092331de129d86783a2600be21cff746d4ed5e3
Reviewed-on: https://code.wireshark.org/review/14334
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-03 21:36:20 +00:00
Uli Heilmeier 894804acd0 QT: TCP Stream Graph: Fix index number
setMaximum() for stream index before calling setValue()

Bug: 12163
Change-Id: Ic1678bc5282a7a01b96a39a44790949b743acf7f
Reviewed-on: https://code.wireshark.org/review/14332
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-03 21:33:45 +00:00
Gerald Combs 53a879c5c3 Make sure our shell, Perl, & Python tools are executable.
Change-Id: Ie58978473c4af7a0eaccf3e664c2f44bed2ef202
Reviewed-on: https://code.wireshark.org/review/14331
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-03 20:11:25 +00:00
Gerald Combs 0a833f0dfc Git: Ignore vgcore files.
Change-Id: Iceb0d2778442d776320d6654cba25f7a43f63689
Reviewed-on: https://code.wireshark.org/review/14330
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-03-03 20:00:55 +00:00
Gerald Combs b9561bd3bb Qt: Allow regex searching in the advanced prefs.
Use a QRegex for Preferences → Advanced → Search.

Change-Id: Iebf1cba9c17ff774ce50ef909b6d181751b272aa
Reviewed-on: https://code.wireshark.org/review/13924
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-03 19:50:30 +00:00
Michael Mann 8435145b1f Create perl script to append existing AUTHORS file with information from git log.
new AUTHORS file can be created with "gen-authors" build parameter

The "original" AUTHORS file has been fixed up to be kind to parsers (so no one gets excluded) and renamed to AUTHORS.src.  This preserves the features authors worked on.  For authors that didn't list features, they may be converted to just getting information from git.

Change-Id: I9a4c4091e229f7f5e1c46d864527a98c1278e451
Reviewed-on: https://code.wireshark.org/review/14231
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 18:28:32 +00:00
glores b70d1d7e14 GTPv2 bearer resource command message conversation fix
Change-Id: Ida7d5aa9a5dd4c7fdc66806730762c70d3d951bb
Reviewed-on: https://code.wireshark.org/review/14327
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-03 17:22:29 +00:00
Michael Mann d7de3515db Refactor wiretap option block types into a registration system.
Also required mergecap to look for plugins to initialize wiretap option blocks.

Change-Id: I4208d1028dd0f94f185393801d72025329266cb7
Reviewed-on: https://code.wireshark.org/review/14300
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 17:02:10 +00:00
Michael Mann 28b76dbb9e Allocate GArray when copying stat blocks within IDB block.
Don't treat it like a GList
Bug: 12220

Change-Id: I057649a26d135516c6e8d4fb028c6cb9dcda2e7c
Reviewed-on: https://code.wireshark.org/review/14326
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 14:25:36 +00:00
AndersBroman 45406f5cff [PPCAP] SCTP association ID IE is alwas 16 octets long including padding.
Change-Id: I1d381cb7f60f0ec57494becddc529cafb5d23052
Reviewed-on: https://code.wireshark.org/review/14323
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-03 13:44:26 +00:00
João Valverde c524d73a67 Revert "autotools: Use -Werror with clean plugin code"
This reverts commit 31654e5e5c.

Change-Id: I27f3465c680daa599b96a7259ca93f96f2a622a5
Reviewed-on: https://code.wireshark.org/review/14324
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-03 13:24:58 +00:00
AndersBroman 780a703c5f [IPv4] In case of a bougus IPv4 version continnue dissection as IPv6 if
the version indicates IPv6.
This handles a case of Linux cooked capture with ethertype set as IPv4 for
IPv6 packets.

Change-Id: Ie79f1a631980a224a7b51963f9174e75ffb69a47
Reviewed-on: https://code.wireshark.org/review/14321
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-03 12:48:20 +00:00