aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-01-18ETSI CAT: allow a length of 0 bytes for Location Information IEPascal Quantin1-0/+2
According to 3GPP 31.111 chapter 8.19, 0 is a valid length (IE is empty in this case) Change-Id: Ia47c9106b5db217425f9e6f56483c84378c34a0b Reviewed-on: https://code.wireshark.org/review/13401 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-18Add a copy button to the Filter Expression preferences.Gerald Combs3-10/+43
Add a "copy" button to match other parts of the UI. Change-Id: I4240aaaaf18a6bbf8e6737a12bcfead2248acca7 Reviewed-on: https://code.wireshark.org/review/13322 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-18Qt: Fixup the Display Filter Expression syntax logic.Gerald Combs4-16/+8
In the Display Filter Expression dialog, only disable the OK button when we have an invalid filter. Move the deprecated warning string from DisplayFilterEdit::checkFilter to SyntaxLineEdit::checkDisplayFilter so that we can use it in more places. Change-Id: I938f5f10258f4fd9dd3a33c174dd9958c9634766 Reviewed-on: https://code.wireshark.org/review/13317 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-18androiddump: There is no need to make full copy optargMichal Labedzki1-4/+4
Copy pointer is enough. Change-Id: I51188a8434f6e4ba1d9bf3456bd29e027dd40f35 Reviewed-on: https://code.wireshark.org/review/13393 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-18Add Lua dependings only if LUA is enabledMichal Labedzki1-1/+1
Avoid build fail if found Lua but it is disabled. Change-Id: If1cf0d650454d2844a1430135de1385c984e5ba4 Reviewed-on: https://code.wireshark.org/review/13394 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-18extcap: add masked to options.Dario Lombardo8-2/+29
This allows an option to be masked (like a password), by using the argument-type password. Change-Id: I2eae1be2e6672bff28ba5f749d7a3f687ebd4631 Reviewed-on: https://code.wireshark.org/review/13385 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-01-18Bluetooth: Update Assign numbers (5th December 2015)Michal Labedzki4-1/+99
Add TDS and OTS/OTP UUID, OTS PSM (I cannot find it, but it seems to be linear), update CompanyIds and add three EIR/AD codes: URI, Indoor Positioning and Transport Discovery Data. Implementation of new "numbers" will be done later. Change-Id: I8ad4d9c1d55c1824d87e88303c28e67dd445ec98 Reviewed-on: https://code.wireshark.org/review/13386 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-18Directly call the FDDI and "raw IP" dissectors from the nettl dissector.Guy Harris3-21/+19
Just get handles for the dissectors, don't go through the wtap_encap dissector table. Change-Id: I459249b98741cc069495c84ad4c47c0aa6768096 Reviewed-on: https://code.wireshark.org/review/13383 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-18Have the "maybe an FCS" version of the Ethernet dissector take a data argument.Guy Harris5-8/+43
It's called from some places other than packet-frame.c, at least one of which currently can't call anything else (the ATM dissector, for VC-multiplexed bridged frames, where you don't know whether the frames include the FCS or not), so the frame's pseudo-data doesn't necessarily have the appropriate "FCS length" value. Have it explicitly check the data argument, and explicitly pass the appropriate value to it. Ping-Bug: 9933 Change-Id: I0c75f921d25d1e2b75e476c15ff9625205036b25 Reviewed-on: https://code.wireshark.org/review/13382 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-18Call the "without FCS" version of the Ethernet dissector.Guy Harris1-1/+1
At least in the sample captures attached to bug 2631, the encapsulated Ethernet frames don't include the FCS. Bug: 9933 Change-Id: Ie14b87020c44d739173e5da9fc58a91924f38dfe Reviewed-on: https://code.wireshark.org/review/13377 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-18Handle frames where the type field is a length field.Guy Harris1-20/+127
The BNEP Version 1.0 spec says, for BNEP_GENERAL_ETHERNET packets, "Note: Networking Protocol Types as used in this specification SHALL be taken to include values in the range 0x0000-0x05dc, used to represent the IEEE802.3 length interpretation of the IEEE802.3 length/type field.", although it says that it's not mandatory to process those packets. We'll process them. We don't need an Ethernet dissector handle, so don't fetch one. Change-Id: I10b1fce62688fc0643435d0a01bdb969577df97e Reviewed-on: https://code.wireshark.org/review/13376 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-18Fix indentation.Guy Harris1-1/+1
Change-Id: I7f9ea1e88b53ce1ac0f0c01678b8aebe4f7ba393 Reviewed-on: https://code.wireshark.org/review/13374 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Prevent out-of-bounds read in hiqnet_display_data.Michael Mann1-14/+25
Bug: 11983 Change-Id: If8b0c4ff45014c0d7480e43afaaf12747590a56f Reviewed-on: https://code.wireshark.org/review/13370 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-17Fix comment.Guy Harris1-1/+1
Change-Id: Icea9d23bb979ae6b57c65e0178a3634689992e78 Reviewed-on: https://code.wireshark.org/review/13369 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17More comments.Guy Harris1-1/+31
Including a URL for a Cisco page with diagrams of the encapsulation. Change-Id: I4fb4356ea6071ca7efb596a8d35f982478bf4896 Reviewed-on: https://code.wireshark.org/review/13367 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Fix construction of subset tvbuff.Guy Harris1-51/+57
We should use both the captured length and original length, and we should use them as the captured length and original length of the tvbuff. Clean up indentation and returning process while we're at it. Change-Id: If7538268cd6ae557d9d5b85eefd57cf3e2e34a9e Reviewed-on: https://code.wireshark.org/review/13366 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Call the "without FCS" version of the Ethernet dissector.Guy Harris1-1/+1
At least in the sample capture attached to bug 3195, the encapsulated Ethernet frames don't include the FCS. Bug: 9933 Change-Id: I4440568deaa676ba8848694b80ed800244c8c5d9 Reviewed-on: https://code.wireshark.org/review/13363 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Fix build [-Werror=maybe-uninitialized]João Valverde7-19/+21
Found building with GCC 5.3.0 and CFLAGS="-g -Og". Change-Id: I5bc29b6e91cc98332a513c9d03b02d2f6906608d Reviewed-on: https://code.wireshark.org/review/13362 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-17[iseries] fix iseries_check_file_type()Martin Kaiser1-6/+15
check that we have a line that contains OBJECT PROTOCOL ETHERNET (at the moment, we fail if there's a line containing OBJECT PROTOCOL but not ETHERNET and succeed otherwise -> a file with some random lines will be identified as iseries) initialize our line buffer with 0s to make sure we don't access uninitialized data while parsing don't set wth->priv unless the file is really an iseries file free the iseries struct if the file is not our type Bug: 11985 Change-Id: I0ac7003c047f54ca025d02e59b56d1ff4e2a6be7 Reviewed-on: https://code.wireshark.org/review/13360 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-17[iseries] return WTAP_OPEN_ERROR if file_seek() failsMartin Kaiser1-1/+1
like it's done for the other file types Change-Id: I8caa360b9c527ea642ee6b5102759ad341ad0030 Reviewed-on: https://code.wireshark.org/review/13359 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-01-17[netlink] remove an unnecessary if (tree) checkMartin Kaiser1-6/+4
Change-Id: Id9d20bf98550cfb879c107063d0011840536538a Reviewed-on: https://code.wireshark.org/review/13361 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-01-17[Automatic update for 2016-01-17]Gerald Combs16-1955/+2019
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I4aacb3b957cbb04f1848504bfb6880fe010723a3 Reviewed-on: https://code.wireshark.org/review/13356 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-17[sll] call the netlink dissector if the arp_hdr type is netlinkMartin Kaiser2-6/+19
re-order things a bit so that don't display anything if we just relay our packet to the netlink dissector Bug: 12018 Change-Id: Ic115de82d682b7105a1e97fb8be2709ac4875232 Reviewed-on: https://code.wireshark.org/review/13335 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-17Correctly construct subset tvbuffs.Guy Harris1-23/+8
Use tvb_subset_remaining() or tvb_subset_length() - they calculate the correct captured length for you. This fixes, for example, the EoIB code, where you ended up with tvbuffs with captured length > reported length. Change-Id: Ie792b53a796d4b32242cb83020b54232a2a09698 Reviewed-on: https://code.wireshark.org/review/13355 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Dissect Ethernet-over-GFP frames with the "with the FCS" dissector.Guy Harris1-2/+8
Ethernet-over-GFP frames include the Ethernet FCS. Ping-Bug: 9933 Change-Id: I4eb3f0428b34d7ab62b505fe20f2ba31762594f3 Reviewed-on: https://code.wireshark.org/review/13354 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Call the "no FCS present" version of the Ethernet dissector.Guy Harris1-1/+19
I haven't found an official spec for EoIB, but slide 10 of http://downloads.openfabrics.org/Media/Sonoma2009/Sonoma_2009_Tues_converged-net-bridging.pdf shows the "Eth Payload" following the "Eth Header" and optional "Vlan tag", and doesn't show an FCS; "Payload" generally refers to the data transported by the protocol, which wouldn't include the FCS. In addition, the capture attached to bug 5061 includes no Ethernet FCS. So we assume the Ethernet frames carried by EoIB don't include the Ethernet FCS. Bug: 9933 Change-Id: I310e5727c42e05498d1f1df08266a48fd6674388 Reviewed-on: https://code.wireshark.org/review/13351 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Call the "no FCS present" version of the Ethernet dissector.Guy Harris1-3/+7
The I-D doesn't explicity indicate that the FCS isn't present in the tunneled Ethernet frames, but it is missing from the captures attached to bug 10282. Update the I-D number while we're at it. Bug: 9933 Change-Id: I6e78b20cb858e6c8c4d7380b17b88382db013d56 Reviewed-on: https://code.wireshark.org/review/13350 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Use the "no FCS" version of the Ethernet dissector.Guy Harris1-1/+10
RFC 6325, section 4.1.4 "Frame Check Sequence (FCS)", says "Thus, when a frame is encapsulated, the original FCS is not included but is discarded." meaning that the inner Ethernet frame does *not* include an FCS. Change-Id: Ie764ceb66dd43b951da015870e3e652ccfc651b5 Ping-Bug: 9933 Reviewed-on: https://code.wireshark.org/review/13347 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Use the "no FCS" version of the Ethernet dissector.Guy Harris1-6/+10
RFC 7348 Figures 1 and 2, in the Payload section, says "(Note that the original Ethernet Frame's FCS is not included)" meaning that the inner Ethernet frame does *not* include an FCS. Also, update the protocol references (the I-D is now RFC 7348) and add the I-D for the group policy stuff. Remove some extra blank lines while we're at it. Change-Id: Ib94a43b95b0761e97d1406a1cca3687ee640e12d Ping-Bug: 9933 Reviewed-on: https://code.wireshark.org/review/13343 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Don't look at pinfo->pseudo_header.Guy Harris4-153/+205
On the off chance that UMTS FP traffic is being carried over a pseudowire. :-) Change-Id: I8db0fbe96545c08f4748bf9ec046e2dc4f2c2cc6 Reviewed-on: https://code.wireshark.org/review/13342 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Add WTAP_ENCAP_NFC_LLCP to the list of types require a pseudo-header.Guy Harris2-17/+21
Discovered by changing wtap_encap_requires_phdr() to use a switch statement and comparing the case arms. Change-Id: I2a23b86ddfbc88c1b3251a0e97f7f00ee93f630e Reviewed-on: https://code.wireshark.org/review/13341 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Have the pcap_pktdata dissector dissect the payload.Guy Harris1-8/+5
That lets us handle pseudo-headers derived from packet data in one central place. Change-Id: Ie8e1d2d7dac176ea45be08cdc49bd808d9f8cc5b Reviewed-on: https://code.wireshark.org/review/13340 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Get rid of unused stuff.Guy Harris1-5/+0
Change-Id: Iad17e64de609d95d1e13c94ae13d1a4834786dd6 Reviewed-on: https://code.wireshark.org/review/13339 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Get rid of a no-longer-needed #include.Guy Harris1-3/+0
Change-Id: I725891d40d27ed87963d717c2c69b1288dafd2da Reviewed-on: https://code.wireshark.org/review/13338 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Have the pcap_pktdata dissector dissect the payload.Guy Harris1-68/+16
That lets us handle pseudo-headers derived from packet data in one central place. Change-Id: I25cb7599a8d3c31e5cbcfda94b072557209f5342 Reviewed-on: https://code.wireshark.org/review/13337 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Don't call dissectors that require a pseudo-header if we can't generate one.Guy Harris1-68/+100
It's not safe to pass a null data pointer to a link-layer header type dissector that expects the data pointer to point to a pseudo-header. Also, remove one extra layer of protocol tree. Change-Id: I030d38fd7d2f99d471020227597e4d7d81506e3e Reviewed-on: https://code.wireshark.org/review/13336 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16doc: fix spelling-error-in-manpage found by lintianAlexis La Goutte3-4/+4
Change-Id: I848159f0c960e0e8ece09c7c96dda6deb0ec6046 Reviewed-on: https://code.wireshark.org/review/13329 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-16plugin_if: fix bug in var assignment.Dario Lombardo1-6/+6
This bug was introduced in d1cb746, when HAVE_PCAP is not defined. Change-Id: I67cd51e4eec45cf7e7c3bdbfea9b8e164bb92883 Reviewed-on: https://code.wireshark.org/review/13333 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-16[sll] add LINUX_SLL_P_NETLINKMartin Kaiser2-11/+10
remove some unnecessary if(tree) checks while at it Change-Id: I2ed7153a25a96f9fa08476176980655117aae26e Reviewed-on: https://code.wireshark.org/review/13334 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-01-16fix spelling-error-in-binary found by lintianAlexis La Goutte2-6/+6
Change-Id: I2bdb40d287b2c19d40679fb73a8bae5f1debdd98 Reviewed-on: https://code.wireshark.org/review/13330 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-01-16LAT: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-2/+0
Change-Id: I3e2fad7f0307e599802c37040b34c899efb0e603 Reviewed-on: https://code.wireshark.org/review/13328 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-16MPTCP: Update ADD_ADDR option to RFC6824bis-04Fabrizio Demaria1-0/+11
The new ADD_ADDR format contains a truncated HMAC value of 8 bytes. The specifications can be found in RFC6824bis-04. Change-Id: Ief5118aea06fcd6c502ff4e55f0a49bf3234fd09 Reviewed-on: https://code.wireshark.org/review/13304 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-01-16IEEE802.11: fix EAPOL key frame detectionAlexander Wetzel3-26/+11
Use eapol key data length to differentiate between #2 and #4. This should work around ieee802.11 client implementation errors. Windows is setting the Secure Bit on #2 when rekeying and Bug 11994 has a sample capture with the Nonce set in #4 and are so both violating the spec. Bug: 11994 Change-Id: Ia9e9c68d08dae042cfa7fd9517892db211b0a00f Reviewed-on: https://code.wireshark.org/review/13299 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-16extcap: Code cleanupStig Bjørlykke1-49/+26
Rewrote to avoid unneeded g_strdup/g_free constructs, made some arguments const, simplified some code and fixed some whitespace. Plugged a memory leak in extcap_free_info(). Change-Id: I0bfcd86e6464d8bc592329b05dc994191a430096 Reviewed-on: https://code.wireshark.org/review/13306 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-01-16Revert "Don't use the printf command; it's not guaranteed to be there."Guy Harris1-1/+1
This reverts commit 67c58497442fb52571e7507cab0115567eb6352d. It's not *guaranteed* to be there in *every* UN*X, but it's in at least the Single UNIX Specification V3, as well as in shells commonly used in non-UNIX UN*Xes :-), so it'll be there in the UN*Xes we'll be run on. Change-Id: I541f7607055a24d6933d10244f85eea60052a3d8 Reviewed-on: https://code.wireshark.org/review/13325 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Don't use the printf command; it's not guaranteed to be there.Guy Harris1-1/+1
Change-Id: I8cb7f1dcf9cbe360f38a2d9e05f1b876c80409e3 Reviewed-on: https://code.wireshark.org/review/13324 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Don't export wtap_encap_dissector_table from packet-frame.c.Guy Harris4-10/+9
Dissectors that need it should fetch it with find_dissector_table("wtap_encap"). Change-Id: I4b12888f20182aa529274b934b81d36f7697e1a6 Reviewed-on: https://code.wireshark.org/review/13323 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16ssl: fix app_data handle detectionPeter Wu1-2/+7
When desegmentation is disabled (as is done with the SSL Decryption (master secret)" test), the app_data dissection is ignored because the app_data dissector it not yet known. Fix this by continuing when the port-based dissector is known (as was done before). Also add avoid setting a "(null)" protocol in the tree when the app_handle is not set (because the encrypted data is not decrypted for example, or when the heuristics dissector fails to set a protocol). Fixes regression since v2.1.0rc0-1501-g50dc0e8 ("ssl: improve interaction with heuristics subdissectors"). Change-Id: I65c1d4705dec8f6fea8b7ac02151fab9dc6152d6 Reviewed-on: https://code.wireshark.org/review/13312 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-16Improve Error messages when failing to load pcapng filesMichael Mann1-20/+23
Include the pcapng block name in every error message to give user a better hint as to where the error is Bug: 8798 Change-Id: Idd80a8541ac37a42b9bd2e988fa8da1ce7bc91a0 Reviewed-on: https://code.wireshark.org/review/13310 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-16Fix indentation.Guy Harris1-7/+7
Change-Id: Ic4c5c0b86e90dc5f3e5e0a6023e21756fa8015d3 Reviewed-on: https://code.wireshark.org/review/13320 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 22:24:29 +0000