From 36e8a6c3ee6127bb4b92d29ed558613be59c6d5d Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 14 Jul 2016 11:05:17 -0700 Subject: Build 2.1.1. Change-Id: I2895d29415bb191bf2d7fc0a4468f085085bd4d9 Reviewed-on: https://code.wireshark.org/review/16437 Reviewed-by: Gerald Combs --- ChangeLog | 7481 ++++++++++++++++++++++++++++++++++++++++ NEWS | 39 +- docbook/release-notes.asciidoc | 1 + make-version.pl | 8 +- ui/qt/wireshark_de.ts | 208 +- ui/qt/wireshark_en.ts | 4 +- ui/qt/wireshark_fr.ts | 6 +- ui/qt/wireshark_it.ts | 26 +- ui/qt/wireshark_ja_JP.ts | 6 +- ui/qt/wireshark_pl.ts | 26 +- ui/qt/wireshark_zh_CN.ts | 32 +- 11 files changed, 7670 insertions(+), 167 deletions(-) diff --git a/ChangeLog b/ChangeLog index e69de29bb2..b96eaeee94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,7481 @@ +commit d5f84c0 +Author: Gerald Combs +Date: Thu Jul 14 11:05:17 2016 -0700 + + Build 2.1.1. + + Change-Id: I2895d29415bb191bf2d7fc0a4468f085085bd4d9 + +commit 530e7f0 +Author: João Valverde +Date: Thu Jul 14 18:12:16 2016 +0100 + + IPv6: Fix jumbo payload length offset + + Change-Id: I52fb082782674cc851b246d3b6afa7b4f14bbe34 + Reviewed-on: https://code.wireshark.org/review/16434 + Reviewed-by: João Valverde + +commit 43f7d22 +Author: João Valverde +Date: Thu Jul 14 17:55:31 2016 +0100 + + IPv6: Fix Jumbogram hop-by-hop expert info + + Change-Id: I751acad2fad501b700c01a37bafa96d2add8fb36 + Reviewed-on: https://code.wireshark.org/review/16433 + Reviewed-by: João Valverde + +commit 75b0e29 +Author: Guy Harris +Date: Thu Jul 14 10:08:26 2016 -0700 + + Update URLs. + + (Gotta ensure that there's always at least one commit here that's less + than a year old. :-)) + + Change-Id: I297920f1b68dd49550ce07544797a9f2cb854cf5 + Reviewed-on: https://code.wireshark.org/review/16432 + Reviewed-by: Guy Harris + +commit 6c0972b +Author: Pascal Quantin +Date: Thu Jul 14 15:07:59 2016 +0200 + + MBIM: add dissection of AT&T proprietary UUID + + Based on AT&T Windows 8 Extended API Requirements version 1.8.0 + + Change-Id: Iaf54173812a02023581c530f2340ea21e9e220d9 + Reviewed-on: https://code.wireshark.org/review/16431 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit d5e435e +Author: Daniele Lacamera +Date: Thu Jul 14 14:08:56 2016 +0200 + + DHCP: correctly parse PXE options (209-210) + + option 209 was marked as opaque, now it's as PXELINUX config file (text) + --> Fix: decorate as non-null terminated string + --> CfR: IETF RFC5071 section 4.2. "Packet Format" + + option 210 was marked as special, and erroneously decorated as Authentication + (option 90) + --> Fix: decorate as non-null terminated string + --> CfR: IETF RFC5071 section 5.2. "Packet Format" + + Bug: 12618 + Change-Id: I4220c137ef4b8b7f0827496c165b0ca35b70f675 + Reviewed-on: https://code.wireshark.org/review/16430 + Reviewed-by: Peter Wu + Petri-Dish: Peter Wu + Reviewed-by: Michael Mann + +commit 644c009 +Author: Pascal Quantin +Date: Thu Jul 14 14:33:01 2016 +0200 + + ETAG: add explicit casts to please OSX buildbot + + Change-Id: I057ffc6eb5e6c16e05b0ddc1c069159980678b85 + Reviewed-on: https://code.wireshark.org/review/16429 + Reviewed-by: Pascal Quantin + +commit 4eecdff +Author: Michael Mann +Date: Thu Jul 14 07:46:13 2016 -0400 + + packet-beep.c: Pacify OS X buildbot with cast + + Change-Id: I0149546cdd2aac8335dcb1046d31ed857ed674f3 + Reviewed-on: https://code.wireshark.org/review/16428 + Reviewed-by: Michael Mann + +commit 81beae9 +Author: Michael Mann +Date: Wed Jul 13 19:48:22 2016 -0400 + + proto.c: Unsigned fields should use %u within printf. + + Found by VS Code Analysis + + Change-Id: I76ea860cd86b41ef33c47dcc8f6b1c122f8bb668 + Reviewed-on: https://code.wireshark.org/review/16424 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 1565910 +Author: Pascal Quantin +Date: Thu Jul 14 10:59:48 2016 +0200 + + MBIM: add a missing break + + Change-Id: I3a4483861b1d97ff5e43041b3ecca64c3077b284 + Reviewed-on: https://code.wireshark.org/review/16427 + Reviewed-by: Pascal Quantin + +commit 67457e9 +Author: William Tu +Date: Tue Jul 12 11:09:31 2016 -0700 + + Add ERSPAN II support for field EN and Index. + + Current ERSPAN II dissector does not support parsing EN field and Index. + The patch follows the field description in draft: + https://tools.ietf.org/html/draft-foschiano-erspan-01 + + Change-Id: I92ce56264be0fb2560c4d1a5da35738cf45a8c96 + Reviewed-on: https://code.wireshark.org/review/16400 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 18e4e3c +Author: Michael Mann +Date: Tue Jul 12 13:18:05 2016 -0400 + + packet-beep.c: Use strtol over scanf to prevent analysis warnings. + + Change-Id: I9244edc537d2eb49d73e097a4cb34bf2cde868e4 + Reviewed-on: https://code.wireshark.org/review/16395 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit efc6e50 +Author: Pascal Quantin +Date: Wed Jul 13 23:50:31 2016 +0200 + + LTE RRC: add dissection of schedulingInfoSIB1-r13 field + + Change-Id: I226ae82a2d75a9b658a0e9122b4ef1925b003279 + Reviewed-on: https://code.wireshark.org/review/16417 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 0d73ae3 +Author: Gerald Combs +Date: Wed Jul 13 14:51:56 2016 -0700 + + Qt: Allocate packet list records using wmem. + + Add PacketListRecord::operator new, which uses wmem_alloc. Roughly + matches the GTK+ UI behavior. Add ColumnTextList which also uses + wmem_alloc. + + Lazily allocate our column text. + + Change-Id: I86a63cd8ace7764eaab1561bf71b4358af72fe03 + Reviewed-on: https://code.wireshark.org/review/16418 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit ed27ad4 +Author: Michael Mann +Date: Wed Jul 13 18:18:03 2016 -0400 + + androiddump.c: Use preprocessor directive to distinguish E_AGAIN and E_WOULDBLOCK. + + VS Code analysis considers them hardcoded values so the if statement is either + always true or always false. + + Change-Id: Iad04add9391c515873e2e00d2c6cbd682fbf5b3f + Reviewed-on: https://code.wireshark.org/review/16419 + Reviewed-by: Michal Labedzki + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 2c0d117 +Author: Guy Harris +Date: Wed Jul 13 20:13:22 2016 -0700 + + Fix VHT valid checks. + + The valid array in a struct mcs_vht_valid is indexed by the bandwidth + and the NSS-1; use the NSS-1, not the NSS, as the index. + + The maximum possible value of the NSS is MAX_VHT_NSS, so allow a value + of MAX_VHT_NSS. + + Change-Id: I49585f217f3e70356c1dd1ba32b6c714ce202236 + Reviewed-on: https://code.wireshark.org/review/16426 + Reviewed-by: Guy Harris + +commit 335b2c0 +Author: Michael Mann +Date: Wed Jul 13 19:42:15 2016 -0400 + + vwr.c Dynamically allocate large buffers + + VS Code Analysis claims the arrays are too large and should be moved to help + + Change-Id: I741ebe8cc73a108cb6e6d9ecbda37e2a4b6e1b4b + Reviewed-on: https://code.wireshark.org/review/16423 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit fb07249 +Author: Michael Mann +Date: Wed Jul 13 19:26:16 2016 -0400 + + pcapng.c: Use preprocessor directive to compare G_BYTE_ORDER with G_LITTLE_ENDIAN. + + VS Code analysis considers them hardcoded values so the if statement is either + always true or always false. + + Change-Id: Iabb8462b66f728195bf378ae26c79a783feddb03 + Reviewed-on: https://code.wireshark.org/review/16422 + Reviewed-by: Michael Mann + +commit 90e97df +Author: Michael Mann +Date: Wed Jul 13 18:42:14 2016 -0400 + + packet-ieee80211-radio.c: Prevent array overflow. + + Found by VS Code Analysis. + + Change-Id: Idab6cb5496749ebff47466b20a9a665b1574565d + Reviewed-on: https://code.wireshark.org/review/16421 + Reviewed-by: Michael Mann + +commit b20fa86 +Author: Michael Mann +Date: Wed Jul 13 18:23:03 2016 -0400 + + packet-gsm_a_common.c: Create typedef declaration for elem_func signature. + + This should keep VS Code Analysis happy. + + Change-Id: I99ebdc644ba353d5986d6509da784eeaa37dcc8f + Reviewed-on: https://code.wireshark.org/review/16420 + Reviewed-by: Michael Mann + +commit b849d3c +Author: João Valverde +Date: Tue Dec 29 19:30:58 2015 +0000 + + IPv6: Add support for more option types + + Change-Id: I1027e6e2481774953216ade6da4785e1a3c5ca63 + Reviewed-on: https://code.wireshark.org/review/16357 + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + +commit 76c0325 +Author: João Valverde +Date: Tue Dec 29 12:15:44 2015 +0000 + + IPv6: Refactor dissect_opts() into type-specific dissectors + + Change-Id: Ife8a7da3bd9bfea347321413bf05ea454186bc6d + Reviewed-on: https://code.wireshark.org/review/16356 + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + +commit b7cdff0 +Author: dsrsupport +Date: Wed Jul 13 14:33:55 2016 +0300 + + ZigBee: fix column description for APS ACK to T2 packet + + If this is APS ACK, do not overwrite its column description by Test Profile command description. + + Change-Id: Ibd4ae978776ad9e9924e6933ede90bc2ad8855de + Reviewed-on: https://code.wireshark.org/review/16414 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 998ab7f +Author: Gerald Combs +Date: Wed Jul 13 11:06:52 2016 -0700 + + Speed up col_append_ports on Windows. + + Fill in our port information using StringCchPrintf on Windows instead + of g_snprintf. Loading a large-ish test capture here under the VS 2013 + profiler showed that we spent 620 samples in col_append_ports. Switching + from g_snprintf to StringCchPrintf reduced that to six samples. + + Inline col_snprint_port while we're here. + + Change-Id: I955e5baa66ebb9cc950fc0eb1682d3c015c7a55a + Reviewed-on: https://code.wireshark.org/review/16416 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit 1bd438b +Author: Kim Kempf +Date: Tue Jul 12 10:28:38 2016 -0700 + + Adding 802.1BR E-Tag dissector + + Based on IEEE Std 802.1BR-2012 + + Bug: 12613 + Change-Id: Ic5198471f67a1af728df40a09443a1cab2621169 + Reviewed-on: https://code.wireshark.org/review/16402 + Reviewed-by: Michael Mann + +commit 6223327 +Author: Michael Mann +Date: Tue Jul 12 22:53:39 2016 -0400 + + Support Juniper VN over UDP. + + Change-Id: I40dab9d392ddea1f895b88f8f19c1194e56563a2 + Reviewed-on: https://code.wireshark.org/review/16408 + Reviewed-by: Amitoj Setia + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 0b00097 +Author: dsrsupport +Date: Wed Jul 13 12:40:54 2016 +0300 + + ZigBee MAC parse: fix Association request parse in case of FCS absence. + + If it is ok to parse packets with bas FSC, FCS may be even absent. Parse MAC command even if remaining buffer length is less that FCS size in such case. + + Change-Id: Ibbc9fed7ab87d0511f8c97db8e0e3bdf562cd15c + Reviewed-on: https://code.wireshark.org/review/16412 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 3ecbe50 +Author: Jeff Morriss +Date: Wed Jul 13 10:07:16 2016 -0400 + + Restore setting data.edt in write_specified_fields(). + + This prevents tshark from crashing when run with "-T fields -e data". + + I5778b08c52119b5be1ec482be9417b3c4ba8ed62 mistakenly removed this line (this + 'data' is a write_field_data_t rather than the print_data structure that + change was cleaning up). + + Bug: 12616 + Change-Id: I773e47f12f852e19a20ec29a43eb3a0953923173 + Reviewed-on: https://code.wireshark.org/review/16415 + Petri-Dish: Jeff Morriss + Reviewed-by: Peter Wu + +commit abd287f +Author: Pascal Quantin +Date: Wed Jul 13 12:22:37 2016 +0200 + + MBIM: add dissection of Intel proprietary UUIDs + + Based on http://www.telit.com/fileadmin/user_upload/products/Downloads/4G/Telit_xN930_MBIM_Command_Functional_Specification_r2.pdf + + While we are at it, add placeholder for AT&T proprietary UUID (no dissection of the buffers). + + Change-Id: I4f9825d1f9fde474853f9b86a4302742c078d8cd + Reviewed-on: https://code.wireshark.org/review/16413 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit 5e9e48b +Author: Alexis La Goutte +Date: Wed Jul 13 09:28:15 2016 +0200 + + TCP: fix indent (use 4 spaces) + + Change-Id: Id08427246f5b481c004e861719b9b213796438c1 + Reviewed-on: https://code.wireshark.org/review/16409 + Reviewed-by: Jaap Keuter + +commit 3124cf8 +Author: João Valverde +Date: Mon Jun 13 04:56:57 2016 +0100 + + IPv6: Simplify RPL routing header dissector + + Use a wmem_array to perform strict checking. + + Fold cmprI/cmprE dissection into a single loop. + + Change-Id: I67443a604b47cd9cbca32c7f7276a7e2229580f1 + Reviewed-on: https://code.wireshark.org/review/16348 + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + +commit e46be62 +Author: Pascal Quantin +Date: Tue Jul 12 19:04:12 2016 +0200 + + LTE RRC: upgrade dissector to v13.2.0 + + Change-Id: If2e15f429e3e35b3deef8afc23e57c8ef3974a22 + Reviewed-on: https://code.wireshark.org/review/16410 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit 33fa58c +Author: Pascal Quantin +Date: Wed Jul 13 10:19:43 2016 +0200 + + RLC LTE: fix a typo + + Change-Id: I6d429da6e36e9609c1b7a539cf75e0c2c484bf00 + Reviewed-on: https://code.wireshark.org/review/16411 + Reviewed-by: Pascal Quantin + +commit fbb47de +Author: Michael Mann +Date: Tue Jul 12 13:28:10 2016 -0400 + + packet-cql.c: Bugfix bitwise operation with parenthesis. + + Change-Id: I93e1c64597f309db5341c6ccadfdb3b23c056182 + Reviewed-on: https://code.wireshark.org/review/16397 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 0600865 +Author: Michael Mann +Date: Tue Jul 12 12:31:33 2016 -0400 + + file-pcapng.c: Apply parenthesis to fix build warnings + + Change-Id: I35d180e7aa040c94ca80a49e7d2132dd76e46aaf + Reviewed-on: https://code.wireshark.org/review/16393 + Reviewed-by: Michael Mann + +commit 8682f4b +Author: Michael Mann +Date: Tue Jul 12 12:32:06 2016 -0400 + + packet-6lowpan.c: fix uninitialized variable (ipv6_ext) warning + + Change-Id: I8182bc9452cbd1201c81407041b6b522434f5ec0 + Reviewed-on: https://code.wireshark.org/review/16394 + Reviewed-by: Michael Mann + +commit 2f3b25c +Author: Michael Mann +Date: Tue Jul 12 13:23:29 2016 -0400 + + packet-btrfcomm.c: Add NULL check to pacify VS Code Analysis + + Some if checks are confusing the analysis, but it does add some + future-proofing. + + Change-Id: Ic4fe16a87646a7055f7639af050d53ff004eda5f + Reviewed-on: https://code.wireshark.org/review/16396 + Reviewed-by: Michael Mann + +commit e063924 +Author: Michael Mann +Date: Tue Jul 12 08:21:35 2016 -0400 + + Remove T.30 FCF mask. + + Found by VS Code Analysis, verified with spec that mask isn't needed. + Also included link to current spec. + + Bug: 1918 + Change-Id: Ic3e8ee599501c7c12717649579ffd70581622178 + Reviewed-on: https://code.wireshark.org/review/16392 + Reviewed-by: Michael Mann + +commit fea50cc +Author: Guy Harris +Date: Tue Jul 12 11:25:49 2016 -0700 + + Handle dissectors that don't have names. + + Dissector handles created with create_dissector_handle() don't have a + name; report them as "(anonymous)" (there's no guarantee that the printf + family of routines don't crash when a null pointer is provided to %s - + the printf routines in at least some versions of Solaris *do* crash in + that case). + + Change-Id: I561ff855a46eeb442299011d567f20751c5c6869 + Reviewed-on: https://code.wireshark.org/review/16399 + Reviewed-by: Guy Harris + +commit 719c018 +Author: Thomas PORTASSAU +Date: Tue Jul 12 08:36:25 2016 +0200 + + USB CCID added Interrupt IN and PC2RDR_params + + Change-Id: I77a88b910fa51e09f9d5bdb541170de76ffb3708 + Reviewed-on: https://code.wireshark.org/review/16386 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 45679d2 +Author: dsrsupport +Date: Tue Jul 12 12:21:23 2016 +0300 + + ZigBee Test Profile #2 enchancement. + + If profile id is ZigBee Test Profile #2, do not try to parse packet contents as other protocol above APS: ZCL or whatever else. + + Change-Id: I0f1446aea9b270c226c7c472fe794e29240defc9 + Reviewed-on: https://code.wireshark.org/review/16387 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 479caf1 +Author: Gerald Combs +Date: Mon Jul 11 15:40:03 2016 -0700 + + Add resource usage logging. + + Add log_resource_usage, which prints the current and elapsed user and + system times. Add a usage example in packet_list_model.cpp. + + Change-Id: I747161c754a3731e540821715cc9bb10b3dc821d + Reviewed-on: https://code.wireshark.org/review/16383 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit 3fe92ff +Author: Michael Mann +Date: Tue Jul 12 09:09:57 2016 -0400 + + Create stub VXLAN (GPE) protocol for Decode As. + + Also remove dissector_add_for_decode_as calls as dissector_add_uint + already handles that. + + Change-Id: I87202d49765ffb1a2e6c922cb02b692fb16c0693 + Reviewed-on: https://code.wireshark.org/review/16388 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 25ba3db +Author: D. Ulis +Date: Mon Jul 11 21:14:36 2016 -0400 + + HTTP: Add request/response arrows + + HTTP has multiple related packets, so seeing which are the actual request/response (related to the current selected packet) is helpful. + + Change-Id: I833f4f620cfe8bfe9b1d7518c4e28fbd41b64e29 + Reviewed-on: https://code.wireshark.org/review/16385 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + Reviewed-by: Michael Mann + +commit f4ab3f4 +Author: Jeff Layton +Date: Mon Jun 20 15:10:32 2016 -0400 + + ceph: distingush between client and server by checking for a second entity_addr_t + + The current ceph dissector assumes that the server will always send its + initial connection negotiation first, but that's not necessarily the + case, especially with the kernel client which sends its banner as soon + as the socket is created. + + So, we need a better mechanism to determine which end is client and + which is the server. The server sends its own address and then the + address of the client, but the client only sends its own address. We + can determine whether the initial negotiation message is from the client + or server by looking at the data after the first entity addr and seeing + whether it also looks like an entity addr. + + This patch takes that approach. It just grabs the address family from + the second address and sees whether it's IPv4 or IPv6. If it's not one + of those, then it assumes that it's not an entity_addr_t at all and is + therefore a request from the client. + + We could go farther and try to verify the port and address as well, but + that's probably overkill. The address family is at the same offset as + the host_type field in the client's Connect request, but it's big endian + and the host_type is little endian. As long as we don't end up with + host_types that are 0x200 or 0xA00, this scheme should be OK. + + Change-Id: I161d02da86d978272eff95497c6df66766b02ebc + Signed-off-by: Jeff Layton + Reviewed-on: https://code.wireshark.org/review/16043 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + Reviewed-by: Alexis La Goutte + +commit 2e879e2 +Author: sjha3 +Date: Sat Jul 2 15:34:37 2016 -0400 + + Generic Protocol Extension support for VxLAN + + Bug: 12323 + Change-Id: I53bfedf50ad09cda52320b0e6eb81e92ed73efc8 + Signed-off-by: Alexis La Goutte + Reviewed-on: https://code.wireshark.org/review/16250 + +commit cfcc6fd +Author: Jesse Gross +Date: Fri Jun 24 15:28:55 2016 -0700 + + Geneve: Update list of option classes. + + Newer versions of the Geneve protocol draft have defined additional + option classes. This updates the list so we can show the class name + instead of unknown. + + Change-Id: I19f2024704abe2bc0692c73be783858d74323c0e + Reviewed-on: https://code.wireshark.org/review/16382 + Reviewed-by: Alexis La Goutte + +commit 4b67b0b +Author: Dario Lombardo +Date: Mon Jul 11 15:35:29 2016 +0200 + + osx-app: small improvement in packaging script. + + Change-Id: I484ab1b001f7fd578e734b4e006137f590a750a9 + Reviewed-on: https://code.wireshark.org/review/16379 + Reviewed-by: Guy Harris + +commit ee28324 +Author: Joerg Mayer +Date: Mon Jul 11 18:59:13 2016 +0200 + + Fix up *some* of the coding style inconsistencies + + - return type of a function definition is always on a seperate line + - reformat single line expert items into multiline format + - no space between functionname and ( + - reformat some hf_ elements that looked different from most others + - space after , where appropriate + - Fix the following warnings and errors from checkhf.pl + Unused href entry: epan/dissectors/packet-ieee80211.c: hf_ieee80211_ff_rcsi + Unused href entry: epan/dissectors/packet-ieee80211.c: hf_ieee80211_ff_rcsi_aid + Error: hf_ieee80211_ff_dsss_ofdm: FT_BOOLEAN with non-null 'convert' field missing TFS in epan/dissectors/packet-ieee80211.c + Error: non-null hf_ieee80211_ff_dsss_ofdm 'convert' field missing 'VALS|VALS64|RVALS|TFS|CF_FUNC|FRAMENUM_TYPE|&' in epan/dissectors/packet-ieee80211.c ? + Error: hf_ieee80211_operat_mode_field_channel_width is passing the address of a pointer to VALS in epan/dissectors/packet-ieee80211.c + Error: hf_ieee80211_operat_mode_field_rxnss is passing the address of a pointer to VALS in epan/dissectors/packet-ieee80211.c + + Change-Id: Ide51d1871755199721e65c0f62b3f6a62ef1159e + Reviewed-on: https://code.wireshark.org/review/16381 + Reviewed-by: Jörg Mayer + +commit 7083839 +Author: João Valverde +Date: Sat Jul 9 02:22:03 2016 +0100 + + IPv6: refactor dissect_routing6() into type-specific dissectors + + Change-Id: I153c39bb76dc30cecede9dbf5fe4abf234fcd719 + Reviewed-on: https://code.wireshark.org/review/16347 + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + +commit 0002f25 +Author: Martin Kaiser +Date: Mon Jul 11 10:49:53 2016 +0200 + + hdcp2: don't throw an exception during heuristic check + + Change-Id: I24895950464e1845c468f9fa9b6e5aa3ab8c75de + Reviewed-on: https://code.wireshark.org/review/16378 + Reviewed-by: Jaap Keuter + Petri-Dish: Jaap Keuter + Reviewed-by: Anders Broman + +commit deaac11 +Author: Martin Kaiser +Date: Mon Jul 11 10:29:26 2016 +0200 + + iso7816: check for minimum atr len + + and reject the packet if it is shorter + + make sure that we don't throw an exception when we read the first byte + and haven't yet decided if the packet contains an iso7816 atr + + Change-Id: I7b4c93cc7c55489467b46241f07a1bb5ddfd927a + Reviewed-on: https://code.wireshark.org/review/16377 + Reviewed-by: Anders Broman + +commit f2584b2 +Author: Alexis La Goutte +Date: Sun Jul 10 19:27:47 2016 +0200 + + BGP: Add support of Vendor Capability 131 (Multisession Cisco) + + Issue reported by Garri Djavadyan + + Change-Id: I6dd4bd20d82a3f2cb8aa45f740f72d33e33053da + Ping-Bug:12604 + Reviewed-on: https://code.wireshark.org/review/16374 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 3932075 +Author: Alexis La Goutte +Date: Sun Jul 10 12:17:04 2016 +0200 + + BGP: Add (Cisco) for "Vendor" Cisco capability + + * Route Refresh Cisco capability (128) + * ORF Cisco capability (130) + + Issue reported by Garri Djavadyan + + Bug: 12605 + Change-Id: Icb19cd6a75315e5af4772dd7833a5b762bdd7ff4 + Reviewed-on: https://code.wireshark.org/review/16373 + Reviewed-by: Michael Mann + +commit b0a32c6 +Author: Binh Trinh +Date: Sun Jul 10 01:57:15 2016 -0400 + + NAS-EPS: Add preference to bypass a heuristic decode of a ciphered NAS. + + Change-Id: Ifedb82bbcb29ab978ffb9ce2f485ac9ff0712fc2 + Reviewed-on: https://code.wireshark.org/review/16363 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit ed69bf3 +Author: Guy Harris +Date: Sun Jul 10 10:23:40 2016 -0700 + + Remove a compiler warning some platforms give. + + Some UN*Xes declare an index() function, that being the name strchr() + originally had in V7 UNIX. This causes warnings from compilers if you + have a variable named "index", so rename the variable. + + Change-Id: Ibb046005d1ef911ce0739ce70a0a55c13310cdf0 + Reviewed-on: https://code.wireshark.org/review/16372 + Reviewed-by: Guy Harris + +commit fac8f1f +Author: Martin Kaiser +Date: Sun Jul 10 18:41:23 2016 +0200 + + pvfs2: clean up dissect_pvfs_distribution() + + remove unnecessary variable initializers + remove an unnecessary if (tree) check + + Change-Id: I4c5326c11efe4fe38fb606a45ca7674484e9421c + Reviewed-on: https://code.wireshark.org/review/16371 + Reviewed-by: Martin Kaiser + +commit 4b83805 +Author: Martin Kaiser +Date: Sun Jul 10 13:32:33 2016 +0200 + + mp2t: use tvb_new_subset_remaining() instead of tvb_new_proxy() + + the latter is internal to the tvb code and not meant to + be called from a dissector + + Change-Id: Iee5af3d59329aeef8156f0bbbd5c765cac4e314d + Reviewed-on: https://code.wireshark.org/review/16364 + Petri-Dish: Martin Kaiser + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit de796aa +Author: Gerald Combs +Date: Sun Jul 10 08:07:47 2016 -0700 + + [Automatic update for 2016-07-10] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: I9d1c7b06a449a3b0dc02dd99f33c4e7634e2d1c0 + Reviewed-on: https://code.wireshark.org/review/16368 + Reviewed-by: Gerald Combs + +commit 35255d9 +Author: Bruno Verstuyft +Date: Wed Jun 29 14:25:34 2016 +0200 + + DOCSIS: Added dissector for Downstream Profile Descriptor (DPD) + + Change-Id: I97e6e07be45a5c4de6c8c467e0c782b35036bd98 + Reviewed-on: https://code.wireshark.org/review/16202 + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: Adrian Simionov + Reviewed-by: Anders Broman + +commit aa9f560 +Author: Jeff Morriss +Date: Tue Jul 5 20:15:09 2016 -0400 + + Cleanup and extend the regex for matching expert info entries. + + Match each entity in the structure explicitly rather than skipping a bunch at + the end. This makes it possible to easily (and clearly) specify where we + allow white space. + + Don't capture the event group and severity: we don't use them anyway. + + Don't put single character matches in []: that makes it hard to read (for + me anyway). + + There's no need for both the "m"(ultiline) and "s"(ingle line) options. Nor + the "o"optimize (make buggy) option. + + These same changes should/will be applied to the hf regex later. + + Change-Id: I3bf307dcd6432eb1a0c2b9aceea201f8403e08c0 + Reviewed-on: https://code.wireshark.org/review/16313 + Reviewed-by: Michael Mann + Reviewed-by: Anders Broman + +commit 448c89e +Author: David Morsberger +Date: Sun Jul 3 19:36:12 2016 -0400 + + Remember query after closing Follow Stream + + Update main filter after follow stream dialog is closed - Use: + previous_filter if new 'Back' button (passed in follow() method) + filter_out_filter_ if 'Filter Out This Stream' button (built by appending !current_stream to previous_filter) + leave filter alone if window closed using Close button or window close. (current stream) + + Change-Id: Ic02edeaffdc65ff0f33cac4cb9afb8cde28963c7 + Reviewed-on: https://code.wireshark.org/review/16277 + Reviewed-by: Jim Young + Petri-Dish: Jim Young + Tested-by: Jim Young + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit ea0b2e0 +Author: Michal Privoznik +Date: Mon Jul 4 10:36:20 2016 +0200 + + Makefile: Install wireshark.pc too + + In my previous patches (8454f2a20e2 and ea16a84ef51) I've tried + to make the pkg-config file more robust. But what I had + completely forgot about is that the file was never installed by + our Makefile rather than we relied on distribution maintainers to + be smart and make the package install the file instead. I've + realized this as soon as I've tried to update wireshark in my + system. + + Change-Id: Idb60157a51ea1dd0afd6cfac695bfa5760485241 + Signed-off-by: Michal Privoznik + Reviewed-on: https://code.wireshark.org/review/16279 + Reviewed-by: Jaap Keuter + Petri-Dish: Jaap Keuter + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit dec3e2e +Author: João Valverde +Date: Sun Jul 10 15:12:05 2016 +0100 + + randpkt_core: Use g_random_* for randpkt_parse_type(). + + randpkt_parse_type() can (and most likely will) be called before + randpkt_example_init(), therefore g_rand_int_range is called with a NULL + GRand argument. This produces non-random output. + + Change-Id: Id420edc15a5f9dec427c5f1a1dd9a1f18a225319 + Reviewed-on: https://code.wireshark.org/review/16367 + Reviewed-by: João Valverde + +commit 3ea8ccf +Author: Martin Kaiser +Date: Sun Jul 10 13:51:14 2016 +0200 + + iso14443: the uid size is a generated item + + Change-Id: I77952e0099ed8103c8316becafc700866b4c46d8 + Reviewed-on: https://code.wireshark.org/review/16366 + Reviewed-by: Martin Kaiser + +commit d68043a +Author: Martin Kaiser +Date: Sun Jul 10 13:48:27 2016 +0200 + + iso14443: expert info for invalid uid size + + Change-Id: I3181375c3a2c8a905e1fd8bb722ac27902735ff0 + Reviewed-on: https://code.wireshark.org/review/16365 + Reviewed-by: Martin Kaiser + +commit 3faf0dd +Author: Dario Lombardo +Date: Sun Jul 10 00:17:03 2016 +0200 + + Qt: add assert (CID 1311486). + + Change-Id: I62290f1f1c7856ee431705a64fae2022b850234a + Reviewed-on: https://code.wireshark.org/review/16361 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 01b28ca +Author: Dario Lombardo +Date: Thu Jul 7 23:01:06 2016 +0200 + + randpkt_core: change rand() to g_rand_int (CID 1355360). + + Change-Id: I48560cbb6007eb16aa545a3e8e6a0e8e3b206930 + Reviewed-on: https://code.wireshark.org/review/16326 + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Petri-Dish: Dario Lombardo + Reviewed-by: Alexis La Goutte + +commit e3cbea3 +Author: João Valverde +Date: Sat Jul 9 15:37:27 2016 +0100 + + IPv6: Remove obsolete comment + + WS_INET6_ADDRSTRLEN should be used instead of INET6_ADDRSTRLEN. + + Change-Id: Id937ca72361f4f1b3cad2c18b1067c3fddc527a9 + Reviewed-on: https://code.wireshark.org/review/16359 + Reviewed-by: João Valverde + +commit a9d5256 +Author: Michael Mann +Date: Sat Jul 9 09:05:12 2016 -0400 + + packet-wsp.c: Fix infinite loop in add_headers + + Bug: 12594 + Change-Id: Id86d1e5f2db12871bc1b345721e79e57192f01e1 + Reviewed-on: https://code.wireshark.org/review/16355 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 8e1cc70 +Author: Pascal Quantin +Date: Fri Jul 8 23:25:14 2016 +0200 + + Fix detection of NSIS/WiX install path when running a win64 CMake + + On x86 system: + System32\cmd.exe + ProgramFiles=C:\Program Files + + On x64 system: + System32\cmd.exe + ProgramFiles=C:\Program Files + ProgramFiles(x86)=C:\Program Files (x86) + ProgramW6432=C:\Program Files + Syswow64\cmd.exe + ProgramFiles=C:\Program Files (x86) + ProgramFiles(x86)=C:\Program Files (x86) + ProgramW6432=C:\Program Files + + Change-Id: I32d52219366b299f1e8099dc6d7737970dc398dd + Reviewed-on: https://code.wireshark.org/review/16346 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit 01c6483 +Author: Guy Harris +Date: Sat Jul 9 00:07:52 2016 -0700 + + Check for pcapng files when reading from a pipe. + + That way, people don't get confused by an "Unrecognized libpcap format" + error - it's *not* libpcap format! + + Also, improve *that* message to say "...or not libpcap data", and put a + period at the end of the error messages. + + Change-Id: I175f9399fe99ce424f1d83596b7330e1fa5c0625 + Reviewed-on: https://code.wireshark.org/review/16349 + Reviewed-by: Guy Harris + +commit 94c0f91 +Author: João Valverde +Date: Thu Jun 30 11:09:07 2016 +0100 + + Fix value_string_ext_free() constness + + Don't declare destructor as taking a const argument. + + Change-Id: I9badfe400718bef41a0e0a00d4b3d1b0bb2879d1 + Reviewed-on: https://code.wireshark.org/review/16342 + Reviewed-by: João Valverde + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 4feb116 +Author: João Valverde +Date: Thu Jun 2 17:17:43 2016 +0100 + + IPv6: Remove a memcpy() + + Replace CamelCase and remove unnecessary casts too. + + Change-Id: Iacf56912448c0e0dc0fe21477d6b71ba9caba69a + Reviewed-on: https://code.wireshark.org/review/16344 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + +commit 44c2560 +Author: Amitoj Setia +Date: Fri Jul 8 09:42:50 2016 -0700 + + fixed some juniper vn dissector bugs + + Change-Id: I67ea5df962266c1476d1d1b6234e831018138422 + Reviewed-on: https://code.wireshark.org/review/16341 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 837b534 +Author: Pascal Quantin +Date: Fri Jul 8 15:58:55 2016 +0200 + + GSM RLC/MAC: register dissectors for EC-GSM-IoT control messages + + Change-Id: I8fe84cc98b8967c529c07ff17014648610ad8660 + Reviewed-on: https://code.wireshark.org/review/16340 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit f0bc390 +Author: Pascal Quantin +Date: Fri Jul 8 12:24:13 2016 +0200 + + MAC LTE: upgrade dissector to v13.2.0 + + Change-Id: Ic859d69583ca3c342d4775511b68fc276f3290a4 + Reviewed-on: https://code.wireshark.org/review/16339 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit 80b4302 +Author: Jaap Keuter +Date: Thu Jul 7 09:46:12 2016 +0000 + + When generating the LUA reference in AsciiDoc then say so. + + Generating LUA documentation source for the developer guide says that + it's generating XML, which it did before the switch to AsciiDoc. Fix + this statement. + + Change-Id: Ib8625af84c74b5f6dc31c1e9e5ded80d9d7940ff + Reviewed-on: https://code.wireshark.org/review/16320 + Reviewed-by: Michael Mann + +commit a7b7f94 +Author: Alexis La Goutte +Date: Fri Jul 8 08:06:30 2016 +0200 + + couchbase: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang + + Change-Id: Ie1e3b071388b3527bba1088af69d76dcb8d6981a + Reviewed-on: https://code.wireshark.org/review/16333 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit c3fc1e4 +Author: Jeff Morriss +Date: Thu Jul 7 21:49:41 2016 -0400 + + APRS: more cleanup. + + There's no need to create global structures with pointers to the (global) hf's + to pass into the dissection functions. Just reference the global variables + directly. + + Remove other global variables passed as arguments while we're at it. + + Remove boilerplate comments. + + Change-Id: I7ce6b356172aa25983f4cc6a007a0158cb7f26c9 + Reviewed-on: https://code.wireshark.org/review/16331 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 54bf3e9 +Author: Jeff Morriss +Date: Thu Jul 7 21:23:57 2016 -0400 + + APRS: clean up some header fields. + + Try to make the names self-explanatory (without relying on blurbs). + + Change-Id: Icfb4797282987b42ac68709b431d8b7248a0a633 + Reviewed-on: https://code.wireshark.org/review/16330 + Reviewed-by: Michael Mann + +commit 07ab40e +Author: Stig Bjørlykke +Date: Fri Jul 8 10:52:29 2016 +0200 + + Qt: Update scrollbars when change byte view format + + Update scrollbars when changing display format between hex and + bits view because the height of the phane will change. + + Change-Id: I81556c8dbdfb0a34f6c97e76834646a40aed62bb + Reviewed-on: https://code.wireshark.org/review/16336 + Reviewed-by: Stig Bjørlykke + +commit 3cf1048 +Author: dsrsupport +Date: Fri Jul 8 11:37:31 2016 +0300 + + ZigBee GreenPower: Fix GP Pairing command dissection. + + Fix length of Sink GroupID in GP Pairing command. + + Change-Id: I5905812456faa0181ee1cc13824a12ce2583d4e0 + Reviewed-on: https://code.wireshark.org/review/16335 + Reviewed-by: Stig Bjørlykke + +commit 0b53325 +Author: Stig Bjørlykke +Date: Fri Jul 8 09:45:26 2016 +0200 + + p1: Add BuiltInEncodedInformationTypes.telex + + This is for completeness. + + Change-Id: Id89f649aa836dd011f0967cdbdc905916b4d2182 + Reviewed-on: https://code.wireshark.org/review/16334 + Reviewed-by: Stig Bjørlykke + +commit 330bc0e +Author: Alexis La Goutte +Date: Wed Jul 6 08:46:29 2016 +0200 + + nbifom: fix no previous prototype for 'proto_register_nbifom' [-Wmissing-prototypes] + + Change-Id: I4456cfd6600986b2e0c1cecf7d3054f3e829a210 + Reviewed-on: https://code.wireshark.org/review/16332 + Petri-Dish: Alexis La Goutte + Reviewed-by: Pascal Quantin + +commit b080563 +Author: Dario Lombardo +Date: Thu Jul 7 22:43:49 2016 +0200 + + Qt: add initializers (CID 1261463). + + Change-Id: I5c2d5c73e188586a91dde342d6347d25495e0263 + Reviewed-on: https://code.wireshark.org/review/16325 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 785d229 +Author: Dario Lombardo +Date: Thu Jul 7 22:38:40 2016 +0200 + + Qt: add initializer (CID 1269610). + + Change-Id: I483e5d3f239f4708f9fc6b11c98869bb1381fb44 + Reviewed-on: https://code.wireshark.org/review/16324 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 03ca5c0 +Author: Dario Lombardo +Date: Thu Jul 7 22:35:30 2016 +0200 + + Qt: add initializers (CID 1317257). + + Change-Id: I61a63c187990b119b62e99871832913a0e3f75e4 + Reviewed-on: https://code.wireshark.org/review/16323 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit d83ee1d +Author: Guy Harris +Date: Thu Jul 7 17:21:48 2016 -0700 + + Handle extcap binaries and the libssh upon which some depend. + + Search the extcap binaries for shared libraries they require. + + Treat libssh specially - for some reason, when built by macosx-setup.sh + (which just does a standard cmake build of libssh), libssh's shared + library has just libssh.4.dylib, not {installation + directory}/libssh.4.dylib, as its shared library ID, so we don't find + its binary using otool -L. + + Bug: 12471 + Change-Id: I3e5632d7520f1bbeca1a8faae3a012938ef9dee7 + Reviewed-on: https://code.wireshark.org/review/16329 + Reviewed-by: Guy Harris + +commit 853df46 +Author: Dario Lombardo +Date: Thu Jul 7 22:13:41 2016 +0200 + + osx-app.sh: add ciscodump. + + Ping-Bug: 12471 + Change-Id: I7326e43ce8b294c8065e09120d85b4743f1659a9 + Reviewed-on: https://code.wireshark.org/review/16321 + Reviewed-by: Guy Harris + +commit d80c3b9 +Author: Joerg Mayer +Date: Fri Jul 8 00:24:14 2016 +0200 + + Clean up fixed field handling + + - Get rid of FF_FIELD macro. Use resoved strings instead. + - Reorder add_ff_ functions so we don't need forward declarations + - Replace add_fixed_field call by call to resolved function + - Remove add_fixed_field and all structs and enums exclusive to it. + - #if 0 out unused function add_ff_relay_capable_sta_info + + Change-Id: I9955febb317f3e7c1b9ae28a5ee9c6a6472f7e9c + Reviewed-on: https://code.wireshark.org/review/16328 + Reviewed-by: Jörg Mayer + +commit 10db044 +Author: João Valverde +Date: Thu Jul 7 21:33:09 2016 +0100 + + CMakeLists.txt: Fix gcee3e82 + + Bug: 12589 + Change-Id: I7f9be4027214cb7ae4f7b235cba73c088596a80d + Reviewed-on: https://code.wireshark.org/review/16322 + Reviewed-by: João Valverde + +commit 166cede +Author: Jeff Morriss +Date: Tue Jul 5 22:01:52 2016 -0400 + + APRS: register the storm fields. + + There's been a comment here since 2012 about them being unregistered. Put in + some registrations based on a feeble understanding of the specification (these + are all strings, add them as such); that should be close enough and is much + better than the (dissector) assertion we'd get otherwise. + + Don't bother putting those hf's in a global structure and passing around the + structure: the hf's are global anyway--just reference them directly. + + Add a link to the specification while we're here. + + Change-Id: Ia7b17e92a996a1a8eb4a4489eff9fca042190a32 + Reviewed-on: https://code.wireshark.org/review/16318 + Petri-Dish: Jeff Morriss + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + Reviewed-by: Michael Mann + +commit fb74b16 +Author: Alexis La Goutte +Date: Wed May 25 08:06:46 2016 +0200 + + PAPI: Update Header field + + Change-Id: I0c2a522ea70e62b6962c99729068e962beb21085 + Reviewed-on: https://code.wireshark.org/review/15572 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 0f07378 +Author: Roland Knall +Date: Wed Jul 6 13:39:54 2016 +0200 + + openSAFETY: Simplify handling of SN Fail/Ack + + Also add information about error group/code acknowledged, + and additional parameter set missing, if applicable + + Change-Id: I911d9941a33ff4064649090908e0fcc2bf6e00f8 + Reviewed-on: https://code.wireshark.org/review/16319 + Petri-Dish: Roland Knall + Tested-by: Petri Dish Buildbot + Reviewed-by: Roland Knall + +commit 0bc8cf2 +Author: João Valverde +Date: Tue Jul 5 20:14:34 2016 +0100 + + configure: Check for working lrelease + + The qtchooser package in many (all?) distros installs executable symlinks to + qtchooser that can mislead AC_PROG_PATH if the corresponding Qt linguist + tools package is missing. + + Bug: 12570 + Change-Id: I98795a3a7b8a05214c56a0c7b50829ea3b2976fa + Reviewed-on: https://code.wireshark.org/review/16316 + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: Adrian Simionov + Reviewed-by: João Valverde + +commit 5758aa5 +Author: Jeff Morriss +Date: Tue Jul 5 21:22:36 2016 -0400 + + ATM PW: don't use macros to generate hf entries. + + The macros weren't saving much code, were confusing checkhf.pl, and were hiding + useability problems with the fields (such as names equal to the abbreviation + and having several fields with the same abbreviation--things checkAPIs.pl can + check now that the macros are out of the way). + + Change-Id: Id2ba67d09ce7dd424aee9d7f2e25eb54fa432d98 + Reviewed-on: https://code.wireshark.org/review/16315 + Petri-Dish: Jeff Morriss + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + Reviewed-by: Michael Mann + +commit 7f22c8a +Author: Jeff Morriss +Date: Tue Jul 5 21:40:26 2016 -0400 + + LAT: use ENC_ASCII when adding strings. + + Change-Id: If3970fbc25d4085037fb975498de02449e2c25c1 + Reviewed-on: https://code.wireshark.org/review/16317 + Reviewed-by: Alexis La Goutte + Reviewed-by: Michael Mann + +commit c43984c +Author: Jeff Morriss +Date: Tue Jul 5 20:46:08 2016 -0400 + + LAT: register several hf's. + + Found by checkhf.pl + + Change-Id: If985d04f24a188ac402bc11cf61d29aa418ad242 + Reviewed-on: https://code.wireshark.org/review/16314 + Reviewed-by: Michael Mann + +commit f5eaf53 +Author: Hendrik Uhlmann +Date: Tue Jul 5 14:16:48 2016 +0200 + + DIS: Introduced support of Collision PDU + + Parse all Attributes of Collision PDU and display them in wireshark HMI. + + Change-Id: I3003c6dd709498cc6c1adf784800047d0984bafa + Reviewed-on: https://code.wireshark.org/review/16299 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + +commit 4b06222 +Author: Dario Lombardo +Date: Tue Jul 5 16:45:52 2016 +0200 + + Qt: add initializers (CID 1268205). + + Change-Id: I7eb71876731df29c076a3a756b6748f165d1c327 + Reviewed-on: https://code.wireshark.org/review/16306 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Dario Lombardo + Reviewed-by: Alexis La Goutte + +commit 50d1d59 +Author: Dario Lombardo +Date: Tue Jul 5 23:08:30 2016 +0200 + + Qt: add initializers (CID 1162824). + + Change-Id: Ib570d3531bfdd35404b75d49dbd7dd43db4c30d9 + Reviewed-on: https://code.wireshark.org/review/16310 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 4b484a6 +Author: Sergey Avseyev +Date: Wed Jul 6 01:22:11 2016 +0300 + + packet-couchbase.c: describe observe-seqno (0x91) + + Change-Id: I6018a57a8ae947ee68aa35901398d504d35b99c7 + Reviewed-on: https://code.wireshark.org/review/16312 + Reviewed-by: Jaap Keuter + +commit 5848845 +Author: Dario Lombardo +Date: Tue Jul 5 23:35:11 2016 +0200 + + Qt: remove unneeded constructors. + + There is no need to have an empty private constructor if an explicit + one is already present. The former private constructor didn't initialize + the private members causing many CIDs from coverity. + + Change-Id: I8ba98d2b9fc32a867fdcf3421df7946b90bd7b09 + Reviewed-on: https://code.wireshark.org/review/16311 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 21f5c53 +Author: João Valverde +Date: Tue Jul 5 15:30:38 2016 +0100 + + Rename PIDL Makefile + + Otherwise it will get overwritten by the in-tree cmake build. + + Issue reported by Rémy Léone. + + Change-Id: I0d908973386bcb70585f5e32c36456230967bb7f + Reviewed-on: https://code.wireshark.org/review/16305 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit addf064 +Author: Dario Lombardo +Date: Tue Jul 5 22:27:55 2016 +0200 + + Qt: remove unused variable. + + This fixes also CID 1159350. + + Change-Id: I21b55686f96131e3e1cff0feac5f16df1c7c7ca2 + Reviewed-on: https://code.wireshark.org/review/16309 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 1eea415 +Author: Dario Lombardo +Date: Tue Jul 5 16:30:28 2016 +0200 + + bgp: add return check (CID 1354417). + + Change-Id: Id8be1d5f6346686087d747167ec44df2b88dd35e + Reviewed-on: https://code.wireshark.org/review/16304 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Dario Lombardo + +commit aea0023 +Author: Dario Lombardo +Date: Tue Jul 5 16:19:33 2016 +0200 + + tap: check return value (CID 1355643). + + Change-Id: I03b141c7aeaa1bc06dc126c5cc8f0d001a57c116 + Reviewed-on: https://code.wireshark.org/review/16302 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit d7c072d +Author: Dario Lombardo +Date: Mon Jul 4 22:49:32 2016 +0200 + + Qt: remove unused variable. + + This fixes CID 1232347. + + Change-Id: I42b5ac997dbde8fcb05665b24444a60b009871be + Reviewed-on: https://code.wireshark.org/review/16290 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 7a3e9b1 +Author: Graham Bloice +Date: Tue Jul 5 16:06:16 2016 +0100 + + Developers Guide updates + + Added info about debugging under Visual Studio. + Updated buildbot info. + + Change-Id: I9a6a0a2b14e3616a35f652c99b04ee23ea642ba5 + Reviewed-on: https://code.wireshark.org/review/16307 + Petri-Dish: Graham Bloice + Tested-by: Petri Dish Buildbot + Reviewed-by: Graham Bloice + +commit bed9d18 +Author: Pascal Quantin +Date: Tue Jul 5 16:21:01 2016 +0200 + + Remove remnants of g_spawn_helper support + + Change-Id: I88121a280ff01a889daeda438b308380b6ea0703 + Reviewed-on: https://code.wireshark.org/review/16303 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit d245698 +Author: Roland Knall +Date: Tue Jul 5 16:01:10 2016 +0200 + + openSAFETY: Add byte offset of frame + + Add the absolute byte offset of each openSAFETY frame to + dissection, so a change in the offset can be easily detected + + Change-Id: Ib935eff7ba1e2e1169cb9071a5c9703cc58fc123 + Reviewed-on: https://code.wireshark.org/review/16301 + Petri-Dish: Roland Knall + Tested-by: Petri Dish Buildbot + Reviewed-by: Roland Knall + +commit 5cc5ba6 +Author: Dario Lombardo +Date: Mon Jul 4 22:53:21 2016 +0200 + + Qt: add initializers (CID 1233100). + + Change-Id: I99e0d6bd10cc0faddb8a503ec877b3d03b927f4e + Reviewed-on: https://code.wireshark.org/review/16293 + Reviewed-by: Michael Mann + +commit 5c11909 +Author: Dario Lombardo +Date: Mon Jul 4 22:58:41 2016 +0200 + + Qt: add initializers (CID 1249475). + + Change-Id: Ic001c0dfab1e82c66473d6ca15633aaa57520659 + Reviewed-on: https://code.wireshark.org/review/16294 + Reviewed-by: Michael Mann + +commit 0b35075 +Author: Dario Lombardo +Date: Mon Jul 4 22:41:01 2016 +0200 + + dis: cast to guint64 to avoid potential overflow (CID 1214480). + + Change-Id: I24ae4a7a5ef8b4ed363ec849ac9c8aeeefe836dd + Reviewed-on: https://code.wireshark.org/review/16288 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit f2786bc +Author: Roland Knall +Date: Tue Jun 28 21:34:46 2016 +0200 + + extcap: Remove g_spawn_helper support + + Move g_spawn to separate file and implement functions to + use Windows based method of spawning, instead of the glib + based version + + Change-Id: Ibae03d834ec86531eba37dc8768fbf17ddadf57f + Reviewed-on: https://code.wireshark.org/review/16049 + Petri-Dish: Roland Knall + Tested-by: Petri Dish Buildbot + Reviewed-by: Graham Bloice + Reviewed-by: Roland Knall + +commit fdd87a1 +Author: Pascal Quantin +Date: Mon Jul 4 22:41:29 2016 +0200 + + Network-Based IP Flow Mobility (NBIFOM) dissector + + Based on 3GPP 24.161 V13.1.0 + + Change-Id: I7bf635c862bf7e0b73fd05bc8a55c900d1f4dd87 + Reviewed-on: https://code.wireshark.org/review/16291 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 308a538 +Author: Guy Harris +Date: Mon Jul 4 16:24:57 2016 -0700 + + Style fix and trailing whitespace fix. + + Change-Id: I03a438fa58f84939f6245426cbe725e6196c2560 + Reviewed-on: https://code.wireshark.org/review/16297 + Reviewed-by: Guy Harris + +commit 6e91389 +Author: Guy Harris +Date: Mon Jul 4 16:22:11 2016 -0700 + + Add a length check. + + Make sure the LBMR TNWG Interest record's length is at least the size of + a minimum-length LBMR TNWG Interest record. + + Hopefully this will fix the real problem about which CID 1363025 is + complaining. + + Change-Id: I60d94a054ec1ba4fb32b0cdd361995a584fe74a6 + Reviewed-on: https://code.wireshark.org/review/16296 + Reviewed-by: Guy Harris + +commit 240f605 +Author: Dario Lombardo +Date: Mon Jul 4 22:47:27 2016 +0200 + + Qt: add initializer (CID 1230901). + + Change-Id: Ie7874ef90ce14978adb2c62f208dbcc2a636d3cf + Reviewed-on: https://code.wireshark.org/review/16289 + Reviewed-by: Michael Mann + +commit 38c6a59 +Author: Guy Harris +Date: Mon Jul 4 14:14:58 2016 -0700 + + Add length checks. + + Make sure the authentication trailer length is large enough for a + minimum-length authentication trailer. + + Hopefully this fixes the real problem reported by CID 1363027. + + Use proto_tree_add_item_ret_uint() while we're at it. + + Change-Id: I3377f2a52a26f00eeb24ee5776853ffc6e4f7cce + Reviewed-on: https://code.wireshark.org/review/16295 + Reviewed-by: Guy Harris + +commit 6b5d839 +Author: Guy Harris +Date: Mon Jul 4 13:52:20 2016 -0700 + + Check to make sure the name length <= DLM3_RESNAME_MAXLEN. + + If it's not, we'd misdissect it. + + Hopefully this fixes the *real* problem that CID 1363031 was complaining + about. + + Change-Id: If1fc7c30f72d75b9dc047d7e475f78c9d5869943 + Reviewed-on: https://code.wireshark.org/review/16292 + Reviewed-by: Guy Harris + +commit 7490ad4 +Author: Michael Mann +Date: Sun Jul 3 11:34:37 2016 -0400 + + packet-packetbb.c cleanup + + Change-Id: I2f6ab0bffca5aa4b021b46b930b55455e76b8a9f + Reviewed-on: https://code.wireshark.org/review/16284 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit de90565 +Author: Michael Mann +Date: Sat Jul 2 21:21:54 2016 -0400 + + packet-tcap.c: Remove MEM_TCAPSRT + + No need to duplicate memory allocation of hash tables to have a "debug copy". + Maybe a separate wmem allocator can be used within the dissector, but that + type of debugging shouldn't be in trunk source. Keep it on private branch + until it's working. + + Change-Id: I4bdd0f3d1b613f7ae79aa57ebb8e5c3293023253 + Reviewed-on: https://code.wireshark.org/review/16282 + Reviewed-by: Michael Mann + +commit 276db50 +Author: Guy Harris +Date: Mon Jul 4 13:40:07 2016 -0700 + + Add length checks. + + While scanning through the Prefix64 option, check to make sure we + haven't run past the end of the option. + + The Prefix64 option requires that the prefix length be <= 12, and, if + it's not, we end up with part of the prefix having a negative length. + Check to make sure that it is <= 12. + + While we're at it, use proto_tree_add_item_ret_uint(), update IETF + document references to use RFCs rather tha earlier I-Ds, and add + references for RFC 7220 and RFC 7225. + + Hopefully this fixes the *real* problem that CID 1363032 was complaining + about. + + Change-Id: I1592de31f1d4f4ed6e6cdc141516fb764f21d2fb + Reviewed-on: https://code.wireshark.org/review/16287 + Reviewed-by: Guy Harris + +commit af35e89 +Author: Alexis La Goutte +Date: Sun Jul 3 22:01:23 2016 +0200 + + .mailmap: Update some name... + + Change-Id: I755010e59d33bc771a3be06bd1f6da1bcd81d836 + Reviewed-on: https://code.wireshark.org/review/16267 + Reviewed-by: Eugene Exarevsky + Reviewed-by: Anil Kumar K K + Reviewed-by: Jose Rubio + Reviewed-by: Alexis La Goutte + +commit 2fbf611 +Author: Michael Mann +Date: Sun Jul 3 11:16:45 2016 -0400 + + LTE PDCP: Replace a few g_malloc0 calls with wmem + + Change-Id: I8bce527fcd2cf9feb77326a5e9fa6857218dda19 + Reviewed-on: https://code.wireshark.org/review/16283 + Reviewed-by: Pascal Quantin + +commit c0949bf +Author: Guy Harris +Date: Mon Jul 4 12:42:11 2016 -0700 + + Fix typo. + + Addresses CID 1363024. + + Change-Id: Ie365f77ca215293aa880a9063521d2c2d7de73c8 + Reviewed-on: https://code.wireshark.org/review/16286 + Reviewed-by: Guy Harris + +commit 52559e9 +Author: Michael Mann +Date: Sat Jul 2 17:40:17 2016 -0400 + + General cleanup of packet-ipsec.c + + Noticed some things working on bug 12567 that weren't related to bug. + + Change-Id: Ie9acbf85cad0899af18202415a40f392a3088ffa + Reviewed-on: https://code.wireshark.org/review/16249 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 1e8ed70 +Author: Michael Mann +Date: Sat Jul 2 16:08:58 2016 -0400 + + Treat SPI field in ESP/SA configuration as string only if wildcards are used. + + Otherwise convert the SPI field to a number, which allows more user + flexibility in SPI format. + + Bug: 12567 + Change-Id: I646f0aeeeec4ca4302eb7d5172af9218e88b289f + Reviewed-on: https://code.wireshark.org/review/16248 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + Reviewed-by: Michael Mann + +commit 3f80490 +Author: Jaap Keuter +Date: Thu Jun 30 23:32:27 2016 +0200 + + NHRP: Add option for source address in authentication extension. + + It seems that not all Cisco IOS implementations adhere to RFC2332 + with respect to having the source address after the SPI in the + authentication extension. This change adds a preference to suppress + the interpretation of the bytes following the SPI as the source + address. The default is to adhere to the RFC. + + Bug: 12569 + Change-Id: I00d3c1b90ace54f16f0fe4704e6127a5c4881c82 + Reviewed-on: https://code.wireshark.org/review/16231 + Tested-by: Petri Dish Buildbot + Petri-Dish: Jaap Keuter + Reviewed-by: Michael Mann + +commit 764b147 +Author: Peter Wu +Date: Tue Jun 28 00:15:33 2016 +0200 + + wslua: fail on tree:add(nil) + + It is unlikely that tree:add(nil) or tree:add(nil, tvb) represents a + valid invocation. Most likely the developer made a mistake and tried + something like: + + local pf_thing = ProtoField.string("some.thing", "Description") + some_proto.fields = { pf_thing } + ... + tree:add(some_proto.fields.thing, tvb()) + + which should have been: + + some_proto.fields = { thing = pf_thing } + + or: + + tree:add(pf_thing, tvb()) + + Save the developer some pain and bail out early. + + Change-Id: I59fc04153f02bb186b47b763676a68bb0271df76 + Reviewed-on: https://code.wireshark.org/review/16177 + Petri-Dish: Peter Wu + Tested-by: Petri Dish Buildbot + Reviewed-by: Stig Bjørlykke + Reviewed-by: Michael Mann + +commit cf508f8 +Author: Dario Lombardo +Date: Sun Jul 3 22:04:38 2016 +0200 + + androiddump: fix leak (CID 1293387). + + Change-Id: I27e167368575dfddf78c237723d20c8b790e5f15 + Reviewed-on: https://code.wireshark.org/review/16268 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + +commit 81a81fb +Author: Dario Lombardo +Date: Sun Jul 3 22:56:28 2016 +0200 + + Qt: add initializers (CID 1159363). + + Change-Id: I5d8c2c847c842ddc172d26a3c8aee5d877201a4d + Reviewed-on: https://code.wireshark.org/review/16276 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 85ed737 +Author: Dario Lombardo +Date: Sun Jul 3 22:50:47 2016 +0200 + + Qt: add initializer (CID 1159361). + + Change-Id: Ib7b66b4e1d600048b8a66b47d035c27ef126da29 + Reviewed-on: https://code.wireshark.org/review/16275 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 5f69a2f +Author: Dario Lombardo +Date: Sun Jul 3 22:46:33 2016 +0200 + + Qt: add initializer (CID 1159360). + + Change-Id: I0ade3925497022d5ac16e66c02727be7fd9f4aa5 + Reviewed-on: https://code.wireshark.org/review/16274 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 21a0fdc +Author: Dario Lombardo +Date: Sun Jul 3 22:43:05 2016 +0200 + + Qt: add initializers (CID 1159359). + + Change-Id: I21de7d1b5f69bdcfa91da560abc262906d412777 + Reviewed-on: https://code.wireshark.org/review/16273 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 8aa2e87 +Author: Dario Lombardo +Date: Sun Jul 3 22:40:11 2016 +0200 + + Qt: add initializer (CID 1159358). + + Change-Id: I3002015d793e48c87017571f8997dd5a78438f75 + Reviewed-on: https://code.wireshark.org/review/16272 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 585cff2 +Author: Dario Lombardo +Date: Sun Jul 3 22:37:42 2016 +0200 + + Qt: add initializers (CID 1159357). + + Change-Id: I27d561d8d63e0d15f7811dd7a033c38df17dfb36 + Reviewed-on: https://code.wireshark.org/review/16271 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 9579d17 +Author: Dario Lombardo +Date: Sun Jul 3 22:34:50 2016 +0200 + + Qt: add initializer (CID 1159355). + + Change-Id: If2504ea4a9d806005a6d7631ec4645df1af0206a + Reviewed-on: https://code.wireshark.org/review/16270 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit e865db4 +Author: Dario Lombardo +Date: Sun Jul 3 22:31:32 2016 +0200 + + Qt: add initializer (CID 1159354). + + Change-Id: I0aa4b9db902d084fe33eff5b69ac5cdc85c3fec8 + Reviewed-on: https://code.wireshark.org/review/16269 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit d439525 +Author: Martin Kaiser +Date: Sun Jul 3 16:04:19 2016 +0200 + + ssh: wmem_strdup() never returns NULL + + Change-Id: I2f7b01e5a71f043e49305d0e2a3e78eaa5eae0a8 + Reviewed-on: https://code.wireshark.org/review/16262 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 79fb9fd +Author: Gerald Combs +Date: Sun Jul 3 08:07:30 2016 -0700 + + [Automatic update for 2016-07-03] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: Ie8e9bf51a9c25c6693597ba1109c221a111e3b58 + Reviewed-on: https://code.wireshark.org/review/16264 + Reviewed-by: Gerald Combs + +commit ce52309 +Author: Martin Kaiser +Date: Sun Jul 3 16:39:20 2016 +0200 + + iso14443: expert info if the crc is wrong + + Change-Id: I1b59a7d7bf0f9f304f816558f38ce5d52deb504e + Reviewed-on: https://code.wireshark.org/review/16263 + Reviewed-by: Martin Kaiser + +commit 2da35bc +Author: Martin Kaiser +Date: Sun Jul 3 13:37:51 2016 +0200 + + profinet, CID 1362120: check the return value of ftell() + + change filePosRecord's data type to long, this is what ftell() and + fseek() expect + + limit filePosRecord's scope to the block where it's actually used + + if ftell() returns < 0, don't move the file pointer and don't call + fseek() with the negative offset + + Change-Id: If5a43099c32e476a691f4d6cd26ed7fb73490fcf + Reviewed-on: https://code.wireshark.org/review/16258 + Petri-Dish: Martin Kaiser + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 50614a9 +Author: João Valverde +Date: Sun Jul 3 13:17:41 2016 +0100 + + checkhf: Use colon as field separator for better readability + + Comma looks like a list when skimming quickly. + + Change-Id: Ic0ac1bc8746c70724d2279e3d725c5c9449b79d8 + Reviewed-on: https://code.wireshark.org/review/16260 + Reviewed-by: João Valverde + Reviewed-by: Michael Mann + +commit ff7d0b3 +Author: João Valverde +Date: Sun Jul 3 12:58:24 2016 +0100 + + ICMPv6-RPL: Fix DRO-ACK reserved field. + + Unused href entry: epan/dissectors/packet-icmpv6.c, hf_icmpv6_rpl_p2p_droack_flag_reserved + + Change-Id: I2fb74946aeb7cf1df708449c185126ee7b6b0253 + Reviewed-on: https://code.wireshark.org/review/16259 + Reviewed-by: João Valverde + +commit 6d4c976 +Author: Martin Kaiser +Date: Sun Jul 3 13:42:40 2016 +0200 + + profinet: add a space to make checkhf happy + + without the space, checkhf complains about an ei entry + + martin@reykholt:~/src/wireshark.git$ ./tools/checkhf.pl plugins/profinet/packet-dcerpc-pn-io.c + ERROR: NO ARRAY: plugins/profinet/packet-dcerpc-pn-io.c, ei_pn_io_unsupported + + Change-Id: Ie72efcec644225bc4f554117ae10672694823cad + Reviewed-on: https://code.wireshark.org/review/16257 + Reviewed-by: Martin Kaiser + +commit 4562a70 +Author: Martin Kaiser +Date: Sat Jun 18 16:35:26 2016 -0700 + + dns: remove a bunch of unnecessary NULL checks + + Change-Id: Ia4066ae3fc31fb43d4cc63cfb739f22738581831 + Reviewed-on: https://code.wireshark.org/review/16256 + Reviewed-by: Martin Kaiser + +commit 0bc3d75 +Author: Alexis La Goutte +Date: Sun Jul 3 09:47:22 2016 +0000 + + Revert "Support for NSH with VXLAN-GPE encapsulation" + + This reverts commit 76a8bca9bc87823e9182fa6ebb35f0b93bcc451b. + + Change-Id: I85b9778329373872e4f9fd1b90280dfef5e33a06 + Reviewed-on: https://code.wireshark.org/review/16255 + Reviewed-by: Alexis La Goutte + +commit 783bb5b +Author: João Valverde +Date: Sun Jul 3 01:29:04 2016 +0100 + + Fix indentation + + Change-Id: I41b9cf4b7e3efbee48174fe0151ca94cb0bbc425 + Reviewed-on: https://code.wireshark.org/review/16254 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 1464261 +Author: João Valverde +Date: Sun Jul 3 01:26:32 2016 +0100 + + ICMPv6: Avoid "no response found" for multicast ping + + Change-Id: Ia6bfdd28fc6d85b3899d542db5aa4ed54be054ea + Reviewed-on: https://code.wireshark.org/review/16253 + Reviewed-by: Michael Mann + Reviewed-by: Alexis La Goutte + +commit 32e8f07 +Author: João Valverde +Date: Sun Jul 3 00:31:38 2016 +0100 + + ICMP: Avoid "no response found" for multicast ping + + Ping-Bug: 12581 + Change-Id: I6943d275de988e9de66bc01e2b421901947a5b95 + Reviewed-on: https://code.wireshark.org/review/16252 + Reviewed-by: Michael Mann + Reviewed-by: Alexis La Goutte + +commit 791c93f +Author: Adrian Simionov +Date: Sat Jul 2 22:49:44 2016 +1000 + + DOCSIS: Update to Type 35 UCD + + Change-Id: Ie0dda94894cfaec9bccbd69d52367034e1c629da + Reviewed-on: https://code.wireshark.org/review/16242 + Reviewed-by: Michael Mann + +commit 76a8bca +Author: sjha3 +Date: Sat Jul 2 19:09:50 2016 -0400 + + Support for NSH with VXLAN-GPE encapsulation + + Bug: 12271 + Change-Id: I8481c4ab69c4432985acc79bff7818e6857fa1cb + Reviewed-on: https://code.wireshark.org/review/16251 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 3d7b817 +Author: Dario Lombardo +Date: Sat Jul 2 23:16:11 2016 +0200 + + Qt: add initializer (CID 1159352). + + Change-Id: Ie355a31284685ca0c160a46a4daa6c28b39e3093 + Reviewed-on: https://code.wireshark.org/review/16247 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 794da62 +Author: Dario Lombardo +Date: Sat Jul 2 23:05:24 2016 +0200 + + Qt: remove unneeded check (CID 1159309). + + fi has already been checked in line 51. + + Change-Id: Idd4d09a35ef1d4897479538979debd708e2cfe5b + Reviewed-on: https://code.wireshark.org/review/16246 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 3bb019f +Author: Gerald Combs +Date: Fri Jul 1 10:35:22 2016 -0700 + + Qt: Fixup byte view context menus + + Shorten text similar to other context menus. + + Change-Id: I8806ed4dddb6fc3c51ddbd4150d9090f5b2ca787 + Reviewed-on: https://code.wireshark.org/review/16238 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 1f28e68 +Author: Matt Texier +Date: Wed Jun 29 17:33:21 2016 +0200 + + BGP: Fixed an side effect of length coding on offset + + Bug: 12568 + Change-Id: Ibf063293041d749664f6e6ecd2455024ea3fd4ed + Reviewed-on: https://code.wireshark.org/review/16237 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 94e97e4 +Author: Michael Mann +Date: Sat Jul 2 08:23:34 2016 -0400 + + packetbb: Prevent divide by 0. + + Bug: 12577 + Change-Id: Ibfa605597b786d8dbf1e256ef2ca6dc691498974 + Reviewed-on: https://code.wireshark.org/review/16241 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit b78dd09 +Author: Pascal Quantin +Date: Mon Jun 27 14:45:03 2016 +0200 + + proto.c: allow calling get_hfi_length() with a 0 byte tvb and length=-1 + + As indicated in the comment, we allow FT_PROTOCOL, FT_NONE, FT_BYTES, FT_STRING + and FT_STRINGZPAD to be zero-length. + But in that case do not call tvb_ensure_captured_length_remaining() that ensures + that at least 1 byte is present. + + Bug: 12561 + Change-Id: I881754368c24d334b88f0dda1d59a68e08219227 + Reviewed-on: https://code.wireshark.org/review/16167 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 7ad9db8 +Author: dsrsupport +Date: Fri Jul 1 13:22:09 2016 +0300 + + ZigBee Green Power: implement GP Pairing Configuration command dissection. + + Change-Id: I539e98935699e5be8f91daaebade00f22b500dbc + Reviewed-on: https://code.wireshark.org/review/16235 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit cb987e8 +Author: Jeff Morriss +Date: Fri Jul 1 11:27:52 2016 -0400 + + Don't leak a file descriptor when changing the SSL debug file name. + + I guess people don't change the SSL debug file name that often--this bug has + been here since 2006... + + Change-Id: I3db053dd7e0cb9a9e4ae49a310e956b3c77c99f6 + Reviewed-on: https://code.wireshark.org/review/16236 + Petri-Dish: Jeff Morriss + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit f3bd70b +Author: Hessam Jalali +Date: Thu Jun 30 21:41:15 2016 +0430 + + fix missing fields for json, ek and pdml when used with -e fields + + + Description: + + when -T json,ed or pdml used in conjunction with -e fields they would + always miss the last field. + + in case of json and ek, if some fields in the middle are empty, + the generated json would be invalid. + + sample for ek: + + { "_index": "packets-2016-06-30", "_type": "pcap_file", + "_score": null, "_source": + { "layers": { "e212.mcc": ["255","262"] "frame.time_epoch": + ["1426550400.004751510"], "e212.mnc": ["1","1"] } } } + + command: + + tshark -T ek -r C:\a.pcap -e e212.mcc -e frame.comment + -e frame.time_epoch -e e212.mnc > C:\test.json + + note: + + the comma is missing between e212.mcc and frame.time_epoch + + Change-Id: I2efae0c48036cf6313e2a064453c8dbc49f38b09 + Reviewed-on: https://code.wireshark.org/review/16226 + Petri-Dish: Pascal Quantin + Reviewed-by: Martin Kacer + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit ad30999 +Author: Jaap Keuter +Date: Wed Jun 29 23:18:57 2016 +0200 + + Cleanup LAPD preferences and registration handoff routine + + The preferences and the registration handoff routine used to handle + preference changes are setup inconsistent and less efficient. This + change cleans it up. + + Change-Id: I9a1d51d8924c30d9e86d8af394ab1f0f31da4d2d + Reviewed-on: https://code.wireshark.org/review/16208 + Petri-Dish: Jaap Keuter + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit a062c80 +Author: Michael Mann +Date: Thu Jun 30 20:41:45 2016 -0400 + + ASN.1 dissectors - don't try to find yourself. + + If an ASN.1 dissector is calling register_dissector for itself in its proto_register_xxx + function and then calling find_dissector for itself in its proto_reg_handoff_xxx + function then just create a static handle for that dissector and use the return + value of register_dissector, so the find isn't necessary. + + Change-Id: I911bdadc2fb4259601c141b955e741a2369cc447 + Reviewed-on: https://code.wireshark.org/review/16233 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit d4add25 +Author: Alexis La Goutte +Date: Thu Jun 30 22:37:10 2016 +0200 + + s7comm: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang + + Change-Id: I296d11ec43b3817d30920432239632f86b9f773f + Reviewed-on: https://code.wireshark.org/review/16227 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Thomas Wiens + Reviewed-by: Anders Broman + +commit 250f248 +Author: Gerald Combs +Date: Thu Jun 30 09:24:57 2016 -0700 + + Qt: Add ASCII+EBCDIC actions to the byte view context menu. + + Add actions to switch between ASCII and EBCDIC, similar to the hex and + bits items. + + Bug: 5298 + Change-Id: Ib601ac6e89411e6482f3e4172726e16a08fdbd2b + Reviewed-on: https://code.wireshark.org/review/16225 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 5cf7fcd +Author: Gerald Combs +Date: Thu Jun 30 14:55:19 2016 -0700 + + Qt+Gtk: Fix the -t command line flag. + + Add the time format to commandline_param_info_t and apply it when we've + finished application initialization. + + Bug: 12489 + Change-Id: Ice626198a610567e945a8e53c0c1093797e8208e + Reviewed-on: https://code.wireshark.org/review/16232 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit f860e8d +Author: Alexis La Goutte +Date: Thu Jun 30 23:04:37 2016 +0200 + + exported_pdu(.h): Fix warning: parameter 'tag_type.' not found in the function declaration [-Wdocumentation] + + Change-Id: Ic93914a7f526b645bc21a5c9c5f2fa0bf988c27e + Reviewed-on: https://code.wireshark.org/review/16230 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 52ab7bb +Author: Pascal Quantin +Date: Thu Jun 30 22:42:26 2016 +0200 + + 802.11 radio: fix an out of bounds access + + Bug: 12571 + Change-Id: I4dafdd9bdec5acddf346fd2db6a06d9dfabcbb2e + Reviewed-on: https://code.wireshark.org/review/16228 + Reviewed-by: Pascal Quantin + Reviewed-by: Guy Harris + +commit cd1ddf6 +Author: Gerald Combs +Date: Wed Jun 29 16:51:37 2016 -0700 + + Speed up print_line_text. + + isatty adds a small delay, at least on OS X. Call it only when we + allocate a stream. Do the same for our codeset check. + + Change-Id: Id3a20059dbc9cf7d5db16d8d238d038b9de0ebf2 + Reviewed-on: https://code.wireshark.org/review/16222 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit 6b15251 +Author: Pascal Quantin +Date: Thu Jun 30 17:40:44 2016 +0200 + + NAS EPS: upgrade dissector to v13.6.0 + + Change-Id: Ie27ce7481b9730ad8da0d465ed1c2bc373d4b602 + Reviewed-on: https://code.wireshark.org/review/16224 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit e594603 +Author: Jeff Morriss +Date: Thu Jun 30 09:16:58 2016 -0400 + + Reinstate the wmem test-programs target. + + It's used when building the test programs (today wmem has only one but it + might someday have more). + + Change-Id: I627513e1297b8348bf034e852eaf212ddbef96ff + Reviewed-on: https://code.wireshark.org/review/16221 + Petri-Dish: Jeff Morriss + Tested-by: Petri Dish Buildbot + Reviewed-by: Jeff Morriss + +commit b483f8d +Author: Gerald Combs +Date: Thu Jun 30 08:25:44 2016 -0700 + + Add missing breaks. + + Add a couple of missing breaks. Fixes CIDs 1362970 and 1362971. + + Change-Id: If37bcfed9b48ba30ce8ed85df6e232a6bc5d36f4 + Reviewed-on: https://code.wireshark.org/review/16223 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit 9ed7568 +Author: Gerald Combs +Date: Wed Jun 29 13:28:57 2016 -0700 + + Recompress PNGs. + + Recompress PNGs using the current versions of various compressors: + + optipng 0.7.6 + advpng 1.20 + advdef 1.20 + pngcrush 1.8.1 + + Parallelize PNG compression. Note why we're not using a couple of other + compression utilities. + + Change-Id: I52757d0bc2d424013e7f00b693a0f5378427cc31 + Reviewed-on: https://code.wireshark.org/review/16209 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit a16d401 +Author: João Valverde +Date: Tue Jun 21 05:06:23 2016 +0100 + + Remove Makefile.common files + + Now that nmake build system has been removed they are not needed anymore. + + Change-Id: I88075f955bb4349185859c1af4be22e53de5850f + Reviewed-on: https://code.wireshark.org/review/16050 + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + +commit f6c5cf9 +Author: João Valverde +Date: Thu Jun 30 00:29:31 2016 +0100 + + SDP: Fix warnings [-Wcast-qual] + + Change-Id: I471c3d060ff69982e94c9046ca121bb0c15f0d74 + Reviewed-on: https://code.wireshark.org/review/16212 + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + +commit 37c928f +Author: Gerald Combs +Date: Wed Jun 29 16:12:12 2016 -0700 + + Qt: Show the correct data in the packet dialog. + + Set our pointers and copy our data *after* we read our packet. + + Bug: 12556 + Change-Id: I5b373f94ad5b2fa2e6563142200a80912e717a96 + Reviewed-on: https://code.wireshark.org/review/16211 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + Reviewed-by: Jaap Keuter + +commit e55eaf5 +Author: Matt Texier +Date: Wed Jun 29 17:33:21 2016 +0200 + + BGP dissector: Fixing NLRI length for flow spec NLRI + + Bug: 12568 + Change-Id: Id2b89c2d133865771e21acf3ee224f57ac9d262b + Reviewed-on: https://code.wireshark.org/review/16203 + Reviewed-by: Alexis La Goutte + +commit e4c86ac +Author: Martin Kaiser +Date: Sun Jun 26 20:13:30 2016 +0200 + + remove Wireshark.pro, modify update-tx accordingly + + Wireshark.pro is the qt project file used by qmake + which in turn was used by nmake + + now that nmake is gone, the only reason to keep Wireshark.pro + was the update-tx script that syncs our translation files with Transifex + + update-tx calls lupdate to create a list of texts to translate and + lrelease to convert such a list into a binary file + lupdate and lrelase can read file names from a project file or + get them on the command line + + modify update-tx to pass the required file names on the command line + we can use wildcards so there's no need to change update-tx when a new + source file is added + + remove Wireshark.pro from the release tarball as well + + Change-Id: I7ff4ebc96f13b4ffc6fb1b2f4e045999fbfbed5e + Reviewed-on: https://code.wireshark.org/review/16151 + Reviewed-by: Gerald Combs + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 641904b +Author: Guy Harris +Date: Wed Jun 29 18:45:41 2016 -0700 + + Pass the format as an argument to write_specified_fields(). + + That makes failing to specify a format a compile-time error. + + Change-Id: Iff0bda8be35b1e3acc97e4314657ceaff2b3d0be + Reviewed-on: https://code.wireshark.org/review/16218 + Reviewed-by: Guy Harris + +commit b4e8479 +Author: Guy Harris +Date: Wed Jun 29 18:39:45 2016 -0700 + + Mention autotools, give some information for other UN*Xes. + + For OS X, mention the use of CMake or autotools for building. + + For Linux, mention autotools as well as CMake, and speak of Debian + derivatives other than Ubuntu. + + Add a section for UN*Xes other than OS X and Linux. + + Change-Id: I73bb7afe2d427333b10016aeb497ab32eee16d43 + Reviewed-on: https://code.wireshark.org/review/16217 + Reviewed-by: Guy Harris + +commit 73e414d +Author: Guy Harris +Date: Wed Jun 29 17:21:53 2016 -0700 + + ui/qt/i18n.qrc is a generated file; ignore it. + + Change-Id: Ifc8b45d42d9dbf9560ec825e3ce1784534df7b3b + Reviewed-on: https://code.wireshark.org/review/16216 + Reviewed-by: Guy Harris + +commit bef07e7 +Author: Guy Harris +Date: Wed Jun 29 17:07:44 2016 -0700 + + Remove unused edt field from print_data structure. + + Change-Id: I5778b08c52119b5be1ec482be9417b3c4ba8ed62 + Reviewed-on: https://code.wireshark.org/review/16215 + Reviewed-by: Guy Harris + +commit 6190f49 +Author: Guy Harris +Date: Wed Jun 29 16:53:06 2016 -0700 + + Get rid of unused edt member in write_pdml_data structure. + + Change-Id: I2a41d378187c1685afb701372cf3a8ec9c0aeb70 + Reviewed-on: https://code.wireshark.org/review/16214 + Reviewed-by: Guy Harris + +commit 6d06e69 +Author: Guy Harris +Date: Wed Jun 29 16:49:04 2016 -0700 + + Remove unused edt member from write_json_data structure. + + Change-Id: Id8b45715c753dc6006f7833e5f49bd8aabc15271 + Reviewed-on: https://code.wireshark.org/review/16213 + Reviewed-by: Guy Harris + +commit 2257478 +Author: Guy Harris +Date: Wed Jun 29 16:13:38 2016 -0700 + + Fix -T fields, broken by ceae9e4d1fff4500b285dba021c3f239ff87779e. + + Rename write_fields_proto_tree() to write_specified_fields(), and make + it static. Make write_fields_proto_tree() a wrapper around + write_specified_fields() that sets the format to FORMAT_CSV. Have + write_specified_fields() fail with an assertion if fields->format isn't + one of the known formats, to catch problems such as this in the future. + + Don't fill in the "data" structure if we're not going to use it. + + Change-Id: I11dbf448d72ca389f0e5fb8558a41b7eecf7c9a4 + Reviewed-on: https://code.wireshark.org/review/16210 + Reviewed-by: Guy Harris + +commit af52c85 +Author: Benjamin Coddington +Date: Fri Jun 24 09:24:20 2016 -0400 + + packet-nfs: fixup whitespace in pNFS SCSI work + + A recent patch introduced whitespace errors.. clean them out. + + Change-Id: Id67bed40646d60dc6775e1e1f958a5a07a5f5f6d + Signed-off-by: Benjamin Coddington + Reviewed-on: https://code.wireshark.org/review/16205 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit bca1f8c +Author: Gerald Combs +Date: Wed Jun 29 13:14:23 2016 -0700 + + Remove an unused image. + + Remove ui/qt/progress_overlay.png. + + Change-Id: I2016c6aa5f77314add9870ba95d1c297d72a05c3 + Reviewed-on: https://code.wireshark.org/review/16207 + Reviewed-by: Gerald Combs + +commit e1b1304 +Author: João Valverde +Date: Wed Jun 29 20:05:27 2016 +0100 + + Update README.qt + + Change-Id: Icf7774098986da29efdf76af1dcf217bced428e4 + Reviewed-on: https://code.wireshark.org/review/16206 + Reviewed-by: Alexis La Goutte + Reviewed-by: Martin Kaiser + Reviewed-by: Gerald Combs + +commit 272ec20 +Author: clairvoyant +Date: Thu Jun 23 16:33:50 2016 +0200 + + LAPD. SCTP can carry LAPD information. + + * LAPD can be configured in "Decode As" using port and protocol identifier. + * Add default sctp ppi (the number is not assigned by IANA). + + Change-Id: Iaa4797e844f6480881605ad4e6b408d7d5f60cad + Reviewed-on: https://code.wireshark.org/review/16107 + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + +commit be12a25 +Author: Michael Mann +Date: Thu Jun 23 23:10:08 2016 -0400 + + Provide new interface for Export PDU. + + Rather than have a bitmask for each desired field, have a dissector + provide a list of structures that represent data that goes into + the PDU. + + Change-Id: I125190cbaee489ebffb7d9f5d8bc6f3be2d06353 + Reviewed-on: https://code.wireshark.org/review/16122 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit 4656191 +Author: Gerald Combs +Date: Tue Jun 28 10:35:27 2016 -0700 + + CMake: Update the macOS wrapper script behavior. + + CMake on macOS creates a convenience wrapper (run/wireshark) that runs + run/Wireshark.app/Contents/MacOS/Wireshark. Have it run the executable + using "exec" instead of opening the bundle using "open" so that + Wireshark runs in the foreground. + + Change-Id: I295ce0681da75678e5e01781e9c8fb58e2236fc9 + Reviewed-on: https://code.wireshark.org/review/16196 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit ceae9e4 +Author: Martin Kacer +Date: Tue Jun 28 13:01:25 2016 +0200 + + tshark fields filter added for other outputs + + -e fields filter addded to ek|json|pdml output. + + Bug: 12529 + Change-Id: I1f0f8772eefceb5b71927925ce0c34af483571b9 + Reviewed-on: https://code.wireshark.org/review/16193 + Petri-Dish: Guy Harris + Tested-by: Petri Dish Buildbot + Reviewed-by: Guy Harris + +commit 348e364 +Author: Guy Harris +Date: Tue Jun 28 19:31:32 2016 -0700 + + Distribute i18n.qrc.in in the release tarball. + + Change-Id: I4f974351ab1f4781e140873f460d028f49640ca1 + Reviewed-on: https://code.wireshark.org/review/16200 + Reviewed-by: Guy Harris + +commit 07570b5 +Author: Guy Harris +Date: Tue Jun 28 17:24:19 2016 -0700 + + Don't assume GNU sed. + + Not all versions of sed support "\n" as meaning "newline" in the + replacement string of an s command. POSIX requires tr to support "\n" + in the replacement string, however, so use % as meaning "newline" in the + sed script, and translate it to a newline using tr. + + Change-Id: Icdbc0b55787340953dfc90ea82e0421b4e77a896 + Reviewed-on: https://code.wireshark.org/review/16199 + Reviewed-by: Guy Harris + +commit 5c03bda +Author: João Valverde +Date: Tue Mar 15 03:06:21 2016 +0000 + + Qt: Generate .qm files during build + + Change-Id: Ia2ee723227e1b331eeec0f0463654f35a4c9f37b + Reviewed-on: https://code.wireshark.org/review/14508 + Petri-Dish: Martin Kaiser + Tested-by: Petri Dish Buildbot + Reviewed-by: Martin Kaiser + +commit fff248b +Author: Bruno Verstuyft +Date: Mon Jun 20 14:29:10 2016 +0200 + + DOCSIS: Added dissector for OFDM Channel Descriptor + + Change-Id: Idbbc1ad126e0b01952957a914bd9c16a990a9b9e + Reviewed-on: https://code.wireshark.org/review/16036 + Reviewed-by: Jaap Keuter + Reviewed-by: Michael Mann + +commit 42b8c95 +Author: Pascal Quantin +Date: Tue Jun 28 21:47:46 2016 +0200 + + 3GPP NAS: add a missing separator for optional string + + Change-Id: Idddbae0e969b525ddbe31f3b1ddbccaed232891a + Reviewed-on: https://code.wireshark.org/review/16197 + Reviewed-by: Pascal Quantin + +commit 422c0f4 +Author: Gerald Combs +Date: Mon Jun 27 20:13:35 2016 -0700 + + Qt: Make the packet map work with Qt 5.7. + + It's not safe to assume that the overlay scroll bar range is equal(ish) + to the number of packets. Adjust our arithmetic accordingly. + + Change-Id: Ic8cc8a746bdd2bdc6771794303e95a810bc3d1d2 + Reviewed-on: https://code.wireshark.org/review/16186 + Petri-Dish: Gerald Combs + Tested-by: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit 000ac66 +Author: Gerald Combs +Date: Tue Jun 28 08:54:53 2016 -0700 + + Qt: Make recent preferences changes work with Qt4. + + Cast a pointer to a QWidget * so that compilation and pref selection + works for Qt4. Add an assert and some comments. + + Change-Id: Ide89b698220a9af7b7252488f0770ff35081432e + Reviewed-on: https://code.wireshark.org/review/16195 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit ff8c6d9 +Author: Jens Kilian +Date: Tue Jun 28 10:32:26 2016 +0200 + + Qt: Add a missing Q_DECLARE_METATYPE to fix a compile error on RHEL 7. + + Change-Id: I6cf0a95525334d5a7561a477093b892a3f821b98 + Reviewed-on: https://code.wireshark.org/review/16189 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 980d3b4 +Author: Alexis La Goutte +Date: Mon Jun 27 08:08:28 2016 +0200 + + DTN: fix indent + + * Replace tab by 4-spaces + * Add modelines (for packet-dtn.c) + + Change-Id: I668f20b4a021ef94a1bb0b26ac815495eb9920d9 + Reviewed-on: https://code.wireshark.org/review/16165 + Reviewed-by: Anders Broman + +commit 0321d06 +Author: David Zoller +Date: Sat Jun 25 09:13:00 2016 -0500 + + DTN follow up to Change ID: I49769271a41b6a7b23c6bc1d4beaadbe8819198d + + Change-Id: Ia90644c22896586e4a260a3bf11d1f3e50bd4c4b + Reviewed-on: https://code.wireshark.org/review/16134 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit ca369ac +Author: Pascal Quantin +Date: Tue Jun 28 16:47:20 2016 +0200 + + 3GPP NAS: upgrade dissector to v13.6.0 + + Change-Id: Ieffc5d6544f3bd121ff317ff598faaadb5f117ab + Reviewed-on: https://code.wireshark.org/review/16194 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit 670b119 +Author: Dario Lombardo +Date: Tue Jun 28 10:43:12 2016 +0200 + + print.c NULL pointer check in print_escaped + + Added NULL pointer check in print_escaped functions. + Requested by comment in change 16034. + + Change-Id: Id172d772d9b5cb4bcd31fe8b42286f885ec5b968 + Reviewed-on: https://code.wireshark.org/review/16188 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Dario Lombardo + +commit 8c006fe +Author: Dario Lombardo +Date: Tue Jun 28 10:43:12 2016 +0200 + + print: change function call. + + Change-Id: I8cae4a8d2b57f961d16cb388befed2348a88badc + Reviewed-on: https://code.wireshark.org/review/16191 + Petri-Dish: Dario Lombardo + Reviewed-by: Pascal Quantin + Reviewed-by: Martin Kacer + Tested-by: Petri Dish Buildbot + Reviewed-by: Dario Lombardo + +commit 94830dc +Author: Dario Lombardo +Date: Tue Jun 28 10:42:55 2016 +0200 + + print: merge json and ek functions. + + Change-Id: Ia5d75bab03bfc065651ea83c936aedffb1f69e9f + Reviewed-on: https://code.wireshark.org/review/16190 + Petri-Dish: Dario Lombardo + Reviewed-by: Pascal Quantin + Reviewed-by: Martin Kacer + Tested-by: Petri Dish Buildbot + Reviewed-by: Dario Lombardo + +commit 7fcdc75 +Author: Alexis La Goutte +Date: Tue Jun 28 07:29:50 2016 +0200 + + print(.c): fix no previous prototype for 'check_protocolfilter' [-Wmissing-prototypes] + + Change-Id: Ib10e919dd3f0bec92004c68bf73a3c7d37961f03 + Reviewed-on: https://code.wireshark.org/review/16187 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit e5a1afc +Author: Gerald Combs +Date: Mon Jun 27 14:34:29 2016 -0700 + + Qt: Preferences dialog performance improvements. + + Fill in advanced and module tree item text when requested. + + Create ModulePreferencesScrollAreas only when we need to show them. + + Change-Id: I5aa7d5dba8f5d20de088de3a9d1ee9d58e779269 + Reviewed-on: https://code.wireshark.org/review/16181 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit ee6c1f5 +Author: Jaap Keuter +Date: Mon Jun 27 23:17:27 2016 +0200 + + OSPF: Differentiate meaning of N/P bit in NSSA LSA type 7 + + In OSPF v2 the N/P bit in NSSA LSA type 7 messages has to be + interpreted as P-bit (RFC 3101) instead of N-bit. This change + makes it so. + + Bug: 12555 + Change-Id: I1d4a8978ca42d0472d5967528e72cbfada87b799 + Reviewed-on: https://code.wireshark.org/review/16174 + Reviewed-by: Alexis La Goutte + +commit f0e6764 +Author: Guy Harris +Date: Mon Jun 27 19:58:21 2016 -0700 + + Global, not static. + + Change-Id: I185a1786365f185f18f3ec492a8ef165d61595ed + Reviewed-on: https://code.wireshark.org/review/16185 + Reviewed-by: Guy Harris + +commit 3ebac2b +Author: Guy Harris +Date: Mon Jun 27 19:54:42 2016 -0700 + + Have commandline_other_options() directly fill in the global structure. + + Other code looks at the global structure, so there won't be other + structures; just fill in the global structure directly. + + Change-Id: I4dc87b79168c5a7c9ab1f085aa2d78cc6d2c9019 + Reviewed-on: https://code.wireshark.org/review/16184 + Reviewed-by: Guy Harris + +commit ac4ad2b +Author: Guy Harris +Date: Mon Jun 27 18:56:29 2016 -0700 + + Don't set quit_after_cap if no pcap, as it's not present. + + Change-Id: I871f75394ba66967d7d7be203bd9e235575458e1 + Reviewed-on: https://code.wireshark.org/review/16183 + Reviewed-by: Guy Harris + +commit 5d019cf +Author: Guy Harris +Date: Mon Jun 27 18:40:09 2016 -0700 + + Make quit_after_cap an item in commandline_param_info_t. + + And make the commandline_info structure global, so all the places that + look at quit_after_cap can get at it. + + Change-Id: I006329cf8842c655cca36f024570855d1b16e107 + Reviewed-on: https://code.wireshark.org/review/16182 + Reviewed-by: Guy Harris + +commit 3f49e89 +Author: Guy Harris +Date: Mon Jun 27 17:21:24 2016 -0700 + + Pull quit_after_cap out of the global capture options. + + Really, all the GUI-related options should be pulled out, so they're not + cluttering up dumpcap and tshark. + + Change-Id: I0276dee2be48bae3498a819d8c0c2747fe1352e7 + Reviewed-on: https://code.wireshark.org/review/16180 + Reviewed-by: Guy Harris + +commit 72d9785 +Author: Guy Harris +Date: Mon Jun 27 16:49:08 2016 -0700 + + We need global_capture_opts if we have extcap, even without pcap. + + Change-Id: I16b778064c1cd2bbf281fb5192bf35da252e99dd + Reviewed-on: https://code.wireshark.org/review/16179 + Reviewed-by: Guy Harris + +commit 9b91e64 +Author: Peter Wu +Date: Tue Jun 28 00:34:07 2016 +0200 + + test: ensure temporary directory outside source tree + + The whole point of using mktemp is to get a temporary directory outside + the source tree. Commit v2.1.0rc0-1027-ge01f8fb tried to fix the + invocation for *BSD (including OS X), but by adding a template it + dropped the implicit --tmpdir option for GNU mktemp on Linux.. + + Use the GNU mktemp invocation and if it fails (for example, because a + template is expected for BSD/OS X), provide a template. + + Change-Id: I77bbc7dc2045e4fa756e102afa080860b0857713 + Reviewed-on: https://code.wireshark.org/review/16178 + Reviewed-by: Peter Wu + +commit e69194a +Author: Peter Wu +Date: Mon Jun 27 23:23:31 2016 +0200 + + qt: fix linking error with global_capture_opts + + global_capture_opts is already defined by ui/commandline.c which is also + linked with wireshark-qt.cpp. Remove the duplicate definition to avoid a + build failure with the gold linker. + + Fixes regression from v2.1.1rc0-192-g9b5b444. + + Change-Id: I4484e2769bf270dee1ec0378fd9c925e01eaf390 + Reviewed-on: https://code.wireshark.org/review/16175 + Petri-Dish: Peter Wu + Tested-by: Petri Dish Buildbot + Reviewed-by: Peter Wu + +commit 4add8b6 +Author: Peter Wu +Date: Thu Jun 16 15:27:25 2016 -0700 + + cmake: add idl2wrs-dissectors target for DCERPC + + Add a callable target such that dissectors can be generated without the + AUTOGEN_dcerpc option. + + Modelled after the pidl CMakeLists.txt file and target. This approach + has the advantage over the previous implementation such that the clean + target does not remove the packet-dcerpc-X.c files. + + Change-Id: I3226937eaa76dffa253df9d4f989421d5faa3f3f + Reviewed-on: https://code.wireshark.org/review/15989 + Petri-Dish: Peter Wu + Tested-by: Petri Dish Buildbot + Reviewed-by: Peter Wu + +commit b0b2540 +Author: Gerald Combs +Date: Mon Jun 27 09:02:51 2016 -0700 + + Qt: Clean up capture file callbacks. + + Mark some callbacks GTK+ only as appropriate. Change a debug message to + an assert since we handle all callbacks. + + Change-Id: I4266f0d7134d19a9c0432354ea36de67501275b4 + Reviewed-on: https://code.wireshark.org/review/16171 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit d8ddf84 +Author: Martin Kacer +Date: Mon Jun 27 06:41:56 2016 +0200 + + Fixed tshark pdml output. + + Corrected if no protocol filter (-j) specified. + + Change-Id: Id20dd255642951633efa935dbb1363e7b9aa9be0 + Reviewed-on: https://code.wireshark.org/review/16164 + Petri-Dish: Jaap Keuter + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + +commit d90e6e7 +Author: Jeff Morriss +Date: Mon Jun 27 09:48:35 2016 -0400 + + There's no need to check the return from g_array_index(). + + g_array_index() returns an index into an array: we're sure to find + something at that index (whether that something is in bounds is + a-whole-nother question). + + This fixes CIDs 1362829 and 1362890/1362830. There were other CIDs like + this but they've already been fixed. + + Change-Id: I94af0931b9adf3abd3bedc969e399cda98bbdd07 + Reviewed-on: https://code.wireshark.org/review/16168 + Reviewed-by: Jaap Keuter + +commit 2ab4155 +Author: Michael Mann +Date: Sun Jun 26 10:52:37 2016 -0400 + + tvb_get_string_enc + proto_tree_add_item = proto_tree_add_item_ret_string + + Also some other tricks to remove unnecessary tvb_get_string_enc calls. + + Change-Id: I2f40d9175b6c0bb0b1364b4089bfaa287edf0914 + Reviewed-on: https://code.wireshark.org/review/16158 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + Reviewed-by: Pascal Quantin + +commit 8c37621 +Author: D. Ulis +Date: Sun Jun 26 22:34:03 2016 -0400 + + CIP: Cleanup info column for MSP packets + + 1. Skip printing class name in info column when it was an MSP, since it's implied. + 2. Don't print response status for embedded messages in info column for MSP. It makes the line too long. + 3. Print the response status for embedded messages in the Service Packet tree. This makes it easier to find the packet that may have failed. + + Change-Id: I2c60fb9baf113a215ada7301f493cbd51e340dcd + Reviewed-on: https://code.wireshark.org/review/16162 + Reviewed-by: Anders Broman + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + +commit 58ccf8e +Author: Jeff Morriss +Date: Sun Jun 26 21:38:19 2016 -0400 + + endpoint dialog: fix compilation when we don't HAVE_GEOIP. + + Also fix some indentation and white space. + Remove a break-after-return. + + Bug: 12562 + Change-Id: I912ccdac62aceaabcffec8f7739da56cc6036abf + Reviewed-on: https://code.wireshark.org/review/16159 + Reviewed-by: Pascal Quantin + +commit 010f5bb +Author: Alexis La Goutte +Date: Mon Jun 27 08:10:33 2016 +0200 + + LTP: fix indent + + replace space by tab + + Change-Id: I52d5fefbf795fe6ee2dbdeda087c49280ba47503 + Reviewed-on: https://code.wireshark.org/review/16166 + Petri-Dish: Alexis La Goutte + Reviewed-by: Anders Broman + +commit af26f31 +Author: Bruno Verstuyft +Date: Thu Jun 16 10:24:21 2016 +0200 + + DOCSIS: Fix unknown TLVs in UCD type29 caused parsing errors + bugfixes + + Change-Id: I9ab56ded7ebf9f087afceed979e451e369eaf1d6 + Reviewed-on: https://code.wireshark.org/review/15967 + Reviewed-by: Alexis La Goutte + Tested-by: Alexis La Goutte + Reviewed-by: Anders Broman + +commit 03adf58 +Author: Joerg Mayer +Date: Sun Jun 26 23:42:20 2016 +0200 + + Remove author comments and some accompanying useless code comments + + This only removes author's names that appear in the AUTHORS* files. + In those cases where a group of people get mentioned, this patch does + not remove any in case at least one name is not found in AUTHORS* + + Change-Id: I2259dbda3d4a1250bdc103f3fc5be93df5482489 + Reviewed-on: https://code.wireshark.org/review/16154 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit ff9e62a +Author: João Valverde +Date: Sat Jun 25 19:23:58 2016 +0100 + + autotools: Qt 5.7 requires C++11 + + Change-Id: Icad622a052a84862ace98a7000f10ccf677f54a5 + Reviewed-on: https://code.wireshark.org/review/16138 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit fbb23e2 +Author: Thomas Wiens +Date: Fri Jun 24 23:53:36 2016 +0200 + + s7comm: Sinumerik NC file transfer + + Added decoding of up-/downloading files from/to a Sinumerik NC CNC control + machine. + + Change-Id: If7939e56e972fc2b8feb12150c4184a880b0cdae + Reviewed-on: https://code.wireshark.org/review/16129 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 76ae2d9 +Author: Alexis La Goutte +Date: Sun Jun 26 18:54:54 2016 +0200 + + AUTHORS: fix duplicate / wrong name entry + + Change-Id: I1e2bb98d1e78af193f449c75109eabc92f934c11 + Reviewed-on: https://code.wireshark.org/review/16149 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: David Zoller + Reviewed-by: Anders Broman + +commit 148d586 +Author: Martin Kacer +Date: Sun Jun 26 21:13:06 2016 +0200 + + json: corrected json output format. + + Some pcaps caused invalid json and ek files. + + Bug: 11754 + Change-Id: Id4c4d744b4d07fe4e8b6423688be1bb10a803844 + Reviewed-on: https://code.wireshark.org/review/16152 + Reviewed-by: Guy Harris + +commit 6196595 +Author: Gerald Combs +Date: Sat Jun 25 09:44:28 2016 -0700 + + CMake: Qt 5.7 requires C++ 11. + + Add -std=c++11 to CMAKE_CXX_FLAGS if we have Qt >= 5.7.0 and we're + compiling with g++ or clang++. + + Change-Id: Id4ce5921ce5c475e9eb9cc67f94c3b3a895924a1 + Reviewed-on: https://code.wireshark.org/review/16135 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + +commit a4711f8 +Author: Ashish Shukla +Date: Fri Jun 24 15:59:39 2016 -0700 + + radiotap: Fix for the VHT 20MHz MCS 9 data rate not displayed + + MCS 9 at 20 MHz is valid for 3 and 6 spatial streams. + Changed the rate table to include rate (mbps) for VHT 20MHz MCS 9. + + Signed-off-by: Alexis La Goutte + + Bug: 12558 + Change-Id: Ia16ae545a5ac1779131e24e1f54a5659390cd321 + Reviewed-on: https://code.wireshark.org/review/16146 + Reviewed-by: Guy Harris + +commit 28048a9 +Author: Alexis La Goutte +Date: Sun Jun 26 17:19:56 2016 +0200 + + circuit(.h): fix indent (and add modelines) + + Change-Id: I71bb0a8eaf9f5bd34395a4182e4158abaca4ace2 + Reviewed-on: https://code.wireshark.org/review/16144 + Reviewed-by: Dario Lombardo + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 4f2c3ad +Author: Alexis La Goutte +Date: Sun Jun 26 18:48:30 2016 +0200 + + Fix typo on AUTHORS.src (about @) + + Change-Id: Ie4ba5b6ca9cdcf0a90c4b7604b0b4ff89690f3d9 + Reviewed-on: https://code.wireshark.org/review/16148 + Reviewed-by: Michael Mann + +commit ea4d01d +Author: Guy Harris +Date: Sun Jun 26 17:37:49 2016 -0700 + + The "coding" subfield of the VHT field is a bitmask. + + Treat it as such. Fetch it once, regardless of whether we have any + non-zero NSS values or not, and use the per-user NSS value to decide + whether a particular bit in the bitmask is valid and worth displaying. + + Make the four coding fields bitfields, with the appropriate bit. + + Change-Id: I506b35afa9d07da8d800da5c304d5d0aadd87c54 + Reviewed-on: https://code.wireshark.org/review/16155 + Reviewed-by: Guy Harris + +commit 497159f +Author: Guy Harris +Date: Sun Jun 26 13:44:17 2016 -0700 + + Check for an invalid 11ac MCS/bandwidth/NSS combination. + + A few of the combinations are marked as "Not valid" in 802.11ac-2013. + + Ping-Bug: 12558 + Change-Id: I18b78ebb84ab32a6fc53c6d634ef07ae87fb4866 + Reviewed-on: https://code.wireshark.org/review/16153 + Reviewed-by: Guy Harris + +commit b84637b +Author: Joerg Mayer +Date: Sun Jun 26 19:07:57 2016 +0200 + + Decode partial virtual bitmap in TIM IE + + - Add yet another filter name for an association id element + - Minor (consistency) cleanups in the vicinity of the new hf element. + + Bug: 12545 + Change-Id: Ic8e7580e7de7572e1b449ae03494b25567d86ea3 + Reviewed-on: https://code.wireshark.org/review/16150 + Reviewed-by: Jörg Mayer + +commit e702da6 +Author: Gerald Combs +Date: Sun Jun 26 08:09:49 2016 -0700 + + [Automatic update for 2016-06-26] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: Id5cc1bbd3d7f899e48ae9c2de48613ef0366cc29 + Reviewed-on: https://code.wireshark.org/review/16142 + Reviewed-by: Gerald Combs + +commit 5e8649b +Author: Gerald Combs +Date: Sat Jun 25 10:12:21 2016 -0700 + + Qt: Don't use QStyleOptionViewItemV4. + + It was deprecated in Qt 5.7. Just use QStyleOptionViewItem. + + Change-Id: I890305a11393940e21bdc68d90ca6602ade16769 + Reviewed-on: https://code.wireshark.org/review/16137 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 4addfc6 +Author: Gerald Combs +Date: Fri Jun 24 16:48:23 2016 -0700 + + Add an RA_INTERFACES register action. + + Add RA_INTERFACES between RA_PREFERENCES and RA_CONFIGURATION. Wireshark + was spending a suspiciously long time loading module preferences here. + (Now we just need to find out why that section of the code is slow.) + + Change-Id: Iecbe55e8e10c8844bcb151a13e383cb13a3f6eb1 + Reviewed-on: https://code.wireshark.org/review/16133 + Reviewed-by: Anders Broman + +commit 60cdee9 +Author: Gerald Combs +Date: Fri Jun 24 15:17:25 2016 -0700 + + Qt: Handle unhandled filter actions. + + Handle FilterAction::ActionColorize and ::ActionFind. Remove + ::ActionConversation since it was unused. Assert when we encounter a + missing FilterAction, similar to what we do in other parts of the code. + + Bug: 12363 + Change-Id: I5c1ecd488e5bdb9700a80fc70ec7c047311054b6 + Reviewed-on: https://code.wireshark.org/review/16131 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 291762d +Author: Gerald Combs +Date: Fri Jun 24 10:52:44 2016 -0700 + + Qt: Try to fix un-maximize behavior on OS X. + + On OS X, create dialogs with valid parents so that we don't trigger + QTBUG-46701. Document QDialog's "on top", maximize, and minimize + behaviors. + + Bug: 12544 + Change-Id: I32c0ef01dba3f7132e5fd0cd61f9feb654b92009 + Reviewed-on: https://code.wireshark.org/review/16127 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 974a530 +Author: Gerald Combs +Date: Thu Jun 23 13:10:52 2016 -0700 + + Qt: Conversation and Endpoint dialog performance tweaks. + + Generate column text dynamically. This keeps us from having to iterate + over our tree items each time we receive updates. + + Set the uniformRowHeights property. + + Stop automatically resizing columns after 200 items. + + Fixup name resolution behavior. Disable the checkbox if host name + resolution is disabled. + + Change-Id: Ib2fef604d6ee9e39a8b1edd72d58d0cb02d3bb64 + Reviewed-on: https://code.wireshark.org/review/16110 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 01e2280 +Author: Dario Lombardo +Date: Thu Jun 23 17:52:51 2016 +0200 + + circuit: rename shadow variable + + Change-Id: I67e2c80e89af9526ba4b482933d64cab93b9490a + Reviewed-on: https://code.wireshark.org/review/16105 + Reviewed-by: Anders Broman + +commit 12efbd6 +Author: Dario Lombardo +Date: Thu Jun 23 17:53:45 2016 +0200 + + app_mem_usage: rename shadow variable + + Change-Id: I0db888633118beeabfe4bb8fa6da419d0827c7c1 + Reviewed-on: https://code.wireshark.org/review/16106 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit f8500f3 +Author: Dario Lombardo +Date: Thu Jun 23 17:51:41 2016 +0200 + + conversation: rename shadow variable + + Change-Id: I8f738b2e01d7f448b21cdc1b488b16b7dd581911 + Reviewed-on: https://code.wireshark.org/review/16104 + Reviewed-by: Anders Broman + +commit 46fc6f5 +Author: Dario Lombardo +Date: Thu Jun 23 17:40:40 2016 +0200 + + ex-opt: rename shadow variable + + Change-Id: Iba19920e58ffb7f1a88c2a75964c518f0479c66f + Reviewed-on: https://code.wireshark.org/review/16103 + Reviewed-by: Anders Broman + +commit 916958c +Author: Dario Lombardo +Date: Thu Jun 23 17:39:43 2016 +0200 + + filter: rename shadow var + + Change-Id: Idc18f2988754fc21b1f8f2dcadfe5e3dd31d5545 + Reviewed-on: https://code.wireshark.org/review/16102 + Reviewed-by: Anders Broman + +commit bfb6f62 +Author: Dario Lombardo +Date: Thu Jun 23 17:35:17 2016 +0200 + + srt: rename shadow variable + + Change-Id: I69bda25f79b6b46bdb288e32133847a853b614e0 + Reviewed-on: https://code.wireshark.org/review/16101 + Reviewed-by: Anders Broman + +commit b845e29 +Author: Dario Lombardo +Date: Thu Jun 23 17:31:49 2016 +0200 + + stats_tree: rename shadow variable + + Change-Id: I5b3272cc4df728c70d6b0370b0d8a6d3482a0c6c + Reviewed-on: https://code.wireshark.org/review/16100 + Reviewed-by: Anders Broman + +commit 581d44f +Author: Dario Lombardo +Date: Thu Jun 23 17:15:34 2016 +0200 + + h248: rename shadow variable. + + Change-Id: I98545776127a0cc3b5d9c44bb625a217672b4443 + Reviewed-on: https://code.wireshark.org/review/16099 + Reviewed-by: Anders Broman + +commit b47aca5 +Author: Gerald Combs +Date: Fri Jun 24 16:01:51 2016 -0700 + + Minor UI locale updates. + + Qt: Call setlocale before commandline_early_options so that we get + proper "-v" output, similar to the GTK+ UI. + + GTK+: Call setlocale once at startup. + + Bug: 11960 + Change-Id: I3c3a196b9d94fc768e1085200891bc8d67e21a08 + Reviewed-on: https://code.wireshark.org/review/16132 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + +commit 79836fa +Author: Roland Knall +Date: Thu Jun 23 10:43:30 2016 +0200 + + wsutil: Move Win32 helper routines from capchild + + Move error handling and argument quoting routines from + capchild to wsutil, as those methods will be used by + extcap_spawn as well. + + Change-Id: I2c4515fefd5aecad317fcdaefa721734288f792c + Reviewed-on: https://code.wireshark.org/review/16123 + Petri-Dish: Roland Knall + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + Reviewed-by: Roland Knall + +commit fe68566 +Author: Gerald Combs +Date: Fri Jun 24 12:59:07 2016 -0700 + + Qt: Fix "-l" behavior. + + gbcae998 didn't completely fix the missing "-l" behavior. + + Bug: 12311 + Change-Id: Iee3c844013ac137e94848aaafca7aeb3de43e080 + Reviewed-on: https://code.wireshark.org/review/16128 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit cc007e5 +Author: Gerald Combs +Date: Fri Jun 24 08:59:48 2016 -0700 + + Qt: Keep the syntax line edit cursor active. + + Ignore focusOutEvents when the syntax line edit completer is active. + This keeps it from hiding its cursor. + + Bug: 12520 + Change-Id: I8e25b92c097e039e26e2381c5209be1e27a6a7cd + Reviewed-on: https://code.wireshark.org/review/16126 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Tested-by: Jeff Morriss + Tested-by: Jim Young + Reviewed-by: Gerald Combs + +commit 4adf695 +Author: Alexis La Goutte +Date: Fri Jun 24 14:13:06 2016 +0200 + + print(.c): fix indent + + Change-Id: Ie7c55fb432b29abe689eed1968cfa30bd8e88e33 + Reviewed-on: https://code.wireshark.org/review/16124 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 1df9918 +Author: Dario Lombardo +Date: Thu Jun 23 18:21:13 2016 +0200 + + tfshark: remove unused variable + + Change-Id: I30ab3e4e044de12b18b7b7213a605df7096d1c54 + Reviewed-on: https://code.wireshark.org/review/16108 + Reviewed-by: Michael Mann + +commit 71a57dc +Author: Guy Harris +Date: Thu Jun 23 18:51:25 2016 -0700 + + Indicate how this should be done. + + Assuming that it could, if registered as an "eth.trailer" heuristic + dissector, get the length of the entire frame, that is. + + Change-Id: I1ac26feeb10bb8ba357089a80f4b768f580bb51d + Reviewed-on: https://code.wireshark.org/review/16121 + Reviewed-by: Guy Harris + +commit a5e9e7e +Author: Guy Harris +Date: Thu Jun 23 12:45:32 2016 -0700 + + Fix "disable this protocol by default". + + Allow a dissector to mark its protocol as "disabled by default", which + means that the "enable all protocols" routine won't enable it. This is + necessary in order to allow the disabling of protocols not to be + unintentionally changed due to profile changes; see bug 9826. + + Change-Id: I3947f794c21350b70a8de06899cfc7715b77f90f + Ping-Bug: 9826 + Reviewed-on: https://code.wireshark.org/review/16109 + Reviewed-by: Guy Harris + +commit dd5f3c9 +Author: Pascal Quantin +Date: Thu Jun 23 16:10:09 2016 +0200 + + LTE RRC: fix display of info column when receiving a BR SIB + + Change-Id: Ic288cb10fad3bd34fe088479e7a79f77985808e0 + Reviewed-on: https://code.wireshark.org/review/16098 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit 45db2fb +Author: Benjamin Coddington +Date: Thu Jun 23 05:57:03 2016 -0400 + + packet-nfs: add extent decoding for SCSI layouts + + Decode extents sent within the response to a LAYOUTGET operation on + SCSI layout types. + + Change-Id: I1fc0a5e3d4782f078f96866dc63f2ec43b6d62b1 + Signed-off-by: Benjamin Coddington + Reviewed-on: https://code.wireshark.org/review/16097 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 738b3e8 +Author: dz-msfc +Date: Wed Mar 2 20:39:12 2016 -0600 + + NASA provided LTP and DTN updates + + Change-Id: I49769271a41b6a7b23c6bc1d4beaadbe8819198d + Reviewed-on: https://code.wireshark.org/review/14310 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit edac72e +Author: Jens Kilian +Date: Thu Jun 23 10:31:42 2016 +0200 + + Increase MAX_DISSECTOR_ADDR_TYPE. + + With the recent changes causing some address types to be registered + by their proper dissectors, I ran into the MAX_DISSECTOR_ADDR_TYPE + limit in a new dissector I'm currently writing. + + Change-Id: I72f521266af9190e8ad198ace4d6608b6b4d2dee + Reviewed-on: https://code.wireshark.org/review/16091 + Reviewed-by: Anders Broman + +commit 982359c +Author: Dario Lombardo +Date: Thu Jun 23 10:13:15 2016 +0200 + + bthci: add missing break (CID 1362832) + + Change-Id: I705cb17d7c6d615361d29f00ba840a94dc835ff0 + Reviewed-on: https://code.wireshark.org/review/16090 + Petri-Dish: Dario Lombardo + Reviewed-by: Stig Bjørlykke + +commit a51b6a6 +Author: Guy Harris +Date: Thu Jun 23 02:33:46 2016 -0700 + + Fix some of the brokenness in the PRP redundancy control trailer dissector. + + IF YOU ARE DOING A HEURISTIC CHECK TO DETERMINE WHETHER THE PACKET + YOU'RE LOOKING AT IS ONE YOU SHOULD DISSECT, EVEN IN A DISSECTOR + THAT'S NOT REGISTERED AS A HEURISTIC DISSECTOR, DO NOT LOOK AT PACKET + BYTES UNLESS YOU HAVE ALREADY DETERMINED THAT THEY ARE AVAILABLE IN THE + CAPTURE. + + THERE ARE NO EXCEPTIONS TO THIS RULE. + + Bug: 9826 + Change-Id: I2327a92ee760003bc10489263c0c53acdf2094e9 + Reviewed-on: https://code.wireshark.org/review/16092 + Reviewed-by: Guy Harris + +commit 6b0923a +Author: Guy Harris +Date: Thu Jun 23 01:00:26 2016 -0700 + + No pcap, no live capture, so no auto_scroll_live. + + Change-Id: Ic1993916cdb78c946bb291fa59f7cdc25e9cef2d + Reviewed-on: https://code.wireshark.org/review/16088 + Reviewed-by: Guy Harris + +commit 2c8056a +Author: Dario Lombardo +Date: Mon Jun 13 20:02:46 2016 +0200 + + Qt: quit the UI if WIRESHARK_QUIT_AFTER_CAPTURE is set (offline mode too). + + This change is useful to use the offline mode in tests (like fuzzing) + that require the software to quit after the processing of a sample. + + Change-Id: I311c642edecf4012dc518c2bf8bca66c97aa1b02 + Reviewed-on: https://code.wireshark.org/review/16038 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit bf29a5c +Author: Michael Mann +Date: Thu Jun 23 00:30:51 2016 -0400 + + Add LACP "flag strings" + + Merged the functionality of a Lua script from Sharkfest '16 + presentation into the dissector. + Also cleaned up some of the tfs values used by the dissector. + + Bug: 12550 + Change-Id: I6b4c2f4d8a07cfb836265518d713a499df3e971c + Reviewed-on: https://code.wireshark.org/review/16086 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 1cdd091 +Author: Chris Brandson +Date: Fri Jun 17 15:12:12 2016 -0700 + + ZigBee updated ZDO support to comply with R22 + + Update ZDO support for R22 (and IEEE 802.15.4-2015) + - Add support for the new IEEE Joining List request / response + - Changed Network Update to support channel pages + - Added Network Update Enhanced request + - Added decoding of EU Sub-GHz Frequency Band + + Change-Id: I3a513a486f6d3784897fc8b783411c678e3f905e + Reviewed-on: https://code.wireshark.org/review/16040 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + Reviewed-by: Anders Broman + +commit fdcfd3a +Author: João Valverde +Date: Wed Jun 22 21:10:50 2016 +0100 + + IPv6: Don't check payload length for ICMPv6 encapsulation + + Change-Id: I783df2ddc98da1c78020837a32005ea143321990 + Reviewed-on: https://code.wireshark.org/review/16081 + Petri-Dish: João Valverde + Tested-by: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + +commit 30f7434 +Author: Guy Harris +Date: Wed Jun 22 21:29:20 2016 -0700 + + Squelch some 64-bit-to-32-bit-shortening warnings. + + Change-Id: I64f833abd11d3b2511c235bb353cb5fb7b813b7f + Reviewed-on: https://code.wireshark.org/review/16085 + Reviewed-by: Guy Harris + +commit 300e055 +Author: Gerald Combs +Date: Wed Jun 22 12:44:02 2016 -0700 + + Qt: Use queued signals+slots for filter actions + + Many of our dialogs can send an "apply this display filter" signal to + the main window. Applying a display filter in turn creates a nested + event loop via cf_read+update_progress_dlg. If the "apply" signal+slot + is directly connected (which is the default, and which means we're + calling into a function table) we can close the dialog while the signal + is firing, which means we return into a deleted object. + + Make all of the filterAction signals+slots queued instead of direct. + + Bug: 12523 + Change-Id: Ica331054c0aa52a7f33bd8df1fa65ecd09fdc292 + Reviewed-on: https://code.wireshark.org/review/16080 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 933c079 +Author: Uli Heilmeier +Date: Thu Jun 16 14:03:04 2016 +0200 + + HTTP: Split URI into path and query. Tokenize parameters. + + Split a HTTP URI into path and query. + Tokenize the parameters of a query. + + Bug: 12514 + Change-Id: I9892914eba9737c9751936ce62e63497aba61c61 + Reviewed-on: https://code.wireshark.org/review/15971 + Petri-Dish: Jaap Keuter + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit fea6e73 +Author: Jeff Morriss +Date: Fri Jun 17 20:41:31 2016 -0400 + + RTP player: increase the maximum number of silence frames to 30 minutes worth. + + The BadAlloc X11 crash I reported in bug 4119 (which is why the limit was as + low as it was) has long since been fixed thanks to + bug 2630/I71e1bd2f9a62792db06ce887e2bbe7a96d110e0a so we can now deal with + more silence frames. + + Change-Id: I0127381e71e497560e0f23af04f9d96af1ed6335 + Ping-Bug: 5902 + Ping-Bug: 4119 + Ping-Bug: 2270 + Reviewed-on: https://code.wireshark.org/review/16003 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit bcae998 +Author: Gerald Combs +Date: Wed Jun 22 14:41:16 2016 -0700 + + Qt: Support the -j, -J, and -l command line flags + + Add support for -j, -J, and -l. Mark the -m flag deprecated. + + Bug: 12546 + Change-Id: Ic44b3997840018e5d571aa1813a1646bce11d4a6 + Reviewed-on: https://code.wireshark.org/review/16083 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 18a900f +Author: John A. Thacker +Date: Mon Jun 20 16:29:49 2016 -0400 + + Editcap: Fix setting of max_packet_number + + editcap -r only sets max_packet_number to the earliest, instead of latest, + packet or end of range selection. This changes it to the proper test. + + Bug: 12547 + Change-Id: I81772962b00fc6566ccead4fb44c6626a47fff31 + Reviewed-on: https://code.wireshark.org/review/16045 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 63027fc +Author: Pascal Quantin +Date: Tue Jun 21 15:31:39 2016 +0200 + + Windows: rename wiretap-${PROJECT_VERSION}.dll to libwiretap.dll + + This aligns the name with what is done for other Wireshark shared libraries. + Moreover it allows to compile a wiretap plugin once per major release, without + the need to recompile it each time ${PROJECT_VERSION} changes (each nightly + build / official release). + + Change-Id: I53c82277223a4f323079cf695168ac85c2fba523 + Reviewed-on: https://code.wireshark.org/review/16058 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit a9a306f +Author: Michael Mann +Date: Wed Jun 22 01:28:48 2016 -0400 + + Don't close Wireshark (GTK) if user cancels Save on Close. + + Bug: 9635 + Change-Id: I4a6e3ca676f1c1096521c0a8147a1459777c92fa + Reviewed-on: https://code.wireshark.org/review/16075 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 92ea291 +Author: Michael Mann +Date: Wed Jun 22 10:56:07 2016 -0400 + + Don't close Wireshark (Qt) if user cancels Save on Close. + + Bug: 9635 + Change-Id: I8c73c839419cd4bcb850824ffb42bf72eed50b19 + Reviewed-on: https://code.wireshark.org/review/16076 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit d9fb7f9 +Author: Gerald Combs +Date: Mon Jun 20 09:41:10 2016 -0700 + + Handle ENAMETOOLONG. + + g_strerror doesn't appear to handle ENAMETOOLONG. Check for it ourselves. + + Change-Id: Icd113a81e8d95bb3c84c91bb420a1a6a19bf5d40 + Reviewed-on: https://code.wireshark.org/review/16041 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + Reviewed-by: Michael Mann + +commit be303c2 +Author: Guy Harris +Date: Wed Jun 22 16:26:56 2016 -0700 + + No GeoIP, no need for geoip_none_. + + Change-Id: I6fb328d07718d2ff7a7d6008c936b7478ea6db3f + Reviewed-on: https://code.wireshark.org/review/16084 + Reviewed-by: Guy Harris + +commit f9cf660 +Author: Gerald Combs +Date: Wed Jun 22 10:56:30 2016 -0700 + + Qt: Fix crash in Conversations and Endpoints dialogs + + Don't assume that conv_item_t or hostlist_talker_t pointers never + change. GArrays can reallocate their data, and in our case this can + happen when we have more than 10,000 items (which is the size that the + conversation table code passes to_array_sized_new). + + Bug: 12288 + Change-Id: I88e58be830e35dde272f81fe9250b054fb87facf + Reviewed-on: https://code.wireshark.org/review/16078 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 692e2b6 +Author: Alexis La Goutte +Date: Wed Jun 22 21:08:57 2016 +0200 + + SSH: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang + + Change-Id: If084278acfeb82ae7c91aefff9035f156e8f4f15 + Reviewed-on: https://code.wireshark.org/review/16079 + Petri-Dish: Alexis La Goutte + Reviewed-by: Kenny Root + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit e82d0ae +Author: Gerald Combs +Date: Tue Jun 21 16:23:04 2016 -0700 + + Qt: Make the syntax line edit less greedy. + + In SyntaxLineEdit::event, only grab ShortcutOverride events that have + Ctrl+Alt modifiers. When the main window display filter edit has focus + this should let us use text editing shortcuts and most main window + shorcuts as appropriate. "Most" means everything except for time display + formats. We might want to use something other than Ctrl+Alt for their + modifiers. + + Bug: 12533 + Ping-Bug: 12270 + Change-Id: I61eb86b80b4237e6907d5e50262b8f5c291b27a7 + Reviewed-on: https://code.wireshark.org/review/16065 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Jeff Morriss + Reviewed-by: Michael Mann + +commit d46daa1 +Author: Balint Reczey +Date: Thu Jun 16 15:09:56 2016 -0700 + + GTK: Keep display filter applied when switching profiles + + Bug: 6130 + Change-Id: I3bcd6aaad33482474e3429e0dcc074973a338fca + Reviewed-on: https://code.wireshark.org/review/15992 + Petri-Dish: Balint Reczey + Tested-by: Balint Reczey + Reviewed-by: Stig Bjørlykke + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 0bf1cb2 +Author: Michael Mann +Date: Tue Jun 21 22:23:05 2016 -0400 + + Add address_to_bytes API. + + This will copy an address's "byte format" into a buffer. The original + intended design is for export_pdu functionality, which tries to do + this "manually" for many address types (and creates undesired dependencies) + + The default functionality if a "byte format function" isn't provided + (currently the case for all address types) is a memcpy of the address + data. Providing "address to byte" functions to aid export PDU + functionality will be provided later. + + Change-Id: I3703f9e617a8cef09165ad53a0f98c6372676b9b + Reviewed-on: https://code.wireshark.org/review/16070 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit c664f72 +Author: Gerald Combs +Date: Tue Jun 21 15:13:30 2016 -0700 + + Qt: Clear the packet list selection before freezing it. + + Call selectionModel()->clear() before removing our model. This will + hopefully make sure we don't end up with an invalid selection in + selectionChanged(). + + Clear the selection model before clearing the model while we're here. + + Change-Id: I1007eeaa480afa0fb31dafc15a49ca6c247b30c8 + Reviewed-on: https://code.wireshark.org/review/16062 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Kenny Root + Reviewed-by: Anders Broman + +commit debbf7e +Author: Michael Mann +Date: Tue Jun 21 20:30:35 2016 -0400 + + Move AT_VINES address type to VINES dissector. + + proto.c still has to deal with FT_VINES, but maybe that + can be refactored to the dissector too. + + Change-Id: Iee04eed3b75f91cb62bb7b625dd44baeeb9aebb3 + Reviewed-on: https://code.wireshark.org/review/16069 + Petri-Dish: Michael Mann + Reviewed-by: Anders Broman + +commit e7b78eb +Author: Michael Mann +Date: Tue Jun 21 20:06:01 2016 -0400 + + Move AT_USB to inside USB dissector. + + This required some hacking in the conversation table handling, but + still seemed worth it as USB address is not widely used. + Maybe a "is_stringlike" property for address types... + + Change-Id: I628a15c17cb1f595bb292130867adbc5bea0f41a + Reviewed-on: https://code.wireshark.org/review/16068 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 3ed06ec +Author: Guy Harris +Date: Tue Jun 21 16:34:36 2016 -0700 + + The C standard requires for getenv() and abort(). + + You might be able to get away with not including it on some or all + UN*Xes, but you can't do so on Windows with MSVC. + + Change-Id: Id2de70745e2a6e8dedc005a55030f3d3fcb54a69 + Reviewed-on: https://code.wireshark.org/review/16064 + Reviewed-by: Guy Harris + +commit 1b1296a +Author: Joerg Mayer +Date: Wed Jun 22 00:23:38 2016 +0200 + + More helpful failure when registration fails. + + Change-Id: I3c574c504cc9166d04b5b725a6a393767a58a280 + Reviewed-on: https://code.wireshark.org/review/16063 + Reviewed-by: Jörg Mayer + +commit 6cc90dd +Author: Guy Harris +Date: Tue Jun 21 11:21:33 2016 -0700 + + As with dissector_add_uint(), so with dissector_add_{string,guid}. + + Improve the error message for a null disssector handle. + + Fix indentation while we're at it. + + Change-Id: I1cb2f8ac52e56fc98f6b3ad981018f571e5a7bf0 + Reviewed-on: https://code.wireshark.org/review/16060 + Reviewed-by: Guy Harris + +commit d970da4 +Author: Joerg Mayer +Date: Tue Jun 21 19:56:00 2016 +0200 + + Slightly improve error message in case of initialization errors. + + Change-Id: Icb5d4f0f3bc60970737abbf62044f4550e8d3ca3 + Reviewed-on: https://code.wireshark.org/review/16059 + Reviewed-by: Jörg Mayer + +commit c3f3bd7 +Author: Martin Kacer +Date: Mon Jun 20 11:03:40 2016 +0200 + + tshark JSON and Elasticsearch output fix + + Fixed json and ek escape function + Fixed -j protocol filter to do exact match + Fixed -T json to correctly close json + Added -j protocol filter also to pdml output + + Bug: 11754 + Change-Id: I02f274e4a5a02346922b37bbe946c10340c242ea + Reviewed-on: https://code.wireshark.org/review/16034 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + Reviewed-by: Guy Harris + +commit df231d9 +Author: Pascal Quantin +Date: Tue Jun 21 15:30:33 2016 +0200 + + libcodecs and libwsutil are DLLs, not static libraries + + Change-Id: I4486f35e07c72d4ca35d5649de25d0c9abd2a964 + Reviewed-on: https://code.wireshark.org/review/16057 + Reviewed-by: Pascal Quantin + +commit 8a0b7cc +Author: AndersBroman +Date: Tue Jun 21 15:20:16 2016 +0200 + + Add a couple of vendor defines. + + Change-Id: I252b4f892a539c7fa585615ef636fc26de356bf7 + Reviewed-on: https://code.wireshark.org/review/16055 + Reviewed-by: Anders Broman + +commit 6b01909 +Author: AndersBroman +Date: Tue Jun 21 15:14:48 2016 +0200 + + [H248-Q1950] Correct signal ids. + + Change-Id: Iafb030313ed3b715a09146d131dfb4ffdcb7961a + Reviewed-on: https://code.wireshark.org/review/16054 + Reviewed-by: Anders Broman + +commit 57b6bc1 +Author: Anthony Coddington +Date: Tue Apr 5 14:21:36 2016 +1200 + + pcap: ERF per-Host ID/Source ID interface support + + Add encap_priv pointer to libpcap_t. + Initialize erf_priv when ENCAP_ERF. + Use erf_populate_interface_from_header() to dynamically create interfaces. + Free encap_priv on pcap_close. + + Ping-Bug: 12303 + Change-Id: Ieda425ef3e50a124d9c38ee4538aa3644128ce60 + Reviewed-on: https://code.wireshark.org/review/15362 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit d50b981 +Author: Yang Luo +Date: Thu Jun 16 11:39:32 2016 +0800 + + pcap: Add support to "new" Npcap native mode without setting PATH + + Npcap decided not to add "C:\Windows\System32\Npcap" to + system PATH in the installation any more (starting from + Npcap 0.07 r14). So this patch needs to be applied, otherwise + Wireshark will not find Packet.dll (the error message will + only say wpcap.dll is missing, but actually is Packet.dll + missing). + + Change-Id: Ifd8b6e6d8ecf9866cd37c3368b604de210ff8c7b + Reviewed-on: https://code.wireshark.org/review/15959 + Reviewed-by: Yang Luo + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit 6ccee3e +Author: Stig Bjørlykke +Date: Tue Jun 21 08:55:14 2016 +0200 + + bthci: Show unknown ocf as undecoded + + Don't show unknown ocf values as unexpected parameters. + + Change-Id: I08a6c8c20d6382a847f0a2969e4c523a2873dd6f + Reviewed-on: https://code.wireshark.org/review/16048 + Petri-Dish: Stig Bjørlykke + Reviewed-by: Michal Labedzki + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Reviewed-by: Stig Bjørlykke + +commit 6ee5464 +Author: Stig Bjørlykke +Date: Tue Jun 21 08:52:51 2016 +0200 + + packetlogger: Add some info types + + Add Kernel, Kernel Debug and Error info types. + + Change-Id: I04547a426b69adde5186e8315a08f4648c1e7837 + Reviewed-on: https://code.wireshark.org/review/16047 + Petri-Dish: Stig Bjørlykke + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 9a5cdac +Author: Dario Lombardo +Date: Fri Jun 17 19:30:57 2016 +0200 + + debian-setup: add additional params to apt-get. + + Can be used to pass params like -qq and -y for automated installations, + like in travis-ci. + + Change-Id: Iddf18829f09ce6b16c1c71264adab38d0a893fe6 + Reviewed-on: https://code.wireshark.org/review/15999 + Reviewed-by: Balint Reczey + Reviewed-by: Alexis La Goutte + Reviewed-by: Dario Lombardo + +commit e6481a9 +Author: Michael Mann +Date: Tue Jun 21 01:19:47 2016 -0400 + + Check for negative nanoseconds in io,stat tap. + + Seconds were already being checked for negative values, but if there is + only a fraction of a second, the negative check wasn't being done, + which led to bad results. + + Bug: 9014 + Change-Id: I820e0a4b1384330acebf4a632a04f7840db2288b + Reviewed-on: https://code.wireshark.org/review/16046 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit f76af2e +Author: Jeff Layton +Date: Mon Jun 20 15:10:32 2016 -0400 + + ceph: c_dissect_sockaddr doesn't need the "data" pointer + + Change-Id: I8d4ca2e46a556e32e594610fd26c72840783601e + Signed-off-by: Jeff Layton + Reviewed-on: https://code.wireshark.org/review/16042 + Reviewed-by: Anders Broman + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit fa20f5c +Author: Rudra Rugge +Date: Wed Jun 15 11:32:57 2016 -0700 + + Add support for Opencontrail virtual network + + Change-Id: Ia6012e0f6425be069e222538eafb1191b398ec83 + Reviewed-on: https://code.wireshark.org/review/15930 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 82ed904 +Author: AndersBroman +Date: Wed Jan 13 17:49:43 2016 +0100 + + [RNSAP]Update to V13.1.0 (2015-12) + + Change-Id: I6cb7099ac691d68ddae7be59bf37130c8affad42 + Reviewed-on: https://code.wireshark.org/review/13263 + Petri-Dish: Anders Broman + Reviewed-by: Anders Broman + +commit a83f88f +Author: AndersBroman +Date: Mon Jun 20 13:57:11 2016 +0200 + + [pre-commit-ignore] Dont check the asn1 files they are imported verbatime + from standards documents in most cases. + + Change-Id: Ie9db1a1431a201dc374f800b5118a199dcb51b9c + Reviewed-on: https://code.wireshark.org/review/16035 + Reviewed-by: Anders Broman + +commit 88b7a48 +Author: Guy Harris +Date: Sun Jun 19 23:54:33 2016 -0700 + + Pull the options structure initialization into commandline_other_options(). + + Change-Id: I931cde27a81566dfa0ce6e5c9307bfc1a4d5fe54 + Reviewed-on: https://code.wireshark.org/review/16033 + Reviewed-by: Guy Harris + +commit 7795082 +Author: Michael Mann +Date: Sun Jun 19 17:53:59 2016 -0400 + + Add display filter completion suggestions to color filters. + + Change-Id: I84d890b55c72e4427ceb2d64e4a7888c07c030f5 + Reviewed-on: https://code.wireshark.org/review/16024 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 5c1d58b +Author: Michael Mann +Date: Sun Jun 19 17:47:27 2016 -0400 + + Add field completion suggestions when adding a Display filter or Y Field to the IO Graph + + Bug: 11899 + Change-Id: I7cee36581dc773daa691dad10500124ab66520bc + Reviewed-on: https://code.wireshark.org/review/16023 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 66bb67c +Author: Gerald Combs +Date: Sat Jun 18 12:13:15 2016 -0700 + + GTK+: Truncate simple_message_box messages. + + In do_simple_message_box, build our primary message using + g_string_vprintf instead of g_strdup_vprintf. Truncate both the primary + and secondary messages so that we end up with merely annoyingly wide + dialogs instead of insanely wide ones. + + Bug: 9761 + Change-Id: I93ff76344c0da7d97cce5180ed9ecf9349190f6f + Reviewed-on: https://code.wireshark.org/review/16005 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit e3289a8 +Author: Martin Kaiser +Date: Fri Jun 17 13:43:20 2016 -0700 + + qt: reset the column sorting when a new file is loaded + + Bug: 12541 + Change-Id: I75656d4027dd39e1f97c4bcd38e0dea6fe2de297 + Reviewed-on: https://code.wireshark.org/review/16002 + Petri-Dish: Martin Kaiser + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 92f4c7c +Author: Pascal Quantin +Date: Sun Jun 19 16:52:50 2016 +0200 + + Add JSON export to Qt/GTK UI + + Change-Id: I5ff46a40cdb1f8f41565d2aa54c6f9e61d397e3a + Reviewed-on: https://code.wireshark.org/review/16013 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + Reviewed-by: Alexis La Goutte + Reviewed-by: Anders Broman + +commit bea1950 +Author: Guy Harris +Date: Sun Jun 19 17:42:14 2016 -0700 + + Protect some code that's only for Wireshark-with-pcap. + + Put that code inside #ifdef HAVE_LIBPCAP/#endif. + + Change-Id: I85768fd49a008341a95ac3c8656e96afa6741fbe + Reviewed-on: https://code.wireshark.org/review/16030 + Reviewed-by: Guy Harris + +commit e79e834 +Author: Guy Harris +Date: Sun Jun 19 16:36:57 2016 -0700 + + Move some option checking to common code. + + Change-Id: Icff9dacd73ea933c59ed664db05098dd8cb3dbf5 + Reviewed-on: https://code.wireshark.org/review/16029 + Reviewed-by: Guy Harris + +commit fb9a7d4 +Author: Guy Harris +Date: Sun Jun 19 15:28:39 2016 -0700 + + Don't assume we successfully read the configuration files. + + read_configuration_files() can fail and return NULL, so check that + commandline_info.prefs_p is non-null before dereferencing it. + + Fixes CID 1362778. + + Change-Id: I3066769c474d394fbfe548b50d6be704964e59d3 + Reviewed-on: https://code.wireshark.org/review/16028 + Reviewed-by: Guy Harris + +commit 30919f7 +Author: Guy Harris +Date: Sun Jun 19 15:18:00 2016 -0700 + + Don't assume we have an array of GeoIP databases. + + The attempt to open them might fail; if geoip_dat_arr is null, just + return 0 as the number of databases, don't crash. + + Change-Id: I967d863d328a42d7dce79f58d4fa67d922d0cb2c + Reviewed-on: https://code.wireshark.org/review/16025 + Reviewed-by: Guy Harris + +commit 234d8ea +Author: Guy Harris +Date: Sun Jun 19 14:12:30 2016 -0700 + + Pass the info strings directly to commandline_early_options(). + + Just pass them directly as arguments, don't stuff them into a structure. + + Change-Id: Iac84226f54898bc953011bca64795e9049762905 + Reviewed-on: https://code.wireshark.org/review/16022 + Reviewed-by: Guy Harris + +commit 85c805d +Author: Guy Harris +Date: Sun Jun 19 13:21:17 2016 -0700 + + Handle capture options in pcap-less Wireshark in the commandline_ routines. + + Get rid of the capture_option_specified and arg_error members of the + commandline_capture_param_info_t and commandline_param_info_t + structures, and have them be local variables in + commandline_early_options() and commandline_other_options(). Have + commandline_early_options() print the "sorry, Wireshark wasn't built + with pcap" and exit if -D was specified but Wireshark wasn't built with + pcap. + + Change-Id: I0efcdea89d9585af8f3c0a28aee060f33d3ec5fd + Reviewed-on: https://code.wireshark.org/review/16021 + Reviewed-by: Guy Harris + +commit 0ca9fc1 +Author: Guy Harris +Date: Sun Jun 19 13:00:13 2016 -0700 + + Fix indentation. + + Change-Id: I71332dc35047e7d8d32b428fb99b8b9368c41de6 + Reviewed-on: https://code.wireshark.org/review/16020 + Reviewed-by: Guy Harris + +commit 42985f4 +Author: Guy Harris +Date: Sun Jun 19 12:55:48 2016 -0700 + + Those aren't capture options, they're the options we must process early. + + The only one of those options that has anything to do with packet + capture is -i, and all we do there is check for an argument of "-"; the + rest are either + + 1) options that affect your preference settings (-C to select + the profile, -P to set the personal file directory path); + + 2) options that just print something to the standard output or + error and exit, before firing up the GUI; + + 3) extension command line options (-X). + + Change-Id: Iba9b8b14fe468e2ca9d4c67e1a9b8103603678d9 + Reviewed-on: https://code.wireshark.org/review/16019 + Reviewed-by: Guy Harris + +commit 147b3d5 +Author: Michael Mann +Date: Sun Jun 19 02:33:13 2016 -0400 + + Ability to invoke "Decode As..." as command-line argument for GUIshark. + + TShark has had the functionality for awhile. While the GUI version + still has ways to change and persist Decode As functionality, adding + command line functionality gives the Decode As from initial launch + of the GUI. + Was also an excuse to refactor a bunch of code out of tshark.c + + Bug: 5143 + Change-Id: Ie67007d75e897bc06cc9afd9b84372a96b93778c + Reviewed-on: https://code.wireshark.org/review/16008 + Reviewed-by: Michael Mann + +commit f4fc03d +Author: Guy Harris +Date: Sun Jun 19 09:52:55 2016 -0700 + + Get rid of an unused variable. + + There's no need for the capture_option_specified variable; it's now in a + structure. + + Change-Id: Ic2f1faee4666eea7ae91fd6899cecaa76d0ceb9f + Reviewed-on: https://code.wireshark.org/review/16018 + Reviewed-by: Guy Harris + +commit 6febf9b +Author: Guy Harris +Date: Sun Jun 19 09:29:21 2016 -0700 + + Get rid of an unused variable; set a structure member. + + There's no need for the capture_option_specified variable, but we *do* + need to initialize the capture_option_specified member of *param_info + before parsing the flags. + + Change-Id: I89d0b8c338c2784742b21ba4e854f702ce491849 + Reviewed-on: https://code.wireshark.org/review/16017 + Reviewed-by: Guy Harris + +commit bb44b48 +Author: Gerald Combs +Date: Sun Jun 19 08:10:58 2016 -0700 + + [Automatic update for 2016-06-19] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: Idd2d53a32188f2e607351da874b1a68a4811ed57 + Reviewed-on: https://code.wireshark.org/review/16014 + Reviewed-by: Gerald Combs + +commit a383e69 +Author: Pascal Quantin +Date: Sun Jun 19 11:01:56 2016 +0200 + + Revert "tap: change glib functions to wmem." + + This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985. + + It breaks the registration of codec, dissector and libwiretap plugins. + + Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de + Reviewed-on: https://code.wireshark.org/review/16012 + Petri-Dish: Pascal Quantin + Reviewed-by: Pascal Quantin + +commit ff84512 +Author: Joerg Mayer +Date: Sun Jun 19 10:33:59 2016 +0200 + + Add modelines + + Change-Id: I3d5ed2e671ec761f3628fb8de6f393fdc915165e + Reviewed-on: https://code.wireshark.org/review/16011 + Reviewed-by: Jörg Mayer + +commit 51ceb6d +Author: Joerg Mayer +Date: Fri Jun 17 20:28:58 2016 +0200 + + Calculate and print CWmin and CWmax in addition to ECWmin and ECWmax + + This also changes the summary presentation to make it more compact + + Change-Id: I27ef8b2da280e36cff84dcb97d6d40dc0015a74b + Reviewed-on: https://code.wireshark.org/review/16000 + Reviewed-by: Jörg Mayer + +commit f4fd1a3 +Author: Guy Harris +Date: Sun Jun 19 00:49:42 2016 -0700 + + Fix problems when compiling without pcap. + + Change-Id: Id682a76ac561f92f65638bbdfcd4236eb92e46b7 + Reviewed-on: https://code.wireshark.org/review/16010 + Reviewed-by: Guy Harris + +commit 8634cee +Author: Guy Harris +Date: Sun Jun 19 00:38:41 2016 -0700 + + Put #ifdef/#endif around a variable used only on Windows. + + Change-Id: Ia6fed6db03cb88433469e758693fcc72c4bd9071 + Reviewed-on: https://code.wireshark.org/review/16009 + Reviewed-by: Guy Harris + +commit 9b5b444 +Author: Michael Mann +Date: Sat Jun 18 16:49:23 2016 -0400 + + Refactor command-line handling of GUI options. + + Both GTK and Qt both use the same command-line options, so refactor + the parsing and (possibly) applying of those arguments to a single + location. + + Ping-Bug: 12546 + Change-Id: Ib31e576c509c5d3d21c33d3247640d9f9c68661b + Reviewed-on: https://code.wireshark.org/review/16006 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit deef1dc +Author: Peter Wu +Date: Thu Jun 16 14:58:19 2016 -0700 + + cmake: add PIDL dissector generation support + + The dissectors list is generated based on regex magic on pidl/Makefile. + A dssetup.cnf file is added because all other protocols already have + this file. The srvsvc and wkssvc protocols cannot be built for some + reason, so just disable it (this mirrors the original Makefile). + + Add frsrpc and samr to PIDL_DISSECTOR_SRC list which was missing + compared to autotools. + + Tested with an out-of-tree and in-tree build with cmake (make and ninja): + + cmake -GNinja && ninja -v pidl-dissectors + touch epan/dissectors/pidl/dfs/dfs.idl && ninja generate_dissector-dcerpc-dfs + cmake . && make -C epan/dissectors/pidl generate_dissector-dcerpc-dfs + + Change-Id: Id8bf34e76c20053a8a393024560d90a048473e03 + Reviewed-on: https://code.wireshark.org/review/15962 + Petri-Dish: Peter Wu + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit c07fd44 +Author: Binh Trinh +Date: Fri Jun 17 21:46:11 2016 -0400 + + DCE/RPC: fix array of pointers with NULL + + Change-Id: Ie89f8fd4ec744d427d41866206d5a6784c5b224f + Reviewed-on: https://code.wireshark.org/review/16004 + Petri-Dish: Jaap Keuter + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit a7aaf0b +Author: Chris Brandson +Date: Fri Jun 17 11:38:15 2016 -0700 + + ZigBee dissector added support for the Power Negotiation bit + + An update to R22 adds the Power Negotiation bit to the Parent + Information of the End Device Timeout Response + + Change-Id: I3d423e1088821ccaba98183e2be7f2152bd659d1 + Reviewed-on: https://code.wireshark.org/review/16001 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 631b9c4 +Author: Michael Mann +Date: Fri Jun 17 10:58:32 2016 -0400 + + GTPv2: Use proto_tree_add_bitmask + + Change-Id: I236a3513237a7a977389438adaf381542281943d + Reviewed-on: https://code.wireshark.org/review/15997 + Reviewed-by: Michael Mann + +commit 2dc3e52 +Author: Samiran Saha +Date: Fri Jun 17 18:20:04 2016 +0530 + + MKA: tvbrange for all subtrees corrected + + * Incorrect tvbrabge was affecting highlight on selection. + + * AN & Confidentiality Offset dissection fixed. + + Change-Id: Ibc4422322b765b0073471345f6e0bc3b1aeba2f9 + Reviewed-on: https://code.wireshark.org/review/15996 + Reviewed-by: Anders Broman + +commit 5a85add +Author: Kenny Root +Date: Thu Jun 16 00:12:53 2016 -0700 + + ssh: add RSA host key printing + + Adds a dissector for the ssh-rsa type of public key where the modulus + and public exponent are extracted out. + + Change-Id: I10b1f2d6f41878d9f7ffe5d399b9b7d4f69ad96e + Reviewed-on: https://code.wireshark.org/review/15975 + Reviewed-by: Anders Broman + +commit e600526 +Author: Kenny Root +Date: Wed Jun 15 17:05:54 2016 -0700 + + ssh: add hostkey information + + Adds a framework for hostkey to be printed out separately from the rest + of the key exchange. This will allow for individual key information to + be presented separately in subsequent changes. + + Change-Id: I27433772ef1a9e1c45f388809017ed07cf6e41fa + Reviewed-on: https://code.wireshark.org/review/15974 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit ecd4120 +Author: Binh Trinh +Date: Thu Jun 16 23:51:14 2016 -0400 + + Diameter-3GPP: add AVP 21 RAT-Type decoding + + Change-Id: Ibede796a52bb382525bc1f430d5fdecd555c233f + Reviewed-on: https://code.wireshark.org/review/15993 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Reviewed-by: Anders Broman + +commit e912db4 +Author: Joerg Mayer +Date: Fri Jun 17 17:45:28 2016 +0200 + + Add an expert item to asure that aifsn is at least 2 + + Change-Id: If7105ba2e476acca8a02ce740decc4966b0af1bb + Reviewed-on: https://code.wireshark.org/review/15998 + Reviewed-by: Jörg Mayer + +commit 2e9f3c5 +Author: Dario Lombardo +Date: Tue May 3 18:40:17 2016 +0200 + + tap: change glib functions to wmem. + + Change-Id: I878ae6b121a669f9b7f4e1e57bc079f0cb44c0bf + Reviewed-on: https://code.wireshark.org/review/15270 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Evan Huus + Reviewed-by: Anders Broman + +commit 2aa55a3 +Author: Binh Trinh +Date: Fri Jun 17 01:21:19 2016 -0400 + + GTPV2: add decoding of ECI into enodebid and cellid + + Change-Id: If46cc354e202ff9a126580bf742d747e42678f83 + Reviewed-on: https://code.wireshark.org/review/15994 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit a6da022 +Author: Jens Kilian +Date: Fri Jun 17 12:39:09 2016 +0200 + + Qt: Fix a compile error occurring on RedHat Enterprise Linux. + + Another missing Qt #include; probably caused by commit 157721c. + + Change-Id: I8ab4be9f18dffde7159debd842201e2a67230ec8 + Reviewed-on: https://code.wireshark.org/review/15995 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + +commit a4f5802 +Author: Alexis La Goutte +Date: Wed Jun 15 00:04:21 2016 +0200 + + autotool: Add -Wc99-extensions CFLAGS + + See with CMake (ga9070e1a90) + + Change-Id: If768b663f9ed032503fc121785b078c0107cdadc + Reviewed-on: https://code.wireshark.org/review/15909 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Peter Wu + +commit 42b0609 +Author: Martin Kacer +Date: Mon Jun 13 15:47:44 2016 +0200 + + tshark JSON and Elasticsearch output + + Added ouput -T for json|ek + Added -j switch fo filter EK json|ek fields. + Added -x switch to work with json|ek to insert raw fields. + + Bug: 11754 + + Change-Id: Iad5a9092b843c074b0b774d1745fa14fca09f6b7 + Reviewed-on: https://code.wireshark.org/review/15869 + Reviewed-by: Jaap Keuter + Petri-Dish: Jaap Keuter + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 0aa5f6c +Author: Peter Wu +Date: Thu Jun 16 15:23:59 2016 -0700 + + idl2wrs: fix more bad strndups + + Fixed another g_strndup case that truncated the name and replaced more + by strdups when possible. + + Change-Id: Id7ce4d82da9fb1d0071bc7a6b4e7c2062bf77f55 + Reviewed-on: https://code.wireshark.org/review/15988 + Reviewed-by: Anders Broman + +commit 22fb7a5 +Author: João Valverde +Date: Thu Jun 16 23:26:58 2016 +0100 + + mswsp: Remove null check (CID1355407) + + value->type is already asserted as not null (and probably shouldn't be). + + Change-Id: I574d3e7e0d5c636e6b731c1c817f2e457447afc1 + Reviewed-on: https://code.wireshark.org/review/15990 + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 0ca6a6d +Author: João Valverde +Date: Wed Jun 15 02:20:11 2016 +0100 + + Align AUTHORS.src column + + Change-Id: I17ed5e0be356666e9b29490ce43deb357fe177ff + Reviewed-on: https://code.wireshark.org/review/15991 + Reviewed-by: João Valverde + +commit f9c2a2e +Author: João Valverde +Date: Thu Jun 16 10:38:33 2016 +0100 + + LDSS: Add an assertion (CID280539,CID280540) + + Change-Id: I18082a4d45f0c320b8ee0e11139295eb1aee2c89 + Reviewed-on: https://code.wireshark.org/review/15968 + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + +commit 157721c +Author: Gerald Combs +Date: Thu Jun 16 14:09:28 2016 -0700 + + Qt: Add "Copy As…" to VoIP Calls. + + Bug: 4389 + Change-Id: I88dba82bd63e8c3be2b6fac3eca88f810c62d8bd + Reviewed-on: https://code.wireshark.org/review/15985 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit ee6e89d +Author: João Valverde +Date: Thu Jun 16 10:18:07 2016 +0100 + + CANopen: Check array bounds for untrusted index (CID 1356262) + + Change-Id: If5ca51e5703fa4137ab9f388a99d613752d3b0d0 + Reviewed-on: https://code.wireshark.org/review/15983 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + +commit 99e2466 +Author: Gerald Combs +Date: Thu Jun 16 13:31:47 2016 -0700 + + Add a sequence analysis wishlist item. + + Change-Id: Idea0bab80c7c05e3ad9f8591904e882df69a17ff + Reviewed-on: https://code.wireshark.org/review/15984 + Reviewed-by: Gerald Combs + +commit c269684 +Author: Martin Kaiser +Date: Thu Jun 16 10:20:40 2016 -0700 + + lemon: use a define for fseek()'s whence parameter + + for people who don't immediately understand what fseek(fp, 0, 2) does + + Change-Id: I297ba6fd718ef0f09c4d0b29bf433262c3c38435 + Reviewed-on: https://code.wireshark.org/review/15976 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 0600f92 +Author: Victor Barratault +Date: Thu Jun 16 14:06:32 2016 -0400 + + ldap: added modify-increment operation identification in packet dissection and generate the modified dissector dissector + + Change-Id: Iad745b9e0e8ab0bc055da7f26ec0822433897db7 + Reviewed-on: https://code.wireshark.org/review/15977 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 86a7ab1 +Author: Alexis La Goutte +Date: Thu Jun 16 20:51:24 2016 +0200 + + DEC DNART: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang + + Change-Id: Ic2d333b418928351f32673890c9c432c7bfa0f16 + Reviewed-on: https://code.wireshark.org/review/15982 + Reviewed-by: Anders Broman + +commit c1626db +Author: Alexis La Goutte +Date: Thu Jun 16 20:48:58 2016 +0200 + + SITA: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang + + Change-Id: I2565b0bee66f934561df506e87a35fdd14590f92 + Reviewed-on: https://code.wireshark.org/review/15981 + Reviewed-by: Anders Broman + +commit 13c0136 +Author: Michael Mann +Date: Wed Jun 15 18:54:07 2016 -0400 + + DCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_value + + Change-Id: I88398aa1923e86bb83b97cc3904529a5810f6c40 + Reviewed-on: https://code.wireshark.org/review/15978 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit c98b0d5 +Author: Jaap Keuter +Date: Tue Jun 14 23:59:12 2016 +0200 + + Add Cisco ttag dissector + + Add dissector for Cisco ttag protocol. + + Bug: 12518 + Change-Id: Id17293a80b2b6827fd2d5c7ead098784c35a28ef + Reviewed-on: https://code.wireshark.org/review/15964 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + +commit 0e8fef5 +Author: Jeff Morriss +Date: Thu Jun 16 12:43:24 2016 -0400 + + Finish getting making the Diameter XML valid XML. + + ... Except for the fact that many AVP names start with "3GPP". + + Make the AVP names XML IDs again. + + Fix all the grouped AVPs that reference AVPs (by name) or vice-versa. This + includes: + * Fixing a bunch of typos (including type mismatches). + * Commenting out a number of references to vendor AVPs for which we don't have + the specs. + * Adding a few missing AVPs. + + Change-Id: Ic2ddb50cc947877de9086be51f7813e8f9be02b4 + Reviewed-on: https://code.wireshark.org/review/15973 + Reviewed-by: Anders Broman + +commit 4ad428d +Author: Kenny Root +Date: Wed Jun 15 23:53:49 2016 -0700 + + ssh: set packet lengths correctly + + Each SSH packet was being set to be the remaining length of the frame. + This change sets the packet lengths correctly for each SSH packet. + + Change-Id: Id9c2331d875465cd5e6bb788d420e0025f5d496e + Reviewed-on: https://code.wireshark.org/review/15966 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit b22e1ae +Author: Kenny Root +Date: Wed Jun 15 23:54:43 2016 -0700 + + ssh: packets after SSH_MSG_NEWKEYS are encrypted + + According to RFC 4253 section 7.3, once the SSH_MSG_NEWKEYS is received + all packets after that will be encrypted using the negotiated keys. This + can happen in the middle of a frame, so account for the offset in the + frame where this happens. + + Change-Id: Ibc3b06a4bdfe38ae15b0e65afac6f5d3646cb58d + Reviewed-on: https://code.wireshark.org/review/15965 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 9a5e6a6 +Author: Michael Mann +Date: Wed Jun 15 15:35:51 2016 -0400 + + DCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_with_flags + + Change-Id: I8891ec90244ffd9609d8443df631a7c8e6453b7e + Reviewed-on: https://code.wireshark.org/review/15942 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 946b037 +Author: Samiran Saha +Date: Thu Jun 16 17:15:06 2016 +0530 + + MKA: Fix for GCM-AES-256 dissection & Added Enumeration for macsec-cipher-suite + + Change-Id: Ief38f949d3e30754a65fbfeaa64cbbd2f5646a9b + Reviewed-on: https://code.wireshark.org/review/15969 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 7d6e3e0 +Author: Thomas Shen +Date: Wed Jun 15 14:26:02 2016 -0700 + + NSH: Correct the display of the NSH header fields + + Change-Id: I3be75d20a3f00091aa3077e475f9ddb00eeca06c + Reviewed-on: https://code.wireshark.org/review/15963 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 44ba346 +Author: Stig Bjørlykke +Date: Thu Jun 16 14:32:58 2016 +0200 + + gtk: Check chunk before g_string_chunk_clear + + Avoid this warning from wireshark-gtk: + (wireshark-gtk:39505): GLib-CRITICAL **: g_string_chunk_clear: assertion + 'chunk != NULL' failed + + Change-Id: I413b3435a1ac595236dd1c4e619e3af1543b6a91 + Reviewed-on: https://code.wireshark.org/review/15970 + Petri-Dish: Stig Bjørlykke + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit d3bb3a0 +Author: Victor Barratault +Date: Tue Jun 14 12:17:54 2016 -0400 + + Typing error line 4928 of packet-dns.c + + Change-Id: I1a6409262614a87c159236375223707c85114650 + Reviewed-on: https://code.wireshark.org/review/15972 + Reviewed-by: Martin Kaiser + +commit 44e3212 +Author: Peter Wu +Date: Wed Jun 15 22:23:46 2016 -0700 + + gitignore: updated cmake paths + + * files.txt: v2.1.0rc0-2918-g2e23b50 ("Add checkAPI calls to CMake.") + * epan: v2.1.0rc0-2202-g6b54fbf ("CMake: Add more structure to + libwireshark build") + * asn1: v2.1.0rc0-2330-g54a520d ("Move /asn1 to /epan/dissectors") + + Change-Id: I0ef590de7d262d96c011be360b958fbda72a61fa + Reviewed-on: https://code.wireshark.org/review/15961 + Reviewed-by: Peter Wu + +commit dabbaaf +Author: Peter Wu +Date: Sat Feb 28 17:44:27 2015 +0100 + + filesystem: Fix build dir detection when using cmake + + Fixes loading of plugins by detecting the build output directory of + cmake. This requires a "CMakeCache.txt" file to be present in the parent + directory (above run/). + + Change-Id: I297432cdcd0981646058410f3eadf5f73b5248c8 + Reviewed-on: https://code.wireshark.org/review/7453 + Petri-Dish: Peter Wu + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 897f9f7 +Author: Gerald Combs +Date: Wed Jun 15 13:17:41 2016 -0700 + + Add a note about the new intelligent scroll bar. + + Should we call it the intelligenter scroll bar? + + Change-Id: I67e76c1aabeb4b2e87e38815fe4ab120f0869b25 + Reviewed-on: https://code.wireshark.org/review/15936 + Reviewed-by: Anders Broman + +commit 50591ac +Author: Martin Kaiser +Date: Wed Jun 15 19:53:45 2016 -0700 + + CID 1250642: check the return value of dup() + + abort if it is -1 + + Change-Id: Ie14c18679ff74529731558d6742f63ebfb9fe97b + Reviewed-on: https://code.wireshark.org/review/15958 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit b223d64 +Author: Jeff Morriss +Date: Thu Jun 16 00:04:36 2016 -0400 + + Make the rest of the Diameter AVP names unique. + + In most cases this means prepending the application- or vendor-name to force + uniqueness. A few vendors have duplicates within their namespace--append the + AVP code to these. + + Also fix a few other invalid names (with spaces or parentheses in the names). + + Change-Id: I5bb78d31526122dd5782055638af410cc497e49d + Reviewed-on: https://code.wireshark.org/review/15960 + Reviewed-by: Anders Broman + +commit f749a64 +Author: Balint Reczey +Date: Tue Jun 14 22:29:34 2016 -0700 + + cmake: Detect proper large file defines even with -Wno-error + + Without this change large file support was detected as available + even when it was not without additional flags on 32 architectures. + + As a result mergecap and other programs are built without large + file support causing mergecap not being able to write files + bigger than 2GB on i386 systems. This used to work properly + with autotools builds, but not with CMake ones. + + Change-Id: Ibfd043342b2a48310d2ac9d760e6404a701c5808 + Reviewed-on: https://code.wireshark.org/review/15937 + Petri-Dish: Balint Reczey + Tested-by: Petri Dish Buildbot + Reviewed-by: Balint Reczey + +commit 4962ea6 +Author: Dario Lombardo +Date: Wed Jun 15 00:47:44 2016 +0200 + + qt: move free_stat_tables from SimpleStatisticsDialog::fillTree to ~SimpleStatisticsDialog. + + Add a reference count to stat_tap_table_ui to prevent bad deallocations. + + Bug: 12437 + Change-Id: Ib9b1f929d08a574c306dc755ec416ab94a3fd6d3 + Reviewed-on: https://code.wireshark.org/review/15920 + Reviewed-by: Peter Wu + Petri-Dish: Peter Wu + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit a38db78 +Author: Jeff Morriss +Date: Wed Jun 15 13:25:44 2016 -0400 + + Update the X11 dissector to use the latest mesa and xcbproto. + + Change-Id: Ia1395cffaebbcf6585b9167861d8c3b4d86cf821 + Reviewed-on: https://code.wireshark.org/review/15923 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit d1d27bd +Author: Balint Reczey +Date: Wed Jun 15 19:16:42 2016 -0700 + + Qt: Clarify follow stream dialog's format button + + The stream is not just shown, but also saved in ASCII, EBDIC, Raw, etc. + + Change-Id: Ic29e3273ebb9a3eca0fe791bdd48606c4be3b828 + Reviewed-on: https://code.wireshark.org/review/15957 + Reviewed-by: Anders Broman + +commit 8b94a66 +Author: Alexis La Goutte +Date: Wed Jun 15 23:35:58 2016 +0200 + + X11: Fix last indent issue on X11 generator + + and regenerate X11 dissector + + Change-Id: If2c781d346713f5a2a2e97de84c0fedcfd1958af + Reviewed-on: https://code.wireshark.org/review/15944 + Reviewed-by: Anders Broman + +commit a9d9d4f +Author: Alexis La Goutte +Date: Wed Jun 15 22:52:18 2016 +0200 + + x11: Regenerate dissector after indent change on g2b8caf31cca + + Change-Id: Iac1522998c5983b417a0083b9c607a60e7f66e8c + Reviewed-on: https://code.wireshark.org/review/15943 + Reviewed-by: Anders Broman + +commit b5a8c4f +Author: Dario Lombardo +Date: Thu Jun 16 01:25:03 2016 +0200 + + randpktdump: fix a crash. + + Randpktdump requires the init the wtap opttypes. + Fixed making the init function public and calling it. + + Bug: 12539 + Change-Id: I02585c41012deacff1526b51ed09ab555cbfc8ce + Reviewed-on: https://code.wireshark.org/review/15951 + Petri-Dish: Anders Broman + Reviewed-by: Martin Kaiser + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 79aab92 +Author: AndersBroman +Date: Wed Jun 15 23:57:39 2016 +0200 + + Don't call g_ascii_strcasecmp() with an NULL string. + + Change-Id: I6efbdcb51efe5f2db233827e32e2105db6322d6c + Reviewed-on: https://code.wireshark.org/review/15946 + Reviewed-by: Anders Broman + +commit 83b2d5e +Author: Dario Lombardo +Date: Thu Jun 16 02:34:27 2016 +0200 + + gtk: add initializer (CID 1362745). + + Change-Id: Ib1bc11e905b0a4e84302e3f9ac43f3a87afd6edf + Reviewed-on: https://code.wireshark.org/review/15954 + Reviewed-by: Martin Kaiser + +commit 66d26d7 +Author: Jeff Morriss +Date: Wed Jun 15 22:01:31 2016 -0400 + + Remove a bunch of unassigned ETSI AVPs. + + These were presumably there to allow indexed search of the AVP list but it + wasn't working anyway (binary search was used). And the expert info for + "unknown" (to Wireshark) AVPs is a good thing. + + Change-Id: Id6b9e5c90b8a2a6e3cf4415cd1b6114308c74440 + Reviewed-on: https://code.wireshark.org/review/15956 + Reviewed-by: Anders Broman + +commit 38afb1d +Author: Rudra Rugge +Date: Wed Jun 15 15:22:25 2016 -0700 + + ip-over-ib description entry was missing + + Description entry was missing in the list. + + Change-Id: Ia8f8bd4608ee6800a352f4979752b5c45c4a5086 + Reviewed-on: https://code.wireshark.org/review/15947 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 37c40bd +Author: Pascal Quantin +Date: Wed Jun 15 18:06:04 2016 -0700 + + Export wtap_optionblock_copy_options() symbol + + It can be useful for wiretap plugins + + Change-Id: Ic56e4357ba3bfcef30d13615efc1361399c3133e + Reviewed-on: https://code.wireshark.org/review/15955 + Reviewed-by: Pascal Quantin + +commit 60578aa +Author: Pascal Quantin +Date: Wed Jun 15 13:42:56 2016 -0700 + + file_util.c: do not search in Npcap installation folder when calling ws_load_library() + + ws_load_library() is not used to load packet.dll or wpcap.dll (we use ws_module_open() for this). + Let's not lose time checking the folder content. + + Change-Id: Ibd4a71b8b0c5ffc0c4c146eca51ad9f20964515b + Reviewed-on: https://code.wireshark.org/review/15938 + Reviewed-by: Pascal Quantin + +commit b2c7e8e +Author: Martin Kaiser +Date: Wed Jun 15 13:02:39 2016 -0700 + + mongo: return the number of bytes we actually consumed + + even if the document length is 0, we consumed at least 4 bytes for the + length field + + bug: 12534 + Change-Id: I2f1612bf575b558c1bcc0afe8202b202747846e3 + Reviewed-on: https://code.wireshark.org/review/15934 + Reviewed-by: Anders Broman + +commit c5528d0 +Author: Jeff Morriss +Date: Wed Jun 15 18:40:53 2016 -0400 + + Make some more Diameter AVP names unique. + + In some cases this means using the correct (updated?) name from the + specification. In others it means prepending the application- or vendor-name + to force uniqueness. + + Remove a few more "Unassigned" AVPs from the XML files. + + Change-Id: I61d55ef97ff8efc3317c91bf79e73031735f740a + Reviewed-on: https://code.wireshark.org/review/15949 + Reviewed-by: Anders Broman + +commit e551731 +Author: Peter Wu +Date: Wed Jun 15 14:06:23 2016 -0700 + + idl2wrs: fix code generation + + Fixes a regression from v1.99.9rc0-470-g87f2bd4 which truncated function + names to 26 characters. + + Test: + + cd epan/dissectors/dcerpc/budb + make IDL2WRS=/tmp/wsbuild/run/idl2wrs + diff packet-dcerpc-budb.c ../../packet-dcerpc-budb.c + + While at it, replace all g_strndup(X, strlen(X)) occurrences with + g_strdup(X) since that is the same thing and less redundant. + + Change-Id: Id8da45792c830e2287cf8f14ff6245149751afd2 + Reviewed-on: https://code.wireshark.org/review/15939 + Petri-Dish: Peter Wu + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + Reviewed-by: Anders Broman + +commit 1708e2e +Author: Balint Reczey +Date: Wed Jun 15 15:40:15 2016 -0700 + + gtk: Fix null dereference in stats + + This fixes the bug reported to Debian: + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786704 + + Change-Id: Iabe19c11067318d78664a17fa00d6a4d1998250c + Reviewed-on: https://code.wireshark.org/review/15948 + Reviewed-by: Balint Reczey + +commit fb38049 +Author: Pascal Quantin +Date: Wed Jun 15 14:50:03 2016 -0700 + + proto.c: allow calling proto_item_add_bitmask_tree() with a length set to 0 + + This is required for the flags from packet-frame.c + + Bug: 12536 + Change-Id: I60bfe671687bcd3a9b5c997ba62bed563e890548 + Reviewed-on: https://code.wireshark.org/review/15945 + Reviewed-by: Pascal Quantin + Reviewed-by: Michael Mann + +commit c3190ad +Author: Alexis La Goutte +Date: Wed Jun 15 20:35:47 2016 +0200 + + capture info (wslua): Dereference of null pointer + + Change-Id: Iced579d5acaefa9d1c8e3775a53916773bf87659 + Reviewed-on: https://code.wireshark.org/review/15929 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Peter Wu + +commit a8f73e9 +Author: Balint Reczey +Date: Wed Jun 15 14:14:23 2016 -0700 + + documentation: Suggest using prefixed public symbols + + Change-Id: I9153756b0e921fd74d7df9d119337f5484856ba0 + Reviewed-on: https://code.wireshark.org/review/15940 + Reviewed-by: Anders Broman + +commit 04058b8 +Author: Gerald Combs +Date: Wed Jun 15 11:27:53 2016 -0700 + + Qt: Adjust the search frame layout. + + Add padding on the left side of the search frame in order to reduce the + amount of mousing required on large screens. + + Change-Id: I1dcd8c4a103f4a462f4ab60a22a93b8c0f28b055 + Reviewed-on: https://code.wireshark.org/review/15928 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit 66efbdb +Author: Jeff Morriss +Date: Wed Jun 15 16:01:05 2016 -0400 + + Make some Diameter AVP names unique. + + In some cases this means using the correct (updated?) name from the + specification. In others it means prepending the application name to force + uniqueness. + + Change-Id: I8301c769af2b2279c0be7c1bc65e99fe25c1cc80 + Reviewed-on: https://code.wireshark.org/review/15935 + Reviewed-by: Anders Broman + +commit 1b0d51f +Author: dsrsupport +Date: Wed Jun 15 19:45:50 2016 +0300 + + ZigBee: decode ZBOSS traffic dump and Interpan frames as ZigBee. + + If decoded ZBOSS traffic dump, sure this is ZigBee, so bypass heuristic. + If decoding air sniffer dump, try to go thru heuristic by checking for ext address src mode required for interpan. + + Change-Id: Iddf799400a4cf0fd73714f06b99e3d11c8cb2e60 + Reviewed-on: https://code.wireshark.org/review/15921 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 561a063 +Author: Gerald Combs +Date: Fri Jun 10 15:26:57 2016 -0700 + + Pass "/utf-8" to Visual C++ 2015. + + Many projects (Qt[1] and GNOME[2] in particular) either recommend, use, + or at least allow for UTF-8 in source and header files. Pass /utf-8 to + Visual C++ 2015 so that it will behave itself around UTF-8 and be more + like that nice compiler down the street. + + [1] https://wiki.qt.io/Strings_and_encodings_in_Qt + [2] https://bugzilla.gnome.org/show_bug.cgi?id=767218 + + Change-Id: Ibc90d235742134cb42dd796ba529699bcbbe3ad0 + Reviewed-on: https://code.wireshark.org/review/15821 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit ca1c5f5 +Author: Alexis La Goutte +Date: Wed Jun 15 20:14:18 2016 +0200 + + diameter (3GPP): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang + + Change-Id: Iaa74265df66455528c86658a26812876574a904a + Reviewed-on: https://code.wireshark.org/review/15927 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 6d89f3b +Author: Jeff Morriss +Date: Wed Jun 15 13:31:41 2016 -0400 + + Update to the latest config.guess and config.sub + + Change-Id: Id493fb3b79326b522a3a11c3258531683f159187 + Reviewed-on: https://code.wireshark.org/review/15924 + Petri-Dish: Jeff Morriss + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 64169e3 +Author: dsrsupport +Date: Wed Jun 15 18:48:01 2016 +0300 + + ZigBee: add support for inter-pan transmissions. + + Added dissection of inter-pan nwk and aps stub to be used to decode ZLL commissioning cluster. + + Change-Id: I871016a93854f1caf2f14f2f84e5397de5f1e2ff + Reviewed-on: https://code.wireshark.org/review/15918 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit 6baa1b5 +Author: Pascal Quantin +Date: Wed Jun 8 15:57:00 2016 +0200 + + Remove Nmake build system + + Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 + Reviewed-on: https://code.wireshark.org/review/15777 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Jörg Mayer + Reviewed-by: Balint Reczey + +commit 88bd50c +Author: Guy Harris +Date: Wed Jun 15 12:15:54 2016 -0700 + + Don't map the interface ID for records that don't pertain to an interface. + + And revert to the previous behavior of map_phdr_interface_id(); that + change broke the mergecap tests when it was merging pcap files into a + pcapng file. + + Change-Id: I2e079b0e87dce06e98faa9ab7615f9b9b2701b77 + Reviewed-on: https://code.wireshark.org/review/15932 + Reviewed-by: Guy Harris + +commit 5a73176 +Author: Pascal Quantin +Date: Wed Jun 15 11:46:53 2016 -0700 + + Win: convert atkversion.h to UTF-8 + + Change-Id: I7bfa9be11596cc9a3e1b0226c6865edf47e96782 + Reviewed-on: https://code.wireshark.org/review/15931 + Reviewed-by: Pascal Quantin + +commit edf0b5c +Author: Dario Lombardo +Date: Wed Jun 15 20:05:32 2016 +0200 + + qt: add initializer to ExpertPacketTreeWidgetItem (CID 1362746). + + Change-Id: I8ca154907e01fb40affb9e5f5a0aaf55921c95db + Reviewed-on: https://code.wireshark.org/review/15926 + Reviewed-by: Gerald Combs + +commit de23fbc +Author: Martin Kaiser +Date: Wed Jun 15 10:53:43 2016 -0700 + + zbee-nwk: don't THROW() an exception from a dissector + + we already have an expert info, so we can just return the number of + bytes in the tvb + + Change-Id: I6199760316d7ef141877bc8f65012d36e4dd357b + Reviewed-on: https://code.wireshark.org/review/15925 + Reviewed-by: Anders Broman + +commit ec5acbc +Author: Stig Bjørlykke +Date: Fri Mar 11 18:42:49 2016 +0100 + + wtap: Make default_filter static + + Address of stack memory associated with local variable 'default_filter' + is still referred to by the global variable 'filter_option' upon returning + to the caller. This will be a dangling reference. + + Change-Id: I6160a37f05b8aea245b723ec50803e4062886738 + Reviewed-on: https://code.wireshark.org/review/14427 + Petri-Dish: Stig Bjørlykke + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 9ba9a05 +Author: João Valverde +Date: Wed Sep 30 14:34:39 2015 +0100 + + Display "IP DSCP" column as short text + + Ping-Bug: 12429 + Change-Id: I618b2017e161d89f0efa25ce2fb82a1808e8d315 + Reviewed-on: https://code.wireshark.org/review/10701 + Reviewed-by: João Valverde + +commit babb9e3 +Author: Peter Wu +Date: Wed Jun 15 08:45:54 2016 -0700 + + androiddump: fix leak on --extcap-interfaces + + extcap_base_register_interface duplicates the memory, so there is no + need to keep it around. + + Change-Id: I2bac8be519b659504c512d4eb29be8f7ef6dbd59 + Reviewed-on: https://code.wireshark.org/review/15919 + Reviewed-by: Anders Broman + +commit 95a0579 +Author: Pascal Quantin +Date: Wed Jun 15 08:24:48 2016 -0700 + + win-setup.ps1: stop downloading user-guide; with CMake it is generated from source code + + Change-Id: I3b015594bd6a6b0c41938ba17d5690c08e04f490 + Reviewed-on: https://code.wireshark.org/review/15917 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit 525fd71 +Author: Michael Mann +Date: Tue Jun 14 23:17:25 2016 -0400 + + proto_tree_add_boolean -> proto_tree_add_bitmask_list_value + + Change-Id: Ic644042d238b5f2abcd874bca92c6dea55804ba9 + Reviewed-on: https://code.wireshark.org/review/15913 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit d25a60c +Author: Gerald Combs +Date: Sun Apr 24 11:21:50 2016 -0700 + + More Sysdig / system event support. + + Add REC_TYPE_SYSCALL to wiretap and use it for Sysdig events. Call the + Sysdig event dissector from the frame dissector. Create a "syscall" + protocol for system calls, but add "frame" items to it for now. + + Add the ability to write Sysdig events. This lets us merge packet + capture and syscall capture files. + + Change-Id: I12774ec69c89d8e329b6130c67f29aade4e3d778 + Reviewed-on: https://code.wireshark.org/review/15078 + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit b26e757 +Author: Jaap Keuter +Date: Wed Jun 15 08:53:14 2016 +0200 + + Let the calculated window scale be 16 bit wide. + + Even though TCP window scale shift is only 8 bits, the scale + calculated from it is max 16384. therefor a 16 bit value. + Let the tree item map to the single byte in the TVB, while + allowing the value to be 16 bit. + + Bug: 12525 + Change-Id: I41cebc62f6b8b09e13efa5f3b7432001e8d994e1 + Reviewed-on: https://code.wireshark.org/review/15914 + Petri-Dish: Jaap Keuter + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 0ef1d94 +Author: Michael Mann +Date: Tue Jun 14 11:55:08 2016 -0400 + + Allow control of individual columns to be (un)writable. + + Most protocols just want to limit COL_INFO or COL_PROTOCOL + so give that level of granularity. + + Bug: 12144 + Bug: 5117 + Bug: 11144 + Change-Id: I8de9b7d2c69e90d3fbfc0a52c2bd78c3de58e2f8 + Reviewed-on: https://code.wireshark.org/review/15894 + Reviewed-by: Jeff Morriss + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit c19e6c2 +Author: Peter Wu +Date: Tue Jun 14 14:52:01 2016 -0700 + + cmake: fix ENABLE_ASAN detection + + Do not add -fsanitize=undefined when ASAN is requested, UBSAN is a + different feature (which could be added later as desired). This makes + the -DENABLE_ASAN=1 option match the autotools --enable-asan option. + + Fail hard if ASAN support is requested but not supported, this avoids + surprises when something is wrong. Fix ASAN detection by setting the + linker option too. + + Note: if you have previously set ENABLE_ASAN=1 with the broken ASAN + detection, you have to clear your CMakeCache.txt file to redo the + detection. + + Change-Id: Iba6ca0da0336eccedd0cf31a251baad9d1aff5b4 + Reviewed-on: https://code.wireshark.org/review/15908 + Petri-Dish: Peter Wu + Reviewed-by: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 3a59021 +Author: Jeff Morriss +Date: Mon Jun 13 15:28:16 2016 -0400 + + Change how dissectors do late-field-registration to avoid a double-registration + assertion. + + If a dissector forces registration of fields during dissection it needs to do + so in a way that clears the prefix registration. Otherwise epan will call the + registration routine a 2nd time (which will cause us to assert out) if a user + types a display filter (with the dissector's prefix) that doesn't exist. + + Update the proto_register_prefix() comments to reflect this. + + Change-Id: I3ce29243395fb55192bb5dfd950baa88410ac136 + Reviewed-on: https://code.wireshark.org/review/15881 + Petri-Dish: Jeff Morriss + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + +commit 22fd85d +Author: Martin Kaiser +Date: Mon Jun 13 18:05:11 2016 -0700 + + mount: fix a memory leak + + don't copy the wmem-buffer from address_to_str() into a g_malloc()ed one + that is never freed + + instead, realloc the wmem-buffer and add the nfs path to it + + (nfs_name_snoop_add_name() will make a copy internally) + + Change-Id: I4274a4a413c09f3f1d78beba65d94748ce185413 + Reviewed-on: https://code.wireshark.org/review/15902 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit eb4ed5a +Author: Guy Harris +Date: Tue Jun 14 17:35:51 2016 -0700 + + Clean up some messages. + + We're checking for more than just a 64-bit off_t; we're checking for the + ability to do 64-bit seeks in files, even if, as on Windows, the APIs + are different. + + Remove trailing white space and clean up some comments while we're at + it. + + Change-Id: I6122b6d6b44ff5dd3a4d8268f9793193e65817ce + Reviewed-on: https://code.wireshark.org/review/15912 + Reviewed-by: Guy Harris + +commit 51dd96f +Author: Pascal Quantin +Date: Tue Jun 14 16:11:18 2016 -0700 + + Fix OSX buildbot + + Dirty CORBA IDL dissectors must be compiled without -Werror option + + Change-Id: I46431c635274399cd6d365a608cdc0aecbc59c95 + Reviewed-on: https://code.wireshark.org/review/15911 + Reviewed-by: Pascal Quantin + +commit 38d08e0 +Author: Dario Lombardo +Date: Tue Jun 14 19:35:32 2016 +0200 + + dns_stats: generate stats just for pure dns (not mDNS, not LLMR). + + The stats for mDNS and llmnr are pending. The change just resolves a bug + in the stats that are wrongly generated when the traffic is mDNS or LLMR. + + Bug: 12492 + Change-Id: Ie772e204d0ddea997dd8cbf609725605c8a507c8 + Reviewed-on: https://code.wireshark.org/review/15897 + Reviewed-by: Alexis La Goutte + +commit 58023e5 +Author: Alexis La Goutte +Date: Tue Jun 14 23:43:15 2016 +0200 + + proto(.h): fix '@return' command used in a comment that is attached to a function returning void [-Wdocumentation] + + Change-Id: Ie0e502adcc8eb00f65ffa6c018d5b9d79655ddb7 + Reviewed-on: https://code.wireshark.org/review/15907 + Petri-Dish: Alexis La Goutte + Reviewed-by: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit b7e32bb +Author: Michael Mann +Date: Tue Jun 14 17:23:58 2016 -0400 + + FIX dissector - Improve Message info + + Bug: 5350 + Change-Id: I4b2d60549f9680bbc008a2abba5d7ec108f6bf22 + Reviewed-on: https://code.wireshark.org/review/15905 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 581a17a +Author: Pascal Quantin +Date: Mon Jun 13 15:11:55 2016 -0700 + + CORBA IDL: compile dissectors with /Ox when using MSVC2013 x64 + + By default Windows files are compiled with /O2 optimization flag (that brings the best performance). + But MSVC2013 x64 compiler generates buggy code for CORBA IDL dissectors. + Let's downgrade the optimization to /Ox for those files specifically. + + Bug: 12495 + Change-Id: Ibbb532653808d915c82bd20b55dd9e68d86b1207 + Reviewed-on: https://code.wireshark.org/review/15884 + Reviewed-by: Peter Wu + +commit d74113f +Author: Jeff Morriss +Date: Tue Jun 14 17:38:17 2016 -0400 + + Don't list "AVP" as a possible member of a grouped AVP. + + There's no AVP named "AVP". And there's no need to tell Wireshark that any AVP + may put in the group (the RFC lists "AVP" for that purpose). + + Change-Id: I3591af725ebe089e13eae7b712ef4404cb7924a2 + Reviewed-on: https://code.wireshark.org/review/15906 + Reviewed-by: Anders Broman + +commit 9bb4edf +Author: Dario Lombardo +Date: Tue Apr 5 18:24:25 2016 +0200 + + packet.c: remove const compiler warning. + + Change-Id: Ida9384dccb0e8bacbc9aad39515c3dae9c5ce563 + Reviewed-on: https://code.wireshark.org/review/14768 + Reviewed-by: João Valverde + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 40a3cbf +Author: Pascal Quantin +Date: Tue Jun 14 11:31:10 2016 -0700 + + Qt: fix crash when opening Expert Info dialog + + g6ff19ff tried to access cinfo by following a chain of pointers from + expert_info. Access cinfo from cap_file_, which is more reliable. While + we are at it, let's explicitly check the pointer validity. + + Change-Id: I0da72c5b1d2230a49c125a1b57c81c3115c4f2fb + Reviewed-on: https://code.wireshark.org/review/15901 + Petri-Dish: Gerald Combs + Reviewed-by: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit c0c00f4 +Author: Jeff Morriss +Date: Tue Jun 14 10:52:28 2016 -0400 + + Give unique names to a bunch of reserved, experimental, etc., AVPs. + + Also remove a bunch of AVPs that are unassigned/unallocated--there's no + real benefit to telling users that... + + Change-Id: I1b18a11a1b65189d21520c74aae3dde77688e592 + Reviewed-on: https://code.wireshark.org/review/15895 + Reviewed-by: Anders Broman + +commit 4ba1fe4 +Author: Joerg Mayer +Date: Tue Jun 14 21:45:53 2016 +0200 + + Replace wlan_ignore_wep_ by wlan_ignore_prot_ and WLAN_IGNORE_WEP_ by WLAN_IGNORE_PROT_ + + Change-Id: I870cc1e5293dd6e1a1b71157987e27399e080a73 + Reviewed-on: https://code.wireshark.org/review/15904 + Reviewed-by: Jörg Mayer + +commit 0d45698 +Author: Dario Lombardo +Date: Mon May 2 17:21:57 2016 +0200 + + tvbparse: change g_hash_table to wmem_map. + + Change-Id: I245595051617f6d6333314240825a526adf19339 + Reviewed-on: https://code.wireshark.org/review/15244 + Reviewed-by: Michael Mann + +commit a7ab65d +Author: Dario Lombardo +Date: Thu Apr 21 18:04:16 2016 +0200 + + addr_resolv: change g_hash to wmem_map. + + Change-Id: Ice7533fbeac700dae0a46766838818a32b0d5736 + Reviewed-on: https://code.wireshark.org/review/15051 + Reviewed-by: Michael Mann + +commit 1dabd3a +Author: Dario Lombardo +Date: Tue Apr 12 18:14:14 2016 +0200 + + dcm: remove g_malloc + + Change-Id: I3d00b710c6fc6e5798ecc5eca9af11ccac920e5a + Reviewed-on: https://code.wireshark.org/review/14913 + Reviewed-by: Michael Mann + +commit 374d120 +Author: Dario Lombardo +Date: Mon May 2 17:50:38 2016 +0200 + + tvbparse: change g_malloc to wmem_alloc. + + Change-Id: I6a6363400d9fd1d76b9de0c5deea83dfc7cea1e2 + Reviewed-on: https://code.wireshark.org/review/15245 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 76ed781 +Author: Joerg Mayer +Date: Tue Jun 14 21:12:16 2016 +0200 + + Add Aerohive gre tunnel between APs. + + Change-Id: I24d0320cd164ead2802af37d07016c9c46d18e9e + Reviewed-on: https://code.wireshark.org/review/15903 + Reviewed-by: Jörg Mayer + +commit e86af3a +Author: Peter Wu +Date: Sun Apr 3 11:10:02 2016 +0200 + + wslua: remove FAIL_ON_NULL_MEMBER_OR_EXPIRED + + Ensure that the member cannot be NULL at initialization, simplifies + checkCaptureInfo and checkCaptureInfoConst logic. + + Change-Id: I2d9caa4a235310569ebbf0b30199dd3df7a4c093 + Reviewed-on: https://code.wireshark.org/review/14791 + Reviewed-by: Anders Broman + +commit f6e223c +Author: Peter Wu +Date: Sun Apr 3 10:58:44 2016 +0200 + + wslua: Drop unused "push_code" macro parameter + + Reduce noise, no caller has used this parameter since its introduction. + Msotly automated regex search and replace. + + Change-Id: I4b1180bfee8544b38d19c9c440ff5b9b0dc080b2 + Reviewed-on: https://code.wireshark.org/review/14790 + Petri-Dish: Peter Wu + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit cecb227 +Author: Alexis La Goutte +Date: Fri Jun 3 17:56:54 2016 +0200 + + Add dissector for Real Time Location System (RTLS) + + Change-Id: I494cbb8c3c6da18dfd7901d098dde6448226f67e + Reviewed-on: https://code.wireshark.org/review/15711 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 4000386 +Author: Irene Ruengeler +Date: Mon Jun 13 17:39:42 2016 +0200 + + Fix SCTP analysis broken + + Bug: 12513 + Change-Id: I3fdf79106ed007aadf528f0b373fb7a487f3d9a9 + Reviewed-on: https://code.wireshark.org/review/15870 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 798f7e9 +Author: Balint Reczey +Date: Tue Jun 23 13:51:32 2015 -0700 + + gtk: Allow restoring maximized windows as maximized + + without losing window decorations on GNOME on the secondary monitor. + + Bug: 11303 + Change-Id: Ie8f541dba9d49f9fe5d4892a8dc1cd42091afe1d + Reviewed-on: https://code.wireshark.org/review/9077 + Reviewed-by: Balint Reczey + Reviewed-by: Peter Wu + Petri-Dish: Peter Wu + Reviewed-by: Anders Broman + +commit f8031fa +Author: Binh Trinh +Date: Tue Jun 14 00:37:53 2016 -0400 + + Added XML proper decoding for XML CDATASection + + Bug: 11755 + Change-Id: Iecf7ce4bfad45d0c49f3af205e8489e53077198b + Reviewed-on: https://code.wireshark.org/review/15889 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + Reviewed-by: Anders Broman + +commit cbfa817 +Author: Anders Broman +Date: Tue Jun 14 15:37:33 2016 +0000 + + Revert "Move inclusion of CmakeListsCustom to the end of the file in order to have all defines in place." + + This reverts commit bcbcad1e597f89e64389b6cc25b2fdbe9f89d960. + + This change breaks building of custom plugins. + + Change-Id: I63e88ceb922ca23ead9784705ad8ba088a504fd1 + Reviewed-on: https://code.wireshark.org/review/15893 + Reviewed-by: Anders Broman + +commit 2f9957a +Author: Alexis La Goutte +Date: Tue Jun 14 15:40:57 2016 +0200 + + browser (dcerpc): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang + + Change-Id: I158a5fd8a645cd4d58565a6a4ee64371d271eb8e + Reviewed-on: https://code.wireshark.org/review/15892 + Petri-Dish: Alexis La Goutte + Reviewed-by: Martin Kaiser + +commit af6936c +Author: Balint Reczey +Date: Mon Jun 13 20:01:08 2016 -0700 + + GTK: Disable liboverlay-scrollbar that crashed wireshark on Ubuntu + + Bug: 11400 + Change-Id: I40d901ab3ef43a61ef984014dabc0547605ef77c + Reviewed-on: https://code.wireshark.org/review/15888 + Reviewed-by: Anders Broman + +commit 048ba7a +Author: Martin Kaiser +Date: Mon Jun 13 15:50:33 2016 -0700 + + mount: don't THROW() an exception from a dissector + + if the length is too large, we can simply skip nfs_name_snoop_add_name() + and the code to prepare its input + + Change-Id: I30c9a89edf7b48c45b52e7dad099ac4151f7f4a7 + Reviewed-on: https://code.wireshark.org/review/15883 + Reviewed-by: Anders Broman + +commit 238a984 +Author: Jeff Morriss +Date: Mon Jun 13 19:51:29 2016 -0400 + + Don't register Wireshark for .pfx (IPFIX) files. + + (As pointed out by Gerald) .pfx files are (more commonly) PKCS#12 files. + People may be upset if we start grabbing them. + + Change-Id: Iecf857d082b7f2a0ad4fdd1a932332fc3c9d9498 + Reviewed-on: https://code.wireshark.org/review/15886 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit da50994 +Author: Jeff Morriss +Date: Mon Jun 13 20:14:41 2016 -0400 + + Adjust the Diameter DTD to accept applications and vendors in any order. + + Change-Id: I301a138b7f6db2d1a9ce1a20ebecf94e100bf831 + Reviewed-on: https://code.wireshark.org/review/15887 + Reviewed-by: Jeff Morriss + +commit 4e13588 +Author: John A. Thacker +Date: Mon Jun 13 16:36:07 2016 -0400 + + extcap: Check libssh >= 0.6.0 for sshdump, ciscodump + + sshdump and ciscodump require libssh >= 0.6.0. Check for this version and + only build them if a sufficient version is present. (The other checks + stay; in particular, ssh_userauth_agent doesn't exist on Windows and + must be checked separately.) + + Bug: 12507 + Change-Id: Ibe42b0cbb597cd9c4aab51f44d48185940ad954b + Reviewed-on: https://code.wireshark.org/review/15882 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Dario Lombardo + Tested-by: Dario Lombardo + Reviewed-by: Michael Mann + +commit 4943082 +Author: Jeff Morriss +Date: Mon Jun 13 19:28:04 2016 -0400 + + Fix Custom.xml so it can be (correctly) included into the main dictionary. + + This file is included into dictionary.xml so it doesn't need all the DOCTYPE + stuff. + + Change-Id: I8397b3babe45c28706867be3169ce6ed566930e6 + Reviewed-on: https://code.wireshark.org/review/15885 + Reviewed-by: Jeff Morriss + +commit 90fa55d +Author: João Valverde +Date: Mon Jun 13 05:35:14 2016 +0100 + + Add missing const to inet_ipv6.h + + Make it simpler too. + + Change-Id: I97dc79d7ac536089c1fa6ec2c20f19754d47a9d4 + Reviewed-on: https://code.wireshark.org/review/15866 + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + +commit 72af485 +Author: Martin Kaiser +Date: Sat Jun 11 13:56:33 2016 +0200 + + dcerpc: don't THROW() an exception from a dissector + + remove the checks in dissect_ndr_ucarray_core() where a block or bytes + dissection function is called and an exception is thrown if the offset + wraps around, i.e. the final offset is lower than the initial one + + the block functions eventually call proto_tree_add_item(), which throws + an exception if necessary + + the bytes functions end up calling functions to dissect basic types. + insert calls to tvb_ensure_bytes_exist() if those functions increase our + offset without reading data. thus, an exception is thrown if there's an + overflow. + + remove some unnecessary if (tree) checks while at it + + Change-Id: I8006399ae20934daeec231246debe247f8dedbf0 + Reviewed-on: https://code.wireshark.org/review/15832 + Reviewed-by: Anders Broman + +commit 551b824 +Author: Michael Mann +Date: Mon Jun 13 15:34:16 2016 -0400 + + Add proto_tree_add_bitmask_list_value. + + Ran across enough situations that proto_tree_add_bitmask_list couldn't + solve that it seemed necessary. + + Change-Id: I6a540ac6efca76cae7c4571a84bb400538652784 + Reviewed-on: https://code.wireshark.org/review/15880 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 720b47f +Author: Andreas Leibold +Date: Fri Jun 10 10:41:19 2016 +0200 + + Updates on AVB IEEE 1722 protocol to support more 1722 subtypes. + + packet-ieee1722.c now contains the entire protocol. + packet-ieee1722a.c file was removed, because the term 1722a is outdated + and now part of 1722 protocol. + + Change-Id: Ic2f44a2752f9254cde62d878dc971f09cddc5adc + Reviewed-on: https://code.wireshark.org/review/15810 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + Reviewed-by: Anders Broman + +commit 858dc0c +Author: Martin Kaiser +Date: Sun Jun 12 16:31:57 2016 -0700 + + use #include for generated include files + + the same mechanism as described in + 7c40de5c38ac71323455c51dcc14a5eb385ce718 + could trick us into using the wrong config.h + + fix this for some occassions where config.h is included before we + include zlib.h + + I saw compile errors on windows where we picked up config.h from a linux + build and zlib failed because of a mission unistd.h + + Change-Id: I91cf73b96c9e1b6f009fb2376fabfe973d1ac941 + Reviewed-on: https://code.wireshark.org/review/15874 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit dda2acc +Author: Martin Kaiser +Date: Sun Jun 12 14:00:21 2016 -0700 + + qt: use #include for generated include files + + make sure that generated include files are picked up only from the + directories set by -I (or /I), not from the current directory + + if we use #include "file.h", Visual Studio searches for file.h in the + same diretory as the source file that includes file.h + + if we do an out-of-tree build with cmake and the source directory + contains files from an in-tree build (done with autotools), we might end + up including the wrong file + + Change-Id: Iaaed2626258b6ff0c12485fe3f436bd03bbb5adf + Reviewed-on: https://code.wireshark.org/review/15873 + Reviewed-by: Anders Broman + +commit 4ca4768 +Author: João Valverde +Date: Sat Jun 11 23:15:01 2016 +0100 + + IPv6: Add text marker for SRH next segment + + Change-Id: If13ffe4ddb9ae08e738ccf0c715dc12ce7a076e8 + Reviewed-on: https://code.wireshark.org/review/15834 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 4dad151 +Author: Martin Kaiser +Date: Mon Jun 13 11:36:10 2016 -0700 + + sip: remove some unnecessary if (tree) checks + + which shouldn't have any impact on performance + + we should not remove the chcks around blocks where + vb_format_text() is called + + Change-Id: Idc191cc70e7458225bbc5dfececb3c88c83ab5f1 + Reviewed-on: https://code.wireshark.org/review/15879 + Reviewed-by: Anders Broman + +commit bcbcad1 +Author: AndersBroman +Date: Mon Jun 13 20:51:48 2016 +0200 + + Move inclusion of CmakeListsCustom to the end of the file in order to have + all defines in place. + + Change-Id: I190257e9b833c409921bbca74c8ab531b632c60d + Reviewed-on: https://code.wireshark.org/review/15878 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 3fe879b +Author: Martin Kaiser +Date: Mon Jun 13 09:30:30 2016 -0700 + + isns: fix dead code + + do the special handling for len==0 and tag==ISNS_ATTR_TAG_PORTAL_GROUP_TAG + before going into the different attributes + + Bug: 12503 + Change-Id: I4dd6dcea25aba2e4963811a7a85f1eed1b906bcd + Reviewed-on: https://code.wireshark.org/review/15875 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 30d1afb +Author: Dario Lombardo +Date: Tue May 3 16:51:45 2016 +0200 + + tvbparse: change g_strdup_printf to wmem_strdup_printf. + + Change-Id: I57ff604d23967eb1f6481c7019e3eab0389dc3a5 + Reviewed-on: https://code.wireshark.org/review/15257 + Petri-Dish: Dario Lombardo + Tested-by: Petri Dish Buildbot + Reviewed-by: Guy Harris + Reviewed-by: Dario Lombardo + +commit 34cacfc +Author: Gerald Combs +Date: Mon Jun 13 11:17:48 2016 -0700 + + Qt: Fix a Windows version check. + + Fetch the version using QSysInfo::windowsVersion. + + Ping-Bug: 12010 + Change-Id: If63c576ec4f56f34b76f320cdd927bee427c8cb7 + Reviewed-on: https://code.wireshark.org/review/15876 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit b8201ae +Author: Gerald Combs +Date: Sun Jun 12 16:07:30 2016 -0700 + + Qt: Main window tab behavior. + + Make the main window tab order more closely match the GTK+ UI. Draw a + focus rect in the byte view text while we're here. + + Change-Id: I04212c14ea7f0d6865b709533246760adc02f45a + Reviewed-on: https://code.wireshark.org/review/15862 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + Reviewed-by: Gerald Combs + +commit 1dcaeb3 +Author: Jeff Morriss +Date: Mon Jun 13 14:29:22 2016 -0400 + + Cisco Diameter: move the XML declaration to the top of the file. + + ... That's where it's supposed to be. + + Change-Id: I0ec68dc8757776bf757b52e75bc156acc7264ee5 + Reviewed-on: https://code.wireshark.org/review/15877 + Reviewed-by: Jeff Morriss + +commit d06cac6 +Author: Jeff Morriss +Date: Mon Jun 13 13:52:19 2016 -0400 + + Diameter (NSN): the attribute name is 'mandatory' not 'mandatory-flag'. + + Change-Id: Ifa19b59e23278abf332d8ab06dd5ad2059f3e679 + Reviewed-on: https://code.wireshark.org/review/15872 + Reviewed-by: Jeff Morriss + +commit 4e989c2 +Author: Jeff Morriss +Date: Mon Jun 13 13:37:08 2016 -0400 + + Diameter: close command elements. + + ... in order to make the XML (more) valid. + + Change-Id: Iefffff3208c98d6ea55d509ed35b57abd268baf3 + Reviewed-on: https://code.wireshark.org/review/15871 + Reviewed-by: Jeff Morriss + +commit 04b82a7 +Author: Michael Mann +Date: Sun Jun 12 12:28:02 2016 -0400 + + Convert AT_SS7PC to a "dissector address type" + + The formatting of the address type is determined by a preference in + packet-mtp3.c, so just make MTP3 register the address type. + Use address_type_get_by_name in other dissectors (and export_pdu) + to use the address type. + + Change-Id: Ifb32d7de27aeaa23cee8e803e25ffb3c905547b5 + Reviewed-on: https://code.wireshark.org/review/15856 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit e2e8456 +Author: Gerald Combs +Date: Fri Mar 18 13:13:44 2016 -0700 + + Use getc_unlocked in a few places. + + Use getc_unlocked or _fgetc_nolock instead of getc in a few places. This + reduces startup time by about 100ms here. + + Change-Id: I59ceb09678457c871cce79fcc3ce71998fe4f5af + Reviewed-on: https://code.wireshark.org/review/14518 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 92ef3d0 +Author: Anton Thomasson +Date: Fri Jun 10 16:12:24 2016 +0200 + + GSM RLC/MAC: add dissection of EC-GSM-IoT control messages + + Change-Id: Ib7096039aa9761fda96ed8552899833597ba70a6 + Reviewed-on: https://code.wireshark.org/review/15812 + Reviewed-by: Pascal Quantin + +commit 4679f5d +Author: Anton Thomasson +Date: Fri Jun 10 16:13:44 2016 +0200 + + GSM RR: add dissection of EC-GSM-IoT ccch control messages + + Change-Id: Ib40f78a0d1822bf216af0911f9672c750a78b265 + Reviewed-on: https://code.wireshark.org/review/15813 + Reviewed-by: Pascal Quantin + +commit c016dcd +Author: Jeff Morriss +Date: Sun Jun 12 19:00:37 2016 -0400 + + Diameter: free the diameter directory variable. + + It's only needed for a few milliseconds--there's no need for it to stick around + until the epan scope ends. + + As discussed on I51813815babb4c40722c38459139ab9e3e3ccb42. + + Change-Id: I81fef351ef2d700cc5ec5866340605704173fbdb + Reviewed-on: https://code.wireshark.org/review/15861 + Petri-Dish: Jeff Morriss + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 8b6ea37 +Author: Gerald Combs +Date: Sun Jun 12 15:10:02 2016 -0700 + + Qt: Make the capture filter read-only only in main welcome. + + As noted in gb7897dd, CaptureFilterCombo needs to be read-only until the + app is initialized. Move the code to do so to MainWelcome, otherwise the + capture filter entry in CaptureInterfacesDialog starts out read-only and + stays that way. Disable / enable the entire CaptureFilterCombo instead + of setting its lineEdit read-only status, which provides a stronger + visual indicator. + + Change-Id: Ic7bf5b5631b861ecf4dc8cca67beb5bf4ed27510 + Reviewed-on: https://code.wireshark.org/review/15859 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Reviewed-by: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 6ff19ff +Author: Gerald Combs +Date: Fri Jun 10 09:57:17 2016 -0700 + + Qt: Add the Info column contents to Expert Info. + + When "group by summary" is enabled, packet items contain a packet number + followed by a lot of empty space. Fill it with the contents of the Info + column. + + Set the first column title to "Severity" or "Packet" depending on the + item selection. + + Change-Id: Iff96ab2ec631300ec8f08e55019e191e88cff84a + Reviewed-on: https://code.wireshark.org/review/15814 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 88f4374 +Author: João Valverde +Date: Wed Apr 27 15:07:03 2016 +0100 + + Indent register.c and other cosmetic changes + + Change-Id: I06e863e0b87118047f4c3b7618df02b9c7384a34 + Reviewed-on: https://code.wireshark.org/review/15836 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 20961a1 +Author: Binh Trinh +Date: Sun Jun 12 14:21:12 2016 -0400 + + Added Diameter 3GPP decoding of AVP 1404 - QoS-Subscribed + (removed spaces) + (removed C++ style comments) + + Change-Id: I0f6c7586486b48eab8659a048be451ce3fe1c72b + Reviewed-on: https://code.wireshark.org/review/15850 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 8ec8f6b +Author: Stig Bjørlykke +Date: Mon Jun 13 10:00:28 2016 +0200 + + Qt: Multi line import from hex dump without offsets + + Fix importing hex dump without offsets with multiple lines. + + Change-Id: I7a7339e375b3125688f5b5d29f493704c7b9944a + Reviewed-on: https://code.wireshark.org/review/15868 + Reviewed-by: Stig Bjørlykke + +commit 4e55a28 +Author: Alexis La Goutte +Date: Sat Jun 11 06:14:35 2016 +0200 + + RADIUS: Add Sangoma dictionary + + From FreeRADIUS master + + commit ba4b4402588ae87497a0b7c87e26eb5cb433c8a7 + Author: Alan T. DeKok + Date: Fri Jun 10 14:38:55 2016 -0400 + + Added dictionary.sangoma + + from http://wiki.sangoma.com/files/NSC-Radius-Support/dictionary.sangoma.txt + + Change-Id: Ie51ea6343a2a8a5b286d70451abce81ca920261f + Reviewed-on: https://code.wireshark.org/review/15823 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 87b5597 +Author: Michael Mann +Date: Sun Jun 12 11:12:15 2016 -0400 + + Add address_type_get_by_name + + This allows the decoupling of a dissector registering an address type + so it doesn't need to export the returned registered type. + + Change-Id: I49c913d042e70bd4b7ea1e964ba9511bb27304f5 + Reviewed-on: https://code.wireshark.org/review/15855 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 0baf13f +Author: Michael Mann +Date: Sun Jun 12 09:38:55 2016 -0400 + + Completely remove dissector_add_handle. + + It has been deprecated and replaced with dissector_add_for_decode_as. + + Change-Id: I5a4976f83951f749e70b5267570fca188daa7a07 + Reviewed-on: https://code.wireshark.org/review/15854 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 6ff6357 +Author: Pascal Quantin +Date: Sun Jun 12 14:50:04 2016 -0700 + + USB: fix dissection of URB setup when the payload was claimed by a sub dissector + + Bug: 12511 + Change-Id: Ic9af8358e2a8110f53c587201cafc337630c302a + Reviewed-on: https://code.wireshark.org/review/15858 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit fef202b +Author: Pascal Quantin +Date: Sun Jun 12 14:49:04 2016 -0700 + + USB HID: add dissector to USB Device 'Decode As' list + + Ping-Bug: 12511 + Change-Id: I6193e3bb084adf9925bb6800a756804164030630 + Reviewed-on: https://code.wireshark.org/review/15857 + Reviewed-by: Pascal Quantin + +commit db8dd0f +Author: João Valverde +Date: Mon Jun 13 03:49:37 2016 +0100 + + Rename a variable + + Change-Id: Ie5d859e166fbc8073be88cbbd96bffa877e6b654 + Reviewed-on: https://code.wireshark.org/review/15865 + Reviewed-by: João Valverde + +commit 3f0c709 +Author: Guy Harris +Date: Sun Jun 12 19:15:40 2016 -0700 + + Finish moving the parenthesis. + + Change-Id: I02f099ef198e360663b03857bdf9538bb63a7de8 + Reviewed-on: https://code.wireshark.org/review/15864 + Reviewed-by: Guy Harris + +commit 49db728 +Author: Guy Harris +Date: Sun Jun 12 18:45:45 2016 -0700 + + Fix a compile error. + + (Perhaps the Petri dish buildbots should, if a build fails, immediately + mark the change as failing the Petri dish build, without waiting for the + other build(s), so that you don't have to, for example, wait for the + Ubuntu buildbot to finish doing a test build for a change that doesn't + affect code built on UN*X.) + + Change-Id: I89ee1616d35c186fcabc0ec989936fa94116df70 + Reviewed-on: https://code.wireshark.org/review/15863 + Reviewed-by: Guy Harris + +commit 010e55c +Author: Guy Harris +Date: Sun Jun 12 15:30:35 2016 -0700 + + Don't assume we can get a module handle for kernel32.dll. + + A failure "shouldn't happen", but check anyway; if nothing else, that + squelches some complaining from the VS Code Analysis tool. + + Change-Id: I9b06db399741176d0e9f859eb650bed8a2f96d9c + Reviewed-on: https://code.wireshark.org/review/15860 + Petri-Dish: Guy Harris + Reviewed-by: Guy Harris + +commit d72b29c +Author: Stig Bjørlykke +Date: Sun Jun 5 21:06:51 2016 +0200 + + Qt: Add import from hex dump without offsets + + Added support for importing from hex dump without offsets. + This will create one packet with all hex values found in the file. + + Change-Id: I0414441721078befeb59aa6a87b9412646cfcf5c + Reviewed-on: https://code.wireshark.org/review/15743 + Petri-Dish: Stig Bjørlykke + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 0acc76a +Author: Léo Gaspard +Date: Sun Jun 12 22:35:16 2016 +0200 + + Fix typo in dissector doc + + Change-Id: I5ca20080f99905ab23d484d0be054a89c406c583 + Reviewed-on: https://code.wireshark.org/review/15852 + Reviewed-by: Anders Broman + +commit 752a8ea +Author: Alexis La Goutte +Date: Sun Jun 12 18:46:46 2016 +0200 + + expert_info_dialog (Qt): fix Uninitialized members (UNINIT_CTOR) reported by Coverity (CID 1362692) + + Change-Id: I1bc71ac7b9c08a9a5749aa9bc88863fa10eb27c7 + Reviewed-on: https://code.wireshark.org/review/15848 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + +commit bc35660 +Author: João Valverde +Date: Sat Jun 11 18:09:05 2016 +0100 + + IPv6: Add dissection for SRH flags + + Change-Id: I535aba36cc906e8d78cb594900e9a7fdcbd26c83 + Reviewed-on: https://code.wireshark.org/review/15828 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + +commit d6e9665 +Author: Thibault Gerondal +Date: Sat May 28 02:55:04 2016 +0200 + + IPv6: Add support for Segment Routing (Type 4) Extension Header + + Bug: 12512 + Change-Id: I5672ff3b8c4e8afcc82e957933330e0bf9454b08 + Reviewed-on: https://code.wireshark.org/review/15593 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: João Valverde + +commit cee3e82 +Author: João Valverde +Date: Sat Jun 11 06:10:17 2016 +0100 + + CMake: Make PROJECT_VERSION_EXTENSION code simpler + + The intent was to allow all sorts of overrides but, ugly. + + I don't think we need $cmake_package_string either, at least with + these changes. + + Follow-up to 7c6e859ccf210a45e1cc0f6da17692845e6b5a23. + + (And bdec712166ba924a2cdeaaca8ae580c343eaf02c). + + Change-Id: I808b6bd3a3c64d2a67165344e8fe23e8314c27db + Reviewed-on: https://code.wireshark.org/review/15835 + Reviewed-by: João Valverde + +commit 38d39f2 +Author: Guy Harris +Date: Sun Jun 12 12:18:14 2016 -0700 + + Have MemoryCheck() directly incorporate the error message and exit. + + Manually inline memory_error() in MemoryCheck(), so that static + analyzers know that, if MemoryCheck() sees a null pointer, it exists, + and the null pointer isn't subsequently used. + + Use MemoryCheck() instead of the one place where we manually checked for + a null pointer and called memory_error(). + + Change-Id: Id6b0328cfd17cb14ec9d1e461420896a31573c71 + Reviewed-on: https://code.wireshark.org/review/15851 + Reviewed-by: Guy Harris + +commit 7bbc60c +Author: Guy Harris +Date: Sun Jun 12 10:34:16 2016 -0700 + + Add more memory checks, and use MemoryCheck() for some existing checks. + + Always check for malloc() and realloc() failing. Use MemoryCheck() for + most of the checks - it's a bit cleaner and makes the error message the + same for those checks. + + Change-Id: I533153c697b37b85adfa0259c1352efece0b0486 + Reviewed-on: https://code.wireshark.org/review/15849 + Reviewed-by: Guy Harris + +commit aaba30a +Author: Gerald Combs +Date: Fri Jun 10 11:16:10 2016 -0700 + + Qt: Draw a border around inactive+selected packet list items. + + Try to make inactive+selected packet list items more visible by drawing + a border around them. Make an exception for Windows 7 and Vista if a + theme is active. + + Bug: 12010 + Change-Id: I974069dda92588b80772f577f319569751ff3347 + Reviewed-on: https://code.wireshark.org/review/15816 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit a5ff5c2 +Author: Gerald Combs +Date: Sun Jun 12 08:11:17 2016 -0700 + + [Automatic update for 2016-06-12] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: I14deff6b9a13a51d66ebdea361686822583b07c0 + Reviewed-on: https://code.wireshark.org/review/15843 + Reviewed-by: Gerald Combs + +commit b882478 +Author: Martin Kaiser +Date: Sat Jun 11 14:23:59 2016 +0200 + + mongo: don't THROW() an exception from a dissector + + just return the overall length even if the value is not in line with the + protocol specification + + Change-Id: Ieeb5d1d265acb6de807a1175f07c7981db4b6c2b + Reviewed-on: https://code.wireshark.org/review/15833 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit be12133 +Author: Jaap Keuter +Date: Sat Jun 11 14:21:17 2016 +0200 + + Actually progress through the command data (CID-281394) + + The loop reading through the command data doesn't progress through + it, it just reads until the available data (represented by max_length) + runs out. It therefore: + - doesn't present the commands + - doesn't detect a missing final marker bit (CID-281394) + This change does make the code progress through the command data, + fixing both issues in the process. + + Change-Id: I61ba8b56b4a153affe9b4f9a574267f981ef0594 + Reviewed-on: https://code.wireshark.org/review/15825 + Petri-Dish: Jaap Keuter + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 416c8a1 +Author: Balint Reczey +Date: Fri Apr 29 10:21:44 2016 +0200 + + debian: Regenerate ASN.1 dissector code during package build + + Change-Id: I3f7378ae5c048d3f954238bd04c707f039401ea1 + Reviewed-on: https://code.wireshark.org/review/15161 + Petri-Dish: Balint Reczey + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 2d095de +Author: Michael Mann +Date: Fri Jun 10 00:00:39 2016 -0400 + + Move Gateway Control Protocol (Context Tracking) into packet-h248.h + + The Gateway Control Protocol (Context Tracking) is used by both H248 + and MEGACO, so the functionality was refactored to epan, but should + really be kept in the dissector directory to minimize (and eventually + completely remove) the epan directory's dependence on it. + + Change-Id: I387b46aecde97234086bfdb7d8c546854fa301cd + Reviewed-on: https://code.wireshark.org/review/15798 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 68ef5db +Author: Michael Vigovsky +Date: Fri Jun 10 15:17:49 2016 +0300 + + Add missing scale in TDS type info + + Change-Id: I6734fe448e4ee6f20a0d57b1aaae5e7e61f0cb5c + Reviewed-on: https://code.wireshark.org/review/15811 + Reviewed-by: Alexis La Goutte + Reviewed-by: Michael Mann + +commit 5416a34 +Author: Guy Harris +Date: Sat Jun 11 19:13:14 2016 -0700 + + Handle zero-length addresses in cmp_address(). + + Don't compare the data if there's none to compare. + + Change-Id: Ib0e3541e448127869d19afddfc71bb441dba5874 + Reviewed-on: https://code.wireshark.org/review/15840 + Reviewed-by: Guy Harris + +commit 24f02da +Author: Guy Harris +Date: Sat Jun 11 18:59:25 2016 -0700 + + Add checks to address setting routines. + + Fail if: + + 1) you have an AT_NONE address with data; + + 2) you have a non-AT_NONE address with a zero length and a + non-null data pointer, or with a non-zero length and a null + data pointer. + + When comparing addresses for equality, just make sure the types are the + same, the lengths are the same and, if the lengths are non-zero, the + data is the same; don't treat AT_NONE specially - the "lengths are + non-zero" check will make sure we do the right thing. + + Make sure when we create an AT_NONE address it has a zero length and + null data pointer. + + Change-Id: I5c452ef0d140c2d9aef3004f1cfd124a95b78fb2 + Reviewed-on: https://code.wireshark.org/review/15839 + Reviewed-by: Guy Harris + +commit 4cab051 +Author: Jaap Keuter +Date: Sat Jun 11 14:49:59 2016 +0200 + + Store the tree item to add to later (CID-1159152) + + The tree item needed to test and append to isn't being stored, + so the items are never amended with notes, resulting in dead code. + + Change-Id: Ib1a9b7994ad12a9a9013d1bc1e1e4c165f34f20f + Reviewed-on: https://code.wireshark.org/review/15826 + Petri-Dish: Jaap Keuter + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 21007dc +Author: Michael Mann +Date: Thu Jun 9 11:02:33 2016 -0400 + + H225: Replace globals that track packet data with p_add_proto_data/p_get_proto_data. + + Change-Id: I0380151fb0f45063b81bc55dd5b8dc4add99ad30 + Reviewed-on: https://code.wireshark.org/review/15794 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit e659faa +Author: Guy Harris +Date: Sat Jun 11 13:28:29 2016 -0700 + + Line up comments. + + Change-Id: Ifda0499e00dfa38c936f7e054ab4d5b3a0fd627f + Reviewed-on: https://code.wireshark.org/review/15830 + Reviewed-by: Guy Harris + +commit de028e8 +Author: Vincent Helfre +Date: Thu Jun 9 17:47:20 2016 +0200 + + GSM RLC/MAC: improve dissection of Packet Resource Request message + + Change-Id: I8513ef550e81a97e1a8ac1c1f365355118d5ebae + Reviewed-on: https://code.wireshark.org/review/15827 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit e00d73a +Author: Martin Kaiser +Date: Sun May 29 16:35:22 2016 +0200 + + dcerpc-browser: don't THROW() an exception from a dissector + + the condition for THROW() will never be true + + there's no way to decrement offset below its initial value + the dissect_browser_TYPE_x_data() functions read a uint32 and increment + offset by 4 + the uint32 value that was read + + Change-Id: Ia5a63e714ffa0add601960d858452152e4d9b10b + Reviewed-on: https://code.wireshark.org/review/15627 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Martin Kaiser + Reviewed-by: Anders Broman + +commit c755c88 +Author: Martin Kaiser +Date: Fri Jun 3 20:11:56 2016 +0200 + + iso14443: dissect attrib's p3 byte + + Change-Id: Iec3595a9ee0f7037af1f949804f1022f315d1edc + Reviewed-on: https://code.wireshark.org/review/15824 + Reviewed-by: Martin Kaiser + +commit 5932044 +Author: João Valverde +Date: Fri Jun 10 19:30:36 2016 +0100 + + ftype-protocol: Fix [-Wcast-qual] warnings + + Change-Id: Ia8a02d8dc66aead486c8ae3f0bdf4cd82717ed20 + Reviewed-on: https://code.wireshark.org/review/15817 + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit b8779f9 +Author: Guy Harris +Date: Fri Jun 10 15:05:23 2016 -0700 + + More comment clarification. + + That's not "the biggest record we're willing to write", it's "the + biggest record the pcapng format supports, as the record length is a + 16-bit field". + + Change-Id: Icbd5e0cc4ed8e2a3a0d474245a9b9ed2c999d520 + Reviewed-on: https://code.wireshark.org/review/15818 + Reviewed-by: Guy Harris + (cherry picked from commit 09de28933f9a17d4472206e1ac4b7c92001e44f5) + Reviewed-on: https://code.wireshark.org/review/15820 + +commit 8626cef +Author: Guy Harris +Date: Fri Jun 10 11:02:07 2016 -0700 + + Make the IPv4 NRB code's comments match the IPv6 NRB code's comments. + + The IPv6 comments gave more details. + + Change-Id: I4e4d865feadbabfd625cdf2b2b162b99c4f23efa + Reviewed-on: https://code.wireshark.org/review/15815 + Reviewed-by: Guy Harris + +commit 00d36c7 +Author: Gerald Combs +Date: Thu Jan 14 11:15:46 2016 -0800 + + Qt: Expert info grouping. + + Add the ability to group expert info items by summary and enable it by + default. This more closely matches the GTK+ UI behavior. + + Show matching item counts while we're here. + + Bug: 12218 + Change-Id: Ic02267da8435fb70015de8dd15e0ac46faabbee9 + Reviewed-on: https://code.wireshark.org/review/15796 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit 237f2d4 +Author: Michal Labedzki +Date: Tue May 19 11:55:01 2015 +0200 + + Qt/Bluetooth: Add Device dialog + + Device dialog appears when user double clicks on device in + Devices dialog (Bluetooth->Devices). It provides + summary of device, like BD_ADDR, name, timeouts, etc. + Base on information from HCI layer, so this feature is more interesting + for local devices (capturing on its side). Each field has changes counter, + what mean that value at specified field changes in time, for example: + user change device name 3 times. Please note that initial change + is not counted. It means that you can see fielkd without any value + then change occur and counter is not increased. It will be increased + next time. Reason for that is in most cases field value is unknown + at start. + + Change-Id: Ife0a6bd454eac00a28f8eb2906e1b395695b0307 + Reviewed-on: https://code.wireshark.org/review/15793 + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Reviewed-by: Michal Labedzki + Tested-by: Michal Labedzki + +commit 2df337d +Author: Alexis La Goutte +Date: Fri Jun 10 08:42:41 2016 +0200 + + Bluetooth HCI (Qt): Remove Q_UNUSED + + See g21754f43e for detail + + There is always some other Q_UNUSED but include on #if/#endif... + + Change-Id: Ib2283660c91787acbf6392841faa3db6aed39438 + Reviewed-on: https://code.wireshark.org/review/15803 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michal Labedzki + +commit e53a1ad +Author: Guy Harris +Date: Fri Jun 10 00:40:18 2016 -0700 + + Always count packets per encapsulation. + + Currently, for pcapng files, if all of the IDBs we've seen *so far* are + the same, we report it as the file's encapsulation type; however, we may + see IDBs of a different type in the future, so don't check for + per-packet encapsulation before counting packets of the encapsulation + type. + + Change-Id: I617ddcf2963aa16e7ba58855b3e5bf326ab7dc32 + Reviewed-on: https://code.wireshark.org/review/15808 + Reviewed-by: Guy Harris + +commit 1438d28 +Author: Guy Harris +Date: Fri Jun 10 00:31:36 2016 -0700 + + Set the size of the packet counts array when we create it. + + g_array_sized_new() sets the amount of *space allocated for* the array, + but doesn't actually set its *length*. + + Change-Id: Ia7deab34c758c88910dfb0e246a6903301e68029 + Reviewed-on: https://code.wireshark.org/review/15806 + Reviewed-by: Guy Harris + +commit 3ba7798 +Author: Guy Harris +Date: Thu Jun 9 23:59:34 2016 -0700 + + Set cf_info.num_interfaces before using it. + + Change-Id: I6ba5932f339ea6296dd91a6800721b11bcd4956a + Reviewed-on: https://code.wireshark.org/review/15804 + Reviewed-by: Guy Harris + +commit 777cddd +Author: Alexis La Goutte +Date: Fri Jun 10 07:04:44 2016 +0200 + + LANforge: fix wrong offset for magic detection + + Issue reported by Brent Lovelace https://www.wireshark.org/lists/wireshark-dev/201606/msg00034.html + + Change-Id: If296f01747316ddbe28e88d4d11d9df90d68bc5d + Reviewed-on: https://code.wireshark.org/review/15800 + Petri-Dish: Alexis La Goutte + Reviewed-by: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit a4afda6 +Author: Jaap Keuter +Date: Thu Jun 9 23:51:04 2016 +0200 + + Remove superfluous length check (CID-1158783) + + When entering a loop with check for minimum length, don't stick + to the pattern of checking length first thing. + + Change-Id: I28c414108efa5499dbacd8527b2c3e654e49e808 + Reviewed-on: https://code.wireshark.org/review/15795 + Reviewed-by: Anders Broman + +commit 4233e9a +Author: Guy Harris +Date: Thu Jun 9 20:32:35 2016 -0700 + + Don't assume all IDBs are available aftre we open the file. + + IDBs can occur anywhere in the file, so if we see an interface ID bigger + than the number of IDBs we've see, re-fetch the interface information, + update the IDB count, and grow the packet count array as necessary. + + Get the information strings for interfaces after reading the entire + file; we don't need them until then. + + Change-Id: Ib6096e481e321de485710d14eadf7b5232bf0be7 + Reviewed-on: https://code.wireshark.org/review/15797 + Reviewed-by: Guy Harris + +commit f928a5f +Author: Jaap Keuter +Date: Thu Jun 9 08:04:04 2016 +0200 + + Make the determination if file is relative. (CID-1348040) + + The code tries to show a file handle when the file is relative + to it, but doesn't actually make that determination. Extract the + relevant bit and use that to flag the relative file. + + Change-Id: I7259c8843dc388b9dda96a73399a6da5575d3f5e + Reviewed-on: https://code.wireshark.org/review/15789 + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 0ccde30 +Author: Michael Mann +Date: Wed Jun 8 23:28:07 2016 -0400 + + MGCP: Replace globals that track packet data with passing data to functions. + + Change-Id: I9595abf882adb821fd3c08532afba1b7e20412fe + Reviewed-on: https://code.wireshark.org/review/15788 + Reviewed-by: Anders Broman + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 9fd37c0 +Author: Michal Labedzki +Date: Tue May 3 22:50:26 2016 +0200 + + Qt/Bluetooth: Set missing HCI Summary Occurence fields + + Set they to zeros at startup like other fields. + + Change-Id: I820e7a0ce8fad5726448cb83f85235ecf578d77d + Reviewed-on: https://code.wireshark.org/review/15792 + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Reviewed-by: Michal Labedzki + Tested-by: Michal Labedzki + +commit 508e0f4 +Author: Michal Labedzki +Date: Wed Jun 8 17:18:45 2016 +0200 + + Bluetooth: ATT: Fix Object List Control Point response + + Fix CID 1355646. + + Bug: 12496 + + Change-Id: Ia6c95c8f31a19b5e8fc21182658147ed4208d635 + Reviewed-on: https://code.wireshark.org/review/15790 + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + +commit 2a0d61e +Author: Michal Labedzki +Date: Sun May 29 11:10:24 2016 +0200 + + Logcat: Unicodize texts + + Text over Logcat is in real in Unicode. + ASCII does not display it correctly. + + Change-Id: I998dad1ee50c4b00b874a1f197f6e465fadd3e38 + Reviewed-on: https://code.wireshark.org/review/15791 + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + +commit d907fc2 +Author: Pascal Quantin +Date: Wed Jun 8 22:26:02 2016 +0200 + + Update Developer's Guide to reflect dissector_t signature change + + Change-Id: Ia793d94c7e79e49d1f27ad8adbdbafdb30131abe + Reviewed-on: https://code.wireshark.org/review/15783 + Reviewed-by: Pascal Quantin + +commit 078ab45 +Author: Guy Harris +Date: Wed Jun 8 18:12:48 2016 -0700 + + Use the locale's decimal separator for times as seconds and fraction. + + We use it when printing *other* seconds-and-fraction values, as we're + just using %f, so we should use it consistently. If you don't want + commas as decimal separators, you presumably don't want them anywhere; + if you want to standardize the way numbers are shown, set the locale to + the C locale. + + This addresses one of the two problems mentioned in bug 12500; there may + be other places in the Wireshark suite where we should use the locale's + decimal separator in times. + + Change-Id: I41f1c44d12ebf0f46ff678c977a955d09831b0cf + Ping-Bug: 12500 + Reviewed-on: https://code.wireshark.org/review/15787 + Reviewed-by: Guy Harris + +commit 6ec6beb +Author: Guy Harris +Date: Wed Jun 8 16:26:18 2016 -0700 + + ieee80211_htrate() isn't exported. + + Change-Id: I8a7a4727b473820d46ee543875f9fb57c5d79928 + Reviewed-on: https://code.wireshark.org/review/15786 + Reviewed-by: Guy Harris + +commit bdec712 +Author: Gerald Combs +Date: Wed Jun 8 14:55:06 2016 -0700 + + 2.1.0 → 2.1.1. + + Change-Id: Ib8aab341be406d3c6e9139ae670489bd9e3edcc5 + Reviewed-on: https://code.wireshark.org/review/15785 + Reviewed-by: Gerald Combs diff --git a/NEWS b/NEWS index b2d4dc1007..ae284356a8 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ - Wireshark 2.1.0 Release Notes + Wireshark 2.1.1 Release Notes This is a semi-experimental release intended to test new features for Wireshark 2.2. @@ -14,8 +14,25 @@ What's New New and Updated Features + The following features are new (or have been significantly updated) + since version 2.1.0: + * Added -d option for Decode As support in Wireshark (mimics TShark + functionality) + * The Qt UI, GTK+ UI, and TShark can now export packets as JSON. + TShark can additionally export packets as Elasticsearch-compatible + JSON. + * The Qt UI now supports the -j, -J, and -l flags. The -m flag is now + deprecated. + * The Conversations and Endpoints dialogs are more responsive when + viewing large numbers of items. + * The RTP player now allows up to 30 minutes of silence frames. + * Packet bytes can now be displayed as EBCDIC. + * The Qt UI loads captures faster on Windows. + The following features are new (or have been significantly updated) since version 2.0.0: + * The intelligent scroll bar now sits to the left of a normal scroll + bar and provides a clickable map of nearby packets. * You can now switch between between Capture and File Format dissection of the current capture file via the View menu in the Qt GUI. @@ -39,6 +56,8 @@ What's New * The Follow Stream dialog now supports UTF-16. * The Firewall ACL Rules dialog has returned. * The Flow (Sequence) Analysis dialog has been improved. + * We no longer provide packages for 32-bit versions of OS X. + * The Bluetooth Device details dialog has been added. New File Format Decoding Support @@ -56,14 +75,16 @@ What's New Bluetooth Pseudoheader for BR/EDR, CISCO ERSPAN3 Marker, Edge Control Protocol (ECP), Ericsson IPOS Kernel Packet Header Dissector Added (IPOS), Extensible Control & Management Protocol (eCMP), FLEXRAY - Protocol dissector added (automotive bus), ISO 8583-1, ISO14443, ITU-T - G.7041/Y.1303 Generic Framing Procedure (GFP), LAT protocol (DECNET), - Metamako trailers, Nokia Intelligent Service Interface (ISI), Open + Protocol dissector added (automotive bus), IEEE 802.1BR E-Tag, ISO + 8583-1, ISO14443, ITU-T G.7041/Y.1303 Generic Framing Procedure (GFP), + LAT protocol (DECNET), Metamako trailers, Network-Based IP Flow + Mobility (NBIFOM), Nokia Intelligent Service Interface (ISI), Open Mobile Alliance Lightweight Machine to Machine TLV payload Added (LwM2M - TLV), RTI TCP Transport Layer (RTITCP), STANAG 5602 SIMPLE, USB3 Vision - Protocol (USB machine vision cameras), USBIP Protocol, UserLog - Protocol, and Zigbee Protocol Clusters Dissectors Added (Closures - Lighting General Measurement & Sensing HVAC Security & Safety) + TLV), Real Time Location System (RTLS), RTI TCP Transport Layer + (RTITCP), STANAG 5602 SIMPLE, USB3 Vision Protocol (USB machine vision + cameras), USBIP Protocol, UserLog Protocol, and Zigbee Protocol + Clusters Dissectors Added (Closures Lighting General Measurement & + Sensing HVAC Security & Safety) Updated Protocol Support @@ -155,7 +176,7 @@ Frequently Asked Questions A complete FAQ is available on the [15]Wireshark web site. __________________________________________________________________ - Last updated 2016-06-08 17:56:17 UTC + Last updated 2016-07-14 18:05:31 UTC References diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index d6382a53f3..8fefb97bd8 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -37,6 +37,7 @@ since version 2.1.0: viewing large numbers of items. * The RTP player now allows up to 30 minutes of silence frames. * Packet bytes can now be displayed as EBCDIC. +* The Qt UI loads captures faster on Windows. The following features are new (or have been significantly updated) since version 2.0.0: diff --git a/make-version.pl b/make-version.pl index f5c21dd521..0ce9e9bb85 100755 --- a/make-version.pl +++ b/make-version.pl @@ -95,12 +95,12 @@ my %version_pref = ( "format" => "git %Y%m%d%H%M%S", # Normal development builds - "pkg_enable" => 1, - "pkg_format" => "-%#", + #"pkg_enable" => 1, + #"pkg_format" => "-%#", # Development releases - #"pkg_enable" => 0, - #"pkg_format" => "", + "pkg_enable" => 0, + "pkg_format" => "", ); my $srcdir = "."; my $info_cmd = ""; diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index c46add06ba..cb97f0ac74 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -102,7 +102,7 @@ UUID Name - UUID Name + UUID-Name @@ -147,7 +147,7 @@ PNG Image (*.png) - PNG Bild (*.png) + PNG-Bild (*.png) @@ -180,12 +180,12 @@ LMP Version - LMP Version + LMP-Version LMP Subverion - LMP Subversion + LMP-Subversion @@ -195,12 +195,12 @@ HCI Version - HCI Version + HCI-Version HCI Revision - HCI Revision + HCI-Revision @@ -225,7 +225,7 @@ ACL Total Packets - ACL Pakete gesamt + ACL-Pakete gesamt @@ -235,7 +235,7 @@ SCO Total Packets - SCO Pakete gesamt + SCO-Pakete gesamt @@ -255,7 +255,7 @@ Page Timeout - Page Timeout + Seitenzeitüberschreitung @@ -311,7 +311,7 @@ Bluetooth Device - %1%2 - Bluetooth Geräte - %1%2 + Bluetooth-Gerät - %1%2 @@ -336,7 +336,7 @@ PNG Image (*.png) - PNG Bild (*.png) + PNG-Bild (*.png) @@ -344,7 +344,7 @@ Bluetooth Devices - Bluetooth Geräte + Bluetooth-Geräte @@ -364,12 +364,12 @@ LMP Version - LMP Version + LMP-Version LMP Subversion - LMP Subversion + LMP-Subversion @@ -379,17 +379,17 @@ HCI Version - HCI Version + HCI-Version HCI Revision - HCI Revision + HCI-Revision Is Local Adapter - Lokaler Adapter + Ist lokaler Adapter @@ -410,17 +410,17 @@ Copy Cell - Kopiere Zelle + Zelle kopieren Copy Rows - Kopiere Zeile + Zeilen kopieren Copy All - Kopiere Alles + Alles kopieren @@ -441,7 +441,7 @@ PNG Image (*.png) - PNG Bild (*.png) + PNG-Bild (*.png) @@ -491,7 +491,7 @@ Hardware Error - Hardware Fehler + Hardwarefehler @@ -539,7 +539,7 @@ Controller & Baseband Commands - Controller & Baseband Kommandos + Controller- & Baseband-Befehle @@ -559,7 +559,7 @@ Status Parameters - Status Parameter + Statusparameter @@ -599,7 +599,7 @@ Vendor-Specific Commands - Herstellerspezifische Kommandos + Herstellerspezifische Befehle @@ -619,7 +619,7 @@ Hardware Errors - Hardware Fehler + Hardwarefehler @@ -634,12 +634,12 @@ Copy Cell - Kopiere Zelle + Zelle kopieren Copy Rows - Kopiere Zeilen + Zeilen kopieren @@ -684,7 +684,7 @@ PNG Image (*.png) - PNG Bild (*.png) + PNG-Bild (*.png) @@ -692,7 +692,7 @@ Packet bytes - Paket Bytes + Paketbytes @@ -836,17 +836,17 @@ &MAC name resolution - &MAC Namensauflösung + &MAC-Namensauflösung &Transport name resolution - &Transportschicht Namensauflösung + &Transportschicht-Namensauflösung &Network name resolution - &Netzwerk Namensauflösung + &Netzwerk-Namensauflösung @@ -862,7 +862,7 @@ Open Capture File Wireshark: Open Capture File - Öffne Mitschnittdatei + Mitschnittdatei öffnen @@ -919,7 +919,7 @@ %1 bytes - %1 Bytes + %1 Byte @@ -929,7 +929,7 @@ more than %1 (preview timeout) - mehr als %1 (Vorschau Timeout) + mehr als %1 (Vorschauzeitüberschreitung) @@ -952,7 +952,7 @@ Capture file comments - Kommentar + Mitschnittdateikommentare @@ -967,7 +967,7 @@ Save Comments - Kommentar sichern + Kommentar speichern @@ -997,7 +997,7 @@ (gzip compressed) - (gzip komprimiert) + (gzip-komprimiert) @@ -1012,7 +1012,7 @@ Snapshot length - Snapshot Länge + Schnappschusslänge @@ -1047,7 +1047,7 @@ OS - Betriebssystem + BS @@ -1092,7 +1092,7 @@ %1 bytes - %1 Bytes + %1 Byte @@ -1122,7 +1122,7 @@ N/A - - + N/V @@ -1147,17 +1147,17 @@ Bytes - Bytes + Byte Average bytes/s - Durschnittliche Bytes/s + Durschnittliche Byte/s Average bits/s - Durschnittliche Bits/s + Durschnittliche Bit/s @@ -1179,7 +1179,7 @@ Created by Wireshark %1 - Erstellt durch Wireshark %1 + Erstellt von Wireshark %1 @@ -1189,7 +1189,7 @@ Capture filter selector - Auswahl Mitschnittfilter + Mitschnittfilterauswahl @@ -1197,7 +1197,7 @@ Capture filter entry - Mitschnittfilter Eintrag + Mitschnittfiltereintrag @@ -1322,14 +1322,14 @@ megabytes Megabytes - Megabytes + Megabyte kilobytes Kilobytes - Kilobytes + Kilobyte @@ -1379,7 +1379,7 @@ Promiscuous - Promiscuous + Promiskuitiv @@ -1394,7 +1394,7 @@ Monitor Mode - Monitor Modus + Überwachungsmodus @@ -1458,7 +1458,7 @@ Achtung: Eine Option MUSS ausgewählt sein. gigabytes Gigabytes - Gigabytes + Gigabyte @@ -1468,7 +1468,7 @@ Achtung: Eine Option MUSS ausgewählt sein. Use a ring buffer with - Verwende einen Ringpuffer mit + Einen Ringpuffer verwenden mit @@ -1484,7 +1484,7 @@ Achtung: Eine Option MUSS ausgewählt sein. Display Options - Anzeige Optionen + Anzeigeoptionen @@ -1529,7 +1529,7 @@ Achtung: Eine Option MUSS ausgewählt sein. Resolve MAC Addresses - MAC Adressen auflösen + MAC-Adressen auflösen @@ -1549,7 +1549,7 @@ Achtung: Eine Option MUSS ausgewählt sein. Resolve transport names - Transport Namensauflösung + Transportschichtnamen auflösen @@ -1664,7 +1664,7 @@ Achtung: Eine Option MUSS ausgewählt sein. Capture packets in promiscuous mode - Pakete im promiscous Modus mitschneiden + Pakete im promiskuitiven Modus mitschneiden @@ -2508,7 +2508,7 @@ Achtung: Eine Option MUSS ausgewählt sein. Packet - Paket + Paket @@ -3191,7 +3191,7 @@ für die Filterdateien kann nicht erstellt werden: Show and save data as Show data as - Daten anzeigen als + Daten anzeigen und speichern als @@ -4450,12 +4450,12 @@ für die Filterdateien kann nicht erstellt werden: The text file has no offset - + Die Textdatei hat keinen Versatz None - + Keine @@ -7125,7 +7125,7 @@ text-decoration: underline; Stop capturing packets - Aufzeichnen beenden + Aufzeichnen von Paketen beenden @@ -9116,7 +9116,7 @@ text-decoration: underline; before quitting - vor dem Schließen + vor dem Schließen @@ -9157,7 +9157,7 @@ text-decoration: underline; before importing a capture before importing a new capture - vor dem Importieren einer Aufzeichnung + vor dem Importieren einer Aufzeichnung @@ -9261,7 +9261,7 @@ text-decoration: underline; before opening another file - vor dem Öffnen einer anderen Datei + vor dem Öffnen einer anderen Datei @@ -9296,7 +9296,7 @@ text-decoration: underline; before closing the file - vor dem Schließen der Datei + vor dem Schließen der Datei @@ -9347,7 +9347,7 @@ text-decoration: underline; before reloading the file - vor dem Neuladen der Datei + vor dem Neuladen der Datei @@ -9372,12 +9372,12 @@ text-decoration: underline; before starting a new capture - vor dem Starten einer neuen Aufzeichnung + vor dem Starten einer neuen Aufzeichnung before restarting the capture - vor dem Neustart der Aufzeichnung + vor dem Neustart der Aufzeichnung @@ -9517,7 +9517,7 @@ text-decoration: underline; Open Files In - Öffne Datei in + Dateien öffnen in @@ -9541,7 +9541,7 @@ text-decoration: underline; Show - Zeige + Anzeigen @@ -9644,7 +9644,7 @@ text-decoration: underline; ScrollArea - Scrollbereich + Bildlaufbereich @@ -9657,7 +9657,7 @@ text-decoration: underline; MTP3 Summary - MTP3 Zusammenfassung + MTP3-Zusammenfassung @@ -9677,7 +9677,7 @@ text-decoration: underline; (gzip compressed) - (gzip komprimiert) + (gzip-komprimiert) @@ -9687,7 +9687,7 @@ text-decoration: underline; Snapshot length - Snapshot Länge + Schnappschusslänge @@ -9743,17 +9743,17 @@ text-decoration: underline; Bytes - Bytes + Byte Bytes/MSU - Bytes/MSU + Byte/MSU Bytes/s - Bytes/s + Byte/s @@ -9768,17 +9768,17 @@ text-decoration: underline; Total Bytes - Bytes insgesamt + Byte insgesamt Average Bytes/MSU - Durchschnittliche Bytes/MSU + Durchschnittliche Byte/MSU Average Bytes/s - Durchschnittliche Bytes/s + Durchschnittliche Byte/s @@ -9846,7 +9846,7 @@ text-decoration: underline; Buffer Alarms - Puffer Alarme + Pufferalarme @@ -9977,7 +9977,7 @@ text-decoration: underline; All co&llapsed - Alle einklappen + Alle eingek&lappt @@ -9997,17 +9997,17 @@ text-decoration: underline; All e&xpanded - Alles aufklappen + Alle auf&geklappt <html><head/><body><p>Export a hexdump of the packet data similar to the packet bytes view</p></body></html> - <html><head/><body><p>Paketdaten als Hexdump exportieren (ähnlich der Paketbytes Ansicht)</p></body></html> + <html><head/><body><p>Paketdaten als Hexdump exportieren (ähnlich der Paketbyte-Ansicht)</p></body></html> Bytes - Bytes + Byte @@ -10075,14 +10075,14 @@ text-decoration: underline; PacketListModel - + Dissecting Analysiere - + Sorting "%1" - Sortiere "%1" + "%1" wird sortiert @@ -13506,12 +13506,12 @@ text-decoration: underline; Narrow & Wide - Schmale und weite Zeichen + Schmal & breit Narrow (UTF-8 / ASCII) - Schmale Zeichen (UTF-8 / ASCII) + Schmal (UTF-8 / ASCII) @@ -15302,22 +15302,22 @@ text-decoration: underline; Copy as CSV - + Als CSV kopieren Copy stream list as CSV. - + Liste der Streams als CSV kopieren. Copy as YAML - + Als YAML kopieren Copy stream list as YAML. - + Liste der Streams als YAML kopieren. @@ -15343,17 +15343,17 @@ text-decoration: underline; Copy - Kopieren + Kopieren as CSV - als CSV + als CSV as YAML - als YAML + als YAML @@ -15426,17 +15426,17 @@ text-decoration: underline; 802.11 Preferences - 802.11 Einstellungen + 802.11-Einstellungen AirPcap Control Panel - WLAN Statistiken + AirPcap-Kontrollfeld Open the AirPcap Control Panel - Öffne AirPcap Control Panel + AirPcap-Kontrollfeld öffnen @@ -15463,7 +15463,7 @@ text-decoration: underline; Wireless LAN Statistics - WLAN Statistiken + WLAN-Statistiken diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index 7e39058a09..ab13be1d67 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -9949,12 +9949,12 @@ a:hover { PacketListModel - + Dissecting - + Sorting "%1" diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index a1205b396f..163cdd7a25 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -3192,7 +3192,7 @@ pour fichiers de filtre : %2. Show and save data as Show data as - Afficher les données comme + @@ -10049,12 +10049,12 @@ a:hover { PacketListModel - + Dissecting Dissection - + Sorting "%1" Triage "%1" diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index 0bfc246a8f..3ec2d5b623 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -2508,7 +2508,7 @@ NOTA: un'opzione DEVE essere selezionata. Packet - Pacchetto + Pacchetto @@ -3189,7 +3189,7 @@ per i file di filtro: %2. Show and save data as Show data as - Mostra dati come + Mostra e salva i dati come @@ -4448,12 +4448,12 @@ per i file di filtro: %2. The text file has no offset - + Il file di testo non ha offset None - Nessuno + Nessuno @@ -10073,12 +10073,12 @@ a:hover { PacketListModel - + Dissecting Decodifica - + Sorting "%1" Ordinamento di "%1" @@ -15295,22 +15295,22 @@ a:hover { Copy as CSV - Copia come CSV + Copia come CSV Copy stream list as CSV. - Copia l'elenco dei flussi come CSV. + Copia l'elenco dei flussi come CSV. Copy as YAML - Copia come YAML + Copia come YAML Copy stream list as YAML. - Copia l'elenco dei flussi come YAML. + Copia l'elenco dei flussi come YAML. @@ -15336,17 +15336,17 @@ a:hover { Copy - Copia + Copia as CSV - come CSV + come CSV as YAML - come YAML + come YAML diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index d62f584046..f87df660c5 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -3174,7 +3174,7 @@ for filter files: %2. Show and save data as Show data as - としてデータを表示 + @@ -10029,12 +10029,12 @@ a:hover { PacketListModel - + Dissecting 解析中 - + Sorting "%1" ソート中 "%1" diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index 6b394718cc..a263f31823 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -2507,7 +2507,7 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać Packet - Pakiet + Pakiet @@ -3195,7 +3195,7 @@ dla plików filtrów: %2. Show and save data as Show data as - Pokazuj dane jako + Pokaż i zapisz dane jako @@ -4447,12 +4447,12 @@ dla plików filtrów: %2. The text file has no offset - + Plik tekstowy nie zawiera danych przesunięcia None - Brak + Brak @@ -10074,12 +10074,12 @@ text-decoration: underline; PacketListModel - + Dissecting Analizowanie - + Sorting "%1" Sortowanie "%1" @@ -15300,22 +15300,22 @@ text-decoration: underline; Copy as CSV - Kopiuj jako CSV + Kopiuj jako CSV Copy stream list as CSV. - Kopiuj listę strumieni jako CSV. + Kopiuj listę strumieni jako CSV. Copy as YAML - Kopiuj jako YAML + Kopiuj jako YAML Copy stream list as YAML. - Kopiuj listę strumieni jako YAML. + Kopiuj listę strumieni jako YAML. @@ -15341,17 +15341,17 @@ text-decoration: underline; Copy - Kopiuj + Kopiuj as CSV - jako CSV + jako CSV as YAML - jako YAML + jako YAML diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index f650bc6d53..9ca4539d30 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -275,13 +275,13 @@ Changes - + 个更改 %1 changes - + %1 个更改 @@ -2507,7 +2507,7 @@ PLEASE NOTE: One option MUST be selected. Packet - 分组 + 分组 @@ -2678,7 +2678,7 @@ PLEASE NOTE: One option MUST be selected. Enter a field %1 - + 请输入一个字段 %1 @@ -3181,7 +3181,7 @@ for filter files: %2. Show and save data as Show data as - 显示数据为 + 显示和保存数据为 @@ -4440,12 +4440,12 @@ for filter files: %2. The text file has no offset - + 该文本文件没有偏移量 None - + @@ -10061,12 +10061,12 @@ text-decoration: underline; PacketListModel - + Dissecting 剖析 - + Sorting "%1" 正在排序“%1” @@ -15257,22 +15257,22 @@ text-decoration: underline; Copy as CSV - 复制为 CSV + 复制为 CSV Copy stream list as CSV. - 复制流列表为 CSV。 + 复制流列表为 CSV。 Copy as YAML - 复制为YAML + 复制为 YAML Copy stream list as YAML. - 复制流列表为YAML。 + 复制流列表为 YAML。 @@ -15298,17 +15298,17 @@ text-decoration: underline; Copy - 复制 + 复制 as CSV - 作为 CSV + 作为 CSV as YAML - 作为YAML + 作为YAML -- cgit v1.2.3