aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2016-12-29zvt: mark some functions as inlineMartin Kaiser1-10/+10
Change-Id: I2637fc18b1eeda5e567ee62c8ed53c6757c259bd Reviewed-on: https://code.wireshark.org/review/19457 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-29zvt: dissect card type and result code bitmapsMartin Kaiser1-2/+39
Change-Id: I26a7821642224c707dc4542a35b2b5b5aee159d5 Reviewed-on: https://code.wireshark.org/review/19456 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-29zvt: dissect the text lines TLV data objectMartin Kaiser1-1/+20
Change-Id: I3d54b4568b883b95294e29347bde0736b78157e1 Reviewed-on: https://code.wireshark.org/review/19455 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-29zvt: dissect the status apdu, add some more bitmapsMartin Kaiser1-2/+29
Change-Id: If74221dd55d61c5794f570daf38c88771f4a2f38 Reviewed-on: https://code.wireshark.org/review/19454 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-29zvt: add some more tag namesMartin Kaiser1-1/+21
Change-Id: If181a22f2794fb9fe812719593f8a7eb642bce42 Reviewed-on: https://code.wireshark.org/review/19453 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-29zvt: print the tag name in the tree headerMartin Kaiser1-1/+3
Change-Id: Iac0744f830020a54790a39820abab9fb756ffa9f Reviewed-on: https://code.wireshark.org/review/19452 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-29ISAKMP: add Reserved fields for Fibre ChannelMirko Parthey1-3/+11
Add Reserved fields for Fibre Channel Traffic Selectors. Reference: RFC 4595, section 4.4 Change-Id: Iba0b3d9a4d3d96918971a9a597fa313b022b5ca2 Reviewed-on: https://code.wireshark.org/review/19444 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-12-28Infiniband: Use base of packet tree (top_tree) for ↵Michael Mann1-23/+24
"infiniband.mad.cm.private" heuristic dissector. The "infiniband.payload" heuristic dissector was converted to use the base of the packet tree so that subdissectors could show their protocol as the base layer. Since many of the subdissectors use the same dissection function for both "infiniband.payload" and "infiniband.mad.cm.private", ensure that both use the same "tree level", but still pass in the "payload tree" as part of the dissector data in case a subdissector wants to use it (currently used by InfinibandSDP) Ping-Bug: 13259 Change-Id: I899e8348f6b23d8eee9e74764d8ca32d7bf6e625 Tested-by: paravpandit@yahoo.com Reviewed-on: https://code.wireshark.org/review/19441 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Parav Pandit <paravpandit@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-28ISAKMP: add traffic selector subtreeMirko Parthey1-105/+100
Create a new subtree for each traffic selector. Use the length field to find the next traffic selector rather than accumulating the individual TS field sizes. Split dissect_ts() to introduce separate offset variables. After adding the final field, do not advance offset again to avoid unused variable warnings. Change-Id: I9951662c1bb3958994162b25b70b43ec1da103a7 Reviewed-on: https://code.wireshark.org/review/19440 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-12-28Added basic support for NVM Express over Fabrics for RDMA.Parav Pandit5-0/+1715
NVM Express is high speed interface for accessing solid state drives. NVM Express specifications are maintained by NVM Express industry association at http://www.nvmexpress.org. Bug: 13201 Change-Id: Id40edaf72838eea9f4087c8ddba9518a9374efab Tested-by: paravpandit@yahoo.com Reviewed-on: https://code.wireshark.org/review/19063 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: Parav Pandit <paravpandit@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-27Move DigestInfo from pkcs12 to cmsРоман Донченко6-50/+42
This type is originally from PKCS #7, the predecessor of CMS, so it makes more sense for it to be there. Change-Id: I3a146f1d000a3bcbcd0d8f1cfe2fc27ed80cc69d Reviewed-on: https://code.wireshark.org/review/19335 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-12-27InterfaceList: Add check for remote interfaceRoland Knall2-0/+13
Add a check, to allow the filtering of remote only interfaces. Also add the necessary options to the type menu. Change-Id: Ib82519362454094f64abf1cbe6d7bc917990d7ac Reviewed-on: https://code.wireshark.org/review/19438 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-12-27Replace assignment with structure assignment (CID 1397183)Jaap Keuter1-2/+1
Replace the individual field assignment with struct assignement to - Reduce code (only single line, but he), - (Hopefully) show Coverity this is as intended. Change-Id: I9400b6e38f86acf57018ee7993e66d5b06d1c39c Reviewed-on: https://code.wireshark.org/review/19434 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-12-27Merge AIM files into single dissector file.Michael Mann26-4806/+3100
These are probably obsolete dissectors anyway, but they are a bunch of very small files causing unnecessary file pollution. Change-Id: I03976484996b4bf987d6743ed379534456809c2c Reviewed-on: https://code.wireshark.org/review/19437 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-26zvt: dissect the TLV container's payloadMartin Kaiser1-26/+121
add a function to dissect the sequence of TLV elements use a hash table for payload functions like we do for the bitmaps add two tags whose payload is another TLV sequence Change-Id: Ibb19fd7af2f58e201174d07d410557dc315c652a Reviewed-on: https://code.wireshark.org/review/19435 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-25[Automatic update for 2016-12-25]Gerald Combs2-27/+272
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I8fd8115fdfd4623bdf94602b6fd55a724e09cec3 Reviewed-on: https://code.wireshark.org/review/19429 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-25Remove individual post-dissect enable preferences.Michael Mann3-48/+23
Use Analyze -> Enabled Protocol dialog interface. Added support for backwards compatibility of preference. Change-Id: I32b3fce9d18083d9324197e3fd7ddc7eb888d1fb Reviewed-on: https://code.wireshark.org/review/19422 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-25DVB-CI: simplify dissection of the resource idMartin Kaiser1-22/+11
Now that proto_tree_add_bitmask_value_with_flags() works for tvb==NULL, we can use it to simplify the dissection of DVB-CI's resource id. Change-Id: Ia09d5668bf0a61161ecd0cb412680838a67d7a7a Reviewed-on: https://code.wireshark.org/review/19409 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-12-25packetbb: Add decoding for TLV with single valueFrancois Schneider1-49/+327
Bug: 4118 Change-Id: I282fb8da657701c5b855dafe1568a5f226d3c12b Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-on: https://code.wireshark.org/review/13985 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-25Cleanup transum post-dissector.Michael Mann1-0/+32
1. Enable/disable preference not needed - just use Enabled Protocol dialog interface. Added support for backwards compatibility of preference. 2. Add value_string for calculation values 3. Create an structured array of "hfs of interest" so they can more easily be extended. 4. Convert a bunch of arrays into hash tables and lists. For the amount of wasted space they were taking up, we can live with the very slight performance degrade. Also puts less limits on number of things to process. Change-Id: I7399789d62432b507062ed9cdc20ad974b9dde1b Reviewed-on: https://code.wireshark.org/review/19406 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-12-25Support all MA modes, fix BB CRC and frag edge casesMustBeArt1-85/+175
Support all four mode adaptation interface formats. Add a user preference to specify which format is in use, or to request that the format be guessed. Guessing is improved, but can never be reliable. Fix problem with baseband header CRC check that caused almost all packets to show a spurious CRC error, introduced with proto_tree_add_checksum. Fix problem with GSE PDU fragmentation CRC beginning in one fragment and ending in another. Any GSE frames following the fragment containing the end of the CRC would be parsed at the wrong offset. Fix problem with IPv4 or IPv6 starting exactly on a fragmentation boundary, so that one baseband frame contains the complete GSE header but zero bytes of the IP payload. Trying to further dissect the zero-length payload led to a "malformed packet" display. Standardize spelling per governing document: adaption -> adaptation Change-Id: I69e64e74e4b4f02515411471e1d76b0eeb02fef1 Reviewed-on: https://code.wireshark.org/review/19421 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-12-25802.11(ad): split Sector Sweep Feedback in 2Alexis La Goutte1-3/+51
one from ISS and other to ISS Add also reserved field Issue reported by Hany ASSASA Bug:13244 Change-Id: Ib20cf6ae455664b87ea3470ebb6d5386a97b0f48 Reviewed-on: https://code.wireshark.org/review/19420 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-25802.11(ad): fix typoAlexis La Goutte1-1/+1
Acknoledgment => Acknowledgment Ping-Bug: 13244 Change-Id: Ia2e8eedec05c39ed0ebc38235cc52d43488e00d4 Reviewed-on: https://code.wireshark.org/review/19419 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-12-25802.11(ad): Enhance dissection of Beam RefinementAlexis La Goutte1-57/+50
You can now use bitmap on 64bits (or 40bits) and also add a reserved field Change-Id: Ibc68b56477e76c2b13624920eb7a9a49f8f887f3 Ping-Bug: 13244 Reviewed-on: https://code.wireshark.org/review/19418 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-25802.11(ad): Add reserved field for BRP RequestAlexis La Goutte1-0/+7
Change-Id: Iee6012e841007b731dc16545a1d9bf6f17377580 Ping-Bug: 13244 Reviewed-on: https://code.wireshark.org/review/19417 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-25802.11(ad): fix wrong bitmask for BRP TX AntennaAlexis La Goutte1-1/+1
Missing a zero Change-Id: I43097bc62fb66dea849c5ed7882d01a6de768c82 Ping-Bug: 13244 Reviewed-on: https://code.wireshark.org/review/19416 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-24AFP: fix indent (use tabs)Alexis La Goutte1-159/+159
Change-Id: I3d1078ddff6ec7b9c7efc5cda9a1821ef52b46ce Reviewed-on: https://code.wireshark.org/review/19415 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-24ppi-vector: Fix Dead Store (Dead assignement/Dead increment) Warning found ↵Alexis La Goutte1-1/+1
by Clang Change-Id: I44ae8a9cc6b09ad205b9c90e7d9595768fcac71b Reviewed-on: https://code.wireshark.org/review/19412 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-24bthci_evt: Fix Dead Store (Dead assignement/Dead increment) Warning found by ↵Alexis La Goutte1-4/+4
Clang Change-Id: Ic9962a1824b9f9d137177c81cb15d7ef4bc7bfc2 Reviewed-on: https://code.wireshark.org/review/19411 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-24disabled_protos: fix no previous prototype for function 'read_protos_list' ↵Alexis La Goutte1-1/+1
[-Wmissing-prototypes] Change-Id: I5bfa11213ca27308204a1d8b6073661161c9151e Reviewed-on: https://code.wireshark.org/review/19414 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-12-24zvt: len is used in dissect_zvt_int_status()Martin Kaiser1-1/+1
Change-Id: I8937dc605abf0414159acfc75ee05ccac89658fb Reviewed-on: https://code.wireshark.org/review/19410 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-24Add enabled protocol list for dissectors who are disabled by defaultMichael Mann4-196/+375
We save a list of dissectors that are disabled through the Enabled Protocols dialog. This is because we assume dissectors are enabled by default. For dissectors that are disabled by default, we have no way to keep them enabled through the Enabled Protocols dialog. A dissector that defaults to being disabled has to be reset to enabled each time Wireshark is launched. Add a list similar to the disabled list for enabling dissectors that are disabled by default. This mostly applies to post-dissectors. Change-Id: I31a8d97a9fdbc472fe2a8666384e0f8786bb8e9f Reviewed-on: https://code.wireshark.org/review/19405 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-12-23Set BCP BPDU to size of bytes used by the protocol, not whole packet.Michael Mann1-0/+2
Bug: 13188 Change-Id: I29b2712d4d6ae57e4b0ea4bc0ec126cb80172779 Reviewed-on: https://code.wireshark.org/review/19400 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-12-23bthci_cmd: Fix Dead Store (Dead assignement/Dead increment) Warning found by ↵Alexis La Goutte1-1/+1
Clang Change-Id: I84472632e715a6f13e2fa5b58ae95f9dc9d16776 Reviewed-on: https://code.wireshark.org/review/19399 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-12-23make proto_tree_add_bitmask_value_with_flags() work for tvb==NULLMartin Kaiser1-1/+3
proto_tree_add_bitmask_value_with_flags() eventually calls proto_tree_add_XXX() for the main hf and for the field elements. These functions work for tvb==NULL if the length is also set to 0. Otherwise, we'll end up in proto_tree_add_pi(), get_hfi_length() and run into the DISSECTOR_ASSERT() there. proto_tree_add_bitmask_value...() are meant for cases where the data is passed directly and not read from a tvb. If tvb==NULL, set our length to 0 instead of using the field length from the main hf. Change-Id: Ia55b068e9842ba4a1ae8be8692320a8e93ea8631 Reviewed-on: https://code.wireshark.org/review/19394 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> 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-12-23DVB-CI: don't call proto_tree_add_subtree_format() with tvb==NULLMartin Kaiser1-4/+10
When I first implemented this, proto_tree_add_subtree_format() worked for tvb==NULL if len was also 0. The bounds check added in 56706427f53cc64793870bf072c2c06248ae88f3 breaks this use case and makes DVB-CI spill out dissector asserts. Warn Dissector bug, protocol DVB-CI, in packet 625: ../epan/tvbuff.c:532: failed assertion "tvb && tvb->initialized" Create a proto_item first and link the subtree to this item. This will work as long as proto_tree_add_uint() accepts tvb==NULL. Thanks to Kay Katzorke for reporting this bug. Change-Id: I25a071c21925f7d362c92852fd5a8136e4d361c8 Reviewed-on: https://code.wireshark.org/review/19389 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-23GSM A GM: align protocol / container id filter format with displayed onePascal Quantin1-1/+1
Change-Id: If5dcee6a2a9dd6de304e78f84456903c932ad452 Reviewed-on: https://code.wireshark.org/review/19393 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-12-23GSM A GM: use same spelling as the 3GPP specificationPascal Quantin1-2/+2
Change-Id: I706b64bb3875a15d8be0e486a03784e19ab5af23 Reviewed-on: https://code.wireshark.org/review/19392 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-12-22packet-rtp.c: Fix of decoding RTP over TCPJiri Novak1-0/+2
During patch modification in https://code.wireshark.org/review/#/c/19293/ we made mistake :-( Change-Id: I2ff65170dbcf3b5c4d27d6d7c629092d5080ed28 Reviewed-on: https://code.wireshark.org/review/19382 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-22RPC: fix crash when using "Dissect unknown RPC program numbers" optionPascal Quantin1-4/+2
When using this option, rpc_prog_info_value structure is not fully initialized. Depending on the memory allocator used, this can lead to a NULL pointer dereference or an access to a random memory block. Ensure that the structure if fully initialized and test pointer before dereferencing it. Bug: 13266 Change-Id: Ifdc54b31c8dd3b2b6220dbe9ee27272758ff60ca Reviewed-on: https://code.wireshark.org/review/19385 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-12-22RTP: fix a possible NULL pointer dereference (CID 1397705 & 1397706)Pascal Quantin1-4/+8
As those dissectors are registered by name, let's not make the assumption that rtp_info is always present. Change-Id: I959b8c71485471b3be4cd2e71a6d96c2d4b278ff Reviewed-on: https://code.wireshark.org/review/19381 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-12-22RTSP dissector: Decode RTP/AVP/TCP and configure RTP session for itJiri Novak1-43/+150
rtsp_create_conversation was modified significantly: - ignore non response calls => process only the complete information - distinguish between UDP, TCP and RTSP interlaced media - supports ED137 recording with RTP/UDP or RTP/TCP It was tested on many samples from bugzilla and from my library. Tests noted in bug 13257 Bug: 13257 Change-Id: I054505bcb9334c3abfff6d61c18c9cb6d2a6d56e Reviewed-on: https://code.wireshark.org/review/19341 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-12-21NAS EPS: upgrade dissector to v13.8.0Pascal Quantin2-32/+16
Change-Id: Ifad1fbd22984ad777278c7cc90622b205405cf1f Reviewed-on: https://code.wireshark.org/review/19377 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-12-21CIP: More attribute updatesD. Ulis3-11/+64
1. CIP Safety: SERCOS Safety Network Number attribute should be 6 bytes. Don't just use all remaining bytes 2. Remove cip_byte_array type. The last remaining usage was #1 above and it really shouldn't be used in the future. Any attribute that would eat up all remaining bytes would have issues with Get Attribute List responses and Set Attribute List requests. 3. Optional Attribute List: Display the attribute name if known. 4. Port: Display Port Number name 5. Port: Associated Communication Objects attribute Change-Id: I94d99bb1f07aa4b8c44949b2ffb5d75e72483459 Reviewed-on: https://code.wireshark.org/review/19374 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-12-21packet-rpcrdma: Fix Reply chunk selection sizeChuck Lever1-1/+1
When a Reply chunk is not present, selecting the "Reply chunk" in the protocol tree should also select the four bytes of zeroes in the header. This should work the same way as for the Read list and Write list. Change-Id: I0a9b7f927cad21e39189cfc1f2b619537ba26a30 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19376 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-21Lua: Fix some typos.Stig Bjørlykke1-8/+8
Change-Id: I4d1cf878245b03665207a500fb7593be1435c3d3 Reviewed-on: https://code.wireshark.org/review/19371 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> 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-12-21packet-tns.c: add Version and Services parsing for SNS messages.chinarulezzz1-2/+48
Tested with pcaps from SampleCaptures wiki. Change-Id: I13656ec484f276024160c8994a6750704058b2db Reviewed-on: https://code.wireshark.org/review/19367 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-12-21gsm_abis_om2000: restore offset increment removed by g1643e37Pascal Quantin1-0/+2
Change-Id: I34666a74f8769c63ecc982bd034b2563ba0298ff Reviewed-on: https://code.wireshark.org/review/19370 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-12-21gsmtap_log: fix no previous prototype for function ↵Alexis La Goutte1-0/+3
'proto_register_/reg_handoff_gsmtap_log' [-Wmissing-prototypes] Change-Id: I5fbd79f056cff330dafbe57ea350768acd820b65 Reviewed-on: https://code.wireshark.org/review/19369 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-12-21packet: duplicate short_name to fix UAF in wsluaPeter Wu2-4/+5
The "short_name" parameter of heur_dissector_add is defined as const (and was assumed to be a string literal). This was no longer the case though since a change in Lua where "short_name" is a dynamically allocated string. This "simple" fix clones the memory for internal use to avoid a heap-use-after-free when heur_dissector_delete tries to access "short_name". An alternative option is to make Proto_register_heuristic track the memory, but since there are multiple possible heuristics lists for a protocol, the Proto (struct _wslua_field_t) structure is not appropriate. A possible working alternative is to store the string into lua_heur_dissectors_table_ref (replacing the value (function) by a tuple {function,short_name}). Change-Id: I6c6b393f4d304dd847e864da6ad17b54c8cd80e2 Fixes: v2.3.0rc0-1474-g7f2a838922 ("lua: Allow proto:register_heuristic to be used on multiple list names") Reviewed-on: https://code.wireshark.org/review/19365 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Franklin Mathieu <snaipe@diacritic.io> Reviewed-by: Peter Wu <peter@lekensteyn.nl>