From: root <root@localhost>
Date: Mon, 22 Oct 2018 14:04:22 +0000 (+0200)
Subject: committing changes in /etc after apt run
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=1e246a97dff5233d498bccd8a7c814be3f1f6a19;p=zenbook

committing changes in /etc after apt run

Package changes:
-libwireshark-data 2.4.5-1 all
+libwireshark-data 2.6.3-1~ubuntu18.04.1 all
---

diff --git a/wireshark/init.lua b/wireshark/init.lua
index 0931c9b..271d5de 100644
--- a/wireshark/init.lua
+++ b/wireshark/init.lua
@@ -9,19 +9,7 @@
 -- By Gerald Combs <gerald@wireshark.org>
 -- Copyright 1998 Gerald Combs
 --
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-- SPDX-License-Identifier: GPL-2.0-or-later
 
 -- Set disable_lua to true to disable Lua support.
 disable_lua = false
@@ -295,7 +283,23 @@ wtap_encaps = {
 	["IP_OVER_IB_PCAP"] = 180,
 	["JUNIPER_VN"] = 181,
 	["USB_DARWIN"] = 182,
-	["NORDIC_BLE"] = 183
+	["LORATAP"] = 183,
+	["3MB_ETHERNET"] = 184,
+	["VSOCK"] = 185,
+	["NORDIC_BLE"] = 186,
+	["NETMON_NET_NETEVENT"] = 187,
+	["NETMON_HEADER"] = 188,
+	["NETMON_NET_FILTER"] = 189,
+	["NETMON_NETWORK_INFO_EX"] = 190,
+	["MA_WFP_CAPTURE_V4"] = 191,
+	["MA_WFP_CAPTURE_V6"] = 192,
+	["MA_WFP_CAPTURE_2V4"] = 193,
+	["MA_WFP_CAPTURE_2V6"] = 194,
+	["MA_WFP_CAPTURE_AUTH_V4"] = 195,
+	["MA_WFP_CAPTURE_AUTH_V6"] = 196,
+	["JUNIPER_ST"] = 197,
+	["ETHERNET_MPACKET"] = 198,
+	["DOCSIS31_XRA31"] = 199
 }
 wtap = wtap_encaps -- for bw compatibility
 
@@ -466,7 +470,9 @@ frametype = {
 	["REQUEST"] = 1,
 	["RESPONSE"] = 2,
 	["ACK"] = 3,
-	["DUP_ACK"] = 4
+	["DUP_ACK"] = 4,
+	["RETRANS_PREV"] = 5,
+	["RETRANS_NEXT"] = 6
 }
 
 
@@ -512,6 +518,7 @@ base = {
 	["PT_TCP"] = 14,  -- TCP port
 	["PT_DCCP"] = 15,  -- DCCP port
 	["PT_SCTP"] = 16,  -- SCTP port
+	["OUI"] = 17,  -- OUI resolution
 	["UNIT_STRING"] = 4096,  -- Add unit text to the field value
 	["LOCAL"] = 1000,  -- local time in our time zone, with month and day
 	["UTC"] = 1001,  -- UTC, with month and day
@@ -562,12 +569,15 @@ ENC_CP437 = 50
 ENC_ASCII_7BITS = 52
 ENC_T61 = 54
 ENC_EBCDIC_CP037 = 56
+ENC_ZIGBEE = 58
 ENC_NA = 0
 ENC_STR_NUM = 16777216
 ENC_STR_HEX = 33554432
 ENC_STRING = 50331648
 ENC_STR_MASK = 65534
 ENC_NUM_PREF = 2097152
+ENC_VARINT_PROTOBUF = 2
+ENC_VARINT_QUIC = 4
 ENC_SEP_NONE = 65536
 ENC_SEP_COLON = 131072
 ENC_SEP_DASH = 262144
@@ -677,9 +687,10 @@ MENU_TOOLS_UNSORTED = 13
 
 
 -- other useful constants
+-- DATA_DIR and USER_DIR have a trailing directory separator.
 GUI_ENABLED = gui_enabled()
-DATA_DIR = Dir.global_config_path()
-USER_DIR = Dir.personal_config_path()
+DATA_DIR = Dir.global_config_path()..package.config:sub(1,1)
+USER_DIR = Dir.personal_config_path()..package.config:sub(1,1)
 
 -- deprecated function names
 datafile_path = Dir.global_config_path