Commit Graph

55149 Commits

Author SHA1 Message Date
Alexis La Goutte 94d35481b7 SPDY: Fix typo about length for Control bit
Found by yurui ming

Change-Id: Ibef07fa13af0de8357bdf98a038460706d0972f7
Ping-Bug: 10566
Reviewed-on: https://code.wireshark.org/review/4635
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 10:49:12 +00:00
Alexis La Goutte 749832a35c USB Mass Storage: Display target number for SCM USB-SCSI converters
The USB Mass Storage Class (Bulk Only Transport) has the LUN in bits [3:0] of byte 13 of the command block wrapper. Bits [7:4] of that byte are undefined/reserved.

USB-SCSI converters based on a chipset from SCM Microsystems can work with multiple SCSI devices. After enabling multi-target mode (which the vendor driver and Linux do), the target number is given in bits [6:4] of CBW byte 13.

Request from Mark

Bug:10563
Change-Id: I8e6d9b7d47ff4296d41e8b9b15f4bd44c89238c9
Reviewed-on: https://code.wireshark.org/review/4625
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 10:43:49 +00:00
Joseph Huffman 8cc7b0d6cf Fixed missing padding. Fixed ENC_NA/ENC_BIG_ENDIAN errors.
There was no tree items for padding in the many instances where there were
bytes added to make certain data types align on even boundaries of 2, 4, or
8 bytes. These instances now show up as "Padding" in the display.

There were many instances where ENC_NA was used for fields of more than one
byte. This wasn't noticed before because ENC_NA was ENC_BIG_ENDIAN for
historical reasons and all these fields are big endian fields.

Change-Id: Iabadd46eacc9ceb8ca85f4a5ba42b6583375c5f0
Signed-off-by: Joseph Huffman <jhuffman@codeaurora.org>
Reviewed-on: https://code.wireshark.org/review/4413
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 10:37:09 +00:00
Matthieu Texier 8d0becd821 Aliging PIM hello message type to IANA in order to fix BUG 10231
Change-Id: Ie9a126d106c08935eb385fd93d011e481913ab3c
Reviewed-on: https://code.wireshark.org/review/4448
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 08:57:00 +00:00
Michael Mann b563a84db6 Eliminate proto_tree_add_text from IP dissectors
Change-Id: I81fc364cbff3c5b305d61b2d444bf8599fbd19e7
Reviewed-on: https://code.wireshark.org/review/4631
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>
2014-10-13 06:45:13 +00:00
Alexis La Goutte 5518513eef IPv6 RPL: Display RPL flag on HEX
Change-Id: I0b3bb9e1a0de388135a71bc6a97602d6abf6a9dc
Reviewed-on: https://code.wireshark.org/review/4628
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 02:13:04 +00:00
Alexis La Goutte 73613d414a Remove DIRTY_DISSECTOR_SRC
x11 dissector don't have longer warning !
and fix different between Autotools and CMake (about gsm_a_common dissector)

Change-Id: Id9da62d84b8b0bb4b0ed5d8fc62abba4e2442ed2
Reviewed-on: https://code.wireshark.org/review/4621
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 02:06:12 +00:00
Pascal Quantin 38c9ac870a GlusterFS: fix OSX compilation failure
ged0b19b introduced support for 64 bits bitmask. Make use of it and add an explicit cast to fix a compilation error

Change-Id: I9f2202d851aedc0dc78655c505b5a0b26b224c0e
Reviewed-on: https://code.wireshark.org/review/4630
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-12 21:44:36 +00:00
Tomasz Moń eed22acbcf Fix double free.
This double free involves damaging GHashTable internals (key and value).

Change-Id: I17c8a473b96ab28e611ccf79ddd2b3da56512184
Reviewed-on: https://code.wireshark.org/review/4629
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Tomasz Moń <desowin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-12 20:22:53 +00:00
Tomasz Moń fc2f31810a Fix handling of extcap boolflags which defaults to true.
Example:
arg {number=0}{call=--test}{type=boolflag}{default=true}

Before this change --test was never added to argument list (no matter if
user left it selected or explicitly deselected it).

After this change --test will be added to argument list unless user
explicitly deselects it.

Change-Id: Ia5bc11f900b03e630aba882ef918dcb7f0b79291
Reviewed-on: https://code.wireshark.org/review/4618
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-12 19:54:57 +00:00
Bill Meier 1b8b2a8aa8 Add editor modelines; Adjust whitespace as needed.
Change-Id: I4da7b335d905dbca10bbce03aa88e1cdeeb1f8ad
Reviewed-on: https://code.wireshark.org/review/4626
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-12 18:58:32 +00:00
Alexis La Goutte 4e328e4709 DCERPC: Remove DIRTY_PIDL_DISSECTOR_SRC
Now mapi and drsuapi build without warning !

Change-Id: Iae19af2fd06fd998a13696ba2adf6cd12d311f58
Reviewed-on: https://code.wireshark.org/review/4619
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>
2014-10-12 17:46:58 +00:00
Alexis La Goutte d62b323c5e PIDL (DCERPC misc): enhance dissector
* Fix -Wunused-function (Set NOEMIT winreg_Data and remove unused function)
* Remove dissector DCERPC misc from DIRTY list

Change-Id: If59b14f8db33354a2d5248e8bc256cadee3ea4bf
Reviewed-on: https://code.wireshark.org/review/4345
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12 17:46:26 +00:00
Alexis La Goutte 148136c9a5 ISUP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I17163b18348919d19d3d336ccf9c1310d473a05d
Reviewed-on: https://code.wireshark.org/review/4624
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12 17:43:12 +00:00
Alexis La Goutte 44208b98d1 LMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ie651e8a7d0309330504a77664bb2eac75c00d968
Reviewed-on: https://code.wireshark.org/review/4623
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12 17:42:18 +00:00
Stig Bjørlykke 1b65cb646d Add back get_uinteger for boolean_type.
This was removed in ed0b19b94b

Change-Id: I548ca955eda6e0b6991a0f6731cbbb3bf82e0e2b
Reviewed-on: https://code.wireshark.org/review/4620
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-12 16:59:14 +00:00
Gerald Combs 6e3a2b450e [Automatic manuf, services and enterprise-numbers update for 2014-10-12]
Change-Id: Icc98f156e55bc8523490bb8a8d712ca80076649e
Reviewed-on: https://code.wireshark.org/review/4615
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-12 15:06:08 +00:00
Pascal Quantin f7c5e3a5b9 E-LMI: add what seems to be a missing break (Coverity CID 1245648)
Change-Id: I6b35ea96fba142bdabf17d3fc3f9db23dc390d31
Reviewed-on: https://code.wireshark.org/review/4613
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-12 14:57:03 +00:00
Daniel Mack ed0b19b94b Make boolean bitmask type 64-bit wide
There are protocols out there that have 64-bit wide bit mask fields, so
make the internal representation and bitfield decoders 64-bit aware.

For this, the ws_ctz() fallback and bits_count_ones() have to be tweaked
slightly.

Change-Id: I19237b954a69c9e6c55864f281993c1e8731a233
Reviewed-on: https://code.wireshark.org/review/4158
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: Michael Mann <mmann78@netscape.net>
2014-10-12 14:15:12 +00:00
Matthieu Patou 29afac24a5 Add support for NTTIME_hyper and NTTIME_1sec
It's hyper with 8 bytes alignment it can have 1/100000 sec resolution or 1sec resolution

Bug: 10541
Change-Id: Iecc4c6d1bd1695a4c02db72e1617134254810cd9
Reviewed-on: https://code.wireshark.org/review/4606
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12 14:08:44 +00:00
Guy Harris b3490c20ce Use the wtap_read_bytes{_or_eof}() routines.
Change-Id: I4f707bc714b2643d0f6c568f3367e712ee635d8e
Reviewed-on: https://code.wireshark.org/review/4612
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-11 23:07:41 +00:00
Stig Bjørlykke eb72d2a160 Use variable name 'len' when handling length.
Change-Id: Icb1d81316d1ead3455c68ad55e52b8120b7dccf9
Reviewed-on: https://code.wireshark.org/review/4609
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-11 20:41:58 +00:00
Guy Harris 8eefa4d9f9 Use the count-of-records fields to figure out how many records to read.
Fetch the count of records from one of the locations where it appears to
be, and, currently, require that it be equal to the count at the other
location where it appears to be; if they ever differ, we'll need the
file in order to reverse-engineer some more.

Fix the way we *write* .rf5 files - it turns out that we were

	1) not writing the full file size;

	2) not writing the packet count in the right location.

Detect files written by the old code, and get the packet count from the
right location for those files.

Change-Id: I7ce83afbc9dbbd300c81c96ef8f7785a0aeefa7a
Reviewed-on: https://code.wireshark.org/review/4608
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-11 20:11:58 +00:00
Matthieu Patou e331083812 Add dissection of MIDL_NDRHEADERBLOB used in drsuapi and some other protocols
Bug: 10540
Change-Id: If4a8603a7cb62894cc46094056dd5313039884b2
Reviewed-on: https://code.wireshark.org/review/4604
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-11 04:04:36 +00:00
Gerald Combs 81f9976b06 CMake: Don't add Custom.make to the bundle.
Change-Id: I08f2701e4450f34aa9d840cc5f507e9348e115bd
Reviewed-on: https://code.wireshark.org/review/4605
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-11 00:27:06 +00:00
Michael Mann 6e42a72923 Dissection of sid28 needs null check.
Bug: 10542
Change-Id: I8fcfbbd96833af2c57754a4c8f96cf702972e22a
Reviewed-on: https://code.wireshark.org/review/4603
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10 23:24:18 +00:00
Gerald Combs 5c5bf3b370 Update READMEs to reflect recent CMake environment changes.
Change-Id: Idbf879f20448eea0b69e793271439dec877832e9
Reviewed-on: https://code.wireshark.org/review/4602
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10 22:05:10 +00:00
Guy Harris ffa377b22f Use names more like the other names in open_info.
For open_info, use names based on the names in other lists.

Also, in comments, indicate what the three count 'em three tables are
used for, and clean up the type/subtype table.

Change-Id: I7a763119e790d5970f87dff05284f465eebfb7e7
Reviewed-on: https://code.wireshark.org/review/4599
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10 20:20:29 +00:00
cbontje d330cd4ecb DNP3 Protocol Bugfix / Enhancement
- Fix for Single-bit Objects offset-pointer
- Enhancement for Obj 12 Var 2 (Pattern Control Block) and Var 3 (Pattern Mask) Decoding

Bug: 10558
Change-Id: I8d3f6cee4acbab09d0b93dab6b868cddd842b682
Reviewed-on: https://code.wireshark.org/review/4597
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10 20:19:08 +00:00
Anish Bhatt f7588eaec2 [ELMI] Add missing information elements, add support for sub-information elements.
Bug 10532

Updated with Bandwidth Profile support

Change-Id: I0f31eb6c78a5e34bcb1c286a9a10730b3b63481c
Reviewed-on: https://code.wireshark.org/review/4571
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>
2014-10-10 19:29:14 +00:00
Michael Mann a168c44fc0 Remove (almost all) proto_tree_add_text calls in ISUP dissector.
Change-Id: I57a01eacaa02e45c23bb4827ae982c897fb308ee
Reviewed-on: https://code.wireshark.org/review/4592
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>
2014-10-10 19:14:14 +00:00
Pascal Quantin a1933022f2 NCP: switch to wmem memory and ensure that all fields are initialized
Change-Id: Ia17e189baed05d8020654e6702a51f51bd384f26
Reviewed-on: https://code.wireshark.org/review/4589
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10 19:02:36 +00:00
Guy Harris 685d3034d5 Version 3 has only absolute timestamps; don't set nsg_creltime.
Version 3's time stamps are all absolute, so we can directly use the
value in the file; we don't need to keep track of the time in the
private data structure, and some compilers issue warnings due to setting
it and then not using the value to which we set it.

Change some names and indentation to match other file versions while
we're at it.

Change-Id: I97698d933b87a8ad58d9e88ceedd75004797df69
Reviewed-on: https://code.wireshark.org/review/4596
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10 18:41:00 +00:00
Pascal Quantin 6463d2a7e6 GSM MAP: fix detection of SMS direction when application context version is < 3
Bug: 10547
Change-Id: I4708fd9977e635c66ef1350ce5098520e4c2ce1e
Reviewed-on: https://code.wireshark.org/review/4579
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10 18:26:49 +00:00
Gerald Combs 98d77e2b15 CMake: Bundle the "share" directory files and directories.
Work around a CMake bug using file globbing.

Change-Id: I67dc8268154e05834e5d4e7d8f22c6eb25b24c1f
Reviewed-on: https://code.wireshark.org/review/4595
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10 16:48:36 +00:00
Bill Meier 23e78cd6bd Add editor modelines; Adjust whitespace as needed.
Change-Id: I3dc57f4c2ca57585103e3b71503ac4c332903e50
Reviewed-on: https://code.wireshark.org/review/4594
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-10 14:50:08 +00:00
AndersBroman bdbc8e3a79 GTPv2: Presence-Reporting-Area-Elements-List do full dissection of ECGI
and TAI.

Change-Id: I95d9ebf1d6f4eabe30b557fdc937d56006f8b123
Reviewed-on: https://code.wireshark.org/review/4593
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-10 13:45:27 +00:00
Guy Harris 7e49f06190 wtap_file_read_till_separator() can return values other than 1 on success.
It returns the length of the string it read, so only treat 0 and -1 as
errors.  (0 either means "EOF" or "string is zero length", but this is
only in the code that reads numbers, and a number needs at least 1
digit, so both EOF and "zero-length string" mean "this isn't a valid
Peek tagged file".)

Change-Id: Ib83eb2f1e53d912a2138be01480e2b464cf936db
Reviewed-on: https://code.wireshark.org/review/4591
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10 10:22:29 +00:00
Guy Harris f5b06c5630 Fix some more int-to-enum conversion complaint.
While we're at it, log a message if a Lua file format module lacks a
read or a seek-read routine, rather than completely silently ignoring
that module if it claims a file.

Change-Id: I9778f7835922439e2d3708614689280ef7b61d33
Reviewed-on: https://code.wireshark.org/review/4590
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10 08:14:38 +00:00
Gerald Combs 3a4cab751e CMake: Bundle our libraries.
Change-Id: I5df4d794602f7e53c2f4f496597f8eaf7c7b6eaa
Reviewed-on: https://code.wireshark.org/review/4588
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10 01:45:55 +00:00
Gerald Combs 33d20c64dc Add back a value_string conversion lost in g58cc452.
I don't have a capture to check but this appears to be correct.

Change-Id: I93405d1e3ec4aac3761d06e257db3ec2e32b2fc2
Reviewed-on: https://code.wireshark.org/review/4587
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10 01:40:16 +00:00
Guy Harris 45f2afc696 Oops, missed one.
Change-Id: I0847846d50d6979f0f50a00438a834c7c7c2acc0
Reviewed-on: https://code.wireshark.org/review/4586
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10 01:30:40 +00:00
Guy Harris 4f4e01b36b Don't treat int return values as valid wtap_open_return_val values.
They happen to be, at least now, but that's not valid in C++, and it's
probably unwise in any case.

Change-Id: Ifd49920cfaa376e5e7788329ee83db3956a7cdff
Reviewed-on: https://code.wireshark.org/review/4585
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10 01:14:37 +00:00
Guy Harris 9754192f9b Cast size_t to to gulong as the length argument to g_snprintf().
Sadly, the GTK+ folks decided not to use size_t for the size argument,
so it doesn't do the right thing on LLP64 platforms such as Windows.

Change-Id: I2aa9096215c488b48f1cf68d2a285a48abb6f07f
Reviewed-on: https://code.wireshark.org/review/4584
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10 01:09:29 +00:00
Guy Harris 5947291294 Fix declared types of open routines.
Change-Id: Ifa38dfec31ec5b03f00d6e077902184a9ae2ee0e
Reviewed-on: https://code.wireshark.org/review/4583
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10 01:04:43 +00:00
Gerald Combs bea24cfdad CMake: Bundle our plugins.
plugins/*/CMakeLists.txt has a lot of repitition. We might want to
create a module or include file to simplify things.

Change-Id: Iadd453c286a4127beacd80edf6dc200aa9148852
Reviewed-on: https://code.wireshark.org/review/4582
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 23:57:43 +00:00
Guy Harris 45e462985d Use an enum for the open-routine return value, as per Evan Huus's suggestion.
Clean up some things we ran across while making those changes.

Change-Id: Ic0d8943d36e6e120d7af0a6148fad98015d1e83e
Reviewed-on: https://code.wireshark.org/review/4581
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-09 23:45:30 +00:00
Pascal Quantin 112c90a04b Kerberos: fix decryption of DCERPC with Kerberos encryption
Bug: 10538
Change-Id: I4e6feaf218da7f977f6c63d8bc204635f387672c
Reviewed-on: https://code.wireshark.org/review/4566
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 21:45:18 +00:00
Pascal Quantin 7690afbc54 Kerberos: remove debug logs when loading a keytab
Bug: 10543
Change-Id: I9ea20cd4d046cc072c21fd3f87f6d6be40b08b27
Reviewed-on: https://code.wireshark.org/review/4567
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 20:57:56 +00:00
Pascal Quantin 40e6d764c5 GTPv2: fix an infinite loop
Bug: 10548
Change-Id: I916e15cecf0ec9dc607362b902709567d69243df
Reviewed-on: https://code.wireshark.org/review/4578
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 20:34:16 +00:00