aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-nfs.c
AgeCommit message (Collapse)AuthorFilesLines
2017-10-26Add a ws_in6_addr typedef for struct e_in6_addr.Guy Harris1-1/+1
That allows a parallel typedef of ws_in4_addr for guint32. Change-Id: I03b230247065e0e3840eb87635315a8e523ef562 Reviewed-on: https://code.wireshark.org/review/24073 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-22NFSv4: Fix for duplicate StateId hashesCal Turney1-57/+51
In WS v11.4.0 released In May, 2014, "tvb_get_string_enc()" was added to dissect_nfs4_stateid() which treats the numeric stateid as a string and converted it to UTF-8. Invalid UTF-8 chars were replaced with the "REPLACEMENT CHARACTER" which are actually three characters: 0xef, 0xbf, and 0xbd (0xefbfbd). A hash was made of the first 16 chars of the returned array although the string was often much larger due to 1 to 16 invalid chars. This has often caused duplicate hashes for different files and locks. That routine has been removed. In addition, the size of the hash has been reduced from 32 to 16 bits which affords a 99.9984% chance of unique hashes. Finally, hf_nfs4_seqid, used for the stateid hash seqid has been changed to hf_nfs4_seqid_stateid because in CLOSE requests the seqid has nothing to do with the stateid seqid. Change-Id: I3bf7caefc3341887a4c9137500dfeac0115af8cf Reviewed-on: https://code.wireshark.org/review/23966 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-17nfs: fix nfs dissector to show correct mirror and data server countsTigran Mkrtchyan1-20/+22
nfs dissector wrongly have used proto_tree_add_item to display a counter, by assuming that last argument is a value. Replace proto_tree_add_item with proto_tree_add_uint or proto_tree_add_subtree_format when a loop counter must be displayed. Update tree item size calculation. Change-Id: I4137e42673fa33cae61494effe1195206fbf7f28 Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> Reviewed-on: https://code.wireshark.org/review/23748 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>
2017-10-03nfs: fix typo on new xattrs attributAlexis La Goutte1-6/+6
Change-Id: I4872334e73df8a71690400e7f0690eecc02d8270 Reviewed-on: https://code.wireshark.org/review/23820 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: Anders Broman <a.broman58@gmail.com>
2017-10-03nfs4: Add ACCESS_MASK support for xattrsTom Haynes1-20/+80
See: https://datatracker.ietf.org/doc/draft-ietf-nfsv4-xattrs/ Change-Id: Ia9238bf96562f95eb56d25a1f8051b4e4fca5ba4 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/23817 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>
2017-09-27nfsv4: Implement the xattr support for NFSv4Tom Haynes1-2/+137
See: https://datatracker.ietf.org/doc/draft-ietf-nfsv4-xattrs/ Change-Id: I775eb2ec994409717f5d4ab9feb07cb4201617f1 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/23756 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>
2017-09-16Have register_decode_as_next_proto create dissector table.Michael Mann1-7/+3
For protocols that have don't have a unique identifier for their payload, have register_decode_as_next_proto be a one stop shop to create Decode As functionality and a dissector table of type FT_NONE. Change-Id: Ic1f2e9ed0aee0554a4eb8f232630b99c0604dfc0 Reviewed-on: https://code.wireshark.org/review/22575 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-04packet-nfs.c: Minor cleanupMichael Mann1-131/+89
Change-Id: Id1b522ae912a05442426d2acc1a036d1ba5689e2 Reviewed-on: https://code.wireshark.org/review/23380 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>
2017-07-11Expand register_decode_as_next_proto to include prompt string.Michael Mann1-12/+1
Many dissectors don't have an identifier to pass to a dissector table. When using Decode As they all have a "value" function that returns 0 just so something is returned. A first step to a cleaner refactor of the functionality is to allow dissectors to provide a "prompt" function when registering Decode As with register_decode_as_next_proto() so that the text exposed in the GUI can vary, but the function that returns 0 (nothing) can be consolidated under decode as registration functionality. This casts a wider net for register_decode_as_next_proto() use. Change-Id: I2995b3c251dae70f5f529b672473d25c6288ed5c Reviewed-on: https://code.wireshark.org/review/22562 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>
2017-02-02NFSv4.2 mode_umask supportAndreas Gruenbacher1-0/+19
Add support for the NFSV4.2 mode_umask attribute which will be initially supported by Linux v4.10. Change-Id: Id98e20cd0ed93bf7ad9b2246e9e05299f3d7a9fc Reviewed-on: https://code.wireshark.org/review/19921 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>
2017-01-10Rename tvb_new_subset() to tvb_new_subset_length_caplen().Guy Harris1-1/+1
This emphasizes that there is no such thing as *the* routine to construct a subset tvbuff; you need to choose one of tvb_new_subset_remaining() (if you want a new tvbuff that contains everything past a certain point in an existing tvbuff), tvb_new_subset_length() (if you want a subset that contains everything past a certain point, for some number of bytes, in an existing tvbuff), and tvb_new_subset_length_caplen() (for all other cases). Many of the calls to tvb_new_subset_length_caplen() should really be calling one of the other routines; that's the next step. (This also makes it easier to find the calls that need fixing.) Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b Reviewed-on: https://code.wireshark.org/review/19597 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-06Convert some easily identifiable pinos.Michael Mann1-13/+13
grepping for "Decode As" comments reveals exactly was pinos were created for - distinguishing multiple dissection functions in a single dissection table. Change-Id: Iaa9294045e9d0633563e7d763cb585c0e6dc598f Reviewed-on: https://code.wireshark.org/review/19490 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-13Adjust proto_tree_add_uint_format_value calls to use unit stringMichael Mann1-3/+2
Several calls to proto_tree_add_uint_format_value could be better served using BASE_UNIT_STRING with a "unit string" in hf_ field. There also a few cases where proto_tree_add_uint_format_value could just be proto_tree_add_uint. Added a few more "common" unit string values to unit_strings.[ch] Change-Id: Iaedff82c515269c9c31ab9100dff19f5563c932d Reviewed-on: https://code.wireshark.org/review/19242 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12nfs: Fixing COPY decoding to match the specOlga Kornievskaia1-2/+1
Current decoding of the COPY operation gets a netloc4 instead of a stateid from the write_response4 structure. Change-Id: Icde8adde8613d50e7a03ee779aad4c62f6f195f4 Reviewed-on: https://code.wireshark.org/review/18169 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-21nfs: Fixing OFFLOAD_STATUS reply decodingOlga Kornievskaia1-1/+45
commit b5aa0ff1a4e84c15f6c159e4900e84bd563570b4 nfs: Add NFSv4.2 ops OFFLOAD_CANCEL and OFFLOAD_STATUS As coded, the reply of the OFFLOAD_STATUS decodes a stateid. However, in the spec, the reply is count and an array of statuses. I propose the following fix to match the spec for the OFFLOAD_STATUS. Change-Id: Ibaddba96446b8d9b520ca977f0b1ed66749d3388 Reviewed-on: https://code.wireshark.org/review/17805 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-09-13nfs: Primary Data's NFSv4 DataSphere filehandle decoderTom Haynes1-1/+52
Change-Id: I0d339f69f37fd3b6a2f7b37b1c239edb2a4cf7a5 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/17676 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: Anders Broman <a.broman58@gmail.com>
2016-09-09nfs: add dissector for CB_NOTIFY_LOCK argsJeff Layton1-0/+4
Show the filehandle and lockowner for the callback. Change-Id: Id09b260d4b31f8fa35ba8452dc143095e5cc88ec Signed-off-by: Jeff Layton <jlayton@redhat.com> Reviewed-on: https://code.wireshark.org/review/17574 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>
2016-08-31NFS: fix indent (remove some trailing spaces)Alexis La Goutte1-20/+20
Change-Id: Ic72d264686c3b37ac15118eec07057c7bb8a2a50 Reviewed-on: https://code.wireshark.org/review/17422 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-08-31nfs4: Handle CB_GETATTRTom Haynes1-5/+8
Change-Id: Ifb68af443c6f13dfab99e32488d86c148621a316 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/17399 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-08-31nfs: Fix style in switchTom Haynes1-1/+2
Change-Id: Ica9fc960946542badb64af12769e7dfa3793db82 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/17397 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-31Don't do any Decode As stuff for dissector tables not used with Decode As.Guy Harris1-1/+1
Have all dissector tables have a "supports Decode As" flag, which defaults to FALSE, and which is set to TRUE if a register_decode_as() refers to it. When adding a dissector to a dissector table with a given key, only add it for Decode As if the dissector table supports it. For non-FT_STRING dissector tables, always check for multiple entries for the same protocol with different dissectors, and report an error if we found them. This means there's no need for the creator of a dissector table to specify whether duplicates of that sort should be allowed - we always do the check when registering something for "Decode As" (in a non-FT_STRING dissector table), and just don't bother registering anything for "Decode As" if the dissector table doesn't support "Decode As", so there's no check done for those dissector tables. Change-Id: I4a1fdea3bddc2af27a65cfbca23edc99b26c0eed Reviewed-on: https://code.wireshark.org/review/17402 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-30nfs: Standardize on FileHandle vs filehandleTom Haynes1-5/+5
Change-Id: Ib945ddee4a35bf984a9411e56ed3801cde70c6c4 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/17398 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-29packet-nfs: fixup whitespace in pNFS SCSI workBenjamin Coddington1-34/+34
A recent patch introduced whitespace errors.. clean them out. Change-Id: Id67bed40646d60dc6775e1e1f958a5a07a5f5f6d Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Reviewed-on: https://code.wireshark.org/review/16205 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: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-23packet-nfs: add extent decoding for SCSI layoutsBenjamin Coddington1-0/+58
Decode extents sent within the response to a LAYOUTGET operation on SCSI layout types. Change-Id: I1fc0a5e3d4782f078f96866dc63f2ec43b6d62b1 Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Reviewed-on: https://code.wireshark.org/review/16097 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-05-27Create a "placeholder" NFS CB protocol for ONC-RPC stats.Michael Mann1-1/+5
In GTK GUI, "NFS" shows up twice in the ONC-RPC Service Response Time Programs list. That's probably confusing enough to users. In Qt the "second" NFS wasn't showing up at all (or getting overwritten) because it was hashing on program name. Make NFS programs unique with a "stubbed" protocol. Bug: 12478 Change-Id: Ic4ebdab8ba8b70e6026e1fb0f8e8defd4532b0f2 Reviewed-on: https://code.wireshark.org/review/15587 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-13packet-nfs: Add flex file flag: FF_FLAGS_NO_READ_IOTom Haynes1-0/+6
Change-Id: I3c5895d2e0671cdcd8063aa27356d49aa2bdbfa7 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/15416 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Trond Myklebust <trondmy@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-05-12packet-nfs: add decoding and displaying of exclusive create attributesTigran Mkrtchyan1-0/+1
NFSv4.1 defines FATTR4_SUPPATTR_EXCLCREAT attribute which tells the client a bitmap of attributes which can be set during exclusive create. Wireshark did show that FATTR4_SUPPATTR_EXCLCREAT is provided, but doesn't show supported attributes. Bug: 12435 Change-Id: I29fc6beb2e75e9c78d68b1ca73a714bab2ad10a2 Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> Reviewed-on: https://code.wireshark.org/review/15401 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: Michael Mann <mmann78@netscape.net>
2016-04-22Do not mix wmem and glib allocatorsPascal Quantin1-4/+3
Change-Id: I0e845668a1b9dbec93ea920a8585ecfe60f001d1 Reviewed-on: https://code.wireshark.org/review/15044 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-04-21packet-nfs: update GETDEVICEINFO op for pNFS SCSIBenjamin Coddington1-0/+183
The pNFS SCSI layout type defines additional structures to be returned for GETDEVICEINFO to refer to SCSI volumes. Update packet-nfs.c to decode these structures. Only BASE volume types have been tested. Change-Id: I8c6e283d6f98763ee505c7880dbc5ceac0e86675 Reviewed-on: https://code.wireshark.org/review/15016 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-20packet-nfs: fix offset calculation for fs_layout_typeBenjamin Coddington1-2/+2
Change-Id: I4d0176938f977caffc09a96c44e081dbe7a0154c Reviewed-on: https://code.wireshark.org/review/15014 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-04-20packet-nfs: fix layout_blksize labelBenjamin Coddington1-1/+1
Change-Id: I81c61b9e04bc787ce2afb90db2c83a37d4f5fd44 Reviewed-on: https://code.wireshark.org/review/15015 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-03-25packet-nfs: enable nfs4.lock_owner4Benjamin Coddington1-4/+2
Change-Id: I32e718a8ef94b514fd2907651e2f9bd92d8119ef Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Reviewed-on: https://code.wireshark.org/review/14627 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>
2016-03-17Associate dissector tables and heuristic subdissector lists with a protocol.Michael Mann1-1/+1
This will make it easier to determine protocol dependencies. Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used) Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d Reviewed-on: https://code.wireshark.org/review/14446 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-24packet-nfs: do not call g_hash_table_remove before g_hash_table_insertTigran Mkrtchyan1-8/+1
The g_hash_table_insert will remove and deallocate existing entry, so we don't need to do it at all. Change-Id: I661cadd8beea9585885e48c03a8b52561d1df778 Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> Reviewed-on: https://code.wireshark.org/review/14113 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-02-24packet-nfs: fix double-freeTigran Mkrtchyan1-19/+2
fixes regression introduced by f5340b2 g_hash_table_remove will call free on object, thus there is no need for explicit g_free, as is causes a double-free: *** Error in `/usr/sbin/wireshark-gtk': double free or corruption (fasttop): 0x0000555556e6bf50 *** ======= Backtrace: ========= /lib64/libc.so.6(+0x77da5)[0x7fffef80ada5] /lib64/libc.so.6(+0x804fa)[0x7fffef8134fa] /lib64/libc.so.6(cfree+0x4c)[0x7fffef816cac] /lib64/libglib-2.0.so.0(g_free+0xe)[0x7ffff09665ee] /lib64/libglib-2.0.so.0(+0x388ba)[0x7ffff094f8ba] /lib64/libwireshark.so.6(+0x1cfb46b)[0x7ffff49d646b] /lib64/libwireshark.so.6(+0x1d03d99)[0x7ffff49ded99] /lib64/libwireshark.so.6(+0x173b11f)[0x7ffff441611f] /lib64/libwireshark.so.6(+0x173bba5)[0x7ffff4416ba5] /lib64/libwireshark.so.6(call_dissector_with_data+0x26)[0x7ffff4419ad6] ..... The g_hash_table_insert will remove and deallocate existing entry, so we don't need to do it at all. Change-Id: Ide47d1f9deb3e1b0d8adefd31fc6f3bf5cbaa010 Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> Reviewed-on: https://code.wireshark.org/review/14096 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-01-24Add the packet number to the packet_info structure, and use it.Guy Harris1-1/+1
That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-22NFSv4.1 bugfixesTrond Myklebust1-1/+14
nfs: Fix up the SEQUENCE status flags The SEQUENCE status flags are being displayed incorrectly (after the NFSv4 operations) due to being attached to the COMPOUND tree instead of the SEQUENCE op's tree. nfs/flexfiles: Ensure that we account for the layout_flags in the offset nfs/flexfiles: Add a dissector for the optional layoutget "stats collect hint" field Change-Id: I8744254aa9f65a0b33510f2352875b01804149c2 Fixes: d892c32cc2d0 ("Eliminate proto_tree_add_text from packet-nfs.c") Fixes: 79b88aacb6d1 ("nfs: Cleanup of FlexFiles Layout Type") Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Reviewed-on: https://code.wireshark.org/review/13477 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-01-08Fix a lot of typos and misspellingsmoshekaplan1-1/+1
Change-Id: I8512cfa1d424f82a873a0e0e1d22c7b075fdd7f3 Reviewed-on: https://code.wireshark.org/review/13069 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>
2016-01-08NFS: fix crash when activating file_name_snooping optionPascal Quantin1-1/+1
gf5340b2 introduced a value destroy function. When transfering a given value from nfs_name_snoop_unmatched to nfs_name_snoop_matched hash map, do not free the value automatically Bug: 11972 Change-Id: I8c4e0db07084b041baf73ccf4d0788248574a9d8 Reviewed-on: https://code.wireshark.org/review/13115 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>
2015-12-31Use wmem_memdup() instead of wmem_alloc() followed by memcpy().Guy Harris1-2/+1
This also fixes a case where, if nfs_fh->len wasn't a multiple of 4, the allocated buffer was too short, by the difference between the next lower multiple of 4 and nfs_fh->len, so the memcpy() went past the end of the buffer. (And, yes, an NFSv3 file handle can have a byte count that's not a multiple of 4 - it's a variable-length opaque type - even if the marshalled data is padded with 0s to a multiple of 4 bytes, as with other XDR types.) Change-Id: I689d4b365e8a1547428a1580884f66177dc5841b Reviewed-on: https://code.wireshark.org/review/12964 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-18[NFS] adding stateid hash based on stateid.otherOlga Kornievskaia1-0/+12
In NFS protocol, stateid's seq# changes within the stateid and therefore it changes the calculated hash of the stateid displayed by the wireshark. It makes it inconvenient to filter packets based on such value. This patches adds additional field (instead of replacing old) to display the CRC32 hash of the stateid.other field. Bug:11895 Change-Id: I70c6d2b88822b6f735e8bc506a1bfcb421f6ddb9 Signed-off-by: Olga Kornievskaia <kolga@netapp.com> Reviewed-on: https://code.wireshark.org/review/12536 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>
2015-12-09new_create_dissector_handle -> create_dissector_handle for dissector directory.Michael Mann1-11/+11
Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now. Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f Reviewed-on: https://code.wireshark.org/review/12484 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-25create_dissector_handle -> new_create_dissector_handleMichael Mann1-26/+29
This finalizes the transformation for dissectors. Change-Id: Ie5986b72bb69a6e8779ca3f5e20a80357c9e6fea Reviewed-on: https://code.wireshark.org/review/12122 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-16create_dissector_handle -> new_create_dissector_handleMichael Mann1-23/+31
Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I96aa9cf53533cbb07105aa400d42922baf3016b3 Reviewed-on: https://code.wireshark.org/review/11860 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-11-04Don't allow multiple registrations of a protocol in dissector tables.Michael Mann1-1/+1
The target here is the Decode As dialog where protocols have multiple registrations into a dissector table and that shows up as multiple entries in the Decode As dialog list with the same name so users are unsure which "dissector" they are choosing. The "default" behavior (done in this commit) is to not allow duplicates for a dissector table, whether its part of Decode As or not. It's just ENFORCED for Decode As. Bug: 3949 Change-Id: Ibe14fa61aaeca0881f9cc39b78799e314b5e8127 Reviewed-on: https://code.wireshark.org/review/11405 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04Don't include "file.h" if you don't need it.Guy Harris1-0/+1
It ends up dragging in libwireshark headers, which programs not linking with libwireshark shouldn't do. In particular, including <epan/address.h> causes some functions that refer to libwireshark functions to be defined if the compiler doesn't handle "static inline" the way GCC does, and you end up requiring libwireshark even though you shouldn't require it. Move plurality() to wsutil/str_util.h, so that non-libwireshark code can get it without include epan/packet.h. Fix includes as necessary. Change-Id: Ie4819719da4c2b349f61445112aa419e99b977d3 Reviewed-on: https://code.wireshark.org/review/11545 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-27nfs: Add FF_FLAGS_NO_IO_THRU_MDS for layout flagsTom Haynes1-0/+6
Change-Id: I6f90aba1d804b1da666d471b9470acac63df4845 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/11291 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>
2015-10-25[nfs] don't THROW() an exception from a dissectorMartin Kaiser1-21/+27
the case where the number of bitmaps is too large was already handled more cleanly in some places, we can just copy their code unfortunately, we have to add a pinfo parameter to quite a few functions Change-Id: I0e0fa9674d6ecd98c3d7e49e065f7121cc275a9b Reviewed-on: https://code.wireshark.org/review/11247 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-10-24NULL terminate some hf_ arrays used in proto_tree_add_bitmask_xxx calls.Michael Mann1-0/+1
I thought this was already caught by one of the check*.pl scripts, but I ran into the one in packet-nfs.c and decided to manually check the dissector directory. Change-Id: I8df83227255818eabc43763e3cf760cf762797cc Reviewed-on: https://code.wireshark.org/review/11230 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-10-22Use address functions instead of ADDRESS macros in asn1 and epanGerald Combs1-2/+2
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 17:04:05 +0000