aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
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_STRUCT_TIMEZONEJoão Valverde1-1/+1
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-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-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-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-01ERF: Add dissection and wiretap support for ERF_TYPE_META.Anthony Coddington1-23/+1120
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 Sumbera1-10/+87
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-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-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.AndersBroman1-0/+1
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-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-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-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-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>
2016-03-30Add support for National Language tables in GSM UDIgnacio Martínez1-1/+79
Change-Id: Idc375b468754ac1287401ebfb88f77a40f747a79 Reviewed-on: https://code.wireshark.org/review/14698 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-30make-taps.pl: Fix generated code indentationJoão Valverde1-8/+11
Change-Id: Ife25c519acb56b58819bc1aabfa069b5fbbc788d Reviewed-on: https://code.wireshark.org/review/14676 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-29[Exported PDU] Add the abillity to use dissector tables from the file.AndersBroman2-20/+84
Change-Id: I51ac8ce56641cf6eeda18c2a3f6d6952d3126415 Reviewed-on: https://code.wireshark.org/review/14693 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-29TCP: Remove double semicolonAlexis La Goutte1-1/+1
Change-Id: I77f96cfee089b8e6a26504279c7a6cd4b6e36a5c Reviewed-on: https://code.wireshark.org/review/14696 Reviewed-by: Matthieu Coudron <matthieu.coudron@lip6.fr> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-03-29EPL: Fix segmented transfer complete detectionChristoph Schlosser1-53/+96
In case of a segmented SDO transfer, the transfer complete response can contain additional data that should not be evaluated by the dissector. Change-Id: I7016eb88b93aac8c318e703fe60a90c3adbf9eeb Reviewed-on: https://code.wireshark.org/review/14692 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-29Fix modeline definitionsPeter Wu1-2/+2
Fix mismatching emacs and vi modelines. Change-Id: I5cab8c5b7692746a5fa731c977cef903ad19a6f6 Reviewed-on: https://code.wireshark.org/review/14688 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-03-29GSM CBCH: fix an out of bounds accessPascal Quantin1-6/+6
As explained by Guy, we should use new_slots[i] and not new_slots[k] Bug: 12278 Change-Id: Ifae44f9d5948bed5c4ee0442510724016e307dee Reviewed-on: https://code.wireshark.org/review/14678 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-28Fix more -Wused-but-marked-unused warnings/errors.Joerg Mayer26-138/+138
Change-Id: Ieb3e70a23c1a55b7ba60b1b32f159341adfe65b7 Reviewed-on: https://code.wireshark.org/review/14682 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-03-28wslua: handle parameters with const keyword when generating tapsPascal Quantin1-0/+2
Change-Id: I46148b6454a501035d86fa8f1eb767687f68aa42 Reviewed-on: https://code.wireshark.org/review/14670 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-28Qt: Make conversation menu items static.Gerald Combs1-2/+2
Add a ConversationAction and ColorizeAction classes which respectively handle conversation filtering and colorization. Move conversation menu initialization to initConversationMenus and call it once at startup. This keeps us from leaking quite a bit of memory each time we select a packet or proto tree item. Bug: 12044 Change-Id: I32e8cedaba08a419d5da6a7a9db31c910909f450 Reviewed-on: https://code.wireshark.org/review/14516 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-03-28Fix warnings/errors of type -Wused-but-marked-unusedJoerg Mayer11-18/+18
Change-Id: I34c2d9953272822da0745d1b24c64d8466e43b37 Reviewed-on: https://code.wireshark.org/review/14668 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-03-28Fix some warnings/errors of typeJoerg Mayer25-179/+143
git/epan/dissectors/packet-a21.c:478:25: error: 'item' was marked unused but was used [-Werror,-Wused-but-marked-unused] proto_item_append_text(item, "%s", val_to_str_const(event_id, a21_event_vals, "Unknown")); ^ Added manual change id because file-jpeg.c forced the use of commit -n Change-Id: Iffff53d6253758c8454d9583f0a11f317c8390cb Fix warnings/errors of type: git/epan/dissectors/packet-ax25-kiss.c:205:52: error: 'pseudo_header' was marked unused but was used [-Werror,-Wused-but-marked-unused] return capture_ax25( pd, l_offset, len, cpinfo, pseudo_header ); Fix checkhf warnings: Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_address_netswitch Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_address_subswitch Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_poll_reply_trailer Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_rdm_universe Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_tod_data_universe Change-Id: Id1fa12afb97a8e9cd4ed0ea25351c3b2639c930e Reviewed-on: https://code.wireshark.org/review/14667 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-03-28Fix some warnings/errors of typeJoerg Mayer3-3/+3
git/epan/dissectors/packet-a21.c:478:25: error: 'item' was marked unused but was used [-Werror,-Wused-but-marked-unused] proto_item_append_text(item, "%s", val_to_str_const(event_id, a21_event_vals, "Unknown")); ^ Added manual change id because file-jpeg.c forced the use of commit -n Change-Id: Iffff53d6253758c8454d9583f0a11f317c8390cb Reviewed-on: https://code.wireshark.org/review/14666 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-03-28NAS EPS: add a missing breakPascal Quantin1-0/+1
Change-Id: I71a32b831cdb8d7d07e48cabe2c6cd7204968c28 Reviewed-on: https://code.wireshark.org/review/14665 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-27NAS EPS: upgrade dissector to v13.5.0Pascal Quantin1-13/+334
Change-Id: I04319c1ca0a6c166904a584f31088460ea35eb89 Reviewed-on: https://code.wireshark.org/review/14655 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-27If setting an address from a tvb and the address length is 0, the address ↵Michael Mann1-1/+4
should be NULL. Bug: 12295 Change-Id: I875308a16b11023a691d34057c7f8561a15aa598 Reviewed-on: https://code.wireshark.org/review/14649 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>
2016-03-27NGHTTP2: Update to 1.8.0Alexis La Goutte5-37/+596
Change-Id: Ic818b7df95c9812076303f613b0641b9e702b62e Reviewed-on: https://code.wireshark.org/review/14562 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 23:28:52 +0000