aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-04-15Expand and clean up comments.Guy Harris1-4/+23
Change-Id: Ie87615c664e3fec70356f86675b219c7a6462417 Reviewed-on: https://code.wireshark.org/review/26948 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-15Clean up the way we handle the FCS.Guy Harris1-36/+100
For the "802.15.4 with FCS" link-layer type, strip what FCS we find, if any, off and use that new tvbuff for all dissection except for checking and dissection of the FCS itself. For the "802.15.4 without FCS" link-layer type, don't fake an uncaptured FCS by increasing the reported length, just use the tvbuff as is. This means we handle 802.15.4 the same way we handle other link-layer types where the FCS might, or might not, appear as part of the captured data. Change-Id: Ia91b7fb0aad495876be00bf813c6b6517e5e11d7 Reviewed-on: https://code.wireshark.org/review/26947 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-14DTN: Minor changes for Bundle-Integrity/Confidentiality Block payloadKrishnamurthy Mayya1-2/+2
Change-Id: I0d4458e02c9e1f747659fb116906ca44515a9033 Reviewed-on: https://code.wireshark.org/review/26941 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-14Bluetooth: ATT: Fix cast-warningsMichał Łabędzki1-11/+11
1. Use explicit cast from gint16 to gint then to gdouble - I can understand my compiler - implicit cast is not explicit cast 2. Fix const cast by remove "const" from one field but add it whenever possible in other places Change-Id: Iab7401f972c40bca2df58f91b89e29cf2d7cf11b Reviewed-on: https://code.wireshark.org/review/26917 Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki <michal.labedzki@wireshark.org>
2018-04-14packet-pcep.c: opposite inner 'if' condition leads to a dead code blockchinarulezzz1-6/+7
Change-Id: I13e32d7f333c3e50085c0008d7677f4c6d0611d4 Reviewed-on: https://code.wireshark.org/review/26928 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-14PDCP NR: remove a now meaningless commentPascal Quantin1-2/+0
Change-Id: Ie234abdad7be9fd6f68d6676bae37286ee5dca2f Reviewed-on: https://code.wireshark.org/review/26938 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-14PDCP LTE: reuse existing pdcp_lte_info structure after first passPascal Quantin2-94/+94
Change-Id: I3fbd95cbdbf958d4b6b93f0b7511be9ee772608c Reviewed-on: https://code.wireshark.org/review/26932 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-14RLC LTE: reuse existing rlc_lte_info structure after first passPascal Quantin1-67/+62
Change-Id: I0f0022ec1d04b466e9725684708088486d5f181c Reviewed-on: https://code.wireshark.org/review/26931 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-14MAC LTE: reuse existing mac_lte_info structure after first passPascal Quantin1-18/+13
Change-Id: I2e6c9067b8c4d8b318f79c6ad9e924af234a6b78 Reviewed-on: https://code.wireshark.org/review/26930 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-14PDCP NR: reuse existing pdcp_nr_info structure after first passPascal Quantin2-86/+87
Change-Id: Ief847244d8f989e2639a0dbcf96e2c7a7b1fb69a Reviewed-on: https://code.wireshark.org/review/26933 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-14packet-tns.c: add TODO to TNS Refuse packet dissectorchinarulezzz1-0/+5
Change-Id: If5f8cf73eb878fa3feb31ba32d576d75a293e314 Reviewed-on: https://code.wireshark.org/review/26927 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-14x509ce: fix display of IPAddress when it is an IPv6 AddressAlexis La Goutte3-20/+44
According to RFC 5280 (Section 4.2.1.6. Subject Alternative Name), an iPAddress can be either four (IPv4) or sixteen octets (IPv6). Bug: 14603 Change-Id: I6894f78c8e3f2a1b10940379397c87bbf981d4d6 Reviewed-on: https://code.wireshark.org/review/26891 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-13PDCP NR: add expert info for unknown / missing UDP framing tagsPascal Quantin1-2/+21
Change-Id: I1b71d30e5e6d5a63e14fc6daf8e2cca2b9b6f7f6 Reviewed-on: https://code.wireshark.org/review/26915 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-13RLC NR: add an expert info for unknown UDP framing tagsPascal Quantin1-2/+15
Change-Id: I8a103840b3c795ce76c8a1af04a5751d6901e62f Reviewed-on: https://code.wireshark.org/review/26914 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-13MAC NR: add an expert info for unknown UDP framing tagsPascal Quantin1-1/+14
Change-Id: I03013e02856508179d1d75ece5d5c215b947eeb4 Reviewed-on: https://code.wireshark.org/review/26913 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-13PDCP LTE: add expert info for unknown / missing UDP framing tagsPascal Quantin1-3/+23
Change-Id: Iafeb49b529da4f62149124193326a4ff6c3960b9 Reviewed-on: https://code.wireshark.org/review/26912 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-13RLC LTE: add expert info for unknown / missing UDP framing tagsPascal Quantin1-2/+20
Change-Id: I252c63f7104ce92de5d72e5e3ea40e3e45d76add Reviewed-on: https://code.wireshark.org/review/26911 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-13MAC LTE: add an expert info for unknown UDP framing tagsPascal Quantin3-16/+26
Change-Id: I505e1df17d468c84f363c3be0ac5e2c29c85ca23 Reviewed-on: https://code.wireshark.org/review/26910 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-13UMTS RLC: add expert info for unknown / missing UDP framing tagsPascal Quantin1-2/+21
Change-Id: I29dbeaf0d90bab4c10b4674bfa983f7f5f26027b Reviewed-on: https://code.wireshark.org/review/26909 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-13kafka: raise the required version to 1.5.0 for lz4_frame.Dario Lombardo1-3/+3
Change-Id: I25619260572163872915c56bcf242e8ff8190b47 Reviewed-on: https://code.wireshark.org/review/26890 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-04-13file-pcap: expert info if captured len > reported lenMartin Kaiser1-1/+20
Bring up an expert info if the file contains a record whose captured length is larger than the reported length. Abort the dissection in this case since we rely on those lengths to find the next record. Change-Id: If249d0fe670373417bbfef6759edc0b020a9f5cb Reviewed-on: https://code.wireshark.org/review/26885 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Craig Jackson <cejackson51@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-13Fix the length of the payload of a private_1 or audio PES packet.Guy Harris2-21/+111
The length field's value doesn't include the length of the length field itself. Change-Id: Icd0cc2721a32212296929d248b9305b0f4a051e6 Reviewed-on: https://code.wireshark.org/review/26920 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-12Add in the signed integer fetch routines.Guy Harris1-0/+13
Change-Id: I75d7ffa74cc669d85861cbd712f1a4c927f098db Reviewed-on: https://code.wireshark.org/review/26918 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-12RoHC: IP version is 1 byte onlyPascal Quantin3-5/+7
Change-Id: I533b9d3ef37af9aa13a20c9af82a8a75cd73e9ad Reviewed-on: https://code.wireshark.org/review/26895 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-12PDCP NR: add SN length to PDCP context for user plane PDUsPascal Quantin1-0/+5
Change-Id: I49d215e65e424e605179747d350d4f36ccbc0d92 Reviewed-on: https://code.wireshark.org/review/26894 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-12PDCP NR: rework UDP framing formatPascal Quantin2-40/+42
Change-Id: I6f4a17ed91d4cb6ea39b5938add6ee882b033687 Reviewed-on: https://code.wireshark.org/review/26893 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-12Update a comment.Guy Harris1-18/+46
We don't just reassemble DOCSIS MAC frames, we reassemble other forms of higher-level packet atop an MPEG Transport Stream as well. Change-Id: If6e709a8d2d3e574fbaedb1fcac74797c5664aa5 Reviewed-on: https://code.wireshark.org/review/26905 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-12Need to flag a variable as volatile, due to the use of exceptions.Guy Harris1-3/+3
The exception mechanism is setjmp/longjmp-based, so we need to mark offset as volatile, otherwise the longjmp might not restore its value. Change-Id: Ib63070bbbbe1f16a93cb58aa7ee5ef2a5488df8a Reviewed-on: https://code.wireshark.org/review/26901 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-12If a subdissector throws an exception, catch it and continue.Guy Harris1-1/+30
That way, some exception thrown higher in the protocol stack doesn't stop us from dissecting the next TSP. Change-Id: Ib756e5d62806caf0edd4e4ded18bb94000653d39 Reviewed-on: https://code.wireshark.org/review/26897 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-11kafka: check lz4 version in a single point.Dario Lombardo1-4/+5
This allows a better check of the required version. Change-Id: I6c4aab67c73434aff4ad744caa2d0add9ec6225c Reviewed-on: https://code.wireshark.org/review/26889 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11Netlink: Add rtnetlink attribute dissectingFilip Sohajek1-23/+396
This patch adds dissecting of several attributes in RTM_NEWLINK and RTM_NEWADDR. Change-Id: Iab476e7439a9bcbc25e70cded67bc371788baec4 Reviewed-on: https://code.wireshark.org/review/26830 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: don't give the cmake macro the directory (it has it already).Dario Lombardo1-1/+0
Change-Id: I1c3febf527f16825793a30eb2ab5d43baaa83a57 Reviewed-on: https://code.wireshark.org/review/26880 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: set the cmake bindir in openSUSE.Dario Lombardo1-0/+5
Change-Id: I41edf52f8021938877bc53dd5eea4ff29cf4827e Reviewed-on: https://code.wireshark.org/review/26878 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: set ninja executable in %install target.Dario Lombardo1-0/+1
It is not inherited by previous target. Change-Id: I11be59211a900375e02fce8c05cc4164b8dc42e4 Reviewed-on: https://code.wireshark.org/review/26877 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11LPP: fix a typo in ASN.1 filePascal Quantin1-1/+1
Change-Id: Id3189b5617aff853d85029624d7e160d48dd1f36 Reviewed-on: https://code.wireshark.org/review/26896 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-11RPM: fix typo.Dario Lombardo1-1/+1
Change-Id: I2e82fb0696e2e7cb636ec1fdfb72a566e0eca94f Reviewed-on: https://code.wireshark.org/review/26879 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-04-11RPM: don't install doc under guides with make.Dario Lombardo1-2/+2
Change-Id: Iaa8f3d941dcb329bbfff28f6d9417b92d44371e1 Reviewed-on: https://code.wireshark.org/review/26876 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11PFCP: Added dissection of IEs 127-131Matej Tkac1-12/+79
According to 3GPP TS 29.244 v15.1.0 Change-Id: Idcaad3eccf0bd5c9cc57eca5038313fd14916963 Reviewed-on: https://code.wireshark.org/review/26859 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11user_encap: Avoid a hash lookup to get dissector nameStig Bjørlykke1-4/+4
The dissector handle is already known so it's no need to fetch this again using find_dissector(). Change-Id: Id48066ab881f2b80ec9e3a6e86bc1e41f32cd1ec Reviewed-on: https://code.wireshark.org/review/26873 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-04-11extcap: Fix crash in extcap_verify_capture_filterStig Bjørlykke1-2/+2
This fixes a regression issue from g57fed5d1 when freeing the arguments passed to extcap. Change-Id: Ic4d6a129569f9e691fd2608e0229342b8b5e9783 Reviewed-on: https://code.wireshark.org/review/26870 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-04-11extcap: Fix whitespace issuesStig Bjørlykke1-13/+13
Change-Id: I70066077a55b094eb2e667d31190ae80c3b97b5f Reviewed-on: https://code.wireshark.org/review/26871 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-04-11ZigBee: MGMT Unsolicited Enh NWKUpdate dissectorDana Sy3-0/+44
Added a dissector for the mgmt_nwk_unsolicited_enhanced_update_notify from the R22 spec (clusterID = 0x003b) Change-Id: I5d60ef0a762f932a7f814743d1c219428c8f9e73 Reviewed-on: https://code.wireshark.org/review/26865 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11zbee zcl: fill constant ett arrays at declaration timeMartin Kaiser1-106/+85
This dissector defines a bunch of ett arrays, most of which contain a constant list of ett entries. Fill those arrays directly when they're declared, this is what the vast majority of other dissectors do. Fix some whitspace things while at it. Change-Id: Iae85e2449024ef04b2a44bd847c45515f8efc903 Reviewed-on: https://code.wireshark.org/review/26869 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11zbee_zcl: (trivial) clean up decode_color_xy()Martin Kaiser1-2/+1
remove unnecessary return statement remove a wrong comment Change-Id: I40afd8144178a2cccba67289d5a3120dd5719ad0 Reviewed-on: https://code.wireshark.org/review/26868 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11pfcp: correction of lengthJoakim Karlsson1-2/+2
flags are uint8 but the whole list was set as uint16 Change-Id: I8726fe533253fd1339351f581e7a2fe01c0edce2 Reviewed-on: https://code.wireshark.org/review/26849 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Matej Tkac <matej.tkac.mt@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11NBSS: take into account snaplen when creating the TVB subsetPascal Quantin1-4/+1
Otherwise you can trigger an exception interrupting the packet dissection when the snaplen defined is shorter than the payload length Bug: 14598 Change-Id: Ibeb6482495ed67c7669574bdcd7c429523318428 Reviewed-on: https://code.wireshark.org/review/26858 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2018-04-11RPM: Make documentation installation optional.Gerald Combs1-3/+17
Add a "guides" bcond so that we can make Asciidoctor and the HTML guide installation optional. Change-Id: I5f9e6cc59689dba7d600cc721547aed020652f00 Reviewed-on: https://code.wireshark.org/review/26867 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11qt: capture file properties: add a splitterMartin Kaiser2-26/+52
Add a splitter to the capture file properties dialog. This allows for modifying the relative sizes of the details vs comment boxes. People who paste lots of text into the capture file comment may want a lager box for it. Change-Id: Id79d9f5fd7e589a2ba88aa5f16b52bb37d7c47ae Reviewed-on: https://code.wireshark.org/review/26845 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2018-04-11Zigbee: Decode the ZCL extension field sets in the scenes cluster.Paul Zander2-6/+286
Change-Id: Ida564e8c292819508fd2dd0fb5b650e95356459a Reviewed-on: https://code.wireshark.org/review/26852 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2018-04-11Qt: Disable collapsible children in the main window.Gerald Combs4-0/+14
Set the childrenCollapsible property to false in the main window splitters. Set the minimum size for the packet list, proto tree, and byte views to a small (one em), consistent, and nonzero value. Otherwise it's easy to inadvertently end up with a hidden main window view. Bug: 14478 Change-Id: I07a352cf2cf0375829ae2e0cb53b2a7d717dbb7d Reviewed-on: https://code.wireshark.org/review/26847 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>