aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2016-07-13osmux: Add osmuxh info for osmux tapDaniel Willmann1-10/+30
Change-Id: Ic562ab92efe0a44d41f6426315d563ffd187e031
2016-07-13osmux: Queue packet to the tap systemDaniel Willmann1-1/+7
Change-Id: I434bac2793e485561168b5402a7848b2a1db1d0d
2016-07-13Add OSMux dissectorDaniel Willmann3-0/+238
Change-Id: I8fb21e54adec8d8bd7ac5ebd2154100a73ab71c9
2016-07-12packet-rsl: Track rtp pt and codec for rslDaniel Willmann1-1/+39
Change-Id: I8f07c2807c7fd6d43c3307e01bf7fb1750accebd
2016-07-12ceph: distingush between client and server by checking for a second ↵Jeff Layton1-22/+54
entity_addr_t The current ceph dissector assumes that the server will always send its initial connection negotiation first, but that's not necessarily the case, especially with the kernel client which sends its banner as soon as the socket is created. So, we need a better mechanism to determine which end is client and which is the server. The server sends its own address and then the address of the client, but the client only sends its own address. We can determine whether the initial negotiation message is from the client or server by looking at the data after the first entity addr and seeing whether it also looks like an entity addr. This patch takes that approach. It just grabs the address family from the second address and sees whether it's IPv4 or IPv6. If it's not one of those, then it assumes that it's not an entity_addr_t at all and is therefore a request from the client. We could go farther and try to verify the port and address as well, but that's probably overkill. The address family is at the same offset as the host_type field in the client's Connect request, but it's big endian and the host_type is little endian. As long as we don't end up with host_types that are 0x200 or 0xA00, this scheme should be OK. Change-Id: I161d02da86d978272eff95497c6df66766b02ebc Signed-off-by: Jeff Layton <jlayton@redhat.com> Reviewed-on: https://code.wireshark.org/review/16043 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> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-12Generic Protocol Extension support for VxLANsjha31-31/+171
Bug: 12323 Change-Id: I53bfedf50ad09cda52320b0e6eb81e92ed73efc8 Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-on: https://code.wireshark.org/review/16250
2016-07-11Geneve: Update list of option classes.Jesse Gross1-2/+7
Newer versions of the Geneve protocol draft have defined additional option classes. This updates the list so we can show the class name instead of unknown. Change-Id: I19f2024704abe2bc0692c73be783858d74323c0e Reviewed-on: https://code.wireshark.org/review/16382 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-11Fix up *some* of the coding style inconsistenciesJoerg Mayer1-605/+713
- return type of a function definition is always on a seperate line - reformat single line expert items into multiline format - no space between functionname and ( - reformat some hf_ elements that looked different from most others - space after , where appropriate - Fix the following warnings and errors from checkhf.pl Unused href entry: epan/dissectors/packet-ieee80211.c: hf_ieee80211_ff_rcsi Unused href entry: epan/dissectors/packet-ieee80211.c: hf_ieee80211_ff_rcsi_aid Error: hf_ieee80211_ff_dsss_ofdm: FT_BOOLEAN with non-null 'convert' field missing TFS in epan/dissectors/packet-ieee80211.c Error: non-null hf_ieee80211_ff_dsss_ofdm 'convert' field missing 'VALS|VALS64|RVALS|TFS|CF_FUNC|FRAMENUM_TYPE|&' in epan/dissectors/packet-ieee80211.c ? Error: hf_ieee80211_operat_mode_field_channel_width is passing the address of a pointer to VALS in epan/dissectors/packet-ieee80211.c Error: hf_ieee80211_operat_mode_field_rxnss is passing the address of a pointer to VALS in epan/dissectors/packet-ieee80211.c Change-Id: Ide51d1871755199721e65c0f62b3f6a62ef1159e Reviewed-on: https://code.wireshark.org/review/16381 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-07-11IPv6: refactor dissect_routing6() into type-specific dissectorsJoão Valverde1-277/+335
Change-Id: I153c39bb76dc30cecede9dbf5fe4abf234fcd719 Reviewed-on: https://code.wireshark.org/review/16347 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-11hdcp2: don't throw an exception during heuristic checkMartin Kaiser1-0/+4
Change-Id: I24895950464e1845c468f9fa9b6e5aa3ab8c75de Reviewed-on: https://code.wireshark.org/review/16378 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-11iso7816: check for minimum atr lenMartin Kaiser1-1/+5
and reject the packet if it is shorter make sure that we don't throw an exception when we read the first byte and haven't yet decided if the packet contains an iso7816 atr Change-Id: I7b4c93cc7c55489467b46241f07a1bb5ddfd927a Reviewed-on: https://code.wireshark.org/review/16377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-10BGP: Add support of Vendor Capability 131 (Multisession Cisco)Alexis La Goutte1-0/+18
Issue reported by Garri Djavadyan Change-Id: I6dd4bd20d82a3f2cb8aa45f740f72d33e33053da Ping-Bug:12604 Reviewed-on: https://code.wireshark.org/review/16374 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-07-10BGP: Add (Cisco) for "Vendor" Cisco capabilityAlexis La Goutte1-2/+2
* Route Refresh Cisco capability (128) * ORF Cisco capability (130) Issue reported by Garri Djavadyan Bug: 12605 Change-Id: Icb19cd6a75315e5af4772dd7833a5b762bdd7ff4 Reviewed-on: https://code.wireshark.org/review/16373 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-10NAS-EPS: Add preference to bypass a heuristic decode of a ciphered NAS.Binh Trinh1-2/+11
Change-Id: Ifedb82bbcb29ab978ffb9ce2f485ac9ff0712fc2 Reviewed-on: https://code.wireshark.org/review/16363 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-07-10pvfs2: clean up dissect_pvfs_distribution()Martin Kaiser1-22/+18
remove unnecessary variable initializers remove an unnecessary if (tree) check Change-Id: I4c5326c11efe4fe38fb606a45ca7674484e9421c Reviewed-on: https://code.wireshark.org/review/16371 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-07-10mp2t: use tvb_new_subset_remaining() instead of tvb_new_proxy()Martin Kaiser1-3/+1
the latter is internal to the tvb code and not meant to be called from a dissector Change-Id: Iee5af3d59329aeef8156f0bbbd5c765cac4e314d Reviewed-on: https://code.wireshark.org/review/16364 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-10[Automatic update for 2016-07-10]Gerald Combs2-11/+151
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9d1c7b06a449a3b0dc02dd99f33c4e7634e2d1c0 Reviewed-on: https://code.wireshark.org/review/16368 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-10iso14443: the uid size is a generated itemMartin Kaiser1-1/+3
Change-Id: I77952e0099ed8103c8316becafc700866b4c46d8 Reviewed-on: https://code.wireshark.org/review/16366 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-07-10iso14443: expert info for invalid uid sizeMartin Kaiser1-5/+16
Change-Id: I3181375c3a2c8a905e1fd8bb722ac27902735ff0 Reviewed-on: https://code.wireshark.org/review/16365 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-07-09IPv6: Remove obsolete commentJoão Valverde1-3/+0
WS_INET6_ADDRSTRLEN should be used instead of INET6_ADDRSTRLEN. Change-Id: Id937ca72361f4f1b3cad2c18b1067c3fddc527a9 Reviewed-on: https://code.wireshark.org/review/16359 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-09packet-wsp.c: Fix infinite loop in add_headersMichael Mann1-0/+15
Bug: 12594 Change-Id: Id86d1e5f2db12871bc1b345721e79e57192f01e1 Reviewed-on: https://code.wireshark.org/review/16355 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-07-08Fix value_string_ext_free() constnessJoão Valverde2-3/+3
Don't declare destructor as taking a const argument. Change-Id: I9badfe400718bef41a0e0a00d4b3d1b0bb2879d1 Reviewed-on: https://code.wireshark.org/review/16342 Reviewed-by: João Valverde <j@v6e.pt> 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-07-08IPv6: Remove a memcpy()João Valverde1-16/+14
Replace CamelCase and remove unnecessary casts too. Change-Id: Iacf56912448c0e0dc0fe21477d6b71ba9caba69a Reviewed-on: https://code.wireshark.org/review/16344 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: João Valverde <j@v6e.pt>
2016-07-08fixed some juniper vn dissector bugsAmitoj Setia1-8/+8
Change-Id: I67ea5df962266c1476d1d1b6234e831018138422 Reviewed-on: https://code.wireshark.org/review/16341 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-07-08GSM RLC/MAC: register dissectors for EC-GSM-IoT control messagesPascal Quantin1-0/+22
Change-Id: I8fe84cc98b8967c529c07ff17014648610ad8660 Reviewed-on: https://code.wireshark.org/review/16340 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-07-08MAC LTE: upgrade dissector to v13.2.0Pascal Quantin2-24/+159
Change-Id: Ic859d69583ca3c342d4775511b68fc276f3290a4 Reviewed-on: https://code.wireshark.org/review/16339 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-07-08couchbase: Fix Dead Store (Dead assignement/Dead increment) Warning found by ↵Alexis La Goutte1-1/+0
Clang Change-Id: Ie1e3b071388b3527bba1088af69d76dcb8d6981a Reviewed-on: https://code.wireshark.org/review/16333 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-07-08APRS: more cleanup.Jeff Morriss1-245/+75
There's no need to create global structures with pointers to the (global) hf's to pass into the dissection functions. Just reference the global variables directly. Remove other global variables passed as arguments while we're at it. Remove boilerplate comments. Change-Id: I7ce6b356172aa25983f4cc6a007a0158cb7f26c9 Reviewed-on: https://code.wireshark.org/review/16331 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-07-08APRS: clean up some header fields.Jeff Morriss1-22/+22
Try to make the names self-explanatory (without relying on blurbs). Change-Id: Icfb4797282987b42ac68709b431d8b7248a0a633 Reviewed-on: https://code.wireshark.org/review/16330 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-08ZigBee GreenPower: Fix GP Pairing command dissection.dsrsupport1-1/+1
Fix length of Sink GroupID in GP Pairing command. Change-Id: I5905812456faa0181ee1cc13824a12ce2583d4e0 Reviewed-on: https://code.wireshark.org/review/16335 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-07-08p1: Add BuiltInEncodedInformationTypes.telexStig Bjørlykke2-1/+7
This is for completeness. Change-Id: Id89f649aa836dd011f0967cdbdc905916b4d2182 Reviewed-on: https://code.wireshark.org/review/16334 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-07-08nbifom: fix no previous prototype for 'proto_register_nbifom' ↵Alexis La Goutte1-0/+2
[-Wmissing-prototypes] Change-Id: I4456cfd6600986b2e0c1cecf7d3054f3e829a210 Reviewed-on: https://code.wireshark.org/review/16332 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-07Clean up fixed field handlingJoerg Mayer1-828/+555
- Get rid of FF_FIELD macro. Use resoved strings instead. - Reorder add_ff_ functions so we don't need forward declarations - Replace add_fixed_field call by call to resolved function - Remove add_fixed_field and all structs and enums exclusive to it. - #if 0 out unused function add_ff_relay_capable_sta_info Change-Id: I9955febb317f3e7c1b9ae28a5ee9c6a6472f7e9c Reviewed-on: https://code.wireshark.org/review/16328 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-07-07APRS: register the storm fields.Jeff Morriss1-39/+57
There's been a comment here since 2012 about them being unregistered. Put in some registrations based on a feeble understanding of the specification (these are all strings, add them as such); that should be close enough and is much better than the (dissector) assertion we'd get otherwise. Don't bother putting those hf's in a global structure and passing around the structure: the hf's are global anyway--just reference them directly. Add a link to the specification while we're here. Change-Id: Ia7b17e92a996a1a8eb4a4489eff9fca042190a32 Reviewed-on: https://code.wireshark.org/review/16318 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-07PAPI: Update Header fieldAlexis La Goutte1-33/+57
Change-Id: I0c2a522ea70e62b6962c99729068e962beb21085 Reviewed-on: https://code.wireshark.org/review/15572 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-07-06openSAFETY: Simplify handling of SN Fail/AckRoland Knall1-47/+61
Also add information about error group/code acknowledged, and additional parameter set missing, if applicable Change-Id: I911d9941a33ff4064649090908e0fcc2bf6e00f8 Reviewed-on: https://code.wireshark.org/review/16319 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-07-06ATM PW: don't use macros to generate hf entries.Jeff Morriss1-20/+27
The macros weren't saving much code, were confusing checkhf.pl, and were hiding useability problems with the fields (such as names equal to the abbreviation and having several fields with the same abbreviation--things checkAPIs.pl can check now that the macros are out of the way). Change-Id: Id2ba67d09ce7dd424aee9d7f2e25eb54fa432d98 Reviewed-on: https://code.wireshark.org/review/16315 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-06LAT: use ENC_ASCII when adding strings.Jeff Morriss1-10/+10
Change-Id: If3970fbc25d4085037fb975498de02449e2c25c1 Reviewed-on: https://code.wireshark.org/review/16317 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-06LAT: register several hf's.Jeff Morriss1-0/+16
Found by checkhf.pl Change-Id: If985d04f24a188ac402bc11cf61d29aa418ad242 Reviewed-on: https://code.wireshark.org/review/16314 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-06DIS: Introduced support of Collision PDUHendrik Uhlmann1-0/+95
Parse all Attributes of Collision PDU and display them in wireshark HMI. Change-Id: I3003c6dd709498cc6c1adf784800047d0984bafa Reviewed-on: https://code.wireshark.org/review/16299 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: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-07-06packet-couchbase.c: describe observe-seqno (0x91)Sergey Avseyev1-2/+70
Change-Id: I6018a57a8ae947ee68aa35901398d504d35b99c7 Reviewed-on: https://code.wireshark.org/review/16312 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-07-05Rename PIDL MakefileJoão Valverde2-1/+1
Otherwise it will get overwritten by the in-tree cmake build. Issue reported by Rémy Léone. Change-Id: I0d908973386bcb70585f5e32c36456230967bb7f Reviewed-on: https://code.wireshark.org/review/16305 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-07-05bgp: add return check (CID 1354417).Dario Lombardo1-2/+3
Change-Id: Id8be1d5f6346686087d747167ec44df2b88dd35e Reviewed-on: https://code.wireshark.org/review/16304 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: Dario Lombardo <lomato@gmail.com>
2016-07-05tap: check return value (CID 1355643).Dario Lombardo1-1/+3
Change-Id: I03b141c7aeaa1bc06dc126c5cc8f0d001a57c116 Reviewed-on: https://code.wireshark.org/review/16302 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-07-05openSAFETY: Add byte offset of frameRoland Knall2-0/+10
Add the absolute byte offset of each openSAFETY frame to dissection, so a change in the offset can be easily detected Change-Id: Ib935eff7ba1e2e1169cb9071a5c9703cc58fc123 Reviewed-on: https://code.wireshark.org/review/16301 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-07-05dis: cast to guint64 to avoid potential overflow (CID 1214480).Dario Lombardo1-1/+1
Change-Id: I24ae4a7a5ef8b4ed363ec849ac9c8aeeefe836dd Reviewed-on: https://code.wireshark.org/review/16288 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-07-05Network-Based IP Flow Mobility (NBIFOM) dissectorPascal Quantin5-21/+596
Based on 3GPP 24.161 V13.1.0 Change-Id: I7bf635c862bf7e0b73fd05bc8a55c900d1f4dd87 Reviewed-on: https://code.wireshark.org/review/16291 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-07-04Style fix and trailing whitespace fix.Guy Harris1-2/+3
Change-Id: I03a438fa58f84939f6245426cbe725e6196c2560 Reviewed-on: https://code.wireshark.org/review/16297 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-04Add a length check.Guy Harris1-1/+5
Make sure the LBMR TNWG Interest record's length is at least the size of a minimum-length LBMR TNWG Interest record. Hopefully this will fix the real problem about which CID 1363025 is complaining. Change-Id: I60d94a054ec1ba4fb32b0cdd361995a584fe74a6 Reviewed-on: https://code.wireshark.org/review/16296 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-04Add length checks.Guy Harris1-4/+8
Make sure the authentication trailer length is large enough for a minimum-length authentication trailer. Hopefully this fixes the real problem reported by CID 1363027. Use proto_tree_add_item_ret_uint() while we're at it. Change-Id: I3377f2a52a26f00eeb24ee5776853ffc6e4f7cce Reviewed-on: https://code.wireshark.org/review/16295 Reviewed-by: Guy Harris <guy@alum.mit.edu>