aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-01-13Dissect the MC and AAL2 headers as 32-bit words.Guy Harris4-288/+263
That's how they're extracted in the libwiretap module, and that's how they're shown in the ERF spec. This gets rid of some compiler warnings about type-punning. Merge some reserved bit fields to match what's in the ERF spec. Renumber others. Process the AAL2 and MC headers differently; yes, they're both big-endian 32-bit values, but that makes the code a bit clearer, and, heck, the optimizer may well combine the two sequences of code. Change-Id: Ief7f976e77e8f2fba1685ad5a50ee677a8070ae7 Reviewed-on: https://code.wireshark.org/review/13251 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-13Assorted cleanups.Guy Harris1-13/+13
Fix indentation. Just directly assign values to elements in the packet buffer; no need to convert them to numbers and note the value as a comment. Give more detail in the comment for null-terminating buffers. Terminate packet_buf[] once we're finished reading into it, to make it a bit clearer what's being done. Make the magic number buffer 513 bytes, so we have 512 bytes plus a terminating null. Change-Id: Ie182d93393cc55835b24075e908393c386c85c24 Reviewed-on: https://code.wireshark.org/review/13250 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-13nettrace_3gpp_32_423 Protect from buffer overun.AndersBroman1-1/+5
Bug: 11982 Change-Id: Ib704d9128ab6427751edbf3a33f4b8fd14902562 Reviewed-on: https://code.wireshark.org/review/13233 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-13[airpcap] Decrypt protected management frames (802.11w)Cedric Izoard3-11/+49
Enable decryption of Protected Management Frames by: - Authorizing decryption for robust management frame (i.e. management frame that may be encrypted): deauth, disassoc and action (Note: Assume all action frames are robust even if it is not the case) - Updating initialization of Additional Authentication Data (AAD) (don't filter-out subtype) and construct nonce (set mgmt flag) for management frames Bug: 11995 Change-Id: I7c34a021e4c49111b85d217c9272d24d0e29ecb2 Reviewed-on: https://code.wireshark.org/review/13232 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-13Use g_ntoh* rather than g_hton*.Guy Harris1-5/+5
Stuff in an ERF file is big-endian, except for timestamps, so we want to convert from big-endian to host format. (The two functions do the same thing; this just makes it clearer what we're doing.) Change-Id: I28e27857dcf299085e8a55747ffd45ad8313789b Reviewed-on: https://code.wireshark.org/review/13248 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Fix type of acn.dmx.data.Guy Harris1-1/+9
Add a comment indicating what choices are offered here; note that going back to FT_BYTES without changing the way it's put into the protocol tree is *not* a choice that's available. Bug: 11999 Change-Id: I9831c7e9e522d3c7cea2e92c2a989050772019e4 Reviewed-on: https://code.wireshark.org/review/13244 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Fix another warning on 64-bit platforms.Guy Harris1-1/+1
Change-Id: I5cdf55cdaef048d9d564a5fca39027dae3b78bab Reviewed-on: https://code.wireshark.org/review/13242 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Add the comment about the Wireshark changes github repo from the commitJoerg Mayer1-1/+2
messages to the README. Change-Id: Ia73807ca4c04ca0e9019ed22e5733bf378cdf327 Reviewed-on: https://code.wireshark.org/review/13241 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-01-12Don't use g_list_free_full().Guy Harris1-3/+7
It first appeared in GLib 2.28, and we support - and use, in the 32-bit OS X buildbot - earlier versions. Change-Id: I941a0206507e532c31cb13a918e3eb4d081e6ea3 Reviewed-on: https://code.wireshark.org/review/13240 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Need to include <epan/prefs.h> to declare preference functions.Guy Harris1-0/+2
Change-Id: I5fbc9d25dde30ce8d14c80e765a3a8a630fec708 Reviewed-on: https://code.wireshark.org/review/13239 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Fix warnings for epan/tap.c [-Wcast-qual]João Valverde1-40/+51
tap_listener queue is declared volatile. Assignment with cast to non-volatile generates compiler warnings. Change-Id: I3a2954f0d6ecfd7862ee0d9c1820cf737128a3c5 Reviewed-on: https://code.wireshark.org/review/13076 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-12proto.h comment spelling fix: sentinal->sentinelKevin Bracey1-1/+1
Change-Id: I72f09eda89adc231a6c97d3abde9ca6cebe4b24d Reviewed-on: https://code.wireshark.org/review/13234 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-12Fix FT_UINT24 comment errorKevin Bracey1-1/+1
Displayed as 6 hex digits, not 3. Change-Id: I61f9b41d4bd846ff74fac24b0651c7243c9c9e51 Reviewed-on: https://code.wireshark.org/review/13235 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-12[PPCAP] Add dissection of IE SCTP Association.AndersBroman1-0/+16
Change-Id: I48a14291205b14bc1eeade9b363c9e1d68d2eb9b Reviewed-on: https://code.wireshark.org/review/13223 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-12Change IPv6 "Flowlabel" to "Flow label"Kevin Bracey1-1/+1
Flow label has never been one word. Change-Id: I61863cb1d7aca0ee7b48e64c4abad700555e57f2 Reviewed-on: https://code.wireshark.org/review/13236 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-12Adding Analog Input Basic,Analog Output Basic,Analog Value Basic Clusters ↵Darshan Nevgi2-0/+825
for Zigbee Change-Id: I17cc19d1309670ac5d30ea8a190575ca77e476cb Reviewed-on: https://code.wireshark.org/review/13211 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-12Fix type: strlen returns a size_tEvan Huus1-1/+1
Change-Id: I5a3ea655c4a362bbacb72e8c7a19f3c96d22a0fc Reviewed-on: https://code.wireshark.org/review/13231 Reviewed-by: Evan Huus <eapache@gmail.com>
2016-01-12Refactor "Follow Stream" functionality on all GUI interfaces.Michael Mann35-3253/+1205
Create a "registration" system for Follow functionality so most of the work can be abstracted into a dissector and GUI can just be responsible for "display". This also removes the global variables in follow.c to open up multithreading possibilities. TCP, UDP and HTTP all have the same "tap interface" for Follow functionality (passing a tvb with byte data to "follow"). SSL still has it's own behavior, so Follow structures have to take that into account. TShark through the Follow registration now has support for HTTP. The only thing possibly missing is dynamic menu generation to further reduce explicit knowledge of Follow "type" (and rely on registration) Bug: 11988 Change-Id: I559d9ee1312406ad0986d4dce9fa67ea2103b339 Reviewed-on: https://code.wireshark.org/review/13161 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-12MAC LTE: fix dissection of out of band eventsPascal Quantin1-2/+2
Calling proto_tree_add_item(tree, proto_mac_lte, tvb, offset, -1, ENC_NA) with a empty tvb will trigger an exception Change-Id: Ieb33f60d3dbe4677531c2b6f7ae2603610b0d300 Reviewed-on: https://code.wireshark.org/review/13227 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-12Qt: Refactor testCaptureFileCloseStig Bjørlykke3-28/+39
Cleanup arguments and simplify code for button texts. Change-Id: Ie505650889212082e088a525f4b82e62b9177b0d Reviewed-on: https://code.wireshark.org/review/13180 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-126LoWPAN: correct IPHC traffic class decompressionKevin Bracey1-5/+9
Traffic class values from IPHC headers were shown correctly in the IPHC dissection, but not correctly inserted into the expanded IPv6 packet. Problem was only visible on little-endian systems - the previous code did work if big-endian. Error was not present in HC1 decompression, but both IPHC and HC1 IPv6 construction code clarified by avoiding writing overlapping union members. Bug: 11971 Change-Id: I3515f18c892f1fc28ef7f8a0830a79d134e81f48 Reviewed-on: https://code.wireshark.org/review/13109 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>
2016-01-12[aeron] don't THROW() an exception from a dissectorMartin Kaiser1-17/+30
in the functions that dissect specific messages, we can just return 0 add a return value to aeron_frame_stream_analysis_setup() and pass it on to the callers to allow for a clean exit Change-Id: Iab4dee38112e32ca36822abc49d27dfe9e4c9ef7 Reviewed-on: https://code.wireshark.org/review/13147 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-12Register the Redback dissector by name.AndersBroman1-0/+1
Change-Id: I8e9e559759a2c72490440123ec22023c4a57a8d2 Reviewed-on: https://code.wireshark.org/review/13221 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-12extcap: Sort extcap interfaces alphabeticallyRoland Knall3-19/+20
The interface list is not sorted at all, leading to a very chaotic list. This sorts it alphabetically, as well as correct a type in extcap_init_interfaces. Bug: 11998 Change-Id: Ib5381a1761e8f07f9ba7996b3e6276da063b3932 Reviewed-on: https://code.wireshark.org/review/13220 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-12C symbols need to be in a decorated section when used from C++.Guy Harris1-0/+8
The usual drill. Change-Id: I85a34362abc3f9795a7f11371f9d14b752c994b1 Reviewed-on: https://code.wireshark.org/review/13218 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Docbook: Revert part of change 13160Graham Bloice1-1/+0
Remove the file dependency on the xml file as this causes build failures due to parallel building. There is still an issue with the build of *.hhp if the corresponding *.xml file is rebuilt. Change-Id: I738c687be50daebcf93576be8a43dbb6475f4fc8 Reviewed-on: https://code.wireshark.org/review/13217 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-01-12Include ws_symbol_export.h explicitly.Guy Harris2-0/+3
Change-Id: I8c50d84cb7a84e907d6409572dd9f6545a284c5d Reviewed-on: https://code.wireshark.org/review/13216 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Fix infinite loop for when port max range is -1Peter Wu1-2/+4
Due to integer overflow (unsigned -1 + 1 = 0), a call to dissector_add_uint_range would be stuck in an infinite loop, eventually crashing due to out of memory. Found when setting radius.alternate_port:-1, but could happen with any dissector using similar ports_range constructs. Change-Id: Ia234e94516446250e959e0f51d552bef704cddff Reviewed-on: https://code.wireshark.org/review/13153 Reviewed-by: Peter Wu <peter@lekensteyn.nl> 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-12[OSC] implement SLIP framing via TCP for OSC-1.1.Hanspeter Portner1-6/+185
OSC-1.1 requires OSC packets to be double SLIP encoded on a TCP stream for framing, whereas OSC-1.0 frames packets via a int32 size prefix. As only either OSC-1.0 or OSC-1.1 will ever be used on the same connection, the tcp part of the OSC dissector should handle both. 'dissect_osc_tcp' now merely acts as a fork into one of both versions. Changes: * Reassembly for OSC-1.0 TCP is left untouched. * Reassembly for OSC-1.1 TCP is implemented in second reassembly mode. * OSC is no protocol per se, it's merely an encoding, renamed accordingly. * Fix logical vs binary OR typo in MIDI pitch bend calculation. Capture file: * Mixed framing (OSC-1.0, OSC-1.1) OSC TCP pcap: Bug 11976 Change-Id: I5d26db023ef3ee659ae5a668b1665abef40b54c3 Reviewed-on: https://code.wireshark.org/review/13112 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-12WS_DLL_PUBLIC_DEF is for definitions; WS_DLL_PUBLIC is for declarations.Guy Harris1-1/+1
Change-Id: I16d5981c8c76d59d19be0600e218495f1f6552b2 Reviewed-on: https://code.wireshark.org/review/13215 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Fix indentation.Guy Harris1-1/+1
Change-Id: Icefabed4c9069bb3fe015739c805cd8fb2426ea5 Reviewed-on: https://code.wireshark.org/review/13213 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Move some definitions and declarations around.Guy Harris4-107/+37
This removes duplicates (including one incorrect duplicate), and also means we have only one chunk_type_values[] value_string. Change-Id: I4c3035b1cfb5c86cc7a5bf79feb9a5b0204b6dcc Reviewed-on: https://code.wireshark.org/review/13212 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Lemon: resync with upstreamAlexis La Goutte3-286/+492
lemon: Thu Oct 29 13:48:15 2015 lempar: Tue Nov 10 14:51:22 2015 a copy of all Wireshark changes are available https://github.com/alagoutte/sqlite/tree/wireshark Change-Id: I51f8b40a7087362502f6ce2156820a9f107ddf15 Reviewed-on: https://code.wireshark.org/review/13033 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-12Add some missing curly braces.Guy Harris1-1/+2
Change-Id: Ifcacd1fedd8c71d47ab618d036765b8195d4ccbb Reviewed-on: https://code.wireshark.org/review/13209 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Fix indentation.Guy Harris1-3/+3
Change-Id: I5b01865b33b65ee55718be680b6d17cdeee1a809 Reviewed-on: https://code.wireshark.org/review/13208 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Fix indentation.Guy Harris1-3/+3
Change-Id: Ia9ad8d4f20453c147a96febc90df653c2489ddb5 Reviewed-on: https://code.wireshark.org/review/13207 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Fix indentation.Guy Harris1-1/+1
Change-Id: I06c424de1022f1aa815b75570775c1c6f2331872 Reviewed-on: https://code.wireshark.org/review/13206 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Fix indentation, add some braces.Guy Harris1-4/+6
Add some braces to make it clearer what some if clauses are. It also makes it clearer what the right indentation for the last statement of dissect_rtmac() is (if you don't have -Werror=misleading-indentation to tell you). Change-Id: I2c44c6de41e610de4c4b6b5025732483f4e33471 Reviewed-on: https://code.wireshark.org/review/13205 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Move the definition of TEXT_LAYER_LENGTH to packet-tpkt.c.Guy Harris2-5/+6
It's not used by anything outside the TPKT dissector - and probably *shouldn't* be used by anything outside the TPKT dissector. Clean up some white space while we're at it. Change-Id: I9bb9642a002fb9e8bd6c36d80d7653ef9af615d4 Reviewed-on: https://code.wireshark.org/review/13204 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Fix indentation.Guy Harris1-1/+1
Change-Id: Ia5d19031ecb55a2716f3b1654d3b546fb6bda0cc Reviewed-on: https://code.wireshark.org/review/13203 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Move definitions of value_string tables into packet-ncp.c.Guy Harris2-185/+188
Make most of them static; make the ones used in more than one file public, and declare them in packet-ncp-int.h. Change-Id: If3df3bda33239d1ad3145b10d375ed76d632d4a9 Reviewed-on: https://code.wireshark.org/review/13202 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Fix indentation.Guy Harris1-2/+2
Change-Id: I5ffe068753e549ac5f3159a3e026da3ae0a368f4 Reviewed-on: https://code.wireshark.org/review/13201 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Move everything from packet-fcdns.h to packet-fcdns.c.Guy Harris3-230/+205
None of it is used outside packet-fcdns.c. Then "#if 0" out an unused item from that file. Change-Id: Ie9f966055ef6b839ec4325d966eaac424d9495be Reviewed-on: https://code.wireshark.org/review/13200 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Fix indentation.Guy Harris1-1/+1
Change-Id: I7bce164bcaa6a5b38fe2614d5340396cff37ba70 Reviewed-on: https://code.wireshark.org/review/13199 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Don't define dvbci_event[] in a header, just declare it.Guy Harris2-9/+10
Define it in a source file, and export it to other users. One instance suffices (and suppresses "defined but not used" errors from -Werror=unused-const-variable). Change-Id: I8b8d624344ec08c777d1869ee2692d535f898f19 Reviewed-on: https://code.wireshark.org/review/13198 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Stylistic and whitespace cleanups.Guy Harris1-40/+13
Change-Id: Ib3a0ca9793925a626ea3121ed2581f23d103bb2c Reviewed-on: https://code.wireshark.org/review/13196 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-11Have separate subtrees for each present flags word.Guy Harris1-6/+23
If you have multiple present flags words, that makes it easier to see which bits belong to which words. Change-Id: Ib8168bf9ab540c3b11467e95d6ddfdd27a6ef317 Reviewed-on: https://code.wireshark.org/review/13193 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-11Rename some variables to make it clearer what they represent.Guy Harris1-35/+39
Change-Id: I025df298fb36320e32d0d932bce3f80217dde16b Reviewed-on: https://code.wireshark.org/review/13192 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-11Try to fix "Werror=misleading-indentation"AndersBroman1-40/+160
Change-Id: I9702a8afad787191b0c5bd8630ef2ec011cceb17 Reviewed-on: https://code.wireshark.org/review/13183 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-11LAT: fix no previous prototype for 'proto_register/reg_handoff_lat' ↵Alexis La Goutte1-0/+3
[-Wmissing-prototypes] Change-Id: Ifac7943f909fdb73395824f7bb6925476edc8cff Reviewed-on: https://code.wireshark.org/review/13181 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: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 21:00:53 +0000