From f88256c2f31fc116d3b0ade8dbb29eecbc75099c Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Sun, 1 Jul 2018 08:16:47 +0000 Subject: [PATCH] [Automatic update for 2018-07-01] Update manuf, services enterprise numbers, translations, and other items. Change-Id: I41a23250a0b818b08475ede50792fd9acc37b2ae Reviewed-on: https://code.wireshark.org/review/28547 Reviewed-by: Gerald Combs --- AUTHORS | 3 +++ docbook/wsug_src/editcap-h.txt | 22 +++++++++---------- enterprises.tsv | 40 ++++++++++++++++++++++++++++++++-- 3 files changed, 51 insertions(+), 14 deletions(-) diff --git a/AUTHORS b/AUTHORS index df70f9293d..23511788c1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4220,6 +4220,7 @@ Jeffrey Smith Jens Kilian Jeremy Browne Jeremy Hitt +Jeremy Martin Jeroen Roovers Jeroen Sack Jesse Gross @@ -4304,6 +4305,7 @@ Mark Cunningham Mark Phillips Mark Weel Marko Hrastovec +Markus Becker Marouen Ghodhbane Martin Boye Petersen Martin Heusse @@ -4500,6 +4502,7 @@ Ulf Uli Schlachter Umberto Corponi Uri Simchoni +Vadim Fedorenko Vadim Yanitskiy Valentin Vidic Vasil Velichkov diff --git a/docbook/wsug_src/editcap-h.txt b/docbook/wsug_src/editcap-h.txt index bc9fd2b072..2c0351e7f9 100644 --- a/docbook/wsug_src/editcap-h.txt +++ b/docbook/wsug_src/editcap-h.txt @@ -1,4 +1,4 @@ -Editcap (Wireshark) 2.5.0 (v2.5.0rc0-1171-g33c00a67) +Editcap (Wireshark) 2.9.0 (v2.9.0rc0-1126-g9d1cea0c) Edit and/or translate the format of capture files. See https://www.wireshark.org for more information. @@ -25,17 +25,6 @@ Duplicate packet removal: LESS THAN prior to current packet. A is specified in relative seconds (e.g. 0.000001). - -a : Add or replace comment for given frame number - - -I ignore the specified number of bytes at the beginning - of the frame during MD5 hash calculation, unless the - frame is too short, then the full frame is used. - Useful to remove duplicated packets taken on - several routers (different mac addresses for - example). - e.g. -I 26 in case of Ether/IP will ignore - ether(14) and IP header(20 - 4(src ip) - 4(dst ip)). - NOTE: The use of the 'Duplicate packet removal' options with other editcap options except -v may not always work as expected. Specifically the -r, -t or -S options will very likely NOT have the @@ -69,6 +58,15 @@ Packet manipulation: -o When used in conjunction with -E, skip some bytes from the beginning of the packet. This allows one to preserve some bytes, in order to have some headers untouched. + -I ignore the specified number of bytes at the beginning + of the frame during MD5 hash calculation, unless the + frame is too short, then the full frame is used. + Useful to remove duplicated packets taken on + several routers (different mac addresses for + example). + e.g. -I 26 in case of Ether/IP will ignore + ether(14) and IP header(20 - 4(src ip) - 4(dst ip)). + -a : Add or replace comment for given frame number Output File(s): -c split the packet output to different files based on diff --git a/enterprises.tsv b/enterprises.tsv index 40b7015e58..f481a1561f 100644 --- a/enterprises.tsv +++ b/enterprises.tsv @@ -5,7 +5,7 @@ # The format used here is: # Where SPACE can be any sequence of spaces and tabs. # -# (last updated 2018-06-23) +# (last updated 2018-06-29) 0 Reserved 1 NxNetworks @@ -13985,7 +13985,7 @@ 14119 Netlife AG 14120 Letifer.org 14121 Stone-IT -14122 Wireless Broadband Alliance Ltd # formerly 'Wi-Fi Alliance' +14122 Wireless Broadband Alliance Ltd 14123 Expertcity Inc. 14124 UK/CA/JN Joint Astronomy Centre 14125 SENAO INTERNATIONAL CO., Ltd. @@ -52039,3 +52039,39 @@ 52225 Block Array Corporation 52226 PEPE Invest s.r.o. 52227 Avanfort +52228 music support group +52229 Roboteurs Inc +52230 WuHan SanJiang Space Network Communication Co,LTD +52231 sentieris +52232 Bitline Informatikberatung GmbH +52233 Internetswitch +52234 Hostsharing eG +52235 ZheJiang Taoshi Technology CO.,LTD. +52236 Lyon e-Sport +52237 Covenant Transportation Group +52238 AMP Robotics +52239 Kernel Labs Inc. +52240 Piwiteam +52241 CENTRAL COAST MEDICAL ONCOLOGY CORP +52242 Wataniya Mobile +52243 Luminor Bank AS +52244 NetWorkS! +52245 meituan +52246 HMSHost +52247 Vivo Telefonica +52248 Altergy Systems +52249 Jefferson Lab +52250 First Weber, Inc. +52251 Enconnex LLC +52252 MNF Group +52253 Symbio Networks +52254 Dabee.ca +52255 Woodridge Baptist Church +52256 GloryTrust, LLC +52257 Ufi Space Co., Ltd. +52258 SDNIMO +52259 PSiDEO SA +52260 happn +52261 Suomen Tilaajavastuu Oy +52262 Service Benefit Plan Administrative Services Corp +52263 NK Lundströms Trävaror AB