aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-03-21Fix case.Guy Harris1-1/+1
Change-Id: I328aae5396cdd071f2c87cded46b8eb747e61dec Reviewed-on: https://code.wireshark.org/review/26582 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-20Add new dot3MauTypes from RFC 4836Joerg Mayer1-7/+27
Change-Id: I998efdfd065c17fce20eb1596d9a247015327ecb Reviewed-on: https://code.wireshark.org/review/26578 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-03-20Note that exit_application() has UI-specific implementations.Guy Harris1-0/+1
Change-Id: I79d51dd4301451d4158d172d0b05094cb3d5d61b Reviewed-on: https://code.wireshark.org/review/26576 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-20Remove redundant declaration of exit_application().Guy Harris1-3/+0
Change-Id: I60c9236a53083f14d1f7b94c7db66172944d17bf Reviewed-on: https://code.wireshark.org/review/26575 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-20gui_utils(.c): fix no previous prototype for ‘exit_application’ ↵Alexis La Goutte1-0/+2
[-Wmissing-prototypes] Change-Id: I975fdc9ce7aa53208fc13cc76dcf0bb7a4a58bcd Reviewed-on: https://code.wireshark.org/review/26569 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-20html2text: Wrap at 72 characters.Gerald Combs1-1/+1
Change-Id: Id8c9d74b71cabce6bbfb25fd857f71c4b2a4e8ea Reviewed-on: https://code.wireshark.org/review/26556 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-20WCCP : fix mask assignmentYuri Chislov1-1/+1
Bug: 14538 Change-Id: I87afe01064e8940140d6fa8de3df778aad4e4dd7 Reviewed-on: https://code.wireshark.org/review/26550 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-03-20TLS13: fix decryption with KeyUpdate after draft -20Peter Wu1-5/+9
Draft -20 shortened the label used by Key Update, adjust accordingly. Change-Id: I3761b94933165a65fd810eff7bef4373290346cd Ping-Bug: 12779 Reviewed-on: https://code.wireshark.org/review/26554 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-20Update to couchbase dissector for 'flexible framing extras' on errorsJim Walker1-5/+6
The flexible framing extras can be on success and error packets, so move the call to dissect out of the success path. See: https://github.com/couchbase/kv_engine/blob/master/docs/BinaryProtocol.md#response-header-with-flexible-framing-extras Change-Id: I6fdadf4a90bd1e9c2b1e6e37793cc7a105fad3a6 Reviewed-on: https://code.wireshark.org/review/26566 Reviewed-by: Dave Rigby <daver@couchbase.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-20X2AP: include packet-x2ap.hPascal Quantin2-7/+9
This should solve the missing prototypes warnings Change-Id: Iaf2ac6c0a151cfb614f76c4a6bb103e0210d3808 Reviewed-on: https://code.wireshark.org/review/26567 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-20Handle Clang/C2.Guy Harris1-0/+18
Microsoft have a C/C++ compiler with a Clang front end and their code generator: https://blogs.msdn.microsoft.com/vcblog/tag/clang/ Try to detect it. (It's not too late.) Change-Id: I574e3f985f376727df77081b429cad7f3d1f5d70 Reviewed-on: https://code.wireshark.org/review/26563 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-20Don't register the link-layer 802.11 dissector in the gre.proto table.Guy Harris1-24/+24
That dissector expects to be handed an 802.11 pseudoheader; the GRE dissector passes the flags and version from the GRE header to subdissectors registered in the gre.proto table, so they'd better either expect the flags-and-version structure or ignore the pseudoheader. (For 802.11, the pseudoheader has radio information, but that's not available from GRE.) Use the no-FCS 802.11 frame dissector instead. Bug: 14544 Change-Id: I6515901dc3674eb36ec768fa4f9a7a4040a78365 Reviewed-on: https://code.wireshark.org/review/26560 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-20QUIC: ensure Initial Packet decryption at first passPeter Wu1-3/+1
Change-Id: Ie17397feb646ae1dc7a53c1386c568ee11c29154 Ping-Bug: 13881 Reviewed-on: https://code.wireshark.org/review/26557 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-19Fix and update the vagrant build systemSake Blok3-7/+7
Fix a dependency issue for the vagrant build system and update it to the latest Ubuntu LTS release (16.04 LTS). Also give it more vCPU's and RAM by default. Change-Id: I058e6a05356dba57a55ada7fe84f959e227a04b4 Reviewed-on: https://code.wireshark.org/review/26541 Reviewed-by: Sake Blok <sake.blok@SYN-bit.nl>
2018-03-19wmem: ensure wmem_memdup(..., NULL, 0) returns NULLPeter Wu3-2/+10
Rather than requiring all callers to pass a non-null source argument, explicitly allow a NULL source when the size is zero. This is consistent with g_memdup behavior. While at it, fix a memleak and avoid memset(0,0,0) in tests. Change-Id: I86a092625a508544d180da959e4afdd0366539f4 Reviewed-on: https://code.wireshark.org/review/26496 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Mališa Vučinić <malishav@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus <eapache@gmail.com>
2018-03-19wmem: fix random test failure due to key collisionPeter Wu1-1/+4
Fixes sporadic test failure in buildbot: ERROR:epan/wmem/wmem_test.c:1170:wmem_test_tree: assertion failed: (wmem_tree_count(tree) == CONTAINER_ITERS) Change-Id: Ia33b54d8f0a7afc37fa9356aa868c4a7b896e7da Test: wmem_test --seed R02S674cddedb75a1db84fb9698ac51213c0 Reviewed-on: https://code.wireshark.org/review/26501 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus <eapache@gmail.com>
2018-03-19GSMTAP: add the handle to dissect LTE NAS EPS messagesMartin Heusse1-4/+37
GSMTAP_TYPE_LTE_NAS has been set to 0x12 by osmocom: https://gerrit.osmocom.org/5018 Change-Id: Ia248e54cd73eaa9b8ad02aa40145e5a87baca79e Reviewed-on: https://code.wireshark.org/review/24554 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-19S1AP: fix filtering on cell-IDPavel Strnad2-4/+23
Filter does not work due to same shared short name for cell-id being used for two different asn.1 defintions cell-ID OCTET STRING, cell-ID CellIdentity, Change-Id: I5921bc82d46f38d43f9083e41d3a0558821042eb Reviewed-on: https://code.wireshark.org/review/26545 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pavel Strnad <pavel_strnad@hotmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-19MAC-NR: unify BSR filtersPascal Quantin1-173/+399
Use a single filter for short/long (truncated) BS values to ease filtering. Rename other filters to the new mac-nr.bsr.* format. Fill the missing entries in 8 bits buffer size levels array. Change-Id: If150f9a951efb40e554c5ea18639cfd4539a1319 Reviewed-on: https://code.wireshark.org/review/26539 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-03-186lowpan: Add option to toggle IID U/L bitStig Bjørlykke1-1/+9
RFC 7668 section 3.2.2 states that IID formed from the 48-bit Bluetooth device addresses does not toggle the Universal/Local bit, but Linux kernel BT IPSP code before version 4.12 does toggle this bit. Add an option to turn this on when needed. Change-Id: I77f84a5d56e77bb2c61770237fe53367498cc194 Reviewed-on: https://code.wireshark.org/review/26533 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-03-18Make a function not used outside this file static.Guy Harris1-1/+2
Change-Id: I8e1a2b0655083403ee0e7efccc976a1a27db8fa4 Reviewed-on: https://code.wireshark.org/review/26540 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-18Qt: allow keyboard navigation in Unsaved packets dialogPeter Wu2-0/+4
Currently the "Continue without Saving" button is visually highlighted in the "Unsaved packets..." dialog, but pressing Enter triggers "Save" instead. Even after changing button focus with arrow or tab keys, pressing Enter will not confirm the action (but Spacebar does). Restore the expected behavior for Linux and Windows, but preserve the fix for macOS since (for which this was originally added). Bug: 14531 Change-Id: Ic20fc5809b55949f6fd960bcb32618a4fa7fd1e9 Fixes: v2.3.0rc0-2672-gb0335359e5 ("Qt: Give discard button focus (but not as default)") Reviewed-on: https://code.wireshark.org/review/26511 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-18QUIC: use GLib constantJaap Keuter1-1/+1
Fix build failure: use G_MAXUINT64 instead of UINT64_MAX. Change-Id: Ie4fc1c3398088863e5db320beeae2b93cd6823c3 Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/26532 Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-03-18ERSPAN: Remove redundant version checkJoerg Mayer1-4/+2
Change-Id: I6f7601983c8bda52d6687a7e1f02e8611f468df3 Reviewed-on: https://code.wireshark.org/review/26531 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-03-18ERSPAN: Various small cleanups and enhancementsJoerg Mayer3-92/+153
Pass Type I vs. II/III via dissector data instead of pinfo Append type to protocol name Put vlan number into pinfo when appropriate Put version 1 and version 2 dissection into separate blocks Rename priority into cos (as per draft-rfc) Add new subheader from draft-3 Change-Id: I6eb7fe7073a6cc92e2028b0491de5e0f3f036b4e Reviewed-on: https://code.wireshark.org/review/26512 Petri-Dish: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-03-18[Automatic update for 2018-03-18]Gerald Combs11-125/+207
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I9424882cb781156d38c634b91defcd45cd3f4743 Reviewed-on: https://code.wireshark.org/review/26528 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-18Qt: ensure field is visible on selection from bytes viewPeter Wu5-75/+7
Ensure that a selected field (via selectedFieldChanged) becomes visible in the packet details view when selected from the bytes view (or when found via a search). As making a field always visible seems a desirable feature (and in the interest of simplifying preferences), enable this by default using the smarter EnsureVisible hint. Remove the associated preferences and mark them GTK+ only. Change-Id: I05a918c1e09135c0b4e10f04024bff092756e55c Fixes: v2.5.0rc0-2383-g6b2764a41e ("ProtoTree behavior fixes.") Reviewed-on: https://code.wireshark.org/review/26509 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-03-17tap-tcp-stream: fix indentation.Dario Lombardo1-17/+22
Change-Id: I9ec60866dc674d9ec682afc6d644d78255182cac Reviewed-on: https://code.wireshark.org/review/26526 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-17tap-tcp-stream: replace some g_malloc with g_new.Dario Lombardo1-3/+3
Change-Id: I25414be8ea73b986ea84294686a1d97159e1e2c7 Reviewed-on: https://code.wireshark.org/review/26525 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-17tap-iax2-analysis: fix minor indentation issues.Dario Lombardo1-5/+9
Change-Id: I778fb32450e43a28b15e78e1e90ed7b69d4f341a Reviewed-on: https://code.wireshark.org/review/26524 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-17tap-sctp: replace g_malloc with g_new.Dario Lombardo1-15/+15
When allocating structs this increases a lot the code readability. Change-Id: I86b26ea3debb400d6e1e8012206008740e528b23 Reviewed-on: https://code.wireshark.org/review/26523 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-17tap-sctp: remove guint32 unneeded allocations.Dario Lombardo1-9/+6
They've been replaced by direct cast. Change-Id: I99fbc0463af724dc2592fbfe24a63c645902c703 Reviewed-on: https://code.wireshark.org/review/26522 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-17CQL: ensure that there is at least one column to display rowsPascal Quantin1-11/+13
Bug: 14530 Change-Id: Ie5729c00ea4d826dbae028b3a4653acf746b92b8 Reviewed-on: https://code.wireshark.org/review/26521 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>
2018-03-17QUIC: Add dissection of Full Packet Number (PKN)Alexis La Goutte1-15/+92
Bug: 13881 Change-Id: I84fdcd48529268c83d48dea633338ed84c647535 Reviewed-on: https://code.wireshark.org/review/26508 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-03-17MAC-NR: add BCCH BCH decodingPascal Quantin1-5/+100
Change-Id: I7a3b99ce99c8589286a6e99728e809a9c9475977 Reviewed-on: https://code.wireshark.org/review/26519 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-17MAC-NR: minor display adjustmentsPascal Quantin1-9/+9
Change-Id: Ib599eb5ca979cb1214576e6932eb8b1bf3bdc560 Reviewed-on: https://code.wireshark.org/review/26518 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-03-17The number of beams field has the wrong title: was System Data LengthGraham Shanks1-1/+1
which is the name of the field before it Change-Id: I7661bcff58b8a1031dcde84dd46499b7b93b42df Reviewed-on: https://code.wireshark.org/review/26517 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-17NSIS: Link to Npcap.Gerald Combs6-26/+31
Mention Npcap on the WinPcap installer page and add a link to it. Update some other text and tell developers to use NSIS 3.0 while we're here. Change-Id: I64728f014f518439ba4a38eda7a283274d40fcdc Reviewed-on: https://code.wireshark.org/review/26515 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-17WSDG: More CMake updates.Gerald Combs2-13/+62
Switch a build example to CMake + Ninja. Add syntax highlighting annotations. Change-Id: I5ee0af548f44ed5be6f6e8367f5167dc499df017 Reviewed-on: https://code.wireshark.org/review/26514 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-16colum-utils.h: Fix 325 million -Wdocumentation warningsJoerg Mayer1-3/+2
Change-Id: I5ce6fbf4a536ffe72ef7c83d8d4f4f3c79155a8e Reviewed-on: https://code.wireshark.org/review/26513 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-03-16F1AP: initial dissector submission based on v15.0.0Pascal Quantin27-132/+7404
Change-Id: Icf5c128119afa86efddb87e744f7aecb8bf71e09 Reviewed-on: https://code.wireshark.org/review/26506 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-16Tidy up LTE mac and RLC headers - trivial things seen while adding NR versionsMartin Mathieson2-4/+28
Change-Id: I354dbf60daa3a4fb961d1f8411971bd892a735d2 Reviewed-on: https://code.wireshark.org/review/26502 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-16More CMake documentation updates.Gerald Combs2-10/+16
Change-Id: Ia568e0f46e7a38007bb9b8ea3d6c92233921cc46 Reviewed-on: https://code.wireshark.org/review/26504 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-16CSS: Add a margin.Gerald Combs1-1/+1
Change-Id: Ib6da6455f7af8a7cfd9dae3ef6a8511a100a184b Reviewed-on: https://code.wireshark.org/review/26503 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-16Fix dist.Gerald Combs2-0/+2
Change-Id: I527aa3a23532ace69aa842b09af70c3b5bca4938 Reviewed-on: https://code.wireshark.org/review/26500 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-16CSS: Fix a font.Gerald Combs1-1/+1
Change-Id: I90b24efa863240986b30cc7ab2692c3883838798 Reviewed-on: https://code.wireshark.org/review/26499 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-16OSCORE: Decrypt responses and dissect plaintext with CoAP functionsMališa Vučinić3-30/+82
Add support for decrypting Observe responses with Partial IV within the response. CoAP prioritizes the Partial IV from the response if present, if not it passes Partial IV from the corresponding request. Bug: 14417 Change-Id: Icb0f782de67bd0507db4f1f2a2ea90c72a4b6f0a Reviewed-on: https://code.wireshark.org/review/25483 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-03-16CoAP: Refactor code, option and payload dissectionMališa Vučinić2-415/+514
OSCORE plaintext contains CoAP code, some CoAP options and CoAP payload. To avoid code duplication, CoAP dissection of these fields used by OSCORE is generalized and exported in packet-coap.h. Exported functions and their subroutines now operate explicitly on local variables. This allows OSCORE dissector to pass its header fields. Use of "offset_end" instead of "coap_length" to denote the end of message. Bug: 14417 Change-Id: If51b0d585ab29d46c1c550fbf264fd3765ed4c32 Reviewed-on: https://code.wireshark.org/review/25482 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-03-16CoAP: Hooks to OSCOREMališa Vučinić2-24/+90
Structure oscore_info_t carries parameters needed by OSCORE for decryption. These parameters are communicated in the CoAP layer within the Object-Security option. To decrypt a response, OSCORE needs the parameters from the corresponding request. Matching of responses to requests on the CoAP layer is leveraged to pass the correct parameters to OSCORE. This change adds an oscore_info_t pointer to coap_info and coap_transaction structures in order to pass the parameters on to the OSCORE dissector. Dissection of Object-Security option is reworked to make use of the new coap_info element, instead of relying on local variables. Bug: 14417 Change-Id: I173057ba95407675aaa539ddbff51d02337551bc Reviewed-on: https://code.wireshark.org/review/25481 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-03-16OSCORE: Add the new dissector - decrypt and verify the authenticity of requestsMališa Vučinić5-0/+930
This change introduces the OSCORE dissector, following draft-ietf-core-object-security-07. It performs decryption and authenticity check on requests. Bug: 14417 Change-Id: I92e45d66d5df51f6d4dbea4ef44e707955b65bee Reviewed-on: https://code.wireshark.org/review/25480 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 22:20:07 +0000