aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-09-02MSDP: fix will never be executed [-Wunreachable-code]Alexis La Goutte1-2/+3
Move tvbuff declaration for avoid https://llvm.org/bugs/show_bug.cgi?id=19020 Found by Clang 3.7 Change-Id: I299d2413dc4effc5e6e34c289152b8f401f19342 Reviewed-on: https://code.wireshark.org/review/10326 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-02ANSI: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-4/+0
Change-Id: I981336271a8f6b41fe777f732069639df494c5d2 Reviewed-on: https://code.wireshark.org/review/10346 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-02UMTS (mac): fix will never be executed [-Wunreachable-code]Alexis La Goutte1-1/+1
Move tvbuff_t declaration for avoid https://llvm.org/bugs/show_bug.cgi?id=19020 Found by Clang 3.7 Change-Id: Id26fd62273d6838774db161a8b3f6c7db94a2de1 Reviewed-on: https://code.wireshark.org/review/10328 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-01ANSI A: fix dissection of numerous fields broken in g7298a31Pascal Quantin2-39/+29
Change-Id: I09898cfc1aedc4b8067c6d12c94effc51a5ebbc0 Reviewed-on: https://code.wireshark.org/review/10345 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-09-01Update the release notes.Gerald Combs1-0/+2
Change-Id: I0ab4cc92c24048e4e77b12bcc205d7a15a5ddb74 Reviewed-on: https://code.wireshark.org/review/10343 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-01Fixup the main window tab order.Gerald Combs2-2/+5
Make sure the packet list is directly after the display filter edit in the main window tab order. When we press enter in the display filter edit, go to the next child in the tab order. Change-Id: If46e178365dbd59feb5985e9f8fa8b55d004d864 Reviewed-on: https://code.wireshark.org/review/10342 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-01[mtp3_summary_dialog] Unused parameter warning with MSVCAndersBroman1-2/+2
mtp3_summary_dialog.cpp(315) : warning C4100: 'edt' : unreferenced formal para mtp3_summary_dialog.cpp(314) : warning C4100: 'pinfo' - Change-Id: Ia21e15ff6348f34bf8ae240f867f0ab2cade606a Reviewed-on: https://code.wireshark.org/review/10340 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-01Eliminate proto_tree_add_text from ANSI dissectors.Michael Mann3-295/+193
Change-Id: I22dccb2f2d71897334e11632f4060ccfbf4794ad Reviewed-on: https://code.wireshark.org/review/10334 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>
2015-09-01Convert the WSP stats to generic stat API.Gerald Combs6-442/+190
Add support for multiple tables to SimpleStatisticsDialog. Change-Id: I843d901db092d2f2856d3d1a16f29f85fb41374b Reviewed-on: https://code.wireshark.org/review/10339 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-31Convert the MTP3 stats to new "generic stat API".Gerald Combs22-510/+909
Convert both the MTP3 statistics and summary. As with the GSM stats this is mostly untested. Change-Id: I7af8d5f21c8161dc95f7f2c710f32364b6f6a431 Reviewed-on: https://code.wireshark.org/review/10338 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-31Windows: update GeoIP library to 1.6.6Pascal Quantin3-19/+10
Change-Id: I56f58e52fa39fdddd35bcc7ef6d96cfa4042892d Reviewed-on: https://code.wireshark.org/review/10333 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>
2015-08-31tshark.pod: fix typoPascal Quantin1-1/+1
Change-Id: Iba5f12637e0f494805f2d9aab370fb42a32c1cb9 Reviewed-on: https://code.wireshark.org/review/10335 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-08-31Qt/Lua: Call atclose when TextWindow closesStig Bjørlykke2-0/+10
The close callback was never called because the destructor was never called. Change-Id: I9f6204858bc5d5e48d0aedc90b0e242ab70e161c Reviewed-on: https://code.wireshark.org/review/10321 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-31NGHTTP2: Update to 1.3.0Alexis La Goutte5-10/+199
Change-Id: Ia12396b3b4a2bb4dcbdce63d06558b6474cd588e Reviewed-on: https://code.wireshark.org/review/10324 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>
2015-08-31Redraw timestamps when time display settings change.Gerald Combs1-3/+3
As with g3bec655, we need to call columnsChanged (which invalidates cached column strings) whenever any settings that generate those strings change. Do so for the time display preferences in the View menu. Bug: 11429 Change-Id: I71bf1cc0df2800902ecb7b734b8f12ebd85a4de5 Reviewed-on: https://code.wireshark.org/review/10331 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-31Add a Telephony→SCTP submenu.Gerald Combs1-0/+8
Add the current SCTP actions to the telephony menu to match the GTK+ UI. Change-Id: Ie7471bcbd1a82fe3f203d60f5ea8a72d923f34b9 Reviewed-on: https://code.wireshark.org/review/10332 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-31Redraw the packet list when name resolution changes.Gerald Combs3-7/+4
Call columnsChanged (which invalidates cached column strings) when we change our name resolution preferences from the View menu. Remove the last sorted column tracking from gf19a173 while we're here (it didn't work properly). Bug: 11468 Change-Id: I7fea58d702b283028235d023f27ab0336d8643a4 Reviewed-on: https://code.wireshark.org/review/10301 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-31Eliminate proto_tree_add_text from packet-rtps.cMichael Mann1-406/+666
Change-Id: I353b4fcb3091e731a4b2a68e1932a5abc60c6038 Reviewed-on: https://code.wireshark.org/review/10323 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>
2015-08-31Add a hidden item that allows to allow filtering on the station address.Joerg Mayer1-0/+37
This currently only works for data frames. A Fixme is in place for managment frames. Change-Id: I0a72a9a3e40cf8269856fbbcd97b270af422afa2 Reviewed-on: https://code.wireshark.org/review/10322 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-08-30dlsw: don't THROW() an exception from a dissectorMartin Kaiser1-4/+9
Change-Id: I897202e7fb2987f608ca4f98aa1a1dc4b7dbd995 Reviewed-on: https://code.wireshark.org/review/10320 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-08-30dlsw: remove unnecessary if (tree) checksMartin Kaiser1-100/+94
don't create an expert info under if (tree) Change-Id: I2c8f90483c434d708a97b621621ca123fc505edc Reviewed-on: https://code.wireshark.org/review/10319 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-08-30Add debug printing to tsharkHadriel Kaplan1-2/+59
Add g_warning functions for tshark debug printing, disabled by default. Change-Id: If1720b790b75bd1228afa62efac49dc04bc8addb Reviewed-on: https://code.wireshark.org/review/10314 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-30Add Lua 5.2.3 built with MSVC2015Pascal Quantin2-13/+7
Change-Id: I9b173f5136f858e4f95fb5b0688ef02c08a8d9e4 Reviewed-on: https://code.wireshark.org/review/10313 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-30[Automatic update for 2015-08-30]Gerald Combs16-10838/+10976
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I37400bf1fac15fcd5f2946913b96184b1828f091 Reviewed-on: https://code.wireshark.org/review/10317 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-30BGP: fixed incorrect NLRI decodingPyeole2-0/+10
Bug: 11308 Change-Id: I967b9596edad1e3656e139d0ca3a0e3c389d80ea Reviewed-on: https://code.wireshark.org/review/10308 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-08-30stanag4607: add check for wtap max size.Dario Lombardo1-0/+10
Bug: 11472 Change-Id: Ic269046e697ac5e65301caf4ea5586098d030458 Reviewed-on: https://code.wireshark.org/review/10279 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-30CBOR: fix definition of cbor.type.tag64 fieldPascal Quantin1-1/+35
Bug: 11486 Change-Id: I070c8c397a41c0c8231720c611938d7282c03d19 Reviewed-on: https://code.wireshark.org/review/10310 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-08-29pcapng: drop count is unknown for ISB without isb_if_drop optionHadriel Kaplan1-2/+6
Bug: 11489 Change-Id: I38bcc2570c2efc461e4eb0edbff8ac2a7371c725 Reviewed-on: https://code.wireshark.org/review/10311 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-29pcapng: handle NRB with optionsHadriel Kaplan1-2/+6
If a pcapng Name Resolution Block has options, they should not screw up the pcapng reader and cause it to fail to read the file. Bug: 11485 Change-Id: Ic27cba937b6d93a3d9ed92522ed6b39ae2daeb8f Reviewed-on: https://code.wireshark.org/review/10307 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-296LoWPAN: IPv6 Fragment Headers don't have a Length fieldKevin Bracey1-16/+25
RFC 6282 specifies special handling of the "Length" field in compressed IPv6 extension headers. However, the Fragment Header does not have a Length field, so this special handling does not apply - the second octet should be treated as opaque data, and the header length is always 8 octets. Bug: 11368 Change-Id: I28fcd66d96f58a5959bb669caf4244afaca9e67e Reviewed-on: https://code.wireshark.org/review/10231 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: Evan Huus <eapache@gmail.com>
2015-08-29pcapng: do not byte-swap NRB IPv4 addressHadriel Kaplan1-2/+2
Per the spec, it's always encoded in network order (4 separate bytes), and thus should not be swapped on read. Bug: 11484 Change-Id: I6a650896b324f42bfd2e05759c84e87ace733372 Reviewed-on: https://code.wireshark.org/review/10304 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-29pcapng: make SPB cap_len the same as packet_len if IDB snaplen is 0Hadriel Kaplan1-2/+3
An IDB snaplen of 0 means no limit, so a Simple Packet Block's capture length should be the same as its encoded packet length in such a case. Bug: 11483 Change-Id: I8856d6c6a669a0048ea64b3adbd23c37a598431d Reviewed-on: https://code.wireshark.org/review/10303 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-29Insure Qt Capture preferences dialog displays default capture device (if any)Jim Young1-2/+6
In CapturePreferencesFrame::updateWidgets() save and restore the default capture device name because the first call (and only the first call) in the loop with addItem() triggers on_defaultInterfaceComboBox_editTextChanged() which unconditionally sets the default name as the first non-hidden device. Bug: 10965 Change-Id: Ie93f84010a19e8144efa46ce889fb9064979e0e9 Reviewed-on: https://code.wireshark.org/review/9584 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-29CBOR: fix no previous prototype for proto_reg*_cbor [-Wmissing-prototypes]Alexis La Goutte1-0/+3
Change-Id: I20476046fc2338484ab85757cad7b19f4e41e4be Reviewed-on: https://code.wireshark.org/review/10283 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>
2015-08-29bootp/dhcp: fix Alcatel suboption detection bugJeffrey Smith1-1/+1
Change-Id: I4a4222f3f30bf8e996770295756dd206b5ce101b Reviewed-on: https://code.wireshark.org/review/10297 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-29Added Reload Lua plugins to the release notes.Stig Bjørlykke1-0/+1
Change-Id: I2ea50b331322e0bc66bf5f3b48d9c2e78bbdd1e5 Reviewed-on: https://code.wireshark.org/review/10285 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-29Fix a GHashTable assertion in DecodeAsDialog.Gerald Combs2-10/+34
Make sure we don't call g_hash_table_removed from g_hash_table_foreach, which generates an assertion error. Bug: 11426 Change-Id: I00283c97b0fc63551b901c0fd526b60c0fb80ace Reviewed-on: https://code.wireshark.org/review/10296 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-28Block sizes are unsigned 32-bit quantities; don't stuff them into an int.Guy Harris2-2/+2
*Especially* don't stuff the amount of remaining data in a block into an int that will then be passed to file_skip() as an amount to skip ahead, as a Really Large Value will turn into a negative value and produce various forms of bizarre and tricky-to-debug behavior. Change-Id: I4d0a6b36fe50df84925690ad688a3ab0433ceb17 Reviewed-on: https://code.wireshark.org/review/10299 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-28Qt: Fix use-after-free patternStig Bjørlykke1-2/+4
Change-Id: I7f6d9316234c1ccfec1ec5b5c3675b3237f22eda Reviewed-on: https://code.wireshark.org/review/10294 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-28Disable most of the main window while we're tapping.Gerald Combs1-0/+10
Our event loop is nested when we read packets. Disable the main window's central widget while we're retapping packets in order to minimize the chance of ending up in an unexpected state while analyzing packets. Note that we will probably want to disable more of the main window and do so in other parts of the code. Change-Id: I68a00fe43d2ac9e7c0749751abd1c10c47155b3b Reviewed-on: https://code.wireshark.org/review/10293 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-28Have separate variables for read and write errors.Guy Harris1-32/+32
That way, when we check for read errors, we don't run the risk of thinking we have a read error after we get a write error. Change-Id: Idb79822d30989b2529433878798c577a76eacca7 Reviewed-on: https://code.wireshark.org/review/10295 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-28Don't show a progress frame if our file was closed.Gerald Combs5-4/+18
Change-Id: Ie363f6764f4e8b2b5c476b85f7ddb0233a127f6e Reviewed-on: https://code.wireshark.org/review/10290 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-28Don't dissect twice from TapParameterDialog.Gerald Combs3-5/+5
When the user applies a display filter in TapParameterDialog we're about to start tapping. We need to set the display filter in the main window but we shouldn't apply it. Change-Id: I08bed5c7f470f1dbf32817a7d999f09d2c52f168 Reviewed-on: https://code.wireshark.org/review/10287 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-28Get rid of trailing blanks.Guy Harris1-1/+1
Change-Id: I0b705c924464dcc4987ed0e7c67b106b2b648dce Reviewed-on: https://code.wireshark.org/review/10289 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-28Don't check the radio information when testing for an HT Control header.Guy Harris3-259/+189
I now read 8.2.4.1.10 "Order field" in 802.11-2012 as saying that, in management and QoS data frames, the Order bit shouldn't be set for non-HT, non-VHT frames, so we can just test it for those frame types without bothering to check the radio metadata to see if the frame is an HT or VHT frame. This handles cases where the radio metadata isn't complete, e.g. an HT frame with a radiotap header but no MCS field. Handle this for *all* QoS data frames when capturing. Get rid of the "fixed-length link-layer header" stuff; it's not being used. Fix a case where we're appending text to a tree item without a space separating it from the previous text. Bug: 11351 Change-Id: I980f5b7509603b0c22c297fddc19434c08817913 Reviewed-on: https://code.wireshark.org/review/10288 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-28Clean up scanning to guess the bitrate of an MPEG-2 Transport Stream file.Guy Harris1-18/+57
Don't treat an EOF at the beginning of a frame as an error. Treat I/O errors as hard errors; treat short reads as an indication that the file isn't an MPEG-2 Transport Stream file. Treat the PCR for a given PID not going forward as an indication that the file isn't an MPEG-2 Transport Stream file. Bug: 11471 Change-Id: I42b5887049423f8265db9d121d7b5bd388e5b244 Reviewed-on: https://code.wireshark.org/review/10286 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-28Preparation Host Flows: make ICMP(v6) code and type retrieval more robustPascal Quantin4-27/+39
Do not retrieve type and code base on the info column content. Instead store type and code in pinfo structure and retrieve them in sequence analysis tap. Change-Id: I71cd505d7faf713c2372731495d47b45928a41f8 Reviewed-on: https://code.wireshark.org/review/10280 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Artho <pascalartho@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-08-28Update the release notes.Gerald Combs1-0/+8
Change-Id: I7fb0d307355320a77f011b59c71d1d54066b7d08 Reviewed-on: https://code.wireshark.org/review/10284 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-28ISAKMP: Add new CHACHA20/POLY1305 Transform Types Values (RFC7634)Alexis La Goutte1-1/+2
From IANA ikev2-parameters (2015-08-24) Change-Id: I02bfd9a0ffc9f863f4d266fcc56cd707c3e71725 Reviewed-on: https://code.wireshark.org/review/10282 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-28Speed up column sorting.Gerald Combs11-36/+141
The GTK+ UI sequentially dissects and caches column strings for all rows before sorting a column. Do the same in the Qt UI, which can improve performance considerably. Don't colorize packets when sorting in the Qt UI unless it's necessary. When sorting in the Qt UI, let the user cancel the initial packet dissection. Note that we'll need to replace std::sort in order to cancel out of sorting. Use a pre-allocated and pre-compiled GRexex when we prime columns. Note that we probably shouldn't parse a regular expression there. Cache the last result of proto_registrar_get_byname. Note performance hot spots elsewhere in the code. To do: GeoIP in packet-ip.c is pretty slow. Bug: 11467 Change-Id: Ib34038fee08ef0319261faeffc4eca01e52f4bd3 Reviewed-on: https://code.wireshark.org/review/10275 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-14 21:24:46 +0000