summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-11-30Fix out-of-bounds read in ascend_seek.master-2.0Michael Mann1-0/+1
Bug: 11794 Change-Id: I74517806b119729ae6d9780bbd4bb094701ff05e Reviewed-on: https://code.wireshark.org/review/12266 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 338da1c0ea0b2f8595d3a7b6d6c9548f7da3e27b) Reviewed-on: https://code.wireshark.org/review/12296
2015-11-29Add bounds checking to find_signature.Michael Mann1-2/+2
Bug: 11791 Change-Id: Ibaa2c16229c1b78818283ba5f954b09f3894dc60 Reviewed-on: https://code.wireshark.org/review/12270 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 185911de7d337246044c8e99da2f5b4bac74c0d5) Reviewed-on: https://code.wireshark.org/review/12294
2015-11-29Qt: Check capture filter only once when selecting interface(s)Stig Bjørlykke3-5/+5
Changed to only check capture filter once (for each active DLT) when changing selected interface(s). This optimizes filter checking and avoids a "No interfaces selected" error when processing unselected interfaces before selected. Added a small optimization fetching device_name outside loop. Bug: 11671 Change-Id: I01ed7a99a2a9ced9a86774a78bec2ba27b4bb97c Reviewed-on: https://code.wireshark.org/review/12268 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit e75f74add63243fcaf620e47ae232f26a5b6dd67) Reviewed-on: https://code.wireshark.org/review/12292
2015-11-29GSM SMS: fix reassembly of UCS2 encoded SMSPascal Quantin1-35/+14
Bug: 11809 Change-Id: I5cbf43cbc9d0f33fa527aef1be4d5105f1d795a7 Reviewed-on: https://code.wireshark.org/review/12288 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> (cherry picked from commit 257938f66c255e2e978d0bf697f1d0e780620d55) Reviewed-on: https://code.wireshark.org/review/12290
2015-11-29Docbook: We no longer support Windows Server 2003.Gerald Combs3-25/+18
Try to clarify 2003 and XP support in the User's and Developer's guides. Change-Id: Id08b21374485bf7655b83bb20b7c3d70f8871499 Reviewed-on: https://code.wireshark.org/review/12275 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 5c620fff3dd6c278cdca4382b2cba2c5d0d35937) Reviewed-on: https://code.wireshark.org/review/12289
2015-11-29Replace my_dgt_tbcd_unpack with the safer tvb_bcd_dig_to_wmem_packet_str.Michael Mann4-185/+41
Bug: 11797 Change-Id: I07fdf3f7564424eac053f4c17de17f0d96597cca Reviewed-on: https://code.wireshark.org/review/12272 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-29[Automatic update for 2015-11-29]Gerald Combs17-1750/+2498
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I5e02d1c5fdc7adefb056e1d7e4f746509e6f598c Reviewed-on: https://code.wireshark.org/review/12285 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-29IPv6: Fix RPL routing header computed address count if ip6r_len == 0João Valverde1-27/+30
Bug: 11803 Change-Id: I6de6a240dee1cfb310c41976853c0c3683b0b80a Reviewed-on: https://code.wireshark.org/review/12276 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> 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>
2015-11-29RSVP: copy all rsvp_request_key info in file scopePascal Quantin1-1/+26
This is needed as it is later used for comparisons in the request hash table Bug: 11793 Change-Id: Ibf5f1bce68fa797e0a17dd3a8313332d093eb2fe Reviewed-on: https://code.wireshark.org/review/12257 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-28vwr: fix buffer overrun in getRatePeter Wu1-3/+6
Bug: 11789 Change-Id: Ieba9f32928b91be5d07b25bf54005155f7cc79f6 Reviewed-on: https://code.wireshark.org/review/12261 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-28Qt: Validate capture filter before showing packet list.Stig Bjørlykke1-2/+2
When starting a capture do validate all settings before showing the packet list. Bug: 11667 Change-Id: Ia0457b9643ca76f8d51c0a254f587398dda888d9 Reviewed-on: https://code.wireshark.org/review/12259 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 41d4dabc291757b5aa880ca98d2c3eb5d8bc3fe3) Reviewed-on: https://code.wireshark.org/review/12260
2015-11-28Diameter: check IPv6 prefix length before copying it in e_in6_addr structurePascal Quantin1-2/+8
Bug: 11792 Change-Id: I37a07044d40f10e9a1a90025d90753fdb3db2278 Reviewed-on: https://code.wireshark.org/review/12248 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit aaa28a9d39158ca1033bbd3372cf423abbf4f202) Reviewed-on: https://code.wireshark.org/review/12251
2015-11-28Qt: Make About->Plugins scrollableStig Bjørlykke2-14/+5
Bug: 11427 Change-Id: Iebc693bc2a035bad3bc2491af4b5a12c9e7d2fa5 Reviewed-on: https://code.wireshark.org/review/12201 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: 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> (cherry picked from commit 15086a808ecc5627cdfbfedae23d2a910f059532) Reviewed-on: https://code.wireshark.org/review/12249 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-28Add boundary check for 802.11 decryptionPeter Wu2-2/+10
Fixed stack-based buffer overflow when the frame length exceeds 8KB. Bug: 11790 Change-Id: I20db8901765a7660e587057e955d4fb5a8645574 Reviewed-on: https://code.wireshark.org/review/12237 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit 40b283181c63cb28bc6f58d80315eccca6650da0) [resolved conflict by accepting comments from v2.1.0rc0-764-g9cd66b2] Reviewed-on: https://code.wireshark.org/review/12246
2015-11-28[mp2t] use the correct file infomation for PCR detectionMartin Kaiser1-7/+13
when we check for an mpeg2 transport stream, we're trying to detect an initial offset before the first sync byte and the length of additional data appended to each packet use those values when we go through the file again and verify the PCR Bug: 11749 Change-Id: Iab03cb271d23d38f850ca857b64ca47ba4501175 Reviewed-on: https://code.wireshark.org/review/12183 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 6da516821d24b8857fe3a55703e517db0106d23c) Reviewed-on: https://code.wireshark.org/review/12244 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-11-28Qt: reload after applying parameters in UDP multicast dialogPeter Wu1-1/+1
Noticed this message in stderr, started investigating: QObject::connect: No such signal MulticastStatisticsDialog::updateFilter(QString&,bool) in ui/qt/multicast_statistics_dialog.cpp:247 QObject::connect: (sender name: 'TapParameterDialog') QObject::connect: (receiver name: 'TapParameterDialog') Verified that after this patch, the "Max Burst" changes from "4/100ms" to "1/1ms" when modifying "Burst measurement interval (ms)" from 100 to 1 using rtp-norm-transfer.pcap from the SampleCaptures wiki. Change-Id: I803ff9e5a542a5fd3507b086f29628fbf5602784 Reviewed-on: https://code.wireshark.org/review/12228 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> 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> (cherry picked from commit 05121be1b4ea35257bfcd8ed38d2312b1519f370) Reviewed-on: https://code.wireshark.org/review/12243
2015-11-28Qt: set focus to text box when opening search framePascal Quantin3-2/+12
Change-Id: Iac932365bc2fa7a5d5102a5f5455ea01daa86590 Reviewed-on: https://code.wireshark.org/review/12236 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> (cherry picked from commit 75da6960e0c6a933e4459249113716c4137cd386) Reviewed-on: https://code.wireshark.org/review/12242
2015-11-28Qt: fix "go to packet" broken by g56625ddPascal Quantin2-1/+8
Keeping auto scroll is required to update the row displayed. Instead catch the mouse event and stop auto scroll only during that time. Change-Id: Ibc5b0a4115192fc3e01e63c82e67761e5aed9d3b Reviewed-on: https://code.wireshark.org/review/12235 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit df83e45084f7a8430225f646a03d1974b188d3ca) Reviewed-on: https://code.wireshark.org/review/12241
2015-11-27Remove 'filetap' residue from .gitignoreJoão Valverde1-2/+0
Change-Id: Ica5aff181e3b5031bd0be59c71a6bfa485e5c199 Reviewed-on: https://code.wireshark.org/review/12148 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit ac7982cf9b2f9c9fe9af422c03e3e43c7c11e264) Reviewed-on: https://code.wireshark.org/review/12233
2015-11-27Fix crash in UDP Multicast Streams dialogPeter Wu5-26/+42
Attempting to open the UDP Multicast Streams dialog in the GTK UI triggers an instant crash (heap-buffer-overflow). Déjà vu. This is the same problem that plagued the RTP Streams dialog. This patch is based on the fix in v1.99.3rc0-33-g2c65b33 (mcaststream_dlg_update confused GList vs. mcaststream_tapinfo_t). After fixing that, the dialog crashed shortly after setting parameters (heap-use-after-free). That fix is based on v1.99.10rc0-292-gb02a0ee (after a retap, the old items were still present in the list). Just that change was not enough as clearing the list still triggered a signal, possibly because of the "changed" signal (while the RTP player uses a selection setter function). Apply the patch based on v1.99.10rc0-270-g01bd832 (disable selection while clearing). Change-Id: I152bac6f954d8d1c5c20d6c7d56a196c3e20c681 Reviewed-on: https://code.wireshark.org/review/12227 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: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit d7f12436709e40d58d7fcdfbcdd08740c039e162) Reviewed-on: https://code.wireshark.org/review/12231
2015-11-27Qt: remove automatic horizontal scrolling when selecting a rowPascal Quantin3-5/+6
QTreeView automatically scrolls so as to show as much as possible the content of the selected column. Let's get rid of that. Rename PacketList::setAutoScroll() so that it does not overload QAbstractItemView::setAutoscroll() Change-Id: I09fb54f9b31c3025efddce6a4e709baaf107702d Reviewed-on: https://code.wireshark.org/review/12225 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> (cherry picked from commit 56625dd4562d89f711ab68caa8cf849509b0970f) Reviewed-on: https://code.wireshark.org/review/12230
2015-11-27Fix display of bytes as EBCDICPascal Quantin5-7/+8
MSVC compiler does not support properly setting an enum being part of a bit field. For example the following code: pinfo->fd->flags.encoding = PACKET_CHAR_ENC_CHAR_EBCDIC; changes pinfo->fd->flags.encoding from 0x0 to 0xfffffffe instead of 0x1 Let's put back an unsigned int definition (like it is in master-1.12 branch) and add explicit casts where required Bug: 11787 Change-Id: Idae0140fb6c172f1b3dbf10baefc8cfb00128f4c Reviewed-on: https://code.wireshark.org/review/12220 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> (cherry picked from commit 62b03da49a3e6c32f788da375faea2ca47fa2aa9) Reviewed-on: https://code.wireshark.org/review/12229
2015-11-27Fix crash in Capture File Properties dialogPeter Wu1-1/+2
Fixes crash when a capture file is closed while the capture file properties dialog is open. Change-Id: Iba35be38e1f53d422ff8428a672703385d477660 Reviewed-on: https://code.wireshark.org/review/12224 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit 946222c676dbda138fff0b437be12f8fddab5131) Reviewed-on: https://code.wireshark.org/review/12226
2015-11-27autotools: do not apply CFLAGS in reverse orderPeter Wu2-33/+41
Fixes false "-Wvariadic-macros" because "-Wpedantic" came after "-Wno-variadic-macros". While at it, avoid (unintentionally?) adding -fPIE to all C++ programs (via CXXFLAGS). Availability of flags is checked by appending a flag (in case the user has something like CFLAGS=-Wno-error). This removes a -fPIE check for CXXFLAGS and removes 5 -Woverlength-strings and 9 -Wvariadic-macros warnings from make with Clang 3.7.0. configure and compile times were equal. (A diff between the configure outputs showed no other changes.) This reverts commit cf0d762d7304aa569ea25faf999c74bbe94f9023 and applies a different approach. Ping-Bug: 10791 Change-Id: Ic7b4137e2d98b06bc7625091be9bc7dd69182586 Reviewed-on: https://code.wireshark.org/review/12175 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 470c745a7a0a5b930bdfb0edd8874436cb9beea0) Reviewed-on: https://code.wireshark.org/review/12186 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-27configure.ac: Fix CXXFLAGS with optimization for HP-UXJoão Valverde1-1/+1
Change-Id: I0cdef95ce44fb5c6112998697dbafe23c3ee13ab Reviewed-on: https://code.wireshark.org/review/12212 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit faf680fbd4c129679b94f78bf76a9e1b955a5729) Reviewed-on: https://code.wireshark.org/review/12218
2015-11-27Qt: Check zero recent column widthStig Bjørlykke2-22/+28
Hidden columns may have been stored with zero width, so ensure we always check for this when fetching. Change-Id: I625c05adccaf2d81198fdeeccf7feeb9a9eb82c2 Reviewed-on: https://code.wireshark.org/review/12196 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit f5b816d4c92e633453fe65dfa56d80ad32bab477) Reviewed-on: https://code.wireshark.org/review/12217
2015-11-27[LDAP] Bugfix counting of search results.Michael Mann2-6/+6
Bug: 11761 Change-Id: Icd955b848edc9f802331f25ab1b8684aa2631553 Reviewed-on: https://code.wireshark.org/review/12184 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> (cherry picked from commit c51f207308d04bda005f84828b59cec4104e4b8f) Reviewed-on: https://code.wireshark.org/review/12216
2015-11-27Qt: display RTP/IAX2 graph analysis arrival time as absolute instead of relativePascal Quantin2-4/+4
It makes it easier to synchronize the graph and packet list Change-Id: Ia0c6bc46227c1ff9267622ff52b5a5d966cd6e6a Reviewed-on: https://code.wireshark.org/review/12195 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> (cherry picked from commit d9f777c99a8af01bcf89fb869602cebdf47f9adf) Reviewed-on: https://code.wireshark.org/review/12215
2015-11-27Qt: display RTP stream Y axis values as millisecondsPascal Quantin1-6/+6
Bug: 11784 Change-Id: I505338d85788e0889999622ff392ca8fe5f46836 Reviewed-on: https://code.wireshark.org/review/12194 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> (cherry picked from commit 2c6824df2dadb3dafeab247301c15252d0a50461) Reviewed-on: https://code.wireshark.org/review/12214
2015-11-26Don't allow the "Ethertype" pseudo-protocol's dissection to be disabled.Guy Harris1-0/+2
It's not a real protocol, it's a helper dissector for various protocols, and it makes no sense to disable it; doing so means that the Ethertype field itself isn't disabled, and allowing it to be disabled means that you can't do "Disable All", and manually enable Ethernet, IPv4, IPv6, and TCP to disable dissection of protocols running atop TCP on Ethernet. (See https://ask.wireshark.org/questions/48011/enabled-protocols-negation-of-disabled-proto for an example of somebody who wants to do exactly that.) Change-Id: Ibdd6ef53503de548e14cecc3766040c3a0b101d4 Reviewed-on: https://code.wireshark.org/review/12207 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 677faf2bd4bf233a7d8243b5c5abccf3111cfc5c) Reviewed-on: https://code.wireshark.org/review/12208
2015-11-26Wrong field name for signal strength as a percentage.Guy Harris1-1/+1
Copy-and-pasteo. Change-Id: I42ba4f172f9b837f01d3b30f2d14e7ee066f3e83 Reviewed-on: https://code.wireshark.org/review/12203 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit e988e1c76488e5e8ee685ca0dca62578120f1467) Reviewed-on: https://code.wireshark.org/review/12204
2015-11-26Don't check whether the C++ compiler supports a flag if there isn't one.Guy Harris1-93/+102
If we didn't find a C++ compiler, we can't check whether the non-existent C++ compiler supports a flag, so don't do so. Change-Id: I3d3232acae2dfc40deb0b01f35656ef53c4f1640 Reviewed-on: https://code.wireshark.org/review/12132 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 6181045bc161678496d557d61f7665c04b2e2ba2) Reviewed-on: https://code.wireshark.org/review/12185
2015-11-26Qt: make Files Set dialog modelessPascal Quantin1-1/+1
Otherwise you need to close the window each time you change the file so as to browse its content... Change-Id: Ibf8485695cec34bb950ad98cb671e77d4f663b63 Reviewed-on: https://code.wireshark.org/review/12187 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> (cherry picked from commit c965fb06148d0144426ba1b3fb301281a30a39b8) Reviewed-on: https://code.wireshark.org/review/12200
2015-11-26Qt: clear new_visible_rows_ when closing a capture filePascal Quantin1-0/+1
Bug: 11756 Change-Id: Iccc92963f81c3ded143953c8c1fad27cd57a7bc2 Reviewed-on: https://code.wireshark.org/review/12193 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-26Qt: Use correct column width when switching profileStig Bjørlykke2-4/+21
QTreeView::setColumnHidden() saves column width on hide and restores column width on show. When switching from a profile with hidden columns to a profile where this columns are shown we get a sectionResized() signal with the saved width from the old profile, initiated from columnsChanged() -> setColumnVisibility(). We must avoid setting this as a new column width because this is recent values from a old column layout. In other cases we use setColumnVisibility() we don’t need to set a new column width either, because we store the column width ourself. Don't store column width when hiding column (new_width == 0). Restore column width when showing column because profiles may have changed the packet_list layout. Change-Id: I7e89c3477402ec6d621cd2015ee74b086f60d6cb Reviewed-on: https://code.wireshark.org/review/12111 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> (cherry picked from commit 4980d505f268b2b1d2ebabf815f3d0ce34e8cd71) Reviewed-on: https://code.wireshark.org/review/12192
2015-11-26Lua: Switch URL to documentation to HTTPSUli Heilmeier1-2/+2
URL to documentation with https as suggested by Alexis. (s. commit ecc9c74326183e8d03eddfdbc1557919f3be6046) Change-Id: I64d82b0c07cce5658eb8f4ae758f1a42946b837a Reviewed-on: https://code.wireshark.org/review/12181 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit ff5719c6e846c2d699c27f972ef5af4740a7a74c) Reviewed-on: https://code.wireshark.org/review/12191
2015-11-26Change TCP transmission window full messageMichael Mann1-1/+1
Bug: 11741 Change-Id: I2b3adc82bc44fd4e83e6f04b7e9bdcfaadf1b445 Reviewed-on: https://code.wireshark.org/review/12180 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> 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> (cherry picked from commit 986a870145903e1b752711a47ac53d9eb0c85cde) Reviewed-on: https://code.wireshark.org/review/12189
2015-11-26Document tvb_get_guintXXX and tvb_get_ieee_XXXMichael Mann1-0/+27
Change-Id: I498c0ca39befa0c0117ee78c23714bf7af193ce9 Reviewed-on: https://code.wireshark.org/review/12164 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 2cf37ea0a09771e59353368ad187e9ad647e3d90) Reviewed-on: https://code.wireshark.org/review/12178 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-26L2TP: Correct L2TP over IP SHA1 message digestNicolas S. Dade1-1/+1
It should match the MD5 code, and skip over the 0x00000000 session id at the start of tvb. Change-Id: Ia3bee2bd07015523acc49bd7cb0247c3f1ac986e Reviewed-on: https://code.wireshark.org/review/12168 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 97e627e56d98bc45cd87cf629617c0dbd1798f6b) Reviewed-on: https://code.wireshark.org/review/12176
2015-11-26NSIS: refuse to install on Windows XP or Server 2003Gerald Combs2-47/+146
Warn the user when installing on Windows Server 2003 along with XP. CMake builds are not targeting them, and their support was officially dropped with Wireshark 1.12. Update our copy of GetWindowsVersion.nsh with "Alternate Script With Server Versions" from http://nsis.sourceforge.net/Get_Windows_version. Change-Id: I762859ea13e1ecd91757eeab360a39d1e6116144 Reviewed-on: https://code.wireshark.org/review/11972 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit a9f5d8503f85704bd6facc2de3f51f5d83f4862c) Reviewed-on: https://code.wireshark.org/review/12173
2015-11-26SCTP: add another NULL dereference checkPascal Quantin1-6/+8
This is a follow-up of g2259bf8 Change-Id: I4dfb839fcd016a8d7a7210e6358d230025eb96a3 Reviewed-on: https://code.wireshark.org/review/12171 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 1b32d505a59475d51d9b2bed5f0869d2d154e8b6) Reviewed-on: https://code.wireshark.org/review/12172
2015-11-26Qt: Redissect packets when changing profileStig Bjørlykke1-0/+2
When changing profile the protocol/dissector preferences may change so we need to redissect according to new settings. We should probably have a preferences diff to check if a redissect is needed, like it is in the preferences dialog. Bug: 11757 Change-Id: I025bbc7297966986a697f2a6368d9a74e3c1ba72 Reviewed-on: https://code.wireshark.org/review/12156 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit ce9d2ee428ce699e8b1c0c184a38cd75441e8d25) Reviewed-on: https://code.wireshark.org/review/12169
2015-11-26ISUP: fix a wrong removal of proto_tree_add_text()Pascal Quantin1-11/+3
Bug: 11768 Change-Id: I42199f391f6559de88ce37104bd74a9f4be77e09 Reviewed-on: https://code.wireshark.org/review/12149 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: Michael Mann <mmann78@netscape.net> (cherry picked from commit b1044d6553241aa10189ff1fc064702c767a09b8) Reviewed-on: https://code.wireshark.org/review/12163
2015-11-26SCTP: verify frame pointer before dereferencing itPascal Quantin1-6/+8
Bug: 11767 Change-Id: Icd01550e0aaa4cd0cc33ae3acc0ef702c38f4db4 Reviewed-on: https://code.wireshark.org/review/12146 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: Michael Mann <mmann78@netscape.net> (cherry picked from commit 2259bf8a827088081bef101f98e4983de8aa8099) Reviewed-on: https://code.wireshark.org/review/12158
2015-11-25qt: move file close (CID 1159303)Dario Lombardo1-2/+3
Change-Id: Ib21327babc77324313a1b3e2dd6ba0987a8fb333 Reviewed-on: https://code.wireshark.org/review/12144 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit b314342c0043d411912a7aff339d8cdd6ee413aa) Reviewed-on: https://code.wireshark.org/review/12154
2015-11-25Press Start instead of Manage Interfaces on EnterPeter Wu2-2/+2
In the Capture Interfaces dialog, the default dialog action was non-existing. Fix Extcap while at it (searched for "YesRole"). Reported on #wireshark at Freenode. Change-Id: I7920b806a855acc20dcd2081f6b0d58e993b4ac1 Reviewed-on: https://code.wireshark.org/review/12136 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit dde848b3d925d040592bd3f86487e9bc86905550) Reviewed-on: https://code.wireshark.org/review/12140
2015-11-25Fix memory leak in capture_get_if_capabilitiesMikael Kanstrup1-0/+2
Valgrind reports memory leaks like these: 154 bytes in 10 blocks are possibly lost in loss record 8,660 of 11,855 at 0x4C2B6CD: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0xBD9EA38: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.4) by 0xBDB3358: g_strndup (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.4) by 0xBDB49AD: g_strsplit (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.4) by 0x502291: capture_get_if_capabilities (capture_ifinfo.c:269) by 0x50A4CC: scan_local_interfaces (iface_lists.c:186) by 0x4C4BBD: refresh_local_interface_lists (capture_dlg.c:6117) by 0x504EC8: iface_mon_handler2 (iface_monitor.c:113) by 0xC9ADF1D: ??? (in /lib/libnl-3.so.200.3.0) by 0xC56DF19: ??? (in /usr/lib/libnl-route-3.so.200.3.0) by 0xC9ABE5E: nl_cache_parse (in /lib/libnl-3.so.200.3.0) by 0xC9AF5CA: nl_msg_parse (in /lib/libnl-3.so.200.3.0) Under certain conditions raw_list variable was not freed properly. Change-Id: Ibbaf0d67d983ee6912cfc9dc1a3169bc773b03c9 Reviewed-on: https://code.wireshark.org/review/12112 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: Michael Mann <mmann78@netscape.net> (cherry picked from commit 479ab3bcdc8d79b27bfc99fcde073457f72126ac) Reviewed-on: https://code.wireshark.org/review/12139
2015-11-25Fix buffer overrun in zlib decompressionPeter Wu1-3/+6
After updating next_in (to remove the gzip header), avail_in must also be updated. Failing to do makes zlib read past the input buffer. In theory this would resukt in a buffer overrun of at most double the input length, in practice zlib returns as soon as the compression fails (after reading a few bytes). Bug: 11548 Change-Id: If71691a2846338f46d866964a77cc4e74a9b61dd Reviewed-on: https://code.wireshark.org/review/12038 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit cec0593ae6c3bca65eff65741c2a10f3de3e0afe) Reviewed-on: https://code.wireshark.org/review/12137
2015-11-25Lua: fix URL to documentationUli Heilmeier1-1/+1
The Lua reference has been moved from User's Guide to Developer's Guide. Change-Id: I3489d774e54310ce49997e33d5318adf5e0bb2bc Reviewed-on: https://code.wireshark.org/review/12128 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit ecc9c74326183e8d03eddfdbc1557919f3be6046) Reviewed-on: https://code.wireshark.org/review/12129
2015-11-25Check whether create_tempfile() fails.Guy Harris1-0/+5
Thanks and a tip of the Hatlo hat to Coverity for finding this. Change-Id: Ie9d4089443e52ef427e0cc8ae6e90a9d9787134e Reviewed-on: https://code.wireshark.org/review/12123 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit e9c26d015bde3ca5e5bf858ddb266a70d6751b7d) Reviewed-on: https://code.wireshark.org/review/12124
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-03 17:56:51 +0000