aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
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>
2017-11-30RRC: reset strbuf pointer after its usePascal Quantin2-45/+114
While we are at it, let's add a partial dissection of PLMN-IdentityWithOptionalMCC-r6 IE. Bug: 14248 Change-Id: I20b76bc74c248914db21629f8ce77799fccb1612 Reviewed-on: https://code.wireshark.org/review/24661 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-30http2: select fields from Decompressed header tab when possiblePeter Wu1-14/+18
The "Decompressed header" tab contains some human-readable text, but no field was associated with it. Instead, the fields were attached to raw compressed headers which, all with the same offset and length. Ensure that each byte in the decompressed header tab is accounted for. The only fields that are still pointing to the raw compressed buffer is the http2.header field (covering a full raw header), the representation type (a few bits, at most 1 octet) and the index length (guessed length, an exact value is probably not worth the cpu cycles). Change-Id: Ic0118e9ed583841a2d353f8b8c28dcafea3401f2 Reviewed-on: https://code.wireshark.org/review/24660 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-30CIP Safety: base packet length can be usedMichael Mann1-1/+1
Slight adjustment to I394fa91a5cfa1700fb12441d4884c0367b39df8b Change-Id: Id097a39265f49a79f3d39855ef6b5c95ffe8c4f1 Reviewed-on: https://code.wireshark.org/review/24654 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30RTPS: Added link to the DCPSPublicationData frame numberJuanjo Martin1-7/+18
Added a link inside the Topic Information feature so users can quickly go to the discovery data associated with the writer sending this submessage. Change-Id: I3a89630a275e5d857e8bbf86dc5171c9f0921d5b Reviewed-on: https://code.wireshark.org/review/24646 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30RTPS: Added new endpoints for the Security specJuanjo Martin2-40/+51
Change-Id: Ia827c43b161a2b64804b0eac220b428eb853d255 Reviewed-on: https://code.wireshark.org/review/24647 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30RRC: Fixup wmem_strbuf usage.Gerald Combs2-35/+39
Instead of calling wmem_strbuf_finalize, which frees the strbuf structure and makes it unsuitable for reuse, call wmem_strdup + wmem_strbuf_truncate. This fixes a heap-use-after-free. Bug: 14248 Change-Id: I498e10ed9f9afa7fa72b607eb43f68c710de777e Reviewed-on: https://code.wireshark.org/review/24650 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30NetBIOS: Don't write past the beginning of a buffer.Gerald Combs1-1/+2
Make sure process_netbios_name doesn't write past the beginning of its buffer. Bug: 14249 Change-Id: Idb294ba2362e48b879bc4c0c0ddaf64fcf1b5d72 Reviewed-on: https://code.wireshark.org/review/24651 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-29LTE L2 protocols: add FT_FRAMENUM_TYPE for most FT_FRAMENUM fields.Martin Mathieson4-13/+45
Missed out some that would probably result in too many links. Added FT_FRAMENUM_RETRANS_PREV and FT_FRAMENUM_RETRANS_NEXT to enum, these display as arrows like REQUEST and RESPONSE do. Change-Id: I6e8d222955f2ba59a713e8a389837b55a1c7f262 Reviewed-on: https://code.wireshark.org/review/24600 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2017-11-29[L2TP] Enhance info col layout.AndersBroman1-6/+7
Change-Id: Ib16b71b47f97516db55412f1881d995706e723b1 Reviewed-on: https://code.wireshark.org/review/24645 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29cmake: fix build with cmake 2.8.11.2Peter Wu1-3/+4
"file(GENERATE ...)" is only supported since 2.8.12, since the list of sources is fixed at cmake time, just use "file(WRITE ...)". Change-Id: If4a547803ab536cf8d131045692d3e58301b0cd2 Fixes: v2.5.0rc0-1763-gfe0c2b0485 ("Rewrite make-dissector-reg.py in C") Reviewed-on: https://code.wireshark.org/review/24638 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29[packer-ehdlc.c] Mark some fields as generated, enhance info col.AndersBroman1-3/+10
Change-Id: I10241389dbd3c463b36c5dfcd7a4fa929a1bbf6a Reviewed-on: https://code.wireshark.org/review/24644 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29autotools: remove unnecessary include directory for epanPeter Wu1-1/+1
Since v2.1.0rc0-2202-g6b54fbf3bf, wslua is also not necessary in the include path, so remove that too. Change-Id: Ib227b71b08da9fc397d6618b60100ab819570b86 Reviewed-on: https://code.wireshark.org/review/24640 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-29cmake: match include directories with autotoolsPeter Wu3-0/+4
Match closer the behavior of autotools which does not include epan in its include paths by default. Change-Id: I885bc7942490a5674c6ac75f9a8ea221555e3784 Reviewed-on: https://code.wireshark.org/review/24639 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-29make-dissectors: Use g_file_set_contents()João Valverde1-25/+39
Also add some more errors checks, we only pass valid files to make-dissectors. Change-Id: I9c068e47f35ee6c3da0112ee9ce905af35030475 Reviewed-on: https://code.wireshark.org/review/24625 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29RTPS: Added DataWriter QoS to topic information featureJuanjo Martin2-12/+58
Change-Id: Ib8d9c4f75543ed05c1bf69589069ed2425e3394e Reviewed-on: https://code.wireshark.org/review/24555 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29RTPS: Added locator and product version to Micro DDSJuanjo Martin2-17/+29
Change-Id: Icfb1c505865f5a32152cc056173baae8f7d01f36 Reviewed-on: https://code.wireshark.org/review/24603 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29Threads: Set lifetimes and add a compatibility routine.Gerald Combs1-18/+6
Join the protocol registration threads so that they call g_thread_unref which in turn detaches/terminates the thread. This gets rid of many TSan and DRD errors here. The remaining ones appear to be false positives. Add g_thread_new to glib-compat (untested). Change-Id: I4beb6746ed08656715cf7870ac63ff80cf1ef871 Reviewed-on: https://code.wireshark.org/review/24619 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-11-29CIP Safety: check packet length before dissectingPascal Quantin1-0/+5
Otherwise we can call CRC functions with a negative value, leading to a segmentation fault. Bug: 14250 Change-Id: I394fa91a5cfa1700fb12441d4884c0367b39df8b Reviewed-on: https://code.wireshark.org/review/24621 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29Use a separate Boolean to indicate whether we have a duration.Guy Harris1-3/+10
Reserved values are a bit of a hack. (If this were Swift....) Change-Id: I243e8f497345f44d94af6106287556b8831fba92 Reviewed-on: https://code.wireshark.org/review/24633 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-28ZigBee: Add remaining attributes from Smart Energy Metering clusterKenneth Soerensen1-3/+731
Change-Id: I7ca67ceaf72a1e4cc1c7b3ccc8fed79fafefe575 Reviewed-on: https://code.wireshark.org/review/24614 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-26TLS13: update for draft -22 (Server Hello, HRR, CCS, NST)Peter Wu4-30/+129
Draft -22 moved the server version to an extension and makes HRR look like a SH. SH is now interpreted as TLS 1.2. Detecting TLS 1.3/HRR requires scanning SH extensions before parsing the message, so do that. Changes: - Add draft 22 version identifier. - Recognize special Server Hello magic for HRR. - Dissect SupportedVersions for SH/HRR, rename the field to match spec. - Recognise new Server Hello format (including legacy fields). - Move version detection up to handshake message dissection to allow HRR (disguised as SH) to be detected as such. DTLS does not have HRR and fragmentation makes it harder, so use its version as usual. - Ignore ChangeCipherSpec again for draft 22 (do not add expert info). - Allow NST ticket_nonce to be empty. Change-Id: I9d5f7dba173e1b5c901bf9a6917c65520ee60a2f Ping-Bug: 12779 Reviewed-on: https://code.wireshark.org/review/24340 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 14:10:15 +0000