aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-eap.c
AgeCommit message (Collapse)AuthorFilesLines
2019-08-19EAP: use new tls_set_appdata_dissector API to set the dissectorPeter Wu1-5/+5
Passing the appdata dissector via the data parameter caused crashes due to type confusion, use an alternative, indirect method instead. Change-Id: I1de3de4e7daf4504c176a6ad8947037606aa20bb Depends-On: I4770d03f912dd75f92878dd74ad830ebb7eb1431 Reviewed-on: https://code.wireshark.org/review/34312 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-15EAP: add support for EAP-PEAPPeter Wu1-0/+3
Tested with the three captures from the linked bug: eap-peap-gtc.pcapng, eap-peap-md5.pcapng, eap-peap-mschapv2.pcapng. Bug: 15597 Change-Id: Idb1fb2809d05648a3b961af8dbdd9b35c3284c13 Reviewed-on: https://code.wireshark.org/review/34294 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-15EAP, Diameter: add EAP-TTLS and EAP-Message dissection supportPeter Wu1-50/+77
Add support for dissecting the decrypted TLS payload as Diameter. Add support for dissecting the EAP-Message attribute as EAP. Disable retransmission detection when EAP-Message is detected (EAP in TLS in EAP) since this results in false positives. Tested with captures from Bug 15603: * eap-ttls-pap.pcapng - ok, User-Name and User-Password AVPs. * eap-ttls-eap-gtc.pcapng, eap-ttls-eap-md5.pcapng - EAP-Message AVP. * eap-ttls-mschapv2.pcapng - partially supported, does not conform to Diameter AVP requirements as it is not padded. Microsoft vendor types are also not yet supported. To be fixed later. * eapttls-diameter-avp.pcapng (Bug 12880) - EAP-Message AVP. Bug: 12880 Bug: 15603 Change-Id: Ie7ea282d05c1d3ff8463c34bf259107562714440 Reviewed-on: https://code.wireshark.org/review/34281 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-15EAP: show expert info for bad EAP lengthsPeter Wu1-2/+7
The EAP length field must cover at least Code (1 byte), ID (1 byte), Length (1 byte) and not have missing data afterwards. Bug: 14406 Change-Id: I829e2aa33e5f286d55d2e8249457e118e7c3ebcc Reviewed-on: https://code.wireshark.org/review/34292 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-14EAP: rename some identity fieldAlexis La Goutte1-2/+2
Bug: 15991 Change-Id: Ie180f4d8e018e31a138bfaf526fc8538d110901c Reviewed-on: https://code.wireshark.org/review/34285 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-13EAP: ignore retransmissions to avoid breaking EAP-TTLS reassemblyPeter Wu1-5/+45
Remember the most recently seen Identifier field for the authenticator and peer. Flag packets that mismatch and skip further processing if it could modify the state as is the case for EAP-TTLS. Bug: 5056 Change-Id: If439d5ef2ae390208f678ff271d3036efaf9fa7f Reviewed-on: https://code.wireshark.org/review/34261 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-12EAP: force a new conversation at EAP-Request/IdentifyPeter Wu1-72/+17
TLS requires unique conversations for every TLS session. With EAP-TTLS over EAPOL, only a single conversation was created, breaking TLS. Force a new conversation at the start of the EAP protocol to fix this. This alone was not sufficient, the right conversation was not always matched. This happened due to wildcard matching in EAP (NO_PORT_B) while TLS does not use NO_PORT_B. TLS ended up setting a dummy port via "conversation_set_port2" because PT_NONE is considered connection-less. Even after treating PT_NONE as *not* connection-less in conversation.c, the EAP Success message was not correctly matched against a conversation and resulted into creation of another conversation. To avoid all of that mess, just use the same conversation matching logic as TLS, without NO_PORT_B. The original conversation tracking logic in EAP was presumably added to avoid multiple conversations for EAP over RADIUS (UDP), but that requirement does not seem necessary. Verified with `tshark -2r eap-tls-bug-cert.pcap -otls.log_file:out.txt`, two different `conversation =` values exist for the two sessions. Bug: 15983 Change-Id: I3376624ee3ea627eaa6233d39ae3c1d19bdc98bb Reviewed-on: https://code.wireshark.org/review/34247 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-11EAP: show reassembled TLS fragments only on the final framePeter Wu1-2/+2
This avoids multiple dissections on the second pass which could potentially break decryption and TLS handshake reassembly. Bug: 15982 Change-Id: I9f83fbd51c732140b831f7d5f29f46e9694e405c Reviewed-on: https://code.wireshark.org/review/34237 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-26eap: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-3/+1
Change-Id: I1ab6fc7ec046038ab130aef994081051a7f40e19 Reviewed-on: https://code.wireshark.org/review/32987 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-23EAP: Passing additional context to allow for reassembly in vendor parserDr. Lars Voelker1-8/+14
Currently an extended vendor parser only gets the vendor_type directly and the vendor_id indirectly. For some cases (eap fragmentation et al.) it is important to have access to the eap_code and the eap_identifier as well. This patch is adding this. Change-Id: I848cbe58dc4f8e4034382a9c9ca43d350a61bb18 Signed-off-by: Dr. Lars Voelker <lars-github@larsvoelker.de> Reviewed-on: https://code.wireshark.org/review/32944 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-20Adding the missing generic method to support multiple vendor-defined ext typesDr. Lars Voelker1-8/+23
The current EAP dissector assumes that all vendor-defined extended types are WPS. This does not allow for adding new vendor-defined payloads. This codes cleans up the limitation. The Vendor-ID can be registered using a dissector table, while the Vendor-Type is passed as data. Change-Id: Idc75108fd42b9b2153089db503b137c6eeefe274 Signed-off-by: Dr. Lars Voelker <lars-github@larsvoelker.de> Reviewed-on: https://code.wireshark.org/review/32888 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-27Try to squeeze some bytes out of the frame_data structure.Guy Harris1-3/+3
Make the time stamp precision a 4-bit bitfield, so, when combined with the other bitfields, we have 32 bits. That means we put the flags at the same structure level as the time stamp precision, so they can be combined; that gets rid of an extra "flags." for references to the flags. Put the two pointers next to each other, and after a multiple of 8 bytes worth of other fields, so that there's no padding before or between them. It's still not down to 64 bytes, which is the next lower power of 2, so there's more work to do. Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe Reviewed-on: https://code.wireshark.org/review/31213 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-11eap: don't dissect the identity as IMSI unless that's the case.Dario Lombardo1-2/+35
The identity in SIM/AKA/AKA' is IMSI (permanent identity) in some cases only. Others contain a pseudonym or a fast reauthentication username. Dissect the formers as flat usernames. Bug: 15196 Change-Id: Ia4491431b6ff557a248271b743c1e37c4e6c0b24 Reviewed-on: https://code.wireshark.org/review/30129 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-13Start renaming SSL to TLS.Gerald Combs1-4/+4
Rename the "ssl" protocol to "tls" and add an "ssl" alias. Prefer "TLS" over "SSL" in user interface text and in the documentation. Fix the test_tls_master_secret test while we're here. Bug: 14922 Change-Id: Iab6ba2c7c4c0f8f6dd0f6d5d90fac5e9486612f8 Reviewed-on: https://code.wireshark.org/review/29649 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-12dissectors: use SPDX identifiers.Dario Lombardo1-13/+1
Change-Id: I92c94448e6641716d03158a5f332c8b53709423a Reviewed-on: https://code.wireshark.org/review/25756 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-29Add conversation endpoint typeMichael Mann1-4/+4
For the moment this mirrors the port_type enumeration (PT_XXX), but the intent is to move away from using "port types", eliminating most (if not all) Added conversation_pt_to_endpoint_type() so that conversations deal with the correct enumeration. This is for dissector that use pinfo->ptype as input to conversation APIs. Explicit use of port types are converted to using ENDPOINT_XXX type. Change-Id: Ia0bf553a3943b702c921f185407e03ce93ebf0ef Reviewed-on: https://code.wireshark.org/review/24166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-29Register reassembly tablesMichael Mann1-15/+3
Register all reassembly tables with a central unit, allowing the central unit to have the callback that initializes and destroys the reassembly tables, rather than have dissectors do it individually. Change-Id: Ic92619c06fb5ba6f1c3012f613cae14982e101d4 Reviewed-on: https://code.wireshark.org/review/19834 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-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>
2016-12-20Make EAPOL packet types into a dissector table.Ethan Young1-0/+2
This decouples EAPOL from the few dissectors it needs to call based on packet type and moves registration to the dissectors themselves. Change-Id: Ia8412fe33370f4aeece52c2c80cda7f140a950cf Reviewed-on: https://code.wireshark.org/review/19328 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-11-06E.212: fix identification of PLMNs with 3 digits MNC ending with a 0Pascal Quantin1-4/+12
Split PLMNs arrays in 2 so as to clearly konw if the MNC is 2 or 3 digits long Bug: 13092 Change-Id: Ic5f776f3c1e5141f8739bf2137ebd046f7e4a0d6 Reviewed-on: https://code.wireshark.org/review/18679 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-09-28eap: check scanf return value (CID 1373396).Dario Lombardo1-2/+4
Change-Id: I4b602110fc3959dd7214fe15e9c37e3870794c1d Reviewed-on: https://code.wireshark.org/review/17967 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-09-25eap: add imsi to wlan identity dissection.Dario Lombardo1-10/+12
Change-Id: Ic8ff4e1846e8c0a11ee19ffbc4897635388dfa62 Reviewed-on: https://code.wireshark.org/review/17888 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-23eap: fix cast warning.Dario Lombardo1-3/+3
Change-Id: I94a4a927c91552f58ecec3d0d78efcf699bf77de Reviewed-on: https://code.wireshark.org/review/17881 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-09-23eap: dissect eap wlan identity.Dario Lombardo1-44/+99
EAP identities can be of different kind. This change adds a sort of heuristic that dissects the wlan identity in the form of <imsi>@wlan.mnc<mnc>.mcc<mcc>.3gppnetwork.org. A general purpose dissection function, acting as a proxy, has been created to make room for other specific dissections. Bug: 12921 Change-Id: Ic48aee004fa7df5ee4dbeca091ed31616d155890 Reviewed-on: https://code.wireshark.org/review/17796 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-19Improve support for single-character fields and filter expressions.Guy Harris1-7/+5
Add an FT_CHAR type, which is like FT_UINT8 except that the value is displayed as a C-style character constant. Allow use of C-style character constants in filter expressions; they can be used in comparisons with all integral types, and in "contains" operators. Use that type for some fields that appear (based on the way they're displayed, or on the use of C-style character constants in their value_string tables) to be 1-byte characters rather than 8-bit numbers. Change-Id: I39a9f0dda0bd7f4fa02a9ca8373216206f4d7135 Reviewed-on: https://code.wireshark.org/review/17787 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-17The full identity string was added above.Guy Harris1-1/+0
Change-Id: I0945cb9cb6a9d5ccf3756b887654d73a28035a49 Reviewed-on: https://code.wireshark.org/review/17768 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-17Update a comment.Guy Harris1-6/+3
In one of the two cases where we treat the first byte of an identity as a prefix, we know it's EAP-AKA. (In the other, we do *not* know that!) Change-Id: I16625f7193eb3ab0840739ec37dbd64e2a5a0fb5 Reviewed-on: https://code.wireshark.org/review/17767 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-17Fix handling of EAP identity.Guy Harris1-20/+47
There's no guarantee that the identity is a string whose first character is a prefix indicating the type of identity; only display it as a prefix if it's one of the known types. We really may need some other mechanism to determine how to parse the identity, perhaps based on what the protocol layers below it are. Put back the display of the full string in one case where that was inadvertently removed. Change-Id: I2e3324f964fa25ebd7065ddb0de82ffae6597509 Reviewed-on: https://code.wireshark.org/review/17764 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-17eap: make eap_identity_prefix a numeric itemMartin Kaiser1-11/+10
This used to be string item, its value was not 0-terminated. This resulted in out-of-bounds mem acceess when eap_identity_prefix was used by proto_tree_add_string_format(). ==14744== Conditional jump or move depends on uninitialised value(s) ==14744== at 0x4C294F8: strlen (mc_replace_strmem.c:390) ==14744== by 0xC19C97F: g_strdup (gstrfuncs.c:355) ==14744== by 0x739CA75: string_fvalue_set_string (ftype-string.c:51) ==14744== by 0x67136A9: proto_tree_add_string (proto.c:3515) ==14744== by 0x6713870: proto_tree_add_string_format (proto.c:3547) ==14744== by 0x69BB494: dissect_eap (packet-eap.c:838) ==14744== by 0x66FD0B4: call_dissector_work (packet.c:649) As the content is a number anyway, the simplest solution is to make eap_identity_prefix a numeric item and use proto_tree_add_uint_format_value(). Bug: 12913 Change-Id: I907b1d3555a96e9662b1d8253d17d35adfdada48 Reviewed-on: https://code.wireshark.org/review/17760 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-17eap: (trivial) reformat a commentMartin Kaiser1-2/+2
Change-Id: I2c8a8066f1591004ace6362e24be57b6cec747d1 Reviewed-on: https://code.wireshark.org/review/17762 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-09-17eap: remove unnecessary if (tree) checksMartin Kaiser1-55/+33
Change-Id: If42a5d610eea7c7818a0d37dd5878c84ba7f7d81 Reviewed-on: https://code.wireshark.org/review/17761 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-09-16eap: add identity details.Dario Lombardo1-3/+55
Change-Id: I60e017ac48d9daf52b8a40809625dc1ae09c9d8e Reviewed-on: https://code.wireshark.org/review/17735 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-15eap: fix EAPOL conversation tracking, fixes TLS decryptionPeter Wu1-14/+50
Use new heuristics based on the EAP Code field to determine whether a field originates from the client or server. This is more reliable than using "pinfo->match_uint" for two reasons: (1) the heuristics dissector does not set "match_uint" (resulting in an arbitrary match on the previous value) and (2) with EAP over EAPOL, there is no matching port number (resulting in two conversations with different addresses and port number zero). To fix TLS decryption, make sure to create a single conversation for both direction and allow the port type to be PT_NONE (to avoid reporting all packets as originating from the server). Bug: 12879 Change-Id: I7b4267a27ffcf68bf9d3f6a90d6e6e2093733f51 Reviewed-on: https://code.wireshark.org/review/17703 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-20Manually add protocol dependencies derived from find_dissector.Michael Mann1-1/+1
Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector. Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector. "data" dissector was not considered to be a dependency. Change-Id: I15d0d77301306587ef8e7af5876e74231816890d Reviewed-on: https://code.wireshark.org/review/14509 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-01eap-sim: add identity in response only.Dario Lombardo1-1/+1
Change-Id: I352600ac8895358816ebb561e5ac841a3498892b Reviewed-on: https://code.wireshark.org/review/14267 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-01-25Move the proto data stuff out of frame_data.[ch].Guy Harris1-0/+1
It's not tied to the frame_data structure any more, so it belongs by itself. Clean up some #includes while we're at it; in particular, frame_data.h doesn't use anything related to tvbuffs, so don't have it gratuitiously include tvbuff.h. Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c Reviewed-on: https://code.wireshark.org/review/13518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24Add the packet number to the packet_info structure, and use it.Guy Harris1-5/+5
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>
2015-12-09new_register_dissector -> register_dissector for dissector directory.Michael Mann1-1/+1
Change-Id: Ie39ef054a4a942687bd079f3a4d8c2cc55d5f22c Reviewed-on: https://code.wireshark.org/review/12485 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03Call reassembly_table_destroy for some dissectorsPeter Wu1-0/+7
This patch adds reassembly_table_destroy calls as cleanup function for dissectors which have a simple init routine that just calls reassembly_table_init (comments are ignored). The changes were automatically generated using https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=4cc0aec05dc67a51926a045e1955b7a956757b5e (with the if and assignment parsers disabled). The only difference from the autogenerated output is that the XXX comments from the init routines in smb-pipe and tds dissectors are kept. Change-Id: I64aedf7189877247282b30b0e0f83757be6199e7 Reviewed-on: https://code.wireshark.org/review/9222 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-23Remove more deprecated tvb_lengthEvan Huus1-2/+2
Change-Id: Iac23a6c804ad3720d37186559477909b2ff33eb2 Reviewed-on: https://code.wireshark.org/review/9042 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-21Cleanup use of #includes in non-generated epan/dissector/*.cBill Meier1-2/+0
Specifically: - Set packet.h to be the first wireshark #include after config.h and "system" #includes. packet.h added as an #include in some cases when missing. - Remove some #includes included (directly/indirectly) in packet.h. E.g., glib.h. (Done only for those files including packet.h). - As needed, move "system" #includes to be after config.h and before wireshark #includes. - Rework various #include file specifications for consistency. - Misc. Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95 Reviewed-on: https://code.wireshark.org/review/5923 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-05Eliminate proto_tree_add_text from some dissectors.Michael Mann1-17/+28
Other minor cleanup while in the area. Change-Id: Id8d957d3d68a2e3dd5089f490bd59d773e1be967 Reviewed-on: https://code.wireshark.org/review/3427 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>
2014-06-26convert to proto_tree_add_subtree[_format]Michael Mann1-4/+2
Change-Id: I525ac2aae2bdbfd5f3a2f3b35f1bf10dde053f66 Reviewed-on: https://code.wireshark.org/review/2667 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann1-2/+2
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo1-2/+2
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-12-19Rename a couple of to_str functions to have ep_ in the name. This makes itEvan Huus1-4/+4
obvious that the returned string is ephemeral, and opens up the original names in the API for versions that take a wmem pool (and thus can work in any scope). svn path=/trunk/; revision=54249
2013-11-23Create the ability to have packet scoped "proto" data. Bug 9470 ↵Michael Mann1-4/+4
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470) I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future. And search/replace of a function name is easy enough to do. The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As. All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope(). All other dissectors were converted to using file_scope() which was the original scope for "proto" data. svn path=/trunk/; revision=53520
2013-10-13whitespace fixes; mostly: remove trailing blanksBill Meier1-1/+1
svn path=/trunk/; revision=52591
2013-09-15Convert a few more dissectors to wmem APIPascal Quantin1-4/+4
svn path=/trunk/; revision=52052
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-23 04:22:24 +0000