AgeCommit message (Collapse)AuthorFilesLines
2016-04-03Move zlib version check to wsutilJoão Valverde12-333/+38
Change-Id: I0950f61e90af5bb21c0017204de0c0b509616e5c Reviewed-on: https://code.wireshark.org/review/14747 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-02Avoid UAF after deregister_dissectorPeter Wu1-18/+34
When deregister_dissector is called by Lua, the protocol was not property removed from the dependent dissectors list. Fix this and also duplicate the memory for keys and values since these strings might be dynamically allocated. Fixes a use-after-free after reloading Lua dissectors that use DissectorTable:add() and opening a new/closing an existing capture file. Change-Id: If2ae02f155e7ab8fc653c08003755897471f9be0 Reviewed-on: https://code.wireshark.org/review/14735 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-02Use AC_PROG_SEDJoão Valverde2-55/+7
Change-Id: I879e2457b8127404b8ddf12ed2d2ff8c90a49dc3 Reviewed-on: https://code.wireshark.org/review/14755 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-02Use AC_CHECK_MEMBERSJoão Valverde7-58/+11
Change-Id: I18779ad869c97a6ddd12e39fe2f7a1f7b0c8cf56 Reviewed-on: https://code.wireshark.org/review/14754 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>
2016-04-02Use AC_STRUCT_TIMEZONEJoão Valverde6-44/+4
Change-Id: I96c12dce662691d37d6eb6c1893c5e9d91a8ea6f Reviewed-on: https://code.wireshark.org/review/14753 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>
2016-04-02Qt: Remember selected item in packet treePeter Wu3-0/+45
Previously, changing a packet in the packet list would lose the currently selected field item in the packet tree. After this patch, this issue no longer occurs because the selected field is focussed again. The approach is to remember the header field ID on the path from a field to its root. Limitations of the current simple approach is that multiple fields/trees under a tree might result in the wrong selection. This is better than nothing though. This patch greatly helps analyzing a capture file which has the same format, except that I need to check a data source for decrypted data. Previously I would have to scroll down and select the field to see the data source which also made it impossible to quickly switch between packets and compare them. Change-Id: Ic113ca9245fd9faa10f91182794c50cfde8d10f4 Reviewed-on: https://code.wireshark.org/review/14697 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-04-02Qt: Keep byte tab when reloading/closing capture filePeter Wu1-12/+0
Do not remove byte view on closing a capture file. For this to work, the tree items must also be remembered. Change-Id: Ice5cd1006b957e2d1331effc15c4c0a9de89916d Reviewed-on: https://code.wireshark.org/review/14715 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: Peter Wu <peter@lekensteyn.nl>
2016-04-02Use faster wmem_str* functions in a few places.Gerald Combs2-14/+14
Use wmem_strdup and wmem_strconcat instead of wmem_strdup_printf. This shaves a small amount of time off of register_all_protocols on Windows according to the Visual Studio profiler. Change-Id: Ib6991e8de5b4fc30e960c513a3028c09dfe6a0a4 Reviewed-on: https://code.wireshark.org/review/14770 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-02androiddump: Register interfaces when list interfacesMichal Labedzki1-3/+3
Trying to find interfaces every androiddump run use a lot of system resources so Wireshark can hang for a while. Back to old behaviour and register interfaces only when list them. Change-Id: Ib63cad05fb47722d3b9de24abf28a86e614417cd Reviewed-on: https://code.wireshark.org/review/14764 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-02Bluetooth: Fix conflicting address fieldsMichal Labedzki2-25/+42
For Broadcast address use FT_ETHER with FF:FF:FF:FF:FF:FF address instead of string address "Broadcast". Change-Id: I638d3d6a1baa9c965dd0a9f548cedbd81af3ec5b Reviewed-on: https://code.wireshark.org/review/14767 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-04-02PDCP LTE: upgrade dissector to v13.1.0Pascal Quantin1-2/+181
Change-Id: I4a778b816a7675ef9e5ac38f241c5587eeb0c436 Reviewed-on: https://code.wireshark.org/review/14785 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-04-02MAC LTE: upgrade dissector to v13.1.0Pascal Quantin2-33/+255
Change-Id: I7e78defaddfff5b45fb21d00f8d7dccaa3df3009 Reviewed-on: https://code.wireshark.org/review/14782 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-04-02ERF: fix crash when displaying erf.ip_proto fieldPascal Quantin1-1/+1
Change-Id: Ib1d0c3d44d404dba2edca0d330693cde55beff25 Reviewed-on: https://code.wireshark.org/review/14781 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-04-02There are two separate IP-over-Infiniband encapsulations.Guy Harris1-1/+2
pcap files and snoop files have different headers, so there's no IP_OVER_IB encapsulation type, there are separate types for pcap and snoop. Change-Id: I00146e478d05bb11c634df0c386329db8de5635d Reviewed-on: https://code.wireshark.org/review/14774 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-02OK, we'll increase PROTO_PRE_ALLOC_HF_FIELDS_MEM a bit.Guy Harris1-1/+1
Change-Id: I6c4ed55634468b1200c069f1aeaf9200b47e052c Reviewed-on: https://code.wireshark.org/review/14772 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-02Qt: Lazily create dialogs.Gerald Combs3-52/+71
According to the Visual Studio 2013 profiler here, we spend about 4% of our startup time creating the Capture Interfaces dialog. Hold off on doing that until the user wants to see the dialog. Do the same for the File Set dialog. While we're here, make sure MainWindow has fewer children when setupUi is called. setupUi calls connectSlotsByName, which iterates over all child objects. Change-Id: I253e6dc5b7e73a6cb7b7036637e336f449449c4a Reviewed-on: https://code.wireshark.org/review/14732 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-02Qt: Try to speed up SplashOverlayGerald Combs3-16/+9
Limit the amount of event processing SplashOverlay does. Let QWidget take care of painting. Change-Id: I9176baeba2cc9203e50c02029d85689f8908daba Reviewed-on: https://code.wireshark.org/review/14771 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-01ERF: Add dissection and wiretap support for ERF_TYPE_META.Anthony Coddington3-36/+2440
ERF Dissector: Add dissection for ERF_TYPE_META, Host ID and Flow ID extension headers. Rename ERF extension header defines to ERF_EXT_HDR* and put in erf.h. The Flow ID extension header has an improved 32-bit Flow Hash with a Hash Type field describing what the hash was computed over. The Host ID extension header contains a 48-bit organizationally unique Host Identifier. Both extension headers contain the same 8-bit Source ID used for distinguishing records from multiple sources in the same file and for metadata linking to ERF_TYPE_META records. Host ID is used to identify the capturing host and can also be used to distinguish records from multiple hosts in the same file. ERF_TYPE_META records have a payload consisting of TLV metadata, divided into sections which define the context of the TLV tag. The dissector registers a field for each tag for each section type based on a template. ERF_TYPE_META records generally have a Host ID extension header used to link metadata to packet records with the same Host ID and Source ID. The associated Host ID can either be explicit on all records, or implicit where the Host ID extension header is only present on MetaERF records and other records are associated using only the Source ID in the Flow ID extension header. Includes per-record generated Source summary and frame linking. These have the 'correct' Host ID and Source IDs from either extension header, including applying the Implicit Host ID, and links to the most recent ERF_TYPE_META record. Relies on Wireshark doing more than one pass to associate the correct implicit Host ID tree items for records before the first ERF_TYPE_META record. The metadata is technically not associated at that point anyway. ERF Wiretap: Add per-HostID/per-SourceID wtap interfaces and basic ERF_TYPE_META support. Adds read support for displaying some fields of the 'first' ERF_TYPE_META record in the Capture File Properties screen. Concatenates and merges some summary fields to provide more useful information and attempt to combine ERF sources, streams and interfaces into wtap interfaces. Interface naming gracefully degrades when Host ID and Source ID are not present and is intended to be parseable for use by DAG software. Supports Implicit Host ID, but assumes it does not change. NOTE: Now only ERF interfaces that are present in the file are added. Only works with native ERF files for now. Written such that it is easily adapted for use by pcap dissector. Some support for setting REC_TYPE_FT_SPECIFIC_REPORT on MetaERF records. Disabled for now as this breaks pcapng_dump saving of ERF_TYPE_META and ft_specific_record_phdr clashes with erf_mc_phdr. Only when native ERF file (as uses wth->file_type_subtype). Register packet-erf as a dissector of WTAP_FILE_TYPE_SUBTYPE_ERF. Bug: 12303 Change-Id: I6a697cdc851319595da2852f3a977cef8a42431d Reviewed-on: https://code.wireshark.org/review/14510 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-04-01support for IP-over-Infiniband - pcap encapsulationPetr Sumbera4-13/+91
Bug: 12279 Change-Id: Ib6c54f8b86d95c5546bc800749f124cd0dbb8ff0 Reviewed-on: https://code.wireshark.org/review/14585 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>
2016-04-01Remove trailing whitespace.Guy Harris1-3/+3
Change-Id: I61dfe0b8e47c98d50975ab825ef529899c31f305 Reviewed-on: https://code.wireshark.org/review/14757 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-01Clean up the wildcard string processing a bit.Guy Harris1-78/+114
Add some comments as well. Change-Id: I308aec7af187b917fbaa318712c82e3d9187cf1b Reviewed-on: https://code.wireshark.org/review/14745 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-01configure.ac: Use AC_MSG_ERROR instead of AC_ERRORJoão Valverde1-1/+1
AC_ERROR is obsolete. Change-Id: If4d2a577863923c8a7aa9b6427c217fc9c1fa630 Reviewed-on: https://code.wireshark.org/review/14756 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-01Rename json.member.key -> json.key to keep it on the same layer as json.valueMichael Mann1-4/+4
Bug: 12300 Change-Id: I636c086d2dd9c950c35724d3e6b8dbf712e9e147 Reviewed-on: https://code.wireshark.org/review/14744 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>
2016-04-01randpkt: restyle the list generation to get rid of the const compiler warning.Dario Lombardo4-32/+36
Change-Id: Id7c62ef18f919ba8a476898bc88c02fd3b6bf5a1 Reviewed-on: https://code.wireshark.org/review/14730 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-01extcap: fix const warningsDario Lombardo1-2/+2
Change-Id: Iac94349069485207d24ac1b8c1c5c09778c12e03 Reviewed-on: https://code.wireshark.org/review/14729 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-01Fix "No interfaces selected" when restarting capturePeter Wu1-0/+4
global_capture_opts.ifaces store the interfaces that were added for the next capture and must always be marked as selected. Fixes regression from 92a2661. Bug: 11939 Change-Id: Ib3dcd1b228b7a9681439e172d934e0ce66de6c0f Reviewed-on: https://code.wireshark.org/review/14725 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-01http: set conv dissector from when heuristics succeededPeter Wu1-1/+1
When a conversation starts with SSL (Client Hello) but gets a HTTP response back, then the first SSL request should be preserved. Bug: 12132 Change-Id: I3f9b5c8828bc5c6680945d7cf71740584dd463ab Reviewed-on: https://code.wireshark.org/review/14726 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-31ieee80211: fix deep recursionPeter Wu3-14/+52
Restrict the list of possible (sub)elements to avoid deep recursion. Bug: 11824 Bug: 12187 Change-Id: I12deb9956c6ba9b6113cf45da4ee919e33ff8567 Reviewed-on: https://code.wireshark.org/review/14114 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-31Remove trailing whitespace.Guy Harris1-1/+1
Change-Id: I307f0185c4a82ba3a15b86c38a2431ba5efd9b28 Reviewed-on: https://code.wireshark.org/review/14738 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-31Update URLGuy Harris1-1/+5
Change-Id: I3774e8650557e6ac253fd8c4ad02aead0935326b Reviewed-on: https://code.wireshark.org/review/14736 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-31wslua: avoid memleak on duplicate names for Proto.newPeter Wu1-2/+2
luaL_error never returns, free memory before. Change-Id: Ibcdbdb6afea5d2dab7be6a16c4c2536dcf14220a Reviewed-on: https://code.wireshark.org/review/14734 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-31dtls: Fix ClientCertificateVerify dissectionPeter Wu1-1/+1
Pass the reassembled fragment instead of the current record. Bug: 11477 Change-Id: Id49fac8fa3f9e1b1904a75ab6c7512306f2071b0 Reviewed-on: https://code.wireshark.org/review/14727 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-03-31LPP: upgrade dissector to v13.1.0Pascal Quantin6-106/+213
Change-Id: Ibc7423858906c01023c6b8d0f3da7261747ebf32 Reviewed-on: https://code.wireshark.org/review/14723 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-31[Nettrace] Add parsing of some HSS records.AndersBroman2-11/+139
Change-Id: I7c2f6ebdb20f90533ee008e1b4557ef27d4672dc Reviewed-on: https://code.wireshark.org/review/14708 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-31Fix byte pane not showing up in Packet dialogPeter Wu1-2/+6
When a packet dialog is being constructed, the layout is apparently not fixed yet and the byte view is technically not visible. Fix the hidden byte pane by not hiding it when it is not (yet) visible. Bug: 11760 Change-Id: I0494fa16a5ed89ff31f934ba682a6bb884cc0e2e Reviewed-on: https://code.wireshark.org/review/14713 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-31replace dangerous tvb_get_ptr with safer string function.Jaap Keuter1-2/+2
Using tvb_get_ptr to get a string is always dangerous in the face of malformed packets. Instead using string functions allow for safe handling of these. Bug: 12242 Change-Id: I059c186032492aae9c90a69858ea3fc59e21313f Reviewed-on: https://code.wireshark.org/review/14714 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-31Add a NULL check: it's not sure we have a radius_call here.Jeff Morriss1-1/+1
Change-Id: I6037a02e6170d0ca8b978135f960213ed22bef97 Reviewed-on: https://code.wireshark.org/review/14710 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-31Revert "Trun on -Wused-but-marked-unused but only as warning, never as ↵Alexis La Goutte1-3/+0
error. (possibly clang only)" This reverts commit 9f40a75bbb9ea8e205bf0ebf9f0651971417cd6e. Change-Id: I4361f1101077643d10a86237e256ba28ed180a66 Reviewed-on: https://code.wireshark.org/review/14721 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-31Ensure our fields are registered before starting dissection--even when !tree.Jeff Morriss2-13/+14
(The check to ensure the delayed field registration had been done was still wrapped inside an if(tree) but a bunch of proto_add_*()'s had been pulled out from under if(tree)'s thus causing some hf's to be used before registered.) Also simplify the code to ensure the fields are registered since we're doing it potentially many times per frame: do an integer comparison rather than looking up an hf by name. Add a note to the docs for proto_register_prefix() to make it clear that the initializer routine may not be called before the dissector is asked to dissect something. Change-Id: I5dc1154638a290c3a94149184d56570c3abb836a Reviewed-on: https://code.wireshark.org/review/14711 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-31Correct 6LoWPAN NHC datagram size calculationsKevin Bracey1-2/+2
Length calculations updating "remaining datagram size" for fragmented 6LoWPAN packets with NHC headers were incorrect if there was any elided option padding. The current header's unpadded length was subtracted from dgram_size, when it should have been the padded length - the datagram size is uncompressed IPv6. This meant the final nhdr_list entry created to represent the remaining payload would have its "reported" field too large. Most visible result of this was that the IPv6 payload length written into the packet by lowpan_reassemble_ipv6() was too large. Error probably went unnoticed because the most typical 6LoWPAN options don't need padding - the RPL option is 6 bytes, and the MPL option is 6 bytes if using 16-bit seeds, making the HbH extension header an aligned 8 bytes. Bug: 12310 Change-Id: If94e9ca57f88c4ac41f002a689ce1da7097b5bd0 Reviewed-on: https://code.wireshark.org/review/14701 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-31Squelch a "not allowed in C++" warning.Guy Harris1-1/+1
Change-Id: I2accdb7fe02072853a5ec9cae84403f3224dfada Reviewed-on: https://code.wireshark.org/review/14718 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-31Clean up some stuff.Guy Harris1-22/+23
Have bin2hex() wmem_allocate the buffer, so it can be used the same way that tvb_get_string_enc() is used. Don't bother checking whether NIBBLE_2_ASCHEX() returns an ASCII hex digit character or not - it returns either a value in the ASCII range of '0' through '9' or in the range 'A' through 'F', all of which are ASCII hex digits. Fix get_bit() to set *length to 0 if the string we're returning is empty. Change-Id: Id331cfd0ab34d45892f98d228dc793a1e93d84e5 Reviewed-on: https://code.wireshark.org/review/14717 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-30Install GNU autotools even on Snow Leopard.Guy Harris1-6/+5
The Snow Leopard versions are too old for current Wireshark. Change-Id: I25936370164d69d6b0eaca4ac9e3253772e0ac73 Reviewed-on: https://code.wireshark.org/review/14712 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-30RTPS: Fixed ACKNACK mask processingJuanjo Martin1-1/+1
Change-Id: I81a83638c2318ba0d806263dbf692cd19b30ce9b Reviewed-on: https://code.wireshark.org/review/14707 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: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-30RTPS: Now PID_ENTITY_NAME and PID_ROLE_NAME use different filtersJuanjo Martin1-2/+10
Change-Id: I852aa09bff6a37ef03b5f55bdf8933ed181da2d0 Reviewed-on: https://code.wireshark.org/review/14705 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: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-30SPOOLSS: Try to avoid an infinite loop.Gerald Combs1-2/+3
Use tvb_reported_length_remaining in dissect_spoolss_uint16uni. Make sure our offset always increments in dissect_spoolss_keybuffer. Change-Id: I7017c9685bb2fa27161d80a03b8fca4ef630e793 Reviewed-on: https://code.wireshark.org/review/14687 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-30TCP: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-10/+1
packet-tcp.c:2155: warning: Value stored to 'relseq' during its initialization is never read packet-tcp.c:3511: warning: Value stored to 'assignedMetaId' is never read packet-tcp.c:3514: warning: Value stored to 'assignedMetaId' is never read Change-Id: I68d8088fc54da5ad52361510d43b893e58bf419f Reviewed-on: https://code.wireshark.org/review/14695 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Matthieu Coudron <matthieu.coudron@lip6.fr> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-30Qt: fix buffer alarm threshold parameter retrieval in multicast statistics ↵Benoit Grange1-1/+1
dialog Bug: 12309 Change-Id: Id67b676bfcb5b4497c48d4cd7ca7c8cc1cbda986 Reviewed-on: https://code.wireshark.org/review/14704 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-30[GSM MAP] Introduce dissector tables to be able to dirrectly call MSGAndersBroman3-10/+69
Arguments. Change-Id: I7e51e2a2b9fa98cf8ca44fb528f49aeae46d9b7c Reviewed-on: https://code.wireshark.org/review/14703 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-30Fix a typoPascal Quantin1-1/+1
Change-Id: I206c3f8ec860e92dce3f43b05f6695347d15398a Reviewed-on: https://code.wireshark.org/review/14706 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>