aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2017-12-14epan: Make expert info summary text mandatoryStig Bjørlykke4-9/+7
This will make the code easier and removes the use of a generic "Expert Info" as name. Change-Id: I57ad2adb851726106ddc5009f3c6ca61721f647a Reviewed-on: https://code.wireshark.org/review/24792 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14ieee1905: Fix an incorrect flags dissection.Richard Sharpe1-1/+1
Change-Id: Iebb434875eac08aeabab6b9179a882817149012c Reviewed-on: https://code.wireshark.org/review/24820 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14ieee1905: Fix for a malformed packet with a Steering request.Richard Sharpe1-5/+27
If the mode bit is zero, we have to do different things than if it is 1. Change-Id: I5ed8bec1d350c02b736818cad5ab864748145686 Reviewed-on: https://code.wireshark.org/review/24775 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2017-12-14Register the UDS dissector by name.Guy Harris1-3/+4
See https://ask.wireshark.org/question/891/use-uds-dissector-inside-doip-dissector/ Change-Id: I608b4ffb90e65fd31e9f3e421f4c473f4e66bebd Reviewed-on: https://code.wireshark.org/review/24818 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-13epan: Use expert info summary text as field nameStig Bjørlykke2-3/+7
Change the expert info registry to use summary text as field name instead of blurb to show the correct column header tooltip in custom columns. Preserve backward compability by not use empty summary text. Change-Id: Ibbaf142165be0d9f42d1e2476f39f8d251ea0593 Reviewed-on: https://code.wireshark.org/review/24788 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-13epan: Show a check mark in custom columns for FT_NONE typesStig Bjørlykke1-8/+1
This is valuable when adding a expert info field as custom column, but will also make sense for other FT_NONE types. Change-Id: Ib1a14c59a5450f2e713f190aecf3484586d116c4 Reviewed-on: https://code.wireshark.org/review/24787 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-12epan: Use check mark in protocol custom columnStig Bjørlykke1-2/+3
Change from the text "Yes" to a utf8 check mark to indicate the precense of a protocol in custom columns. Change-Id: I9510333fc12148bf1f61aa2ddea2c6d390a9491a Reviewed-on: https://code.wireshark.org/review/24783 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-12nfapi: Add missing expert info summaryStig Bjørlykke1-2/+2
Change-Id: Iba6330f9c7f27e82adfa967fe9b082920a5b0afa Reviewed-on: https://code.wireshark.org/review/24785 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-12-12ieee80211: Add additional ANQP IEs defined in IEEE802.11-2016.Richard Sharpe1-16/+66
Dissect the Venue URL element. More to come. Change-Id: I64330b3f90f9f6222df0fb00d3ea277f59424e98 Reviewed-on: https://code.wireshark.org/review/24776 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-12-11SIP statistics: use flipped indices for tables when incrementing statsMartin Mathieson1-2/+2
Change-Id: I22ed38b1c2d7849e8930149fb39ee14fa198a6e1 Reviewed-on: https://code.wireshark.org/review/24771 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2017-12-11SIP statistics: fix problems with invalid itemsMartin Mathieson1-5/+9
Change-Id: Ide21489cad66e4bebaafe5ef813a000db2956a2e Reviewed-on: https://code.wireshark.org/review/24759 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-11Rewrite make-tap-reg.py in CJoão Valverde1-2/+0
Change-Id: Ief5b1fffecc9712c01ff10292c403b7c84a5908a Reviewed-on: https://code.wireshark.org/review/24756 Reviewed-by: João Valverde <j@v6e.pt>
2017-12-11NTP: fix authenticator dissection when padding is usedPascal Quantin1-3/+17
Bug: 14269 Change-Id: Ifdc9af7524a0566e33acbedff3757cff416ce8fb Reviewed-on: https://code.wireshark.org/review/24758 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-11NTP: fix parsing of multiple comma separated identifiersPascal Quantin1-2/+7
Bug: 14268 Change-Id: Id1d6040052d34d3f8bdfe49d20f4f3f8efbe001b Reviewed-on: https://code.wireshark.org/review/24755 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10Add support for MongoDB OP_COMPRESSED packetsDerick Rethans1-48/+216
Bug: 14259 Change-Id: Iab6b494bebaa913267f94d41b7950b67dd406cb6 Reviewed-on: https://code.wireshark.org/review/24705 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10SOCKS: Display right version in pseudo headerUli Heilmeier1-14/+17
Use the previous recorded version as version and set field as generated. Bug: 14262 Change-Id: I0872ed826ccd8a5a1b75b071d810404d08ddc7b3 Reviewed-on: https://code.wireshark.org/review/24741 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10asterix: wrong presentation of fields I009/080 in CAT009.Marko Hrastovec1-3/+3
Fields I009/080 were wrongly represented for CAT009. 8 and 16 bit long fields were represented as 24 bit. Change-Id: I5bd1c1f006292f58d0290ced80dde22324cb4002 Reviewed-on: https://code.wireshark.org/review/24746 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10LLDP: Add 802.3 TLV Additional Ethernet Capabilities (Subtype 7)Anton Glukhov1-0/+59
Bug: 14267 Change-Id: I23eb82a2f9bb2d57952f71870cc0fc8f12f036df Signed-off-by: Anton Glukhov <anton.a.glukhov@gmail.com> Reviewed-on: https://code.wireshark.org/review/24735 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-09make-dissectors: Indent and cleanup #includeJoão Valverde1-26/+32
Change-Id: I395d0c168a6ba2fc8fad85598e6355493b897a7a Reviewed-on: https://code.wireshark.org/review/24748 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-09[MIPv6] Fixed IPv4 Home Address OptionMatej Tkac1-1/+0
Change-Id: I1c09ac390d5a40c92fc30cf114a3a13359b46eee Reviewed-on: https://code.wireshark.org/review/24738 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-08Typing error correction for CAT002 settings selection.Marko Hrastovec1-1/+1
Two settings had the same string "Select the CAT001 version". One should be CAT002. Change-Id: Iee6204a1064af786338d1b53c7b983763b985a0c Reviewed-on: https://code.wireshark.org/review/24745 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-08[SCTP] Export of reassembled PDU uses wrong tvb.AndersBroman1-1/+1
Change-Id: I87ff6ef54dff5900a4a92406c87693fec6d9f692 Reviewed-on: https://code.wireshark.org/review/24737 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-08Have the frame_tvbuff.c routines not use the global cfile.Guy Harris2-0/+4
Have the routines that create them take a pointer to a struct packet_provider_data, store that in the tvbuff data, and use it to get the wtap from which packets are being read. While we're at it, don't include globals.h in any header files, and include it in source files iff the source file actually uses cfile. Add whatever includes that requires. Change-Id: I9f1ee391f951dc427ff62c80f67aa4877a37c229 Reviewed-on: https://code.wireshark.org/review/24733 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08Hand the packet provider functions to epan_new().Guy Harris4-50/+34
Have separate packet_provider_data structures and packet_provider_funcs structures; the latter holds a table of functions that libwireshark can call for information about packets, the latter holds the data that those functions use. This means we no longer need to expose the structure of an epan_t outside epan/epan.c; get rid of epan/epan-int.h. Change-Id: I381b88993aa19e55720ce02c42ad33738e3f51f4 Reviewed-on: https://code.wireshark.org/review/24732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08Move the frame_set stuff back into the capture_file structure.Guy Harris7-141/+22
libwireshark now expects an epan_t to be created with a pointer to a "packet provider" structure; that structure is opaque within libwireshark, and a pointer to it is passed to the callbacks that provide interface names, interface, descriptions, user comments, and packet time stamps, and that set user comments. The code that calls epan_new() is expected to provide those callbacks, and to define the structure, which can be used by the providers. If none of the callbacks need that extra information, the "packet provider" structure can be null. Have a "file" packet provider for all the programs that provide packets from a file. Change-Id: I4b5709a3dd7b098ebd7d2a7d95bcdd7b5903c1a0 Reviewed-on: https://code.wireshark.org/review/24731 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-07Qt: Use QTextLayout in ByteViewText.Gerald Combs1-14/+3
Use QTextLayout to draw each line in ByteViewText instead of drawing fragments ourselves. Build our pixel-to-byte-offset map when we draw our first line, which should hopefully make it more accurate. This should fix layout and hover issues on some systems. Start moving common code to DataPrinter. Mark prefs.gui_hex_dump_highlight_style GTK+ only. Bug: 11844 Change-Id: Ifda16ae7dc1a5ea22570c0bfd0eb20cee621bfc9 Reviewed-on: https://code.wireshark.org/review/24717 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-12-07mongo: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I60ee2a37ff166b80ce11cf1c12e9c575bba85529 Reviewed-on: https://code.wireshark.org/review/24722 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Derick Rethans <github@derickrethans.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-06frame user comments: move to epan, add support for user comments in sharkd.Jakub Zawadzki2-0/+35
Change-Id: Id15edc60177b160fd09cae99de1c9e01e17d9421 Reviewed-on: https://code.wireshark.org/review/24714 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-06netlink-netfilter: Add NFQA_CT and NFEXP conntrack dissectorsKevin Cernekee1-4/+813
Add support for the netlink messages used by userspace conntrack helpers. Change-Id: I37d3829399834f578a0ab0f08eab99f119445ff5 Reviewed-on: https://code.wireshark.org/review/24695 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-04Fix loop bounds check.Guy Harris1-2/+2
Fix indentation while we're at it. Change-Id: If8acaa944fd4c1aae848faa3a99f7566e003e801 Reviewed-on: https://code.wireshark.org/review/24707 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-04[decode_as.c] Use g_list_prepend() insted of g_list_append, it's faster.AndersBroman1-1/+1
Change-Id: I56c4a7948da48d02c81c5cf30187a6eeb973db77 Reviewed-on: https://code.wireshark.org/review/24700 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04make-dissectors: Fix null pointer dereference for error conditionJoão Valverde1-1/+1
Found by scan-build. Change-Id: I89b56bac951ccb7054d494592928306a860f9e5e Reviewed-on: https://code.wireshark.org/review/24697 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04tshark: fix pdml export for LUA casesPavel Strnad1-0/+2
- bug fix for wrong level introduced in SHA-1:b8ead953 - fix indent for Close off fake wrapper protocol Change-Id: Iccb10af8f3ac1604fc5582d730f2fd39ffaeb1c0 Reviewed-on: https://code.wireshark.org/review/24681 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-04Let a "past the on-the-network length" exception terminate dissection.Guy Harris1-5/+5
Don't make sure we have the full server entry before trying to dissect it; that way, a malformed frame that was really too short on the network (as opposed to being cut short by a snapshot length) will get reported as such. Change-Id: Ib7f0d909645a698162ebcd9b3fe8dd2d520983b7 Reviewed-on: https://code.wireshark.org/review/24696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-04RTPS: Added new PIDs to SecurityJuanjo Martin2-4/+220
Change-Id: I91ffb48ac5435d4eb45b60f8083762b2151de2c3 Reviewed-on: https://code.wireshark.org/review/24671 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04Show retx prev and next framenum types as chevronsMartin Mathieson1-1/+1
Change-Id: I1641c70130a7562db9ea099770d8b5a7fe6e5532 Reviewed-on: https://code.wireshark.org/review/24676 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04Put the structure of a capture_file back in cfile.h.Guy Harris1-1/+0
The split isn't necessary now that epan no longer uses the capture_file structure. Change-Id: Ia232712a2fb5db511865805518e8d03509b2167f Reviewed-on: https://code.wireshark.org/review/24693 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-04Move the parts of a capture_file used by libwireshark to a new structure.Guy Harris6-23/+107
Embed one of those structures in a capture_file, and have a struct epan_session point to that structure rather than to a capture_file. Pass that structure to the routines that fetch data that libwireshark uses when dissecting. That separates the stuff that libwireshark expects from the stuff that it doesn't look at. Change-Id: Ia3cd28efb9622476437a2ce32204597fae720877 Reviewed-on: https://code.wireshark.org/review/24692 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-03Clean up dissection of server entries in SAP responses.Guy Harris1-19/+52
Have the top-level protocol tree item for a server entry cover the entire entry, rather than just the server name. Have the server name be just another entry under that top-level item. Change-Id: I8089f3e132a0f388c87ba04caa3d15f5146c2303 Reviewed-on: https://code.wireshark.org/review/24688 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-03Use cfile.h to define the capture_file type.Guy Harris3-7/+17
Have cfile-int.h declare the structure, and use it in files that directly access the structure. Have cfile.h just incompletely declare the structure and include it rather than explicitly declaring it in source files or other header files. Never directly refer to struct _capture_file except when typedeffing capture_file. Add #includes as necessary, now that cfile.h doesn't drag in a ton of Change-Id: I7931c8039d75ff7c980b0f2a6e221f20e602a556 Reviewed-on: https://code.wireshark.org/review/24686 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-03[Automatic update for 2017-12-03]Gerald Combs1-5/+50
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I4a3a5f62e5024a4df19c12296ddd67012c9ff5c7 Reviewed-on: https://code.wireshark.org/review/24683 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-03LDP: Add support for MP2MP FECUli Heilmeier1-0/+2
As stated in https://tools.ietf.org/html/rfc6388#section-3.2 MP2MP uses the same structure as the P2MP FEC element. Bug: 13171 Change-Id: Ia619deac6075f5eb27dff2144edbbb60b440cc46 Reviewed-on: https://code.wireshark.org/review/24677 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-01MPLS: Add Media Access Control (MAC) Address Withdrawal over Static ↵Alexis La Goutte5-0/+264
Pseudowire (RFC 7769 Bug: 14208 Change-Id: I80beda971b3727566c107dba0efdee0291529c42 Reviewed-on: https://code.wireshark.org/review/24560 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Francesco Fondelli <francesco.fondelli@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-01Get rid of some void pointers.Gerald Combs2-10/+12
Explictly struct _capture_file * in epan_session and its callbacks. Change-Id: I63703015c661a08f3350a7448a7bcdaf98f119dc Reviewed-on: https://code.wireshark.org/review/24675 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-01TDS: Improve TDS7 Prelogin request/response handlingCraig Jackson1-77/+112
- Fix detection of TDS7 Prelogin responses to have fewer false positives. This was causing regular responses to be recognized as Prelogin responses if they happened to begin with a DONEINPROC token. - Define symbolic constents for the Prelogin options. - Apply the version_convert processing to the relevant prelogin options as well as to the loginack_progversion. - Correct the display of the program version in version_convert. - Factor out the setting of tds7_version so it can be called from the dissect_tds7_login as well as dissect_tds_login_ack_token. This is needed to correctly handle tokens which come before the loginack token in the login response. - Fix the wording of a comment in my last commit. Change-Id: I57615bbb1e780db37cda25d8d5d7f964f68b337e Reviewed-on: https://code.wireshark.org/review/24664 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-01ZigBee: Correct Smart Energy Publish Block Thresholds and endianessKenneth Soerensen1-8/+13
Change-Id: I1007fdff01b370c06a8ccfb1145fd162ffde9a94 Reviewed-on: https://code.wireshark.org/review/24674 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-12-01RTPS: Fixed a quick typo in a hf itemJuanjo Martin1-1/+1
Change-Id: I71315900a4fd5130ab051854bc70dbc4ba9afc2b Reviewed-on: https://code.wireshark.org/review/24672 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-30RRC: Improve C-RNTI resolvingDarien Spencer7-42/+54
Now also trying to resolve C-RNTIs in FACH from the global RNTIs map Change-Id: If9ce5b73d6855271c15001fd73d8acaaaf9d1864 Reviewed-on: https://code.wireshark.org/review/24665 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30packet-rsl.c: Use value-string in RXLEV and RXQUAL fieldsPau Espin Pedrol4-16/+17
RXLEV and RXQUAL fields in RSL "Uplink Measurements" use same scale format (0-63, 0-7) as RXLEV and RXQUAL in RR. RXQUAL value-string is moved to packet-gsm_a_common.c in order to use it in both protocols. Change-Id: Idadd9505225353fec76b9605e2045a5222669475 Reviewed-on: https://code.wireshark.org/review/24663 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-11-30rrc: Remove unused GTreeDarien Spencer4-25/+7
Change-Id: I137ac55cd99e659db9d9a496cc82f4427300765d Reviewed-on: https://code.wireshark.org/review/24662 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>