aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2016-01-05GFP: Add support for Generic Framing Procedure (ITU-T G.7041/Y.1303)John A. Thacker3-0/+681
Add support for Generic Framing Procedure. Generic Framing Procedure (GFP) is used to map octet-aligned variable length payloads (e.g. Ethernet, MPLS, octet-aligned PPP, IP) into octet-synchronous signals such as SONET/SDH (ITU-T G.707) and OTN (ITU-T G.709). GFP is a telecommunications industry standard defined in ITU-T G.7041/Y.1303. (https://www.itu.int/rec/T-REC-G.7041/) Bug: 11961 Change-Id: Idf5b311e82b051b1ee65bde5149b3de405537b02 Reviewed-on: https://code.wireshark.org/review/13043 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-01-04Don't walk the entire protocol tree to extract the value of one field.Guy Harris3-3/+14
Instead, prime the epan_dissect_t's tree to look for rtp.ssrc, and extract that value with proto_get_finfo_ptr_array(). Also, have the filter used to check whether the packet is a candidate for RTP analysis to check for RTPv2 (and add a check for IPv4 or IPv6 back to the Qt version), and get rid of an unnecessary extra level of indirection for that string. In the Qt version, if findStreams() set the error string, don't overwrite it with a "No streams found." indication, and fix error handling for the "filter didn't compile" case. Change-Id: I09d0ea37ccd4806d99e3b6394f2a8a376e974705 Reviewed-on: https://code.wireshark.org/review/13045 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-04PPP: fix registration of CRTP (CNTCP) protocolPascal Quantin1-0/+1
Also protect against any badly registered protocol Bug: 11958 Change-Id: I0c03f50c2c5478a9524ad06e669510ffb5739b21 Reviewed-on: https://code.wireshark.org/review/13041 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-04C12.22: fix compilation without LibgcryptPascal Quantin1-4/+6
Change-Id: I9ef842b4ed543cfbd199e49496bc01a09f71404b Reviewed-on: https://code.wireshark.org/review/13039 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-04IPv6: Don't export Shim6 protocol parametersJoão Valverde2-47/+47
Change-Id: Ic279965ec4fff22825a9cf8e4819fb24f3cf8475 Reviewed-on: https://code.wireshark.org/review/13026 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-01-04Added/extended handling of CPU message systemThomas Wiens3-36/+1491
The message system includes mode-transition and alarm events by PLC programmed blocks. The IDs in the mode-transition events are the same as used in a SZL response, so I used the same decoding function. Change-Id: If00990c21190ba0bed7933d6c8cfb590c6d8eab2 Reviewed-on: https://code.wireshark.org/review/13032 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-01-04Remove extraneous stuff from a comment.Guy Harris1-1/+0
(Probably inserted by a script.) Change-Id: Ibf4e4d84c0c036841971df8dad54a916502d6909 Reviewed-on: https://code.wireshark.org/review/13036 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-04Rename ipv4_addr and ipv6_addr to indicate their full contents.Guy Harris12-110/+113
They're not just addresses, they also include a mask length for IPv4 and a prefix length for IPv6. Rename them appropriately. Rename the old ipv4_addr_and_mask() and ipv6_addr_and_mask() to reflect that 1) they fetch data from a tvbuff and 2) *don't* fetch the mask length or prefix length, those lengths are passed as arguments to indicate how many bytes worth of address to fetch. Change-Id: I4cad5a186ad7bfcb60022a91dbe8bc8479e6471f Reviewed-on: https://code.wireshark.org/review/13035 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-01-03Rename ipv6-utils.h to ipv6.h.Guy Harris13-13/+13
By analogy to ipv4.h. Change-Id: I147565b332024b1bb88e9cd15889255773d04524 Reviewed-on: https://code.wireshark.org/review/13034 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-01-03[Automatic update for 2016-01-03]Gerald Combs2-1/+11
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia31206d914b7e024d71a88edd2c66ed8b3cbf4be Reviewed-on: https://code.wireshark.org/review/13028 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-03Pass SslPacketInfo structure directly to SSL tap instead of having listeners ↵Michael Mann1-2/+2
get it themselves anyway. Change-Id: I3817d12e473b67e26159e1562a08169e91f51d46 Reviewed-on: https://code.wireshark.org/review/13019 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-01-03Add HTTP Follow streamMichael Mann3-4/+27
This automatically detects and decompresses HTTP along a TCP stream through the use of taps. Bug: 3528 Change-Id: I8ab832d509700d0da8eabf3c3e514d8511c598d3 Reviewed-on: https://code.wireshark.org/review/13009 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-01-03If you want nstime_t, include <wsutil/nstime.h>.Guy Harris1-4/+4
Don't just define struct nstime_t yourself. Change-Id: I275f53c6c9f34813898e7ffe4493583017fbf7f0 Reviewed-on: https://code.wireshark.org/review/13021 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-03If you want struct e_in6_addr, include <epan/ipv6-utils.h>.Guy Harris3-4/+2
Don't just define it yourself. (And especially don't define it yourself if you're already including epan/ipv6-utils.h.) Change-Id: I9970d0edecef0c820b2a7fdce34509b54e7b3106 Reviewed-on: https://code.wireshark.org/review/13020 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-03Clean up error checking and handling.Guy Harris1-71/+55
The TLV length includes the T and the V, so it must be at least 4; fail if it's not. If the IPv4 or IPv6 prefix length isn't valid, don't bother trying to parse the rest of the addresses, just give up. Don't bother returning offset values that aren't used. Rename some routines to indicate that they process more than one item. Add some comments while we're at it. Change-Id: I6825216f0e7218e230d8d60d958b3c2453a3bb62 Reviewed-on: https://code.wireshark.org/review/13016 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-03IPv6: Minor rename, cleanup (Shim6)João Valverde1-6/+9
Change-Id: Ia799910f72674702c98f146525171d29f1b35432 Reviewed-on: https://code.wireshark.org/review/13006 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-03EIGRP: field eigrp.ipv4.destination does not show the correct destinationAlexis La Goutte1-4/+8
Reported by Fredrik Lönnman Bug:11953 Change-Id: Icaff04122e8ed94751ea8aeb4069be2fc2dda52c Reviewed-on: https://code.wireshark.org/review/13007 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-03proto.c: Disable warning when loading a symbol [-Wpedantic]João Valverde1-4/+12
Change-Id: I309764e9cd0784c674a3cd91050eb697404561c6 Reviewed-on: https://code.wireshark.org/review/13012 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-03Fix some constness issues [-Wcast-qual]João Valverde4-10/+13
Change-Id: I111558df3d36436ddf5e2728f113b022cc48a713 Reviewed-on: https://code.wireshark.org/review/13013 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-02Get rid of an unnecessary level of indirection.Guy Harris1-31/+29
Instead of an array of pointers to preference values, have an array of preference values. Clean up some white space while we're at it. Change-Id: Iaa2cf6bcc2a271a5c2645ddbb2dbddba311b413d Reviewed-on: https://code.wireshark.org/review/13002 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-02Use #defines for the values for the facility_encoding preference.Guy Harris1-7/+9
Change-Id: I496782308e2f2e9605f2256d7a482d50b086e49c Reviewed-on: https://code.wireshark.org/review/13001 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01ifdef out the decryption code and preferences if LIBGCRYPT isn't defined.Guy Harris1-24/+24
Change-Id: Idf4f1e461d3bc6e85f2760488ad566a4cd70c5ea Reviewed-on: https://code.wireshark.org/review/12999 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01DNP3: dissector cleanupGraham Bloice1-130/+126
Cleaned up handling of the qualifier field. Sub-parts are now identified as the prefix and range rather than index and code. This has changed the field names; dnp3.al.objq.index -> dnp3.al.objq.prefix dnp3.al.objq.code -> dnp3.al.objq.range and the associated packet tree details text strings. Change-Id: I42d51b71233303eaf8b37982dd15b5090918630b Reviewed-on: https://code.wireshark.org/review/12998 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-01-01Only use nibble logic to determine MPLS payloadMichael Mann1-17/+13
Bug: 11949 Change-Id: I625d80ce01918bd050889d21236aaa4cde4af8d0 Reviewed-on: https://code.wireshark.org/review/12961 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-01-01Make color filters part of dissectionMichael Mann5-32/+55
Color filters can be seen as a function that takes a tree and display filters as input and a (possibly empty) coloring rule as output. This coloring rule is then added to the frame tree and used by the GUI for coloring the packets list. From an architectural POV, "coloring" is part of the UI component, but since it influences the tree, it is something for the dissection component. Bug: 5703 Bug: 6099 Change-Id: I73d132ec1dca7262bcb1b55c8481ca564c6161d1 Reviewed-on: https://code.wireshark.org/review/12507 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-01-01Clean up response matching type preference.Guy Harris1-14/+19
Add #defines for all the value types and use them. Make the preference static, as it's not used outside this module. Change-Id: I3ed715701f77d5ea6cc45c8f978d6e2da7b38671 Reviewed-on: https://code.wireshark.org/review/12988 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01Clean up response matching type preference.Guy Harris1-14/+17
Add #defines for all the value types and use them. Make the preference static, as it's not used outside this module. Change-Id: Ibd04274b4160d18a55b10f47ce866ac97a76309e Reviewed-on: https://code.wireshark.org/review/12987 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01Get rid of trailing whitespace.Guy Harris1-3/+3
Change-Id: If6347938525194c08465b9b383edf8fb7eaf1e49 Reviewed-on: https://code.wireshark.org/review/12986 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01No need for toolkit-dependent color initialization.Guy Harris3-63/+71
We're not allocating colors ourselves in GTK+ (and haven't been doing so since at least 1.12), and all color_t values are valid colors, so we don't need any toolkit-specific processing to fill in a color_t. While we're at it, catch read errors when reading color filter files. Change-Id: Ieb520d141cf15e371a31a01459d466c95ba2209b Reviewed-on: https://code.wireshark.org/review/12985 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01Get rid of the "pixel" member of a color_t.Guy Harris2-24/+5
Now that we're letting GTK+/GDK allocate colors behind the scenes, if it allocates them at all, there's no reason to save the allocated color in the toolkit-independent color value. Change-Id: I99df32bd6b07924f41f3d855d2ddecb3dc8d5201 Reviewed-on: https://code.wireshark.org/review/12983 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31uat: Fix warnings [-Wcast-qual]João Valverde3-15/+15
uat_fld_tostr_cb_t callback *out_ptr argument is g_mallocated and is to be freed by the caller so drop constness requirement to fix the corresponding g_free warnings. Change-Id: I1be25fa3e2f54fb32058ac0b5c1631b193b07701 Reviewed-on: https://code.wireshark.org/review/12943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't allocate something until we know we need it.Guy Harris1-5/+3
From change I1be25fa3e2f54fb32058ac0b5c1631b193b07701. Change-Id: Iad01cd4c5920afcdc1f8329937f4141cf8bc0ab4 Reviewed-on: https://code.wireshark.org/review/12979 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't cast away constness.Guy Harris1-3/+4
Save a non-const pointer and use it when freeing. Fix some indentation while we're at it. Change-Id: Iad2451130c4d1f252ad9f63b12205cd1aae70eb7 Reviewed-on: https://code.wireshark.org/review/12978 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Squelch a compiler warning.Guy Harris1-1/+1
Change-Id: I8933cbc250e3d1a3c6867f8166bc5b584b82211c Reviewed-on: https://code.wireshark.org/review/12977 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't cast away constness.Guy Harris1-4/+3
Change-Id: I37a1923c2e463346244cd5e56daf22122d119d78 Reviewed-on: https://code.wireshark.org/review/12976 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't cast away constness.Guy Harris1-1/+1
Change-Id: I14130b4be91f36a4dbc187f2eef6d6c438a75774 Reviewed-on: https://code.wireshark.org/review/12975 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't cast away constness.Guy Harris1-33/+33
Change-Id: I6b5a6099cd90f2e148625c1a1eb3fb36262e8c39 Reviewed-on: https://code.wireshark.org/review/12972 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't cast away constness.Guy Harris1-3/+3
Change-Id: I8ca89bea19d7d014b81713455c85d2253f906058 Reviewed-on: https://code.wireshark.org/review/12971 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Use wmem_strdup_printf().Guy Harris1-2/+1
Change-Id: Ifb9dd16ab4435c23ea2914e16a65a17f9c61c0cb Reviewed-on: https://code.wireshark.org/review/12970 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Clean up setting the port and address.Guy Harris1-8/+13
Change-Id: I2384424c410e83d299e810467734bfc5428d1182 Reviewed-on: https://code.wireshark.org/review/12969 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Don't cast away constness.Guy Harris1-1/+1
Change-Id: I75c782185b8847abf8c985572d8280271ba00a5a Reviewed-on: https://code.wireshark.org/review/12968 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Get rid of unused #defines.Guy Harris1-18/+0
Change-Id: I589d8c9b99425eb1893d61e4730864f0b2718acf Reviewed-on: https://code.wireshark.org/review/12967 Reviewed-by: Guy Harris <guy@alum.mit.edu>
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-31Don't throw away constness.Guy Harris1-3/+3
Change-Id: Ia0b014c3d9e4fcaa6f81cdb23dc76f9d384b782b Reviewed-on: https://code.wireshark.org/review/12963 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Use wmem_memdup() instead of wmem_alloc() followed by memcpy().Guy Harris1-8/+4
Change-Id: Ia937fe15a371a3109178ba619dbdb3a6db3897ee Reviewed-on: https://code.wireshark.org/review/12962 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31[iso14443] continue dissection of the ATSMartin Kaiser1-4/+62
display the individual bytes the next step is to dissect the meaning of their bits Change-Id: Id93bcdb3913886365dbd0fb3fdedc7ed0c63be93 Reviewed-on: https://code.wireshark.org/review/12957 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-12-30GTP: fix Dual Stack with one static and one Dynamic IP dissectionPascal Quantin1-4/+18
Bug: 11945 Change-Id: I759baec7c9af6d2502c5d3c151cb5c6adcf3d25f Reviewed-on: https://code.wireshark.org/review/12950 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-30LBM: No need to cast to 'void *' [-Wcast-qual]João Valverde1-1/+1
Change-Id: Ib179fdbdfe8edf8a83b3ff0de323bd26b4bb8362 Reviewed-on: https://code.wireshark.org/review/12945 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-30Zbee (ZCL Closures): Fix Dead Store (Dead assignement/Dead increment) ↵Alexis La Goutte1-1/+1
Warning found by Clang Change-Id: Ic9dbdfbce7a1a3e29d1b59e9d1c56ee695a532ff Reviewed-on: https://code.wireshark.org/review/12917 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-30Zbee (Zcl Closures): fix FT_BOOLEAN with a bitmask must specify a 'parent ↵Alexis La Goutte1-2/+2
field width' for 'display' found by checkAPIs Change-Id: Ie2a77896f50b438cee1226c9702b0932acaefb84 Reviewed-on: https://code.wireshark.org/review/12926 Reviewed-by: Aditya Jain <aditya.jain@samsung.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 11:35:05 +0000