aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-09-01uat: clarify documentationPeter Wu4-50/+96
No functional change, fixes typos, adds some meaningful function parameters and tries to clarify the memory management concerns. Also fix a -Wdocumentation issue in epan/proto.h Change-Id: I59d1fcd2ce96178e0a64a0709409a9a7a447c7c6 Reviewed-on: https://code.wireshark.org/review/17431 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-01GTP: Added dissection of UTRAN Container for Forward Rel Req/Resp MessagesBinh Trinh1-1/+27
Change-Id: I8330e7e57d3ad09e526da0d7a0970f96fedd03a6 Reviewed-on: https://code.wireshark.org/review/17434 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-09-01gtk: fix compilation with GTK+ before 2.18Peter Wu31-8/+37
Removed in v1.99.2rc0-399-g43f09e6, but some includes are still needed. Basically I looked for the functions defined in the ui/gtk/old-gtk-compat.h header file that were in files below ui/gtk/. Then I matched it against the removed part in the above commit and added the header back at its old place. In two other cases, the header was only needed for Windows. If the above commit did not reference the file, I checked which function was in use and added the header on top, removing redundant conditionals. Reported and tested by a user of GTK+ 2.12.12 on top of v2.0.5. Change-Id: I649eec1e5531070f88c99d893c4920306f56d849 Reviewed-on: https://code.wireshark.org/review/17371 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-01ipv6: fix build with old 32-bit glib headers (master only)Peter Wu1-1/+1
Introduced with v2.3.0rc0-112-gdcb7b71, nxt is only a guint8* which fails on 32-bit glib before 2.31.2. Change-Id: Ide1816a971fa213f5669a7fa71bc111d5b1cc921 Reviewed-on: https://code.wireshark.org/review/17418 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-01ipsec: fix build with old 32-bit glib headersPeter Wu1-1/+1
In commit v2.3.0rc0-121-gb6d13ef, GUINT_TO_POINTER(ah_nxt) was added, but on 32-bit glib before 2.31.2 this results in a type error. Change the type of ah_nxt since all its users take a guint anyway. Change-Id: I2fb030f79011b8a7159a0b0df26d3545b0ce3c06 Reviewed-on: https://code.wireshark.org/review/17419 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-01gtk: fix 32-bit buildPeter Wu2-3/+3
32-bit glib before 2.31.2 expand GUINT_TO_POINTER(x) as (gpointer)x. add explicit cast since curr_layer_num is 8 bits. Fixes v1.99.10rc0-179-g1d7bcb2. Storing a 64-bit integer into a 32-bit pointer makes the compiler complain. Add explicit cast. Fixes v1.99.1rc0-76-ged0b19b. Change-Id: I75fdf17882a0f5ddce7d3b3e74b1bf80ff6cd4ae Reviewed-on: https://code.wireshark.org/review/17417 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-31E.212: update list to Operational Bulletin No. 1106 (15.VIII.2016)Pascal Quantin1-135/+289
Also manually add PLMN 460 02 (Chian Mobile) as it is not listed by ITU yet Bug: 12622 Bug: 12798 Change-Id: I7c6fab9dcb9da90178186e94f624301ef1861421 Reviewed-on: https://code.wireshark.org/review/17428 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>
2016-08-31OSSP: Retrieve OUI at proper offset in packetJaap Keuter1-4/+4
Bug: 12801 Change-Id: Ic70f0d93bbffc99ceacf6b2963b04d7477e4914b Reviewed-on: https://code.wireshark.org/review/17425 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-31NFS: fix indent (remove some trailing spaces)Alexis La Goutte1-20/+20
Change-Id: Ic72d264686c3b37ac15118eec07057c7bb8a2a50 Reviewed-on: https://code.wireshark.org/review/17422 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-08-31diam_dict.l: remove use of strdupPeter Wu1-16/+6
This should fix crashes on Windows, _strdup should not be mixed with g_free. This was only uncovered in v2.3.0rc0-474-ga04b6fc, before that ddict_free was never called. Change-Id: I34111385c82715de70fb42fe44b99b89e132a374 Reviewed-on: https://code.wireshark.org/review/17423 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31Win: switch back to Lua library compiled with MinGWPascal Quantin1-12/+4
It does not suffer anymore from bug 9957 Change-Id: I871f01db67101b09a21545ecec5473941997a5cb Reviewed-on: https://code.wireshark.org/review/17416 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>
2016-08-31rftap: add new dissectorJonathan Brucker4-0/+611
The RFtap protocol is a simple metadata header designed to provide Radio Frequency (RF) metadata about frames. For official specifications see: https://rftap.github.io/ Signed-off-by: Jonathan Brucker <jonathan.brucke@gmail.com> Change-Id: I0d008b2baadcc5cc9577113e9795eef2691b961a Reviewed-on: https://code.wireshark.org/review/17355 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: Michael Mann <mmann78@netscape.net>
2016-08-31Revert "Revert "diameter: fix 400kb leaked memory on exit""Guy Harris2-9/+38
This reverts commit 5fea2b5f4198f1a36f313ef38532ddffd02ac5b1. I.e., it puts back the change; the reverted version passed the tests on which the versions with this change crashed. Change-Id: Idcc0eb11588cf14e2fe666de1905ee63917b0fcf Reviewed-on: https://code.wireshark.org/review/17413 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31Revert "diameter: fix 400kb leaked memory on exit"Guy Harris2-38/+9
This reverts commit a04b6fcb3db901734ed948134c973996786be8b7. Temporary revert to see if this prevents the "tshark -G" crashes being seen on the 64-bit Windows buildbot. Change-Id: I561439039ca2667b72d7e2319a6f3f5f97e18d15 Reviewed-on: https://code.wireshark.org/review/17412 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31OK, it probably crashed in proto_initialize_all_prefixes().Guy Harris1-2/+0
Remove the debugging printouts. The changes that were committed between the last build that didn't crash and the first build that did were: commit 961f743d69b323aa217a6b39184485d6a0bfb2d5 Author: Peter Wu <peter@lekensteyn.nl> Date: Mon Aug 29 01:34:22 2016 +0200 xml: fix some memleaks No more memleaks reported for the attachment in bug 12790 :-) Change-Id: I8472e442143b332edfacdf9ef3b8b893f1ec4386 Ping-Bug: 12790 Reviewed-on: https://code.wireshark.org/review/17365 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: Peter Wu <peter@lekensteyn.nl> commit a04b6fcb3db901734ed948134c973996786be8b7 Author: Peter Wu <peter@lekensteyn.nl> Date: Sun Aug 28 22:19:29 2016 +0200 diameter: fix 400kb leaked memory on exit Before: SUMMARY: AddressSanitizer: 399684 byte(s) leaked in 17208 allocation(s). After addressing to-do by calling ddict_free: SUMMARY: AddressSanitizer: 3024 byte(s) leaked in 256 allocation(s). After fixing all remaining leaks cases in the flex file for diameter: SUMMARY: AddressSanitizer: 735 byte(s) leaked in 58 allocation(s). Not bad huh :-) Ping-Bug: 12790 Change-Id: I0c730ad77ae15c69390bc6cf0a3a985395a64771 Reviewed-on: https://code.wireshark.org/review/17364 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> commit 14312835c63a3e2ec9d311ed1ffee5285141f4f9 Author: Peter Wu <peter@lekensteyn.nl> Date: Sun Aug 28 19:20:59 2016 +0200 pcapng: do not leak blocks pcapng_open and pcapng_read have 'wblock' allocated on the stack, so if they return, they do not have to set wblock.block to NULL. pcapng_read_block always sets wblock->block to NULL and may initialize it for SHB, IDB, NRB and ISB. Be sure to release the memory for IDB and ISB. It is better to have more wtap_block_free calls on a NULL value than missing them as this would be a memleak (on the other hand, do not release memory that is stored elsewhere such as SHB and NRB). Ping-Bug: 12790 Change-Id: I081f841addb36f16e3671095a919d357f4bc16c5 Reviewed-on: https://code.wireshark.org/review/17362 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> *If* one of those is the cause, my guess is that it's the Diameter one, as the crash happens before any file is read (so it's probably not the pcapng one) and thus before any dissection is done (so it's probably not the XML dissector one). Change-Id: I816c1bbd6078eab251efd02ebb7c3195f6dd1483 Reviewed-on: https://code.wireshark.org/review/17411 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31GTP: patch for Target identification for non-compliance workaroundBinh Trinh1-0/+7
bug 3974 Change-Id: I2faa473c725a803056d6ffd0cb34b46d75121061 Reviewed-on: https://code.wireshark.org/review/17410 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-08-31ieee80211: Fix the BAR Ack policy valuesChaitanya T K1-2/+2
As per 802.11-2012 table 8-15 the string should be reverse. 0 - Send Immediate Ack (False) 1 - Dont't Send Immediate Ack (True) Change-Id: Iea3b179e11781f891d2294b0bcdf92de2bdba7ba Reviewed-on: https://code.wireshark.org/review/17394 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-08-31nfs4: Handle CB_GETATTRTom Haynes1-5/+8
Change-Id: Ifb68af443c6f13dfab99e32488d86c148621a316 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/17399 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-08-31Crashing in proto_initialize_all_prefixes()? Debugging output.Guy Harris2-8/+2
Change-Id: I6db711b1730b95460983ee190762753198c1959e Reviewed-on: https://code.wireshark.org/review/17409 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31MAUSB: Add Cancellation Status values defined in v1.0a SpecSean O. Stalley1-1/+3
Change-Id: I72812fa0650da0cde37ea6cbef81a3c7a9ba333d Reviewed-on: https://code.wireshark.org/review/17373 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>
2016-08-31Debugging printouts, to see why tshark -G crashes on the Win64 buildbot.Guy Harris1-0/+8
Change-Id: I16f6b7a69eed5ec66842df9d0640216fd273d3b0 Reviewed-on: https://code.wireshark.org/review/17408 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31RTPS: Fixed data holder dissection to match the standardJuanjo Martin1-84/+30
The OMG standard has changed in this new version. I have fixed the implementation. Change-Id: Ie9054ed52c66580c76096af86e0fb8e34a44e9d1 Reviewed-on: https://code.wireshark.org/review/17348 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-08-31nfs: Fix style in switchTom Haynes1-1/+2
Change-Id: Ica9fc960946542badb64af12769e7dfa3793db82 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/17397 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-31Use "ecatf" as the protocol name, to parallel everything else.Guy Harris1-1/+1
The fields have names beginning with "ecatf.", the dissector is called "ecatf", and it's only the frame layer of EtherCAT anyway, so just call it "ecatf". Change-Id: I2f127363fd115c307f0525f612fe184a30d46c55 Reviewed-on: https://code.wireshark.org/review/17406 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31Don't do any Decode As stuff for dissector tables not used with Decode As.Guy Harris217-518/+522
Have all dissector tables have a "supports Decode As" flag, which defaults to FALSE, and which is set to TRUE if a register_decode_as() refers to it. When adding a dissector to a dissector table with a given key, only add it for Decode As if the dissector table supports it. For non-FT_STRING dissector tables, always check for multiple entries for the same protocol with different dissectors, and report an error if we found them. This means there's no need for the creator of a dissector table to specify whether duplicates of that sort should be allowed - we always do the check when registering something for "Decode As" (in a non-FT_STRING dissector table), and just don't bother registering anything for "Decode As" if the dissector table doesn't support "Decode As", so there's no check done for those dissector tables. Change-Id: I4a1fdea3bddc2af27a65cfbca23edc99b26c0eed Reviewed-on: https://code.wireshark.org/review/17402 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-30RTPS: Allowing duplicates in the rtps.type_name tableJuanjo Martin1-1/+1
Change-Id: Ie7a35b0bb3275a0895fad646bf9a81406eadf37c Reviewed-on: https://code.wireshark.org/review/17393 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-30nfs: Standardize on FileHandle vs filehandleTom Haynes1-5/+5
Change-Id: Ib945ddee4a35bf984a9411e56ed3801cde70c6c4 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/17398 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-30Support Decode As for {SSL,TLS}-over-TCP.Guy Harris1-0/+41
We register dissectors for "Decode As" for {SSL,TLS}-over-TCP, so we should actually set up the "Decode As" stuff for it. Change-Id: I2a738667efdec1007069df74885a4fe8fc3fcbab Reviewed-on: https://code.wireshark.org/review/17400 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-30[Diameter] Improve dissection of malformed packets by continnuingAndersBroman1-1/+11
dissection and display the problem more prominetly. Change-Id: Ia1a32667a18e1e5b60b5c167da9b6dd945ba3dfc Reviewed-on: https://code.wireshark.org/review/17385 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-08-30time_util: fix -Wshadow issuePeter Wu1-3/+3
time_util.c was already fixed, but the header was missing the change, breaking the build on a very old compiler. Change-Id: I95685c9a3e25dcb7567f2551b92f20c8792a6e47 Reviewed-on: https://code.wireshark.org/review/17384 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-30ssl: fix wrong detection of non-resumed renegotiated sessionPeter Wu1-0/+2
If the heuristics fail to detect a resumed session, then it must mark the session as a normal session. This will also prevent from applying secrets that do not apply to this renegotiated session. Bug: 12793 Change-Id: I90f794a7bbaf7f1839e39656ac318183ecf48887 Reviewed-on: https://code.wireshark.org/review/17376 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> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-30GTP: add new RAT Type valuesBinh Trinh1-0/+3
Change-Id: Ia3d8956197faff9366de2635a9bd29f2bfc40f0d Reviewed-on: https://code.wireshark.org/review/17381 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-30Don't use a no-longer-extant variable.Guy Harris1-1/+1
Change-Id: I41c1a37248335d983da58b0b657a28ec521be290 Reviewed-on: https://code.wireshark.org/review/17378 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-29xml: fix some memleaksPeter Wu1-10/+8
No more memleaks reported for the attachment in bug 12790 :-) Change-Id: I8472e442143b332edfacdf9ef3b8b893f1ec4386 Ping-Bug: 12790 Reviewed-on: https://code.wireshark.org/review/17365 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: Peter Wu <peter@lekensteyn.nl>
2016-08-29diameter: fix 400kb leaked memory on exitPeter Wu2-9/+38
Before: SUMMARY: AddressSanitizer: 399684 byte(s) leaked in 17208 allocation(s). After addressing to-do by calling ddict_free: SUMMARY: AddressSanitizer: 3024 byte(s) leaked in 256 allocation(s). After fixing all remaining leaks cases in the flex file for diameter: SUMMARY: AddressSanitizer: 735 byte(s) leaked in 58 allocation(s). Not bad huh :-) Ping-Bug: 12790 Change-Id: I0c730ad77ae15c69390bc6cf0a3a985395a64771 Reviewed-on: https://code.wireshark.org/review/17364 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-29pcapng: do not leak blocksPeter Wu1-8/+8
pcapng_open and pcapng_read have 'wblock' allocated on the stack, so if they return, they do not have to set wblock.block to NULL. pcapng_read_block always sets wblock->block to NULL and may initialize it for SHB, IDB, NRB and ISB. Be sure to release the memory for IDB and ISB. It is better to have more wtap_block_free calls on a NULL value than missing them as this would be a memleak (on the other hand, do not release memory that is stored elsewhere such as SHB and NRB). Ping-Bug: 12790 Change-Id: I081f841addb36f16e3671095a919d357f4bc16c5 Reviewed-on: https://code.wireshark.org/review/17362 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-29MAUSB: Add Status value defined in v1.0a SpecSean O. Stalley1-0/+1
Change-Id: Ie8e77fffd54eb9b1918d90999a4419a80de8bc5e Reviewed-on: https://code.wireshark.org/review/17374 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-29tap-iostat.c: ensure that interval is set to its maximum value when using 0Pascal Quantin1-5/+5
Otherwise the statistics will be wrong if the capture duration is greater than G_MAXINT32 and it the user specifies an interval of 0 Bug: 12778 Change-Id: I83a0f627ec0bb7c535446c17afa486835091ab8b Reviewed-on: https://code.wireshark.org/review/17367 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>
2016-08-29telnet: remove meaningless line (CID 1372125).Dario Lombardo1-1/+0
Change-Id: I3b9bc01a4f72e2e0de3f83426a9b8e7060d0c89a Reviewed-on: https://code.wireshark.org/review/17366 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-29tproxy: fix memleak in is_banner_exchange_forPeter Wu1-1/+1
strdup and strcmp is a recipe for leaking. Change-Id: I522c71964e39f671a4101df9b2b432433fc1c12e Reviewed-on: https://code.wireshark.org/review/17363 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-28tvbparse: fix memleakPeter Wu1-0/+10
Use same wmem_epan_scope() as "w" (tvbparse_wanted_t). Change-Id: I73fdb1fb3b55a91b7bb0fc36e435024c6f0b3d73 Ping-Bug: 12790 Reviewed-on: https://code.wireshark.org/review/17361 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-28UAT gtk-ui, Qt-ui: Fixed copying records when no cp callback is definedMichał Skalski2-2/+11
According to documentation of uat_copy_cb_t, if uat->copy_cb is NULL, memcpy() should be used. This affected IKEv1 and IKEv2 UAT tables (possibly others). Change-Id: I27ebdc08385d260945699f101e714d3abb288b22 Reviewed-on: https://code.wireshark.org/review/17245 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>
2016-08-28[Automatic update for 2016-08-28]Gerald Combs12-101/+439
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ic4d32253800cb94d52c817f1cd40179d878323cb Reviewed-on: https://code.wireshark.org/review/17358 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-28ISAKMP: fix # of SPIs field name in Delete payloadMirko Parthey1-1/+1
Fix the "Number of SPIs" field name in the Delete payload. References: RFC 2408, RFC 7296 Change-Id: I205fb830275fc011e6605fdae53c6b9141e1628b Reviewed-on: https://code.wireshark.org/review/17353 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>
2016-08-28xmpp: Improve stanza reassembly.Stig Bjørlykke1-5/+7
A XMPP stanza may be fragmented inside a conversation, so don't check for this only when starting a new conversation. Change-Id: I63b987184f52645e6c72c3c4155b39b7948de828 Reviewed-on: https://code.wireshark.org/review/17344 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>
2016-08-27Qt: Support "Resolve Names" with multiple custom column fieldsStig Bjørlykke1-6/+11
Make "Resolve Names" enabled if at least one of the custom column fields can be resolved. Change-Id: I702471be5d90c91f71209923e6abcc6921dca850 Reviewed-on: https://code.wireshark.org/review/17350 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-08-26extcap: improve interface print in help.Dario Lombardo4-13/+30
Change-Id: Ife8e73b6cb1756623e937452fc042d8b31e2554f Reviewed-on: https://code.wireshark.org/review/17321 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-08-26wsutil: add enumeration of local ip addresses in Windows.Dario Lombardo2-3/+72
Routine used by ssh-based extcaps. Change-Id: I06d8e1e1444cd03a0508dc0c7cb91d340a451c58 Reviewed-on: https://code.wireshark.org/review/17308 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-08-26Properly end address type search by name (CID-1362742)Jaap Keuter1-3/+3
Search address type by name iterates over an array, but fails to find its end. Therefore it may dereference invalid pointers, or NULL. Add the proper check in the for loop and make sure an end condition is always there in the array searched. Change-Id: I60ade9d438dc394340b6483b4fcb23e5ce432000 Reviewed-on: https://code.wireshark.org/review/17337 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-08-26SDP: Restore usability of conversation debug feature.Jaap Keuter1-4/+4
Some type changes were not carried forwared into the conversation debugging code. These changes allow compilation again. Change-Id: I90dde7cc94496828cf8931d74225773c2cea42a1 Reviewed-on: https://code.wireshark.org/review/17336 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>