Commit Graph

56540 Commits

Author SHA1 Message Date
Graham Bloice b4f5b6e72b Update CMake "Project names" and Folders
This gives a more structured layout in Visual Studio

Change-Id: I0da87a3e5ec759c69aeee031366cf287485cdac2
Reviewed-on: https://code.wireshark.org/review/6485
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-11 00:09:14 +00:00
Gerald Combs b2f03cb7db make-version.pl updates.
Set the version variables in CMakeLists.txt directly from
make-version.pl instead of pulling them from configure.ac.

Use the correct default value for VERSION_EXTRA in config.nmake.

wireshark-common.files was removed in g97e1491. We don't need to update
it any more.

Change-Id: I751b6df9ac16e19090712aa79a68e308397c1d25
Reviewed-on: https://code.wireshark.org/review/6483
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-10 22:57:53 +00:00
Martin Mathieson 2219f78426 Netflow: do transport resolution on ports (if know they are UDP or TCP)
Change-Id: I8fc3675f03b7eaec6a9385638197067981762a70
Reviewed-on: https://code.wireshark.org/review/6474
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-10 21:52:46 +00:00
Michael Mann 14cad60f7d Remove ep_ allocated memory from get_conversation_filter and just return a g_alloced string.
Change-Id: Ie7f6b2c5479fec1a44afb5e446ef6abf304113af
Reviewed-on: https://code.wireshark.org/review/6480
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 19:58:21 +00:00
Michael Mann 59c1e32d2c Add BASE_SPACE for FT_BYTES
It's just like BASE_DOT, BASE_DASH and BASE_SEMICOLON, only its a space between bytes.  Since this seems pretty specific to FT_BYTES, perhaps there is a better was to represent the functionality (like FT_BOOLEAN uses numeric values for number of bits)?

Change-Id: I1a8f1ab263ece2736a8012b66fdd6a9105db7282
Reviewed-on: https://code.wireshark.org/review/6451
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 19:57:59 +00:00
Michael Mann effc8266ce Add preference to display spaces between bytes for FT_BYTES fields.
I think this can make fields more readable (for a small amount of bytes).

Converted DeviceNet dissector to use proto_tree_add_item for some FT_BYTES field as tvb_bytes_to_str_punct was used to create this effect "manually".

Change-Id: I59e2acf9b00a4eb1279e6c2b2b7bd8ecef20db9b
Reviewed-on: https://code.wireshark.org/review/6304
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 19:57:27 +00:00
Guy Harris 02fb2908ff Sort the value_string_exts at dissector registration time.
You *CANNOT* defer it until dissection time, otherwise "tshark -G
values" will fail.

Change-Id: I4edf9abda271baaf916f020a211b9add5543ecc7
Reviewed-on: https://code.wireshark.org/review/6481
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-10 19:48:10 +00:00
Guy Harris 531a9f0eab Squelch a compiler warning.
The clang I'm using warns about a non-constant format string in
val_to_str_ext() calls; get rid of the unknown_format variable and,
instead, make two different proto_item_append_text() calls with
different format arguments in the val_to_str_ext()-call arguments.

Change-Id: Id668efe666634798c278958bd7e6d790ec476539
Reviewed-on: https://code.wireshark.org/review/6479
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-10 19:40:33 +00:00
Robert Grange 51acf1685b packet-mq: sort some value_string_ext in dissector
Some value_string_ext are sorted only in the dissector,
and only once.

Adapted as said in comments.
Added test for sort in dissect_mq_spx

Change-Id: If72159fe96ab28a3ed540778d67996e152b4f110
Reviewed-on: https://code.wireshark.org/review/6444
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-10 17:42:09 +00:00
Pascal Quantin b760da956d MQ: ensure that at least 4 bytes were captured before doing heuristic checks
Otherwise it could trigger an exception

Change-Id: I280e3c5d9e5554e4be49035c03e0170ae4495e6e
Reviewed-on: https://code.wireshark.org/review/6463
Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-10 16:44:40 +00:00
Alexis La Goutte 7600ddb88e UTS: fix Copy-paste error (CID 11158603)
Change-Id: Ibabb8ab3ccb0543856c84822542baa1ac0139f7e
Reviewed-on: https://code.wireshark.org/review/6472
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 15:57:05 +00:00
Alexis La Goutte 15ac6eb5c8 ISMACRYP: fix Copy-paste error (CID 11158602)
Change-Id: I4978627115f46a8aa90ccf67f7c008cdf9986da6
Reviewed-on: https://code.wireshark.org/review/6471
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 15:56:16 +00:00
Alexis La Goutte e2fa5a516d CTDB: fix Copy-paste error (CID 11158596)
Change-Id: Ieaa70505f4b880569be6126166a71f32d84f79a8
Reviewed-on: https://code.wireshark.org/review/6470
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 15:55:15 +00:00
Alexis La Goutte 678051933d NLM: fix Copy-paste error (CID 11158588)
Change-Id: I0d2736f3e00c62bb908e346a641d0ddc8b171fd2
Reviewed-on: https://code.wireshark.org/review/6469
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 15:54:43 +00:00
Alexis La Goutte 0f6b09d32e to_str (epan): fix parameter 'scope' not found in the function declaration [-Wdocumentation]
Change-Id: Ie414d28415b71a79780d37fae454b90a7a610e1c
Reviewed-on: https://code.wireshark.org/review/6475
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 15:52:40 +00:00
Michal Labedzki 1a30c9767a Bluetooth: A2DP: APT-X: Unhardcode stream configuration
Change-Id: I16cfb4d014020a7fb2c67fef3128021c9901719a
Reviewed-on: https://code.wireshark.org/review/6442
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:36:39 +00:00
Michal Labedzki f343710ee2 Bluetooth: HCI: Detect Vendor by "Read Local Version Information"
There is information about manufacturer of Bluetooth chip.
Also try to detect if that "permament" info is not changed,
if so informs user about this rare event (probably there is an issue)

Change-Id: I1fa748a67ad7943e61d4445d240f0578b94560fc
Reviewed-on: https://code.wireshark.org/review/6408
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>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:36:22 +00:00
Michal Labedzki 55df238efd Bluetooth: SMP: Add missing opcode for "Identity Address Information"
Also fix tvb_length, tvb_length_remaining warnings.

Bug: 10299

Change-Id: Ib8b55ea9f2220394a5896d13e5cc4e2cefff1e13
Reviewed-on: https://code.wireshark.org/review/6407
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:36:02 +00:00
Michal Labedzki d6e0409892 Bluetooth: Add HCI Vendor Broadcom dissector
Since those command/events are vendor specific and proprietary
not all commands/events are implemented. All implemented commands can be
found in Open Source implementations for Broadcom chip. If you found more,
please let me know.

Change-Id: Ie68d3737c88a8cef39260a9d93192cfc81871d6c
Reviewed-on: https://code.wireshark.org/review/6406
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:35:39 +00:00
Michal Labedzki c69b2ab320 Bluetooth: ATT: Dissect opcode with more precision
Change-Id: Iddc1a6d899b10b0d5c25723a71da7dcd11c6dfad
Reviewed-on: https://code.wireshark.org/review/6405
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:35:03 +00:00
Michal Labedzki 7177cedc26 USB: Fix Conversation/Endpoint filters
There were not fields for that, so simple add them.

Change-Id: I489bae24ac96ea0baf395add731f4d62ccf19352
Reviewed-on: https://code.wireshark.org/review/6401
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-10 15:34:24 +00:00
Alexis La Goutte c93d0ab880 IS-IS: Incorrect decoding of IPv4 Interface/Neighbor Address sub-TLVs in Extended IS Reachability TLV
Correct 4-byte IPv4 address is incorrectly detected as wrong 6-byte IPv4 address and cannot be decoded (IPv4 Interface Address (sub-TLV type 6) and IPv4 Neighbor Address (sub-TLV type 8) of Extended IS Reachability TLV (TLV type 22) of IS-IS.

Wrong offset for some Sub-TLV

Issue found by Alexander Okonnikov

Bug: 10837
Change-Id: I81d083722da72115e1905237352650d380e9d0ac
Reviewed-on: https://code.wireshark.org/review/6453
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-01-10 13:41:20 +00:00
Michael Mann 5fe1f66176 Finish off emem_strbuf_t usage.
Change-Id: Ib0b911c86a7f8a7cca022e9e324c910664ce397e
Reviewed-on: https://code.wireshark.org/review/6461
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 04:20:27 +00:00
Evan Huus 3a9869d81a Remove/replace ep_strsplit()
Change-Id: I4a803d83844d937804849b2ad3b067381c9b96d0
Reviewed-on: https://code.wireshark.org/review/6448
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 01:56:08 +00:00
Gerald Combs e54b5f052d CMake: Copy admonition graphics to the correct directory.
Change-Id: Iecba4000c487a90efedfc7547771539c3748a7f0
Reviewed-on: https://code.wireshark.org/review/6454
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 22:59:38 +00:00
Gerald Combs 8bd80e0191 CMake: Set WIRESHARK_TARGET_PLATFORM.
Set WIRESHARK_TARGET_PLATFORM near the top of CMakeLists.txt.  It's used
by a couple of our modules and will be used for NSIS packaging.

Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11
Reviewed-on: https://code.wireshark.org/review/6458
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 22:21:41 +00:00
Gerald Combs a81f0d1b38 Fix airpdcap debugging code.
Change-Id: Ied1094dd3c6ad176fea830c0857ba43e09d3cb10
Reviewed-on: https://code.wireshark.org/review/6457
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 22:17:16 +00:00
Gerald Combs 2bb26eaf2c CMake: Copy CHM graphics from the correct source.
Change-Id: Iea67bdaf8d83009c808bd39693fe273b3181ff76
Reviewed-on: https://code.wireshark.org/review/6452
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 18:29:13 +00:00
Martin Mathieson f5de0c45a3 Netflow: Fix some duplicate label names
Change-Id: I077bdd6394898a445c00a1e7aec1c4c11b3e9ec2
Reviewed-on: https://code.wireshark.org/review/6450
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-09 18:13:38 +00:00
Gerald Combs 4f658999e6 CMake: Migrate to hhc.cmake.
Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the
hhc.cmd wrapper.

Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c
Reviewed-on: https://code.wireshark.org/review/6449
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 17:49:37 +00:00
Gerald Combs ffb6f10f4e CMake: Cygwin-ify the xmllint path as well.
Change-Id: I5e62ed6baeed3fcb76cdffd30666ad01713acd2a
Reviewed-on: https://code.wireshark.org/review/6439
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 17:02:21 +00:00
Dario Lombardo 1b4f96516c Some typos fixed.
Change-Id: I65df0c40d771c4854b73fd5c35d1af600f15f324
Reviewed-on: https://code.wireshark.org/review/6445
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-09 14:07:06 +00:00
AndersBroman 872a239732 Add missing #include ( "ui/gtk/old-gtk-compat.h" )
Change-Id: Ic53c3cd4a38c587ab3c0dcb9f8349ca50e338f80
Reviewed-on: https://code.wireshark.org/review/6443
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 09:17:42 +00:00
Michael Mann 284229c0f8 Convert EUI64 address APIs to use wmem.
Change-Id: I57d2e435ac72ea07ec9a567e0b1ce4410966e3d2
Reviewed-on: https://code.wireshark.org/review/6419
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 07:44:54 +00:00
Michal Labedzki 17f1a44168 Bluetooth: AVDTP: Fix other-side Reconfigure
It is used to properly configure internal SEP data using to
properly decode music stream.

Change-Id: If8a15267ce072eaedfac947d7558be2d3e796483
Reviewed-on: https://code.wireshark.org/review/6404
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-09 07:00:41 +00:00
Michal Labedzki 5be440f1cb Bluetooth: AVDTP/VDP: Add link to first and last packet in the stream
Useful for analyzing stream issues.

Change-Id: I1c9f43807dc3abc050cf17c971fbd270b812faa5
Reviewed-on: https://code.wireshark.org/review/6402
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>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-09 07:00:21 +00:00
Michal Labedzki 879a221db4 Bluetooth: BTLE RF: Remove tree and reduce indentation level
Useless check for tree avoid setting Bluetooth addresses.

Change-Id: If38465679370c5ea74f6d916e409e337d60cf7db
Reviewed-on: https://code.wireshark.org/review/6403
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>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-09 06:59:29 +00:00
Michael Mann 6a6e2efbf9 Have ipxnet addresses use wmem scoped memory.
Change-Id: I1d8eed2ceacccce2768590f0689cd2c83a5e56e9
Reviewed-on: https://code.wireshark.org/review/6418
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 06:02:59 +00:00
Michael Mann 456095c89d disperse atalk-utils.[ch]
The functionality was suiting for address_to_str.c and the #defines belong in packet-atalk.h.  Kept the address structure with the "address string conversion", but that can probably be better cleaned up when the address to str as a whole is cleaned up.

Would also consider making AT_ATALK an FT_ type as well.

Change-Id: Ia534096c707e6fb94acdfee0d332beda6571c371
Reviewed-on: https://code.wireshark.org/review/6417
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 05:58:59 +00:00
Michael Mann d296c75247 Some more random removal of ep_ memory.
Change-Id: I6eccd20280e907bd9e6a5fcf873ccf80afddecac
Reviewed-on: https://code.wireshark.org/review/6416
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 05:54:38 +00:00
AndersBroman 45cbdbc70a Add missing #include ( "ui/gtk/old-gtk-compat.h" )
Change-Id: I03ddea2fc7db52df1ff3571e196250bc5e3ff036
Reviewed-on: https://code.wireshark.org/review/6410
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09 05:44:59 +00:00
Joerg Mayer fb40fd31c3 Add a possible replacement for the cmd hack to work around hhc.exe
returning non-null on success.
To be invoked via "cmake -P hhc.cmake <single-arg>".

Change-Id: Ib2584379c512cbd7f437f36ef932b372fe02203a
Reviewed-on: https://code.wireshark.org/review/6440
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-09 01:36:33 +00:00
Gerald Combs 4bc8d0f9a8 CMake: Try to fix the xsltproc path.
Try to make the xsltproc path compatible with Cygwin. This is a blind
attempt to fix the Windows 8 buildbot. It works fine locally.

Change-Id: Ib9d55dd07c6b17cfddf313716227d347109d2103
Reviewed-on: https://code.wireshark.org/review/6438
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 01:11:29 +00:00
Michael Mann 67b1593921 Remove proto_tree_add_ax25
There isn't a legitimate use for the API, all cases can be covered with proto_tree_add_item.  As a bonus, a few more tvb_get_ptr calls can be removed.

Change-Id: I3bb86ba8f05ef3363407bcfe9b059ee27ebc135d
Reviewed-on: https://code.wireshark.org/review/6429
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-09 01:10:28 +00:00
Michael Mann ecaa1f8d21 convert variables that were static just because of SET_ADDRESS macro to use the proper pinfo->pool instead.
Change-Id: I914918d9629f654ead497dddac0f412b690e4409
Reviewed-on: https://code.wireshark.org/review/6430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-09 01:10:05 +00:00
Joerg Mayer a2abf8b37f Fix CMake Warning "Argument not separated from preceding token by whitespace."
Change-Id: I1ecd3bd0081c2f69d4e4f21f84cb46d086b657a2
Reviewed-on: https://code.wireshark.org/review/6437
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-09 01:07:59 +00:00
Joerg Mayer ab717f222a Use the FindHTMLHelp.cmake provided by cmake to find the hhc.
Lower case some function/macro calls.

Change-Id: I57532e3b4701963b88a536a7ecfe7dfaf4be3d4c
Reviewed-on: https://code.wireshark.org/review/6436
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-09 01:04:14 +00:00
Gerald Combs 03f273a5ee HTML Help: Fix titles.
AsciiDoc converts single quotes into curly quote entities, which HTML
Help doesn't support. Use sed to fixup the title string.

We might want to drop HTML Help at some point.

Change-Id: I0c7d3be90c0de7dbac0f1367cc6ba323c7380939
Reviewed-on: https://code.wireshark.org/review/6435
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 00:35:19 +00:00
Gerald Combs 315cc729a8 CMake: Revert the release notes xsltproc command.
Should fix the release_notes_txt target.

Change-Id: Ie930c49ad34ad70070b8f7d28d79bee55f263c40
Reviewed-on: https://code.wireshark.org/review/6434
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 00:29:49 +00:00
Guy Harris 1baf9bba9c Use G_GINT64_CONSTANT() for 64-bit constants.
Change-Id: I2b4f24c0e68f8d1edb53981b2ada7db6cd0eff72
Reviewed-on: https://code.wireshark.org/review/6433
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-08 23:50:44 +00:00