aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2014-06-12Capture Interfaces Dialog:Irene Ruengeler2-0/+5
- allow to change the interface options in the table - save the options to preferences when the dialog is left - add a field for setting a capture filter for all selected interfaces - add a "Compile BPF" button and a window to show the compiled filter output - try to address Alexis' and Evan's comments Change-Id: Ic1272e29183ec80e2d2f4b3e494c79dabe2c3b6f Reviewed-on: https://code.wireshark.org/review/1946 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-12function to parse the usbpcap pseudo-headerMartin Kaiser1-57/+44
and fill the conversation struct Change-Id: I8917fae39458568ab980ece1e819cb83719e3baf Reviewed-on: https://code.wireshark.org/review/2077 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-12Fix USB Class-Specific Control URB requestsSean O. Stalley1-17/+17
Fixes Bug 10165. (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10165) The condition that caused the bug is a non-standard URB where the length of the tvb is less than the reported length. It will pass the tvb_reported_length_remaining() != 0, but fail the assertion in tvb_composite_append() (which checks the length value, not reported_length). This condition appears in a few other locations (where the if statement checks reported_length, but the code inside the if statement uses the length value). This patch also fixes them. Also removes depricated calls to tvb_length() & tvb_length_remaining() with tvb_captured_length() & tvb_captured_length_remaining(), respectively. Change-Id: Ie8d50cfb24af62558c905c23c37ec603ce76366f Reviewed-on: https://code.wireshark.org/review/2011 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-11Fix bit fields definition in the "DMG Capability" IEVladimir Kondratiev1-107/+112
Bits in the byte was counted wrong direction; bit0 should be LSB (0x01) and bit7 - MSB (0x80) Also, all fields are interpreted as little-endian Change-Id: I3485e8743a156e2e8cb84e726045211f1d332598 Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> Reviewed-on: https://code.wireshark.org/review/2138 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-11Rename temp variables to a more human readable formAnish Bhatt1-117/+117
Change-Id: Idafe97df6be71d885203e2e3426fdb6a133862c4 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/2140 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-11Use offset instead of tempOffset, return offset instead of calculating (len ↵Anish Bhatt1-507/+539
+ n) where possible Change-Id: I91ef4ec59698903cb2a7be00e7e0ece478fc26a8 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/2139 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-11FixAndersBroman1-43/+43
Warn Dissector bug, protocol LPP, in packet 1: proto.c:3403: failed assertion "DISSECTOR_ASSERT_NOT_REACHED" redifine FT of NavModel-GLONASS-ECEF/gloP1 Change-Id: Id865c39b8d15528417075f9e7ed0378704aa98dc Reviewed-on: https://code.wireshark.org/review/2132 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-11Use expert info for Invalid length/type where possible, other minor fixesAnish Bhatt1-105/+70
Change-Id: I4a0421bf918439261f31f4bfc2cb5519b38f1711 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/2118 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-11Fix bug in dissect_lldp_port_id, support all port id subtypesAnish Bhatt1-12/+78
Change-Id: I8b44e0d55701ba5d583e3e734e19d4d2aa024b25 Reviewed-on: https://code.wireshark.org/review/2049 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-103GPP NAS: add dissection of MSISDN in PCOPascal Quantin1-2/+9
Change-Id: Ie8dac8c898ff94e955a4c0fdde7f4ffff496e97f Reviewed-on: https://code.wireshark.org/review/2098 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-10CAPWAP: Fix soft-deprecated APIs warningAlexis La Goutte1-2/+2
tvb_length_remaining => tvb_reported_length_remaining Change-Id: Ie1fa09e00e098c41df2e87771300e3842659dad6 Reviewed-on: https://code.wireshark.org/review/2095 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10CAPWAP: Display incorrect value for Wireless IEEE802.11 RSSI and Data RateAlexis La Goutte1-8/+11
* Wireless data ieee80211 RSSI (dBm) is a signed integer. In the wireless radio the dBm value is negative. * Wireless data ieee80211 Data Rate (Mbps) is a 100Kbps. You need divide this value by 10. Issue found by Massimo Vellucci (SmartCAPWAP) Change-Id: I04dd8a9e38a5f60ee5bf64cd304db1b11413c809 Reviewed-on: https://code.wireshark.org/review/2094 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09Add modelinesAnish Bhatt1-0/+13
Change-Id: Ib8e157e2744198eaa1a5a69732bd8e977b146026 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/2089 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09Add Modelines infoAlexis La Goutte2-0/+26
Change-Id: If3e77cbdfdeab75766984b10b3356b8343100602 Reviewed-on: https://code.wireshark.org/review/2065 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-4/+1
Change-Id: I08f4860a97d8406fef878887887b6537bf7600ee Reviewed-on: https://code.wireshark.org/review/2063 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09Dissection of USB setup data in MA USB data packetsSean O. Stalley3-5/+70
This patch adds support for dissection of USB setup data contained inside of MA USB data packets. The MAUSB Dissector calls the same function used by the USB dissector to dissect the setup data. This patch also (and a bit unintentionally) adds transfer following. TransferReq & TransferAck packets now show a link & a time delta to their TransferReq (ie [Request in: XXX] & [Time from request: XXX]. TransferReq packets have a [Response in: XXX] tag, but it erronously points to the TransferAck, not the TransferResponse. Change-Id: I01041de3c38ea6248e9d34506b0b012518a1e6d8 Reviewed-on: https://code.wireshark.org/review/1548 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09Try to fix the builds.AndersBroman1-2/+1
Change-Id: I3ccb5c1b40504cd9314da5a09b225e3e2bf991b8 Reviewed-on: https://code.wireshark.org/review/2073 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09fill the conversation info struct in dissect_linux_usb_pseudo_header()Martin Kaiser1-42/+50
Change-Id: I9743a6fe57ff3197baa0c084dae428df8c31b24d Reviewed-on: https://code.wireshark.org/review/2068 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-09use the direction info from the conversation structMartin Kaiser1-5/+5
Change-Id: I2345fae33333568ffeaaa3aa3329cb8371a444e1 Reviewed-on: https://code.wireshark.org/review/2067 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-09Add sse4.2 optimized function ws_mempbrk_sse42()Jakub Zawadzki1-16/+13
In text protocols, like SIP, lot of time is spend guint8_pbrk(), assume that text is not binary (no NULs), and use SSE4.2 pcmpistri instruction. Also move & rename guint8_pbrk() from tvbuff.c as _ws_mempbrk. HAVE_SSE42 must be defined to use _ws_mempbrk_sse42() only activaded for Windows currently. Change-Id: Ic853d84805bdb6492c4f45d2bcc79a973fd9804e Reviewed-on: https://code.wireshark.org/review/1730 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09Try to fix acket-tftp.c:207: error: \u2018data_tvb\u2019 may be usedAndersBroman1-1/+1
uninitialized in this function. Change-Id: I92a344b8ec86fc71b64903c2e6edc74f8ed7a330 Reviewed-on: https://code.wireshark.org/review/2066 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09remove all checks for if (tree)Anish Bhatt1-655/+514
Change-Id: I82617c0a396fdf42735ba39a5ed266a3f5240854 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/2048 Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-09IEEE 80211: fix dissection of HT CapabilitiesPascal Quantin1-36/+33
Bug: 10166 Change-Id: Iafe789968bd5b9a6e593b682f8d42ba42db5fce9 Reviewed-on: https://code.wireshark.org/review/2046 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-08[Automatic manuf, services and enterprise-numbers update for 2014-06-08]Gerald Combs2-4/+304
Change-Id: I28963e69c7bd6bdca031635e3e59a8060f52bd3b Reviewed-on: https://code.wireshark.org/review/2036 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-07PEEKREMOTE packets don't appear to have Atheros padding.Guy Harris1-1/+1
Call the without-Atheros-padding dissector for the payload. Fixes bug 10139. Change-Id: I883bf4e58899aa78b07fae63d8c0376a31bda444 Reviewed-on: https://code.wireshark.org/review/2027 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-07Per Spec update, SetUSBDevAddrReq now contains dataSean O. Stalley1-1/+1
Per MAUSB Spec (1.0), the SetDevAddrReq packet now contains data in addition to the packet header. Change-Id: I4d2c6bb2530edf5de33ef69c0e6af0441e197fa4 Reviewed-on: https://code.wireshark.org/review/2014 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07Removed MAUSB DWORD-Aligned Length CheckSean O. Stalley1-8/+0
Removed a check to see if the Packet is in DWORDs. I misread section 6.2 of the spec, which states that all _headers_ mausb be DWORD-aligned, not all _packets_. Change-Id: I11e320e6e2592930024ffa8143e4d8f470de13ba Reviewed-on: https://code.wireshark.org/review/2013 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07USB: put back URB setup to parent tree like it was before g3169939Pascal Quantin1-1/+1
Change-Id: I645fb04c8039bd7bf43848c14d163aa0990cc977 Reviewed-on: https://code.wireshark.org/review/2022 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07Added usb_get_trans_info() functionSean O. Stalley1-53/+64
Moved code in usb_dissect_common() for getting/creating transfer info into it's own function. This is part of an effort to make dissect_usb_common() more modular so that code can be shared between the USB & the MAUSB dissector. Change-Id: I70f4f98536a6355e57b33eb01a9b5d8688183635 Reviewed-on: https://code.wireshark.org/review/1993 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07tvb_new_subset -> tvb_new_subset_length when length parameters are equal.Michael Mann218-676/+629
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06Misc lldp cleanup.Anish Bhatt1-32/+39
I'm cheating a bit here, hf_media_loc_long & hf_media_loc_lat need a 5byte bitmask, but the bitmask field in hf is restricted to guint32 Change-Id: I7e044fc680bb947973e437fc66057488a8deee67 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/2012 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06Moved dissection of setup field to own functionSean O. Stalley1-34/+55
Dissection of all setup field types (standard & nonstandard) are handled in a seperate function. Before, nonstandard dissection was handled in dissect_usb_common. This is part of an effort to make dissect_usb_common() more modular so that code can be shared between the USB & the MAUSB dissector. Change-Id: I15d7e3691afc29cd569aa5d3770d2aa569630b12 Reviewed-on: https://code.wireshark.org/review/1992 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06Q.2931: sort extended value string 'q2931_message_type_vals' in increasing orderPascal Quantin1-12/+12
Change-Id: I003d55b338c79b9841dd16d0947e4734f118f7c6 Reviewed-on: https://code.wireshark.org/review/2002 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin1-1/+1
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06Fixed Fencing for Multiple MAUSB Packets in 1 TCP Packet.Sean O. Stalley1-2/+6
Packet info for all MAUSB packets in a single TCP packet is now displayed in the info column. Before, only info on the last packet was displayed. See conversation for change Ib20e5e30474d93270dd24e203ab96f64f5cc77ad. Patch 3 had fencing, I messed up and left it out of patches 4-6. This patch adds it back in. Change-Id: I37f0e028a8f9b5a8500700f03ac36f8bf1c4f63c Reviewed-on: https://code.wireshark.org/review/1958 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-06Added tap queue helper function to USB dissectorSean O. Stalley1-16/+19
Added a helper function which handles all the USB-Specific tap data. This is part of an effort to make dissect_usb_common() more modular so that code can be shared between the USB & the MAUSB dissector. Change-Id: If0f0b5542203ddaed28009d8a8a1bb8660fa5d70 Reviewed-on: https://code.wireshark.org/review/1990 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte1-1/+1
packet-q931.c:2532:25: warning: Access to field 'message_type' results in a dereference of a null pointer (loaded from variable 'q931_pi') Change-Id: I7533ff60c541e31efe4522e710f86175c1c0ccf4 Reviewed-on: https://code.wireshark.org/review/1997 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: Iada015df96b8c1b5070699589bb4b4f759217ecd Reviewed-on: https://code.wireshark.org/review/1996 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I2e7e32f618f709739948b2b5ebd1db0e775bfaed Reviewed-on: https://code.wireshark.org/review/1995 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06(trivial) changed when transfer info is setSean O. Stalley1-2/+1
usb_conv_info->usb_trans_info is set to the same thing regardless of the branch taken, to pull it out of the condition. Change-Id: Ieabf0a6e796b942d7bafedbeba18d9e0fa113e17 Reviewed-on: https://code.wireshark.org/review/1991 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-06LLDP-MED CleanupAnish Bhatt1-116/+258
Co-ordinate based LCI is untested, as the sample capture does not have this, could not find one anywhere. Change-Id: Id0b52c234d6a36ee430ab9a7265bcd84f151c80c Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/1929 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-06IPMI trace dissector (without PCAP-dependent part).U-beauty\bdn14-923/+4583
Added KCS and TMode protocol dissectors. Request/response logic has been revised. Saved request data logic has been revised. Added Get Message command response dissector. Added missing PICMG command dissectors. Added new PICMG command dissectors. Added new PPS OEM command entries. Added VITA 46.11 command dissectors. From: Bill Meier: - refs to value_strings/range_strings in hf[] entries, by convention, should use VALS/RVALS macros; - refs to true_false_strings should use TFS(&...) macro. also: true_false_string definitions should not be defined as arrays. - remove some unneeded #includes (packet-ipmi.c). - Do some re-indentation. - Add editor-modelines as needed. bug: 10004 Change-Id: Ib269b35784c0b70892d1e0111bcfb483ea64092c Reviewed-on: https://code.wireshark.org/review/1185 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05Add a missing header file, and add new file to cmake buildMartin Mathieson1-0/+1
Change-Id: I3be8bef8c7542e7bcb11f3696783ca68c3920082 Reviewed-on: https://code.wireshark.org/review/1987 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-06-05Add Object (file) export for files transferred over TFTP.Martin Mathieson2-3/+173
Updated following review comments. Change-Id: I56e70d8f8e332d2aea604ceec16c980ad890fa58 Reviewed-on: https://code.wireshark.org/review/1885 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-06-05When have more than one SDU in the same RLC PDU, make sure output from all ↵Martin Mathieson1-0/+8
of them stays in the INFO column Change-Id: I7b2555101f3a1a596a4108a13240d21786054671 Reviewed-on: https://code.wireshark.org/review/1985 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-06-05Add a handle to dissect sip userinfo.AndersBroman1-11/+21
Change-Id: Ia8c15b710d79f12e8f62a49b17f057b746f31f0c Reviewed-on: https://code.wireshark.org/review/1980 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05sip: avoid calling tvb_format_text() when tree is not visible.Jakub Zawadzki1-83/+112
sip dissector when filtering spends ~5% of Ir in tvb_format_text(), avoid calling. Change-Id: I1de8e970b300354c0536aead65178401f140f509 Reviewed-on: https://code.wireshark.org/review/1974 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05Make socpe a local variable, can be used if we change the g_slist to aAndersBroman1-4/+7
wmem_list. Change-Id: I176a2acc5ae334916978f543c959287bf0d8541e Reviewed-on: https://code.wireshark.org/review/1979 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05STUN: Add error code from MS-ICE2BWMAlexis La Goutte1-0/+3
Interactive Connectivity Establishment (ICE) 2.0 Bandwidth Management Extensions http://msdn.microsoft.com/en-us/library/ff595756.aspx Change-Id: I218229225ea5c64cfe2d5f269625deafe7eb8292 Reviewed-on: https://code.wireshark.org/review/1972 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05STUN: Add support of MS-TURN (Used by Lync)Alexis La Goutte1-1/+91
MS-TURN: Traversal Using Relay NAT (TURN) Extensions http://msdn.microsoft.com/en-us/library/cc431507.aspx Change-Id: I2a6f28f5f7db4da45543816caecce1da7cf03c35 Reviewed-on: https://code.wireshark.org/review/1971 Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 20:39:30 +0000