aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-11-01Add ability to create endpoints through conversationsMichael Mann8-25/+67
Add endpoint information to the packet_info structure for dissectors to potentially use as their data to create conversations. This patch includes a simple "example" of using conversation_create_endpoint with TDMoP. The assignment of the PT_TDMOP "port type" has been replaced by setting ENDPOINT_TDMOP within the endpoint structure. Then when subdissectors of TDMoP call find_or_create_conversation(), it implicitly picks up the conversation information set by TDMoP Change-Id: I11dc29989cccd3b0f0349ee901babb455ca02d19 Reviewed-on: https://code.wireshark.org/review/24190 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Andrew Chernyh <andrew.chernyh@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-01configure: Fix pcap-config --cflags command substitutionJoão Valverde1-1/+1
Change-Id: I654dd34d229b4cd69b5e3a0c77d8958d12bceead Reviewed-on: https://code.wireshark.org/review/24207 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-31DOCSIS: add burst descriptor types. Fixed some bugs.Bruno Verstuyft1-18/+22
Change-Id: I9f7df2f62197c574087dbcce2c7b0ba7e6c8c56b Reviewed-on: https://code.wireshark.org/review/24197 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-31mqtt: Add message decodingStig Bjørlykke1-1/+201
Add support for configuring message decoding based on topic. Matching criteria is equal-to, contains, starts-with, ends-with or regular expression. Change-Id: I677d869716eb1d2798974e2c65605a454421a66c Reviewed-on: https://code.wireshark.org/review/24196 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-10-31s7comm: Several minor improvementsThomas Wiens1-85/+170
This patch includes several minor improvements: - Special (only for Sinumerik NC): allow NCK address description in data-part - Userdata parameter part: add text definition for second req/res - Don't add data tree in userdata telegrams, when there is no data in there - Cyclic functions: add new subfunction - Alarming: add SCAN message decoding - Improve info column display when there are multiple PDUs in one frame Change-Id: Ib9afd0c6b14cf97ed645084e095f79fb40b07f43 Reviewed-on: https://code.wireshark.org/review/24170 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-31HTTP: Update status codesUli Heilmeier2-0/+24
Updated status codes to include "103, Early Hints". s. https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml Change-Id: Ic00285c0ffafeb689bbc30533fcbdeb688528c62 Reviewed-on: https://code.wireshark.org/review/24203 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-31Qt: ByteViewTab Fix tabs creationRoland Knall1-0/+2
Fix creation of tabs Change-Id: I11b22a3964f7c25c0c88b8ecd4eec1ad480fe800 Reviewed-on: https://code.wireshark.org/review/24202 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-10-31ByteViewText: Remove epan dependancyRoland Knall10-344/+393
Remove all dependancy for the byte_view_text from the epan system, and therefore cleanly separate data and display for further separation of dissection and view Change-Id: Id1ee91b93da4511afa95f24da4cbbf39cbb89b1f Reviewed-on: https://code.wireshark.org/review/24050 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-10-31conversation_table(.h): fix parameter 'ptype/port_type_val' not found in the ↵Alexis La Goutte1-3/+3
function declaration [-Wdocumentation] Change-Id: Iea18cc73d28af68e14f7b9516b630b0987fe5731 Reviewed-on: https://code.wireshark.org/review/24195 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-31Deduplicate Elasticsearch outputChristoph Wurm1-24/+56
Collects multiple values of the same field into an array. Empty protocols are now written as empty objects to not conflict with the same protocols in other packets. Remove _score since it has no effect. Bug: 12958 Change-Id: Ibe8ea9bc1e3e63dea1fe4eaf522fa38cad88a17f Reviewed-on: https://code.wireshark.org/review/24171 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-31.mailmap: update (of October)Alexis La Goutte2-4/+4
Change-Id: I3b8d693c288edd61ec1bd9e9161919ac3ab35f52 Reviewed-on: https://code.wireshark.org/review/23850 Reviewed-by: Florian Fainelli Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-31Fix segfault in Elasticsearch outputChristoph Wurm1-15/+19
When using the Elasticsearch output but only printing the packet summary with -P a segfault will occur because the empty packet tree is not properly handled in this case. Change-Id: I0c91314ae013785ae6dceabd6af33db4b836d1b2 Reviewed-on: https://code.wireshark.org/review/24153 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-31Remove unused netdb.h #includesJoão Valverde3-12/+0
Change-Id: Ia46903586219ee79210a980a04024af02acb0db0 Reviewed-on: https://code.wireshark.org/review/24189 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-31[BSSMAP-LE] Correct dissection of 10.20 Positioning Data.Anders1-6/+62
Change-Id: Ia0c3b688dfdcd9fdad4f65df12ef97db99bdb095 Reviewed-on: https://code.wireshark.org/review/24192 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-30[BSSGP] Add PEIAnders1-1/+15
Change-Id: I64d1924aba3c11fa72fbb12121bd09bcf21d598d Reviewed-on: https://code.wireshark.org/review/24193 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-30[BSSGP] Fix IE numbering in PERFORM-LOCATION messages.Anders1-4/+4
Change-Id: If767d905177b8d78f6b5d3c4e7b8d32a9e8a596a Reviewed-on: https://code.wireshark.org/review/24191 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-30Avoid asserting with EAFNOSUPPORTJoão Valverde1-9/+34
We require support for AF_INET/AF_INET6 to run and assume this is available on all supported platforms. If and when reality clashes with that assumption just avoid aborting. Errors are to be expected as long as they don't produce a crash. Change-Id: I5c107b1a8fd64441eb96f48381412e180b66feb7 Reviewed-on: https://code.wireshark.org/review/24187 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-30tshark doc updatesGraham Bloice1-0/+5
After other changes, add info about -G help and update output from -G dissector-tables. Change-Id: I339d5c31a606720ef92e641e59ec5a45114321a8 Reviewed-on: https://code.wireshark.org/review/24188 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-10-30FT_IPv4 fields' values are 4-byte integers, not structures with a pointer.Guy Harris1-2/+1
Fix a tpyo while we're at it. Change-Id: I1bde763ec2bd188c0f8afd1069db5a9f23963e8e Reviewed-on: https://code.wireshark.org/review/24186 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-30Fix indentation.Guy Harris1-5/+5
Change-Id: I0cc9d31cbe5dc7a95908a43c093f62e13b969eec Reviewed-on: https://code.wireshark.org/review/24185 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-30[BSSGP] Fix decoding of Paging Attempt Information in PAGING PS.Anders1-2/+2
Change-Id: I46770e4e50c34f13eaf6244de0ac6345b12646b5 Reviewed-on: https://code.wireshark.org/review/24182 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-30Fix assert when trying to display an IPv4 addressPascal Quantin1-1/+2
Follow-up of gdd1c18dd Change-Id: Ifa6fc2e68f866540184a29a5fb61c3b7033bc8b2 Reviewed-on: https://code.wireshark.org/review/24180 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-30Remove port_type values not set in pinfo->ptypeMichael Mann5-15/+4
NCP and SBCCS values used for conversation (endpoints) and not to pass "type" to subdissectors. Change-Id: I56a13d2bb7d718b340e9b5a102c43f6e0012bfb9 Reviewed-on: https://code.wireshark.org/review/24174 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-30Add wsutil/inet_ipv4.h.Guy Harris6-14/+50
It defines a ws_in4_addr type, which is intended to hold IPv4 addresses in network byte order, and some macros to test for IPv4 addresses in the local network control block and multicast IPv4 addresses. Use those macros in places where dissectors had their own code for that purpose. Change-Id: I4252b410e37207157be85119a332e2a6913b332f Reviewed-on: https://code.wireshark.org/review/24178 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-30Make FT_IPv4 a bit more like FT_IPv6.Guy Harris3-17/+12
FT_IPv6 doesn't expose the prefix, which is used only for values in filter expressions, not values in protocol fields; do the same for FT_IPv4, hiding the netmask, and using fvalue_get_integer() to get the value, having it return a network-byte-order value for the address. (This also makes it opaque whether the address and netmask are stored in host or network byte order.) Change-Id: I4285a87f6ccef2c0ccec040490ddcd15d787326e Reviewed-on: https://code.wireshark.org/review/24177 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-30Get rid of ipv4_get_net_order_addr() and ipv4_get_host_order_addr().Guy Harris4-16/+5
Just directly use the addr field, converting from host to network byte order if necessary. Change-Id: Ie1cd9ea5527b7824014dc315225ad2a6adb61c38 Reviewed-on: https://code.wireshark.org/review/24176 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-29Get rid of unused #defines.Guy Harris2-5/+0
Change-Id: I6d4f56cddbe4378a3a7d4feb5ac16933675ac83b Reviewed-on: https://code.wireshark.org/review/24175 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-29Do not assert in ws_inet_ntop()João Valverde2-11/+17
Change-Id: I9d420c5f6bc29ce94855017739169dc8e8ce4d48 Reviewed-on: https://code.wireshark.org/review/24173 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-29parlay: Add another pragma to disable warningJoão Valverde1-3/+8
Use our DIAG_OFF macros instead while at it. Change-Id: I01d8d71a42fb108be156a68f8552ce537a1e2484 Reviewed-on: https://code.wireshark.org/review/15467 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-29Use endpoint_type in conversation tables and hostlistsMichael Mann25-103/+104
Follow up to having conversions use endpoint_type instead of port_type. Change-Id: Ifd59a33bd8b9a013c242bce5fcceb09533f02c17 Reviewed-on: https://code.wireshark.org/review/24172 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-29"Hardcode" the port types used by Export PDU functionalityMichael Mann4-39/+177
The "internal" port type has been serialized by export PDU functionality and nettrace_3gpp_32_423 wiretap. To better support "endpoint" functionality the port types will be removed/updated and that changes the implicit values from the port_type enum. Take a snapshot of the current port_type values and use those specific values when reading/writing export PDU data and provide conversion functions that can be modified when port_types are removed. Do the same for nettrace_3gpp_32_423 wiretap. Change-Id: I770bd0cab22e84f3cf49032fc86c5927bf85263f Reviewed-on: https://code.wireshark.org/review/24169 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-29make-manuf: Fix a comment.Gerald Combs1-1/+1
make-manuf lives in the "tools" directory. Change-Id: I9be2d44178f27d46629c439ff61f624d8d99e681 Reviewed-on: https://code.wireshark.org/review/24168 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-29Add conversation endpoint typeMichael Mann92-467/+499
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-10-29Diameter: Add Huawei DCC AVPsJeff Dyer4-0/+61
Change-Id: I480e58a1676677bb362bb4e9dc866c5d5f0814e1 Reviewed-on: https://code.wireshark.org/review/24111 Reviewed-by: Jeff Dyer <jmasterfunk@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-29sizeof(buf) is not what you want hereJoão Valverde1-6/+3
Change-Id: Iaf3463006b93c9acdc27f59fcbbea92df1d2fd7d Reviewed-on: https://code.wireshark.org/review/24164 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-29Improve our ip6_to_str_buf() implementationJoão Valverde3-25/+45
Change-Id: I02b5d01797e526299a6dc5a031662cb78e4f8423 Reviewed-on: https://code.wireshark.org/review/24163 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-29More ws_inet_ntop() tweaks.João Valverde1-2/+20
Change-Id: I8f77f189337f9299e566a4149ae6ea481d3dbed6 Reviewed-on: https://code.wireshark.org/review/24162 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-29Clean up processing of encoded addresses.Guy Harris1-77/+70
Allocate the buffer at the point we fill it in, and pick the appropriate size or let the wmem_strXXX routine do it for us. If we aren't using an address table, just fetch the value as an IPv4 address and hand it to ip_to_str_buf() - don't fetch it in host byte order and then *fix* it by byte-swapping (hint: on a big-endian machine, host byte order *is* network byte order and you don't want to swap it; not all the world's an x86). Change-Id: I966b107271ba166ff76a5600fbc4922808e7ead1 Reviewed-on: https://code.wireshark.org/review/24159 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-29[Automatic update for 2017-10-29]Gerald Combs12-14/+151
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ia316bd89a4a8d08237b0e5eb9f0036dc5a6bad61 Reviewed-on: https://code.wireshark.org/review/24157 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-29Remove unused epan/compress/ source codeJoão Valverde6-232/+1
Change-Id: I8f3bd41ff35f00b7a423751bc312725b7e7ae316 Reviewed-on: https://code.wireshark.org/review/24152 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-10-29Get rid of MAX_IP_STR_LEN and MAX_IP6_STR_LEN.Guy Harris10-16/+14
We have WS_INET_ADDRSTRLEN and WS_INET6_ADDRSTRLEN; use them. Change-Id: Idade0da9fae70d891901acd787b06d21e2ddbc5f Reviewed-on: https://code.wireshark.org/review/24156 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-29wtap.h: Replace literal buffer size with WS_INET_ADDRSTRLENJoão Valverde1-2/+3
Bug: 14149 Change-Id: Ib7d60f93373eb23f5c950607f4cf6fc832c79670 Reviewed-on: https://code.wireshark.org/review/24154 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-29Go with the RFC 2133-and-successors values for IPv4 and IPv6 address strings.Guy Harris1-4/+31
Add a comment explaining why Windows has different, larger values for INET_ADDRSTRLEN and INET6_ADDRSTRLEN. Change-Id: I4ad53c6cffae46d108f778460ce653dcc9343c64 Reviewed-on: https://code.wireshark.org/review/24155 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-29Retire use of getprotobynumber()João Valverde4-30/+1
Dead weight. If this feature is wanted getprotobynumber() should be called once on startup. Change-Id: I0358bacdc60466f676fa1aab7f4b7c9e588d8d74 Reviewed-on: https://code.wireshark.org/review/24045 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-29configure: Display ssh_user_agent as a libssh sub-optionJoão Valverde1-8/+4
Change-Id: I19e38015d1395b021bc5169a6bf37fba0c5b1fe9 Reviewed-on: https://code.wireshark.org/review/24116 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-28Privatize the conversation_key structureMichael Mann15-55/+108
The intention is to make it more transparent when making a switch to an "endpoint" over address/port combination. Change-Id: Ic424c32095ecb103bcb4f7f4079c549de2c8d9c4 Reviewed-on: https://code.wireshark.org/review/24148 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28Remove display of "old" key in GTK configuration hashtable dialogMichael Mann1-16/+1
The information was for internal debugging, presumably as conversations were converted to use the new algorithm. The algorithm has been in place for a few years now and GTK is deprecated. Change-Id: Ice0d0611bfbc0970089c671ab2cca15bfa5bf2fa Reviewed-on: https://code.wireshark.org/review/24147 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28Fix bug in FMPUX heuristic dissectorNikolai Ipatyev1-1/+1
The variables in the check were reversed Change-Id: Idc7fc2b88ac1cde699b76423890918ce4b0ac086 Reviewed-on: https://code.wireshark.org/review/24149 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28Share use of conversation_hash_exactMichael Mann4-60/+4
It was duplicated in GTK, so just make it public (at least for now) Change-Id: I89d985b2d42f0edb1c535a65a97b132920dedbcd Reviewed-on: https://code.wireshark.org/review/24146 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28Convert to using find_conversation_pinfo where appropriateMichael Mann47-240/+82
This makes it easier to identify the simpler/common conversations Change-Id: I7094f23e49156ee27f5f72c8e130308470f3e462 Reviewed-on: https://code.wireshark.org/review/24145 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-29 18:02:32 +0000