aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
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 Harris1-4/+6
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-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-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-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-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>
2016-01-15Don't try to dissect if the link-layer header type requires a pseudo-header.Guy Harris1-15/+62
If a link-layer header type is one where Wiretap generates a pseudo-header from the bytes at the beginning of the packet data, we can't handle it, because we don't have code to process those bytes and generate a pseudo-header. Punt on it. Change-Id: I28c585e9d368216411cc841068ce3414f27f2d86 Reviewed-on: https://code.wireshark.org/review/13319 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-15Not passing a struct atm_phdr to an ATM dissector is a bug.Guy Harris1-12/+4
Check for it with DISSECTOR_ASSERT(). Change-Id: I71ba81107f7a4aff21b0f0dbecb5158dc4ff6238 Reviewed-on: https://code.wireshark.org/review/13318 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-15ATM: do not try to dissect if pseudo header is not presentPascal Quantin1-0/+16
Bug: 12013 Change-Id: If753fcdbb01d646fc4db43485549e8c6f668eced Reviewed-on: https://code.wireshark.org/review/13311 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-15Always initialize need_colorize flagPascal Quantin1-0/+1
Change-Id: I1da2f3e5d5cd6111a6ac7abaee2a97a36e8fd3c1 Reviewed-on: https://code.wireshark.org/review/13309 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-15Add http.file_data string field to store decompressed HTTP data.David Morsberger1-1/+10
Change-Id: I6031ae6f9b31447665236098c87ffed97e4b8a2d Reviewed-on: https://code.wireshark.org/review/13275 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-15plugin_if: Add function to get capture file infoPaul Offord2-2/+57
This is an enhancement to allow a plugin to obtain capture file and other status information via a simple plugin_if call Added GTK port to this revision Bug: 11968 Change-Id: Ibcf4e8b43c6f3b48e971fa4020a07cc273234fb8 Reviewed-on: https://code.wireshark.org/review/13103 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-15uaudp: fix buffer overrun while reading prefPeter Wu1-39/+17
Drop the custom str_to_addr_ip, it overruns the buffer with at most 3 bytes when an empty string is passed. Remove sizeof(guint8) while at it, the C standard requires this to be 1. Avoid overwriting uaudp.system_ip to avoid an invalid free of the preference. Change-Id: I39cb0a35364f2ecd32b780fcb7c0253bd866f329 Reviewed-on: https://code.wireshark.org/review/13145 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-15ssl: avoid duplicate PDU dissectionsPeter Wu1-4/+30
When a single frame contains multiple SSL segments and the higher-level PDU requests desegmentation, then each segment will trigger a dissection, resulting in a new tree for each. This seems to happen because the SSL dissector tries to complete a reassembly whenever a segment is found in the last frame. When doing the second pass, the fully reassembled segment is known and as a result the payload dissector is called for all SSL segments in a single frame. Fix this by checking whether the end of the segment covers the whole reassembled data. Another workaround is added to avoid "[SSL segment of a reassembled PDU]" in the Info column when desegmentation finishes. Also fix the SSL version in the Protocol column when a segment is part of a reassembled PDU. Bug: 11079 Change-Id: I9ae0c8ae5c56ed0dd7b071dec8bcc87e838a068d Reviewed-on: https://code.wireshark.org/review/12307 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-15DICOM: fix addition of item subtreesPascal Quantin1-10/+20
Bug: 12011 Change-Id: Idcb0b547d49dcf4b87ddfc05aceb24d06c38ab32 Reviewed-on: https://code.wireshark.org/review/13295 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-15LTE RRC: upgrade dissector to v13.0.0Pascal Quantin1-1748/+12527
Change-Id: Ie41471f79191097c491d58949c4e90b314cade04 Reviewed-on: https://code.wireshark.org/review/13300 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-14Adding Device Temperature Configuration Cluster for ZigbeeDarshan Nevgi2-0/+231
Change-Id: I574b0364a3007c02d45bbb8cfbfed786a78da0a5 Reviewed-on: https://code.wireshark.org/review/13289 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-14[BER] Fix Wireshark heap-based out-of-bounds read in ↵AndersBroman1-1/+9
dissect_ber_constrained_bitstring Bug: 11828 Change-Id: I43c493ed261e73e0f3b31892c161dcfc46071054 Reviewed-on: https://code.wireshark.org/review/13292 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-14Adding IAS WD cluster and IAS ACE Cluster for Zigbee Protocol.Aditya Jain4-0/+792
Change-Id: Ib5cf998cd0217e9335d826962efdc29ff13af12a Reviewed-on: https://code.wireshark.org/review/13214 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-14Adding On/Off Switch Configuration Cluster for ZigbeeDarshan Nevgi2-0/+200
Change-Id: Ie21553cf487dbf3920f4ba955503a819103d7b51 Reviewed-on: https://code.wireshark.org/review/13279 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-14IPv6 fragment header's reserved octet is 8 bitsKevin Bracey1-1/+1
Change-Id: I14d8245ee5ca51d15c7b6eda3d5993a805680530 Reviewed-on: https://code.wireshark.org/review/13287 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-14ranap: Sync with asn1 sourceStig Bjørlykke1-2/+2
Change-Id: I3b16427f43603bc665385b5c59d6e278797a2b96 Reviewed-on: https://code.wireshark.org/review/13285 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-14RTPS: Call dissector for user data using Type NameJuanjo Martin1-25/+54
With this dissector, anyone can write a plugin to dissect their data type and RTPS will call it if the dissector is registered using the Type Name (what is the common thing to do). Also, added a fix in dissect_APP_ACK so now the APP_ACK messages are properly dissected. It had a couple of wrong offsets and was calling dissect_serialized_data instead of directly adding the serialized data (dissecting an encapsulation that is not there). Bug: 11917 Change-Id: Ie1c6880d60e3537a1cbae4840cc6ff6e1a62ca0e Reviewed-on: https://code.wireshark.org/review/12824 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-14Expand a comment.Guy Harris1-1/+10
Change-Id: I9d749c43727291768a36adc0c1956f73a5374f91 Reviewed-on: https://code.wireshark.org/review/13283 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14Get rid of unused dissector handles.Guy Harris1-4/+0
Change-Id: Id439256b4a6705fed4ded69884bc371a8d6ce47b Reviewed-on: https://code.wireshark.org/review/13280 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14ssl: improve interaction with heuristics subdissectorsPeter Wu2-38/+79
Do not call heuristics dissectors when the SSL application data protocol is known (via STARTTLS or via an earlier packet in session). When the protocol is *not* known, first try heuristics on the initial payload. If a match is found, it can then override the protocol that would otherwise be used due to a port number match. The HTTP2 dissector is adjusted to take advantage of that such that HTTP2 on non-standard ports still get detected as HTTP2. Also save dissector registration to avoid the http2 dissector from showing up as "(null)". Now HTTP2 is really shown as "http2" and not "http" in the "Application Data Protocol"! The CredSSP dissector is untested and not modified as I don't know if the whole stream will be SSL. Tested with fix-ssl.pcap and a http2 capture (from bug 11331) wrapped in SSL (without ALPN). Change-Id: I134e2d4ac22287bc0a5aeadb1e38cb4059fa108b Reviewed-on: https://code.wireshark.org/review/13179 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-14fix,ssl: "fix" FIX over SSLPeter Wu1-0/+16
Enable FIX dissection over SSL using a heuristics dissector for SSL application data. Tested with fix-ssl.pcap from the SampleCaptures wiki page which I generated using f8test from Fix8 1.3.4 (compiled/running on Debian Jessie with OpenSSL 1.0.1k-3+deb8u1). Bug: 8625 Change-Id: Ib29c30352f22f49dcf4c5b5f1915c43031064c34 Reviewed-on: https://code.wireshark.org/review/12263 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-14Present PDU header timestamps with microsecond resolution as exists in ↵alpartis1-7/+7
packet data. On behalf of SimPhonics, Inc. IEEE 1278.1-2012 DIS spec details the PDU header timestamp in section 6.2.88 as a 31-bit unsigned integer count of microseconds since the start of the current interval. Likewise, the DIS dissector should reflect this information accurately, based on the actual complete contents of captured packets. Tested with DIS packets generated from VPlus for radio simulation by SimPhonics. Change-Id: I73b9689e1fb35900b7063746cac604a72a69ab16 Reviewed-on: https://code.wireshark.org/review/13210 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: Anders Broman <a.broman58@gmail.com>
2016-01-14Clarify IPHC dissection of IPv6 ECN and DSCPKevin Bracey1-27/+34
6LoWPAN IPHC dissection displayed ECN and DSCP as if they were an IPv6-layout bitfield. Remove this extra abstraction layer, and output them more simply as individual bit items, with a generated field to indicate the IPv6 equivalent. Change-Id: Iff1473ce181fb40ae07a773689a5fee7bd9e98c7 Reviewed-on: https://code.wireshark.org/review/13185 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-14[airpcap] Fix parsing of GTKCedric Izoard1-54/+44
- When parsing key data for GTK, check both the IE ID (0xdd) and OUI-type (00-0F-AC 1) as key data may contains more that one IE with ID (0xdd) and GTK KDE is not always the first one - Determine key type (TKIP/CCMP) based on actual key length and not size of the whole key_data part - Remove arbitrary limit on size of key_data Bug: 11973 Change-Id: I8f71fe970c07a092131eada2be3936c12a61cdd5 Reviewed-on: https://code.wireshark.org/review/13182 Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-14Rename new_register_per_oid_dissector to register_per_oid_dissector.Guy Harris2-3/+3
There's no "old" register_per_oid_dissector, so the new_ is redundant. Change-Id: Iaf85a0bec120c5171d68ca4b12b6724a77df8305 Reviewed-on: https://code.wireshark.org/review/13274 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14Rename new_dissector_t to dissector_t.Guy Harris26-62/+62
There are no longer any "old" dissectors, so "new_" is redundant. Change-Id: I5fee51228c2a8562166f5991e1f30c2c697e45c8 Reviewed-on: https://code.wireshark.org/review/13273 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14Clean up indentation.Guy Harris1-4/+4
Change-Id: I140a6c7ac2f9380335ce9756824319b4d4a5b323 Reviewed-on: https://code.wireshark.org/review/13272 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14Use the return value of register_dissector().Guy Harris1-2/+1
Change-Id: I6814616be9d46e0a075cc3f1d97ded131493b67e Reviewed-on: https://code.wireshark.org/review/13271 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14Have various ATM dissectors use the data arguments for pseudo-headers.Guy Harris6-234/+233
Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-13Enable USB sub-dissectors for MA USB.Sean O. Stalley5-445/+393
MA USB packets with USB payload are now passed into the USB dissector. This allows the payload to be dissected by the USB sub-dissectors. 1. Refactor dissect_usb_common() and put the code needed for finding USB subdissectors into a seperate helper function. 2. Add dissect_usb_payload() call 3. Add dissect_mausb_pkt_common() helper function 4. Put code for dissecting all types of MA USB packets into helper function dissect_mausb_pkt(). 5. Add dissect_mausb_pkt_data() helper function 6. Put code for dissecting MA USB datapacket-specific fields into helper function dissect_mausb_pkt(). 7. Use proto_tree_add_bitmask() call for MA USB bitfields. 8. Create packet-mausb.h to expose MA definitions to USB dissector 9. Dissect MA USB payload with USB subdissectors 10. Undeclare USB calls no longer used by MA USB dissector Change-Id: I456714572cd8dfc9982b087670ca73c17e25a26c Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> Reviewed-on: https://code.wireshark.org/review/13187 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-13Do not filter on "http" when Following HTTP streams.Michael Mann1-25/+1
Change-Id: I5be0ce9168e987e8fd5ba404338111c8b8706c9f Reviewed-on: https://code.wireshark.org/review/13243 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> 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-13RRC: follow-up of g588955dPascal Quantin1-124/+138
Change-Id: I46d23e57441f5776a63776adc8cbf7fedffad49c Reviewed-on: https://code.wireshark.org/review/13264 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-13[RRC] Update to V13.1.0 (2015-12)AndersBroman1-9143/+14383
Change-Id: Ic9c19bf7f8ee4233ac1150bc372b3693502d986d Reviewed-on: https://code.wireshark.org/review/13261 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-13Use result of register_dissectorPeter Wu32-123/+79
Assign result of `register_dissector(..., func, proto)` to FOO_handle and remove `FOO_handle = create_dissector_handle(func, proto)`. Found by looking for files named packet-FOO.c having the above create_dissector_handle pattern. Some files (with different dissect routines for the two functions) remain unchanged. Change-Id: Ifbed8202c6dbc63a1dae9acc03313980ffbbbb90 Reviewed-on: https://code.wireshark.org/review/13247 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-13Clean up handling of the data before the Ethernet packet in ERF files.Guy Harris1-15/+10
The data before the Ethernet packet isn't a 16-bit little-endian integer, it's two bytes, one byte of offset and one byte of padding. Change-Id: I327b88f058dda184b79d3c2c6cf0dea52c0d28b1 Reviewed-on: https://code.wireshark.org/review/13254 Reviewed-by: Guy Harris <guy@alum.mit.edu>