aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-01-10make-version.pl updates.Gerald Combs2-74/+46
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-10Netflow: do transport resolution on ports (if know they are UDP or TCP)Martin Mathieson1-1/+31
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-10Remove ep_ allocated memory from get_conversation_filter and just return a ↵Michael Mann4-12/+16
g_alloced string. Change-Id: Ie7f6b2c5479fec1a44afb5e446ef6abf304113af Reviewed-on: https://code.wireshark.org/review/6480 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10Add BASE_SPACE for FT_BYTESMichael Mann3-45/+34
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-10Add preference to display spaces between bytes for FT_BYTES fields.Michael Mann4-14/+30
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-10Sort the value_string_exts at dissector registration time.Guy Harris1-18/+5
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-10Squelch a compiler warning.Guy Harris1-4/+2
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-10packet-mq: sort some value_string_ext in dissectorRobert Grange1-38/+54
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-10MQ: ensure that at least 4 bytes were captured before doing heuristic checksPascal Quantin1-1/+1
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-10UTS: fix Copy-paste error (CID 11158603)Alexis La Goutte1-1/+1
Change-Id: Ibabb8ab3ccb0543856c84822542baa1ac0139f7e Reviewed-on: https://code.wireshark.org/review/6472 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10ISMACRYP: fix Copy-paste error (CID 11158602)Alexis La Goutte1-1/+1
Change-Id: I4978627115f46a8aa90ccf67f7c008cdf9986da6 Reviewed-on: https://code.wireshark.org/review/6471 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10CTDB: fix Copy-paste error (CID 11158596)Alexis La Goutte1-1/+1
Change-Id: Ieaa70505f4b880569be6126166a71f32d84f79a8 Reviewed-on: https://code.wireshark.org/review/6470 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10NLM: fix Copy-paste error (CID 11158588)Alexis La Goutte1-3/+1
Change-Id: I0d2736f3e00c62bb908e346a641d0ddc8b171fd2 Reviewed-on: https://code.wireshark.org/review/6469 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10to_str (epan): fix parameter 'scope' not found in the function declaration ↵Alexis La Goutte2-3/+3
[-Wdocumentation] Change-Id: Ie414d28415b71a79780d37fae454b90a7a610e1c Reviewed-on: https://code.wireshark.org/review/6475 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10Bluetooth: A2DP: APT-X: Unhardcode stream configurationMichal Labedzki4-43/+130
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-10Bluetooth: HCI: Detect Vendor by "Read Local Version Information"Michal Labedzki5-13/+202
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-10Bluetooth: SMP: Add missing opcode for "Identity Address Information"Michal Labedzki4-12/+34
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-10Bluetooth: Add HCI Vendor Broadcom dissectorMichal Labedzki7-58/+1490
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-10Bluetooth: ATT: Dissect opcode with more precisionMichal Labedzki1-5/+33
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-10USB: Fix Conversation/Endpoint filtersMichal Labedzki4-18/+52
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-10IS-IS: Incorrect decoding of IPv4 Interface/Neighbor Address sub-TLVs in ↵Alexis La Goutte1-5/+5
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-10Finish off emem_strbuf_t usage.Michael Mann3-10/+15
Change-Id: Ib0b911c86a7f8a7cca022e9e324c910664ce397e Reviewed-on: https://code.wireshark.org/review/6461 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10Remove/replace ep_strsplit()Evan Huus8-100/+19
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-09CMake: Copy admonition graphics to the correct directory.Gerald Combs1-2/+1
Change-Id: Iecba4000c487a90efedfc7547771539c3748a7f0 Reviewed-on: https://code.wireshark.org/review/6454 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09CMake: Set WIRESHARK_TARGET_PLATFORM.Gerald Combs3-3/+15
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-09Fix airpdcap debugging code.Gerald Combs1-6/+8
Change-Id: Ied1094dd3c6ad176fea830c0857ba43e09d3cb10 Reviewed-on: https://code.wireshark.org/review/6457 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09CMake: Copy CHM graphics from the correct source.Gerald Combs1-2/+3
Change-Id: Iea67bdaf8d83009c808bd39693fe273b3181ff76 Reviewed-on: https://code.wireshark.org/review/6452 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09Netflow: Fix some duplicate label namesMartin Mathieson1-9/+8
Change-Id: I077bdd6394898a445c00a1e7aec1c4c11b3e9ec2 Reviewed-on: https://code.wireshark.org/review/6450 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-09CMake: Migrate to hhc.cmake.Gerald Combs7-57/+35
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-09CMake: Cygwin-ify the xmllint path as well.Gerald Combs1-21/+46
Change-Id: I5e62ed6baeed3fcb76cdffd30666ad01713acd2a Reviewed-on: https://code.wireshark.org/review/6439 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09Some typos fixed.Dario Lombardo6-10/+10
Change-Id: I65df0c40d771c4854b73fd5c35d1af600f15f324 Reviewed-on: https://code.wireshark.org/review/6445 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-09Add missing #include ( "ui/gtk/old-gtk-compat.h" )AndersBroman4-0/+4
Change-Id: Ic53c3cd4a38c587ab3c0dcb9f8349ca50e338f80 Reviewed-on: https://code.wireshark.org/review/6443 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09Convert EUI64 address APIs to use wmem.Michael Mann10-72/+51
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-09Bluetooth: AVDTP: Fix other-side ReconfigureMichal Labedzki1-39/+63
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-09Bluetooth: AVDTP/VDP: Add link to first and last packet in the streamMichal Labedzki2-9/+121
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-09Bluetooth: BTLE RF: Remove tree and reduce indentation levelMichal Labedzki1-74/+84
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-09Have ipxnet addresses use wmem scoped memory.Michael Mann6-14/+16
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-09disperse atalk-utils.[ch]Michael Mann11-122/+45
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-09Some more random removal of ep_ memory.Michael Mann7-20/+19
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-09Add missing #include ( "ui/gtk/old-gtk-compat.h" )AndersBroman7-0/+7
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-09Add a possible replacement for the cmd hack to work around hhc.exeJoerg Mayer1-0/+9
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-09CMake: Try to fix the xsltproc path.Gerald Combs1-17/+27
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-09Remove proto_tree_add_ax25Michael Mann5-59/+11
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-09convert variables that were static just because of SET_ADDRESS macro to use ↵Michael Mann8-49/+40
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-09Fix CMake Warning "Argument not separated from preceding token by whitespace."Joerg Mayer1-1/+1
Change-Id: I1ecd3bd0081c2f69d4e4f21f84cb46d086b657a2 Reviewed-on: https://code.wireshark.org/review/6437 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-09Use the FindHTMLHelp.cmake provided by cmake to find the hhc.Joerg Mayer1-11/+7
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-09HTML Help: Fix titles.Gerald Combs1-1/+8
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-09CMake: Revert the release notes xsltproc command.Gerald Combs1-1/+3
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-08Use G_GINT64_CONSTANT() for 64-bit constants.Guy Harris1-59/+59
Change-Id: I2b4f24c0e68f8d1edb53981b2ada7db6cd0eff72 Reviewed-on: https://code.wireshark.org/review/6433 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-08CMake: Enable DocBook on Windows.Gerald Combs10-95/+312
Add a wrapper script and CMake macros which lets us run Cygwin's a2x from Windows. Add *another* wrapper script that ignores the return value of hhc.exe. Move the ASCIIDOC2DOCBOOK macro to FindASCIIDOC.cmake. Add FindHHC.cmake. Add hints to FindFOP.cmake. Use unique file names in the HTML Help chain in an attempt to avoid a race condition. To do: - Fix curly quote in HHC title. Change-Id: I9b154b7fbd02703656e2ab380199ec0a6db4e36d Reviewed-on: https://code.wireshark.org/review/6379 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 15:46:52 +0000