aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt1
-rw-r--r--Makefile.am2
-rw-r--r--epan/addr_resolv.c60
-rw-r--r--manuf266
-rwxr-xr-xpackaging/nsis/uninstall.nsi1
-rw-r--r--packaging/nsis/wireshark.nsi1
-rw-r--r--packaging/wix/ComponentGroups.wxi4
-rwxr-xr-xtools/make-manuf19
-rw-r--r--wka (renamed from wka.tmpl)6
9 files changed, 49 insertions, 311 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78fcad36f3..7d648ba46a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1584,6 +1584,7 @@ set(INSTALL_FILES
pdml2html.xsl
services
smi_modules
+ wka
docbook/ws.css
${CMAKE_BINARY_DIR}/doc/AUTHORS-SHORT
${CMAKE_BINARY_DIR}/doc/asn2deb.html
diff --git a/Makefile.am b/Makefile.am
index d771aeb33d..55e34d38d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,7 +55,7 @@ EXTRA_PROGRAMS = wireshark-gtk wireshark tshark tfshark capinfos captype \
# Wireshark configuration files are put in $(pkgdatadir).
#
dist_pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
- smi_modules ipmap.html pdml2html.xsl enterprises.tsv
+ smi_modules ipmap.html pdml2html.xsl enterprises.tsv wka
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = wireshark.pc
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 3559e525f9..9b0ca61a4a 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -115,6 +115,7 @@
#define ENAME_ETHERS "ethers"
#define ENAME_IPXNETS "ipxnets"
#define ENAME_MANUF "manuf"
+#define ENAME_WKA "wka"
#define ENAME_SERVICES "services"
#define ENAME_VLANS "vlans"
#define ENAME_SS7PCS "ss7pcs"
@@ -314,6 +315,8 @@ static guint name_resolve_concurrency = 500;
gchar *g_ethers_path = NULL; /* global ethers file */
gchar *g_pethers_path = NULL; /* personal ethers file */
+gchar *g_wka_path = NULL; /* global well-known-addresses file */
+gchar *g_manuf_path = NULL; /* global manuf file */
gchar *g_ipxnets_path = NULL; /* global ipxnets file */
gchar *g_pipxnets_path = NULL; /* personal ipxnets file */
gchar *g_services_path = NULL; /* global services file */
@@ -1005,13 +1008,13 @@ host_lookup6(const struct e_in6_addr *addr)
/*
- * If "manuf_file" is FALSE, parse a 6-byte MAC address.
- * If "manuf_file" is TRUE, parse an up-to-6-byte sequence with an optional
+ * If "accept_mask" is FALSE, either 3 or 6 bytes are valid, but no other number of bytes is.
+ * If "accept_mask" is TRUE, parse an up-to-6-byte sequence with an optional
* mask.
*/
static gboolean
parse_ether_address(const char *cp, ether_t *eth, unsigned int *mask,
- const gboolean manuf_file)
+ const gboolean accept_mask)
{
int i;
unsigned long num;
@@ -1033,8 +1036,8 @@ parse_ether_address(const char *cp, ether_t *eth, unsigned int *mask,
/* OK, what character terminated the octet? */
if (*cp == '/') {
/* "/" - this has a mask. */
- if (!manuf_file) {
- /* Entries with masks are allowed only in the "manuf" files. */
+ if (!accept_mask) {
+ /* Entries with masks are not allowed in this file. */
return FALSE;
}
cp++; /* skip past the '/' to get to the mask */
@@ -1064,9 +1067,8 @@ parse_ether_address(const char *cp, ether_t *eth, unsigned int *mask,
/* We're at the end of the address, and there's no mask. */
if (i == 2) {
/* We got 3 bytes, so this is a manufacturer ID. */
- if (!manuf_file) {
- /* Manufacturer IDs are only allowed in the "manuf"
- files. */
+ if (!accept_mask) {
+ /* Manufacturer IDs are not allowed in this file */
return FALSE;
}
/* Indicate that this is a manufacturer ID (0 is not allowed
@@ -1076,10 +1078,8 @@ parse_ether_address(const char *cp, ether_t *eth, unsigned int *mask,
}
if (i == 5) {
- /* We got 6 bytes, so this is a MAC address.
- If we're reading one of the "manuf" files, indicate that
- this is a MAC address (48 is not allowed as a mask). */
- if (manuf_file)
+ /* We got 6 bytes, so this is a MAC address (48 is not allowed as a mask). */
+ if (accept_mask)
*mask = 48;
return TRUE;
}
@@ -1108,7 +1108,7 @@ parse_ether_address(const char *cp, ether_t *eth, unsigned int *mask,
static int
parse_ether_line(char *line, ether_t *eth, unsigned int *mask,
- const gboolean manuf_file)
+ const gboolean accept_mask)
{
/*
* See the ethers(4) or ethers(5) man page for ethers file format
@@ -1125,7 +1125,7 @@ parse_ether_line(char *line, ether_t *eth, unsigned int *mask,
if ((cp = strtok(line, " \t")) == NULL)
return -1;
- if (!parse_ether_address(cp, eth, mask, manuf_file))
+ if (!parse_ether_address(cp, eth, mask, accept_mask))
return -1;
if ((cp = strtok(NULL, " \t")) == NULL)
@@ -1158,7 +1158,7 @@ end_ethent(void)
}
static ether_t *
-get_ethent(unsigned int *mask, const gboolean manuf_file)
+get_ethent(unsigned int *mask, const gboolean accept_mask)
{
static ether_t eth;
@@ -1169,7 +1169,7 @@ get_ethent(unsigned int *mask, const gboolean manuf_file)
return NULL;
while (fgetline(&buf, &size, eth_p) >= 0) {
- if (parse_ether_line(buf, &eth, mask, manuf_file) == 0) {
+ if (parse_ether_line(buf, &eth, mask, accept_mask) == 0) {
return ð
}
}
@@ -1366,7 +1366,6 @@ static void
initialize_ethers(void)
{
ether_t *eth;
- char *manuf_path;
guint mask = 0;
/* hash table initialization */
@@ -1376,8 +1375,7 @@ initialize_ethers(void)
/* Compute the pathname of the ethers file. */
if (g_ethers_path == NULL) {
- g_ethers_path = wmem_strdup_printf(wmem_epan_scope(), "%s" G_DIR_SEPARATOR_S "%s",
- get_systemfile_dir(), ENAME_ETHERS);
+ g_ethers_path = g_build_filename(get_systemfile_dir(), ENAME_ETHERS, NULL);
}
/* Set g_pethers_path here, but don't actually do anything
@@ -1387,26 +1385,40 @@ initialize_ethers(void)
g_pethers_path = get_persconffile_path(ENAME_ETHERS, FALSE);
/* Compute the pathname of the manuf file */
- manuf_path = get_datafile_path(ENAME_MANUF);
+ if (g_manuf_path == NULL)
+ g_manuf_path = get_datafile_path(ENAME_MANUF);
/* Read it and initialize the hash table */
- set_ethent(manuf_path);
-
+ set_ethent(g_manuf_path);
while ((eth = get_ethent(&mask, TRUE))) {
add_manuf_name(eth->addr, mask, eth->name);
}
-
end_ethent();
- g_free(manuf_path);
+ /* Compute the pathname of the wka file */
+ if (g_wka_path == NULL)
+ g_wka_path = get_datafile_path(ENAME_WKA);
+
+ /* Read it and initialize the hash table */
+ set_ethent(g_wka_path);
+ while ((eth = get_ethent(&mask, TRUE))) {
+ add_manuf_name(eth->addr, mask, eth->name);
+ }
+ end_ethent();
} /* initialize_ethers */
static void
ethers_cleanup(void)
{
+ g_free(g_ethers_path);
+ g_ethers_path = NULL;
g_free(g_pethers_path);
g_pethers_path = NULL;
+ g_free(g_manuf_path);
+ g_manuf_path = NULL;
+ g_free(g_wka_path);
+ g_wka_path = NULL;
}
/* Resolve ethernet address */
diff --git a/manuf b/manuf
index 066841bcee..753c205554 100644
--- a/manuf
+++ b/manuf
@@ -1,5 +1,5 @@
# This file was generated by running ./make-manuf.
-# Don't change it directly, change manuf.tmpl and wka.tmpl instead.
+# Don't change it directly, change manuf.tmpl instead.
#
#
# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
@@ -32188,267 +32188,3 @@ FC:FC:48 Apple # Apple, Inc.
FC:FE:77 HitachiR # Hitachi Reftechno, Inc.
FC:FE:C2 Invensys # Invensys Controls UK Limited
FC:FF:AA IeeeRegi # IEEE Registration Authority
-
-#
-# Well-known addresses.
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald [AT] 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.
-#
-# The data below has been assembled from the following sources:
-#
-# Michael Patton's "Ethernet Codes Master Page" available from:
-# <http://www.cavebear.com/CaveBear/Ethernet/>
-# <ftp://ftp.cavebear.com/pub/Ethernet.txt>
-#
-# Microsoft Windows 2000 Server
-# Operating System
-# Network Load Balancing Technical Overview
-# White Paper
-#
-00-00-0C-07-AC/40 All-HSRP-routers
-00-00-5E-00-01/40 IETF-VRRP-VRID
-00-BF-00-00-00-00/16 MS-NLB-VirtServer
-00-E0-2B-00-00-00 Extreme-EDP
-# Extreme Encapsulation Protocol (basically EDP renamed)
-00-E0-2B-00-00-01 Extreme-EEP
-00-E0-2B-00-00-02 Extreme-ESRP-Client
-00-E0-2B-00-00-04 Extreme-EAPS
-00-E0-2B-00-00-06 Extreme-EAPS-SL
-00-E0-2B-00-00-08 Extreme-ESRP-Master
-01-00-0C-00-00/40 ISL-Frame
-01-00-0C-CC-CC-CC CDP/VTP/DTP/PAgP/UDLD
-01-00-0C-CC-CC-CD PVST+
-01-00-0C-CD-CD-CD STP-UplinkFast
-01-00-0C-CD-CD-CE VLAN-bridge
-01-00-0C-CD-CD-D0 GBPT
-01-00-0C-DD-DD-DD CGMP
-01-00-10-00-00-20 Hughes-Lan-Systems-Terminal-Server-S/W-download
-01-00-10-FF-FF-20 Hughes-Lan-Systems-Terminal-Server-S/W-request
-01-00-1D-00-00-00 Cabletron-PC-OV-PC-discover-(on-demand)
-01-00-1D-00-00-05 Cabletron-PVST-BPDU
-01-00-1D-00-00-06 Cabletron-QCSTP-BPDU
-01-00-1D-42-00-00 Cabletron-PC-OV-Bridge-discover-(on-demand)
-01-00-1D-52-00-00 Cabletron-PC-OV-MMAC-discover-(on-demand)
-01-00-3C Auspex-Systems-(Serverguard)
-01-00-5E/25 IPv4mcast
-01-00-81-00-00-00 Nortel-Network-Management
-01-00-81-00-00-02 Nortel-Network-Management
-01-00-81-00-01-00 Nortel-autodiscovery
-01-00-81-00-01-01 Nortel-autodiscovery
-#
-# As per
-#
-# http://www.t11.org/ftp/t11/pub/fc/bb-5/08-334v0.pdf
-#
-# Broadcom "donated" one of their OUIs, 00-10-18, for use for
-# Fibre Channel over Ethernet, so we add entries for the
-# addresses in that document and a group of addresses for all
-# otherwise unlisted 01-10-18-XX-XX-XX addresses.
-#
-01-10-18-01-00-00 All-FCoE-MACs
-01-10-18-01-00-01 All-ENode-MACs
-01-10-18-01-00-02 All-FCF-MACs
-01-10-18-00-00-00/24 FCoE-group
-01-11-1E-00-00-01 EPLv2_SoC
-01-11-1E-00-00-02 EPLv2_PRes
-01-11-1E-00-00-03 EPLv2_SoA
-01-11-1E-00-00-04 EPLv2_ASnd
-01-11-1E-00-00-05 EPLv2_AMNI
-01-20-25/25 Control-Technology-Inc's-Industrial-Ctrl-Proto.
-01-80-24-00-00-00 Kalpana-Etherswitch-every-60-seconds
-01-80-C2-00-00-00/44 Spanning-tree-(for-bridges)
-01-80-C2-00-00-02 Slow-Protocols
-01-80-C2-00-00-03 Nearest customer bridge
-01-80-C2-00-00-0E LLDP_Multicast
-01-80-C2-00-00-0F Nearest non-TPMR bridge
-01-80-C2-00-00-10 Bridge-Management
-01-80-C2-00-00-11 Load-Server
-01-80-C2-00-00-12 Loadable-Device
-01-80-C2-00-00-13 IEEE-1905.1-Control
-01-80-C2-00-00-14 ISIS-all-level-1-IS's
-01-80-C2-00-00-15 ISIS-all-level-2-IS's
-01-80-C2-00-00-18 IEEE-802.1B-All-Manager-Stations
-01-80-C2-00-00-19 IEEE-802.11aa-groupcast-with-retries
-01-80-C2-00-00-1A IEEE-802.1B-All-Agent-Stations
-01-80-C2-00-00-1B ESIS-all-multicast-capable-ES's
-01-80-C2-00-00-1C ESIS-all-multicast-announcements
-01-80-C2-00-00-1D ESIS-all-multicast-capable-IS's
-01-80-C2-00-00-1E Token-Ring-all-DTR-Concentrators
-01-80-C2-00-00-30/45 OAM-Multicast-DA-Class-1
-01-80-C2-00-00-38/45 OAM-Multicast-DA-Class-2
-01-80-C2-00-00-40 All-RBridges
-01-80-C2-00-00-41 All-IS-IS-RBridges
-01-80-C2-00-00-42 All-Egress-RBridges
-01-80-C2-00-00-45 TRILL-End-Stations
-01-80-C2-00-00-46 All-Edge-RBridges
-01-80-C2-00-01-00 FDDI-RMT-Directed-Beacon
-01-80-C2-00-01-10 FDDI-status-report-frame
-01-DD-00-FF-FF-FF Ungermann-Bass-boot-me-requests
-01-DD-01-00-00-00 Ungermann-Bass-Spanning-Tree
-01-E0-52-CC-CC-CC Foundry-DP
-# DOCSIS, defined in ANSI SCTE 22-1 2012
-01-E0-2F-00-00-01 DOCSIS-CM
-01-E0-2F-00-00-02 DOCSIS-CMTS
-01-E0-2F-00-00-03 DOCSIS-STP
-
-# Extremenetworks in their infinite wisdom seems to use 02-04-94 (Vendor MAC XOR 02-00-00)
-# for their base mac address, thus colliding with MS-NLB 02-04/16 which Microsoft in their
-# infinite wisdom decided to use for MS-NLB.
-02-04-96-00-00-00/24 ExtremeNetworks
-
-# Microsoft Network Load Balancing (NLB)
-# Actually, 02-01-virtualip to 02-20-virtualip will be used from server to rest-of-world
-# 02-bf-virtualip will be used from rest-of-world to server
-02-BF-00-00-00-00/16 MS-NLB-VirtServer
-02-01-00-00-00-00/16 MS-NLB-PhysServer-01
-02-02-00-00-00-00/16 MS-NLB-PhysServer-02
-02-03-00-00-00-00/16 MS-NLB-PhysServer-03
-02-04-00-00-00-00/16 MS-NLB-PhysServer-04
-02-05-00-00-00-00/16 MS-NLB-PhysServer-05
-02-06-00-00-00-00/16 MS-NLB-PhysServer-06
-02-07-00-00-00-00/16 MS-NLB-PhysServer-07
-02-08-00-00-00-00/16 MS-NLB-PhysServer-08
-02-09-00-00-00-00/16 MS-NLB-PhysServer-09
-02-0a-00-00-00-00/16 MS-NLB-PhysServer-10
-02-0b-00-00-00-00/16 MS-NLB-PhysServer-11
-02-0c-00-00-00-00/16 MS-NLB-PhysServer-12
-02-0d-00-00-00-00/16 MS-NLB-PhysServer-13
-02-0e-00-00-00-00/16 MS-NLB-PhysServer-14
-02-0f-00-00-00-00/16 MS-NLB-PhysServer-15
-02-10-00-00-00-00/16 MS-NLB-PhysServer-16
-02-11-00-00-00-00/16 MS-NLB-PhysServer-17
-02-12-00-00-00-00/16 MS-NLB-PhysServer-18
-02-13-00-00-00-00/16 MS-NLB-PhysServer-19
-02-14-00-00-00-00/16 MS-NLB-PhysServer-20
-02-15-00-00-00-00/16 MS-NLB-PhysServer-21
-02-16-00-00-00-00/16 MS-NLB-PhysServer-22
-02-17-00-00-00-00/16 MS-NLB-PhysServer-23
-02-18-00-00-00-00/16 MS-NLB-PhysServer-24
-02-19-00-00-00-00/16 MS-NLB-PhysServer-25
-02-1a-00-00-00-00/16 MS-NLB-PhysServer-26
-02-1b-00-00-00-00/16 MS-NLB-PhysServer-27
-02-1c-00-00-00-00/16 MS-NLB-PhysServer-28
-02-1d-00-00-00-00/16 MS-NLB-PhysServer-29
-02-1e-00-00-00-00/16 MS-NLB-PhysServer-30
-02-1f-00-00-00-00/16 MS-NLB-PhysServer-31
-02-20-00-00-00-00/16 MS-NLB-PhysServer-32
-
-# [ The following block of addresses (03-...) are used by various ]
-# [ standards. Some (marked [TR?]) are suspected of only being ]
-# [ used on Token Ring for group addresses of Token Ring specific ]
-# [ functions, reference ISO 8802-5:1995 aka. IEEE 802.5:1995 for ]
-# [ some info. These in the Ethernet order for this list. On ]
-# [ Token Ring they appear reversed. They should never appear on ]
-# [ Ethernet. Others, not so marked, are normal reports (may be ]
-# [ seen on either).
-03-00-00-00-00-01 NETBIOS-# [TR?]
-03-00-00-00-00-02 Locate-Directory-Server # [TR?]
-03-00-00-00-00-04 Synchronous-Bandwidth-Manager-# [TR?]
-03-00-00-00-00-08 Configuration-Report-Server-# [TR?]
-03-00-00-00-00-10 Ring-Error-Monitor-# [TR?]
-03-00-00-00-00-10 (OS/2-1.3-EE+Communications-Manager)
-03-00-00-00-00-20 Network-Server-Heartbeat-# [TR?]
-03-00-00-00-00-40 (OS/2-1.3-EE+Communications-Manager)
-03-00-00-00-00-80 Active-Monitor # [TR?]
-03-00-00-00-01-00 OSI-All-IS-Token-Ring-Multicast
-03-00-00-00-02-00 OSI-All-ES-Token-Ring-Multicast
-03-00-00-00-04-00 LAN-Manager # [TR?]
-03-00-00-00-08-00 Ring-Wiring-Concentrator # [TR?]
-03-00-00-00-10-00 LAN-Gateway # [TR?]
-03-00-00-00-20-00 Ring-Authorization-Server # [TR?]
-03-00-00-00-40-00 IMPL-Server # [TR?]
-03-00-00-00-80-00 Bridge # [TR?]
-03-00-00-20-00-00 IP-Token-Ring-Multicast (RFC1469)
-03-00-00-80-00-00 Discovery-Client
-03-00-0C-00-00/40 ISL-Frame [TR?]
-03-00-C7-00-00-EE HP (Compaq) ProLiant NIC teaming
-03-00-FF-FF-FF-FF All-Stations-Address
-03-BF-00-00-00-00/16 MS-NLB-VirtServer-Multicast
-09-00-07-00-00-00/40 AppleTalk-Zone-multicast-addresses
- # only goes through 09-00-07-00-00-FC?
-09-00-07-FF-FF-FF AppleTalk-broadcast-address
-09-00-09-00-00-01 HP-Probe
-09-00-09-00-00-04 HP-DTC
-09-00-0D-00-00-00/24 ICL-Oslan-Multicast
-09-00-0D-02-00-00 ICL-Oslan-Service-discover-only-on-boot
-09-00-0D-02-0A-38 ICL-Oslan-Service-discover-only-on-boot
-09-00-0D-02-0A-39 ICL-Oslan-Service-discover-only-on-boot
-09-00-0D-02-0A-3C ICL-Oslan-Service-discover-only-on-boot
-09-00-0D-02-FF-FF ICL-Oslan-Service-discover-only-on-boot
-09-00-0D-09-00-00 ICL-Oslan-Service-discover-as-required
-09-00-1E-00-00-00 Apollo-DOMAIN
-09-00-2B-00-00-00 DEC-MUMPS?
-09-00-2B-00-00-01 DEC-DSM/DDP
-09-00-2B-00-00-02 DEC-VAXELN?
-09-00-2B-00-00-03 DEC-Lanbridge-Traffic-Monitor-(LTM)
-09-00-2B-00-00-04 DEC-MAP-(or-OSI?)-End-System-Hello?
-09-00-2B-00-00-05 DEC-MAP-(or-OSI?)-Intermediate-System-Hello?
-09-00-2B-00-00-06 DEC-CSMA/CD-Encryption?
-09-00-2B-00-00-07 DEC-NetBios-Emulator?
-09-00-2B-00-00-0F DEC-Local-Area-Transport-(LAT)
-09-00-2B-00-00-10/44 DEC-Experimental
-09-00-2B-01-00-00 DEC-LanBridge-Copy-packets-(All-bridges)
-09-00-2B-01-00-01 DEC-LanBridge-Hello-packets-(All-local-bridges)
-09-00-2B-02-00-00 DEC-DNA-Level-2-Routing-Layer-routers?
-09-00-2B-02-01-00 DEC-DNA-Naming-Service-Advertisement?
-09-00-2B-02-01-01 DEC-DNA-Naming-Service-Solicitation?
-09-00-2B-02-01-09 DEC-Availability-Manager-for-Distributed-Systems-DECamds
-09-00-2B-02-01-02 DEC-Distributed-Time-Service
-09-00-2B-03-00-00/32 DEC-default-filtering-by-bridges?
-09-00-2B-04-00-00 DEC-Local-Area-System-Transport-(LAST)?
-09-00-2B-23-00-00 DEC-Argonaut-Console?
-09-00-4C-00-00-00 BICC-802.1-management
-09-00-4C-00-00-02 BICC-802.1-management
-09-00-4C-00-00-06 BICC-Local-bridge-STA-802.1(D)-Rev6
-09-00-4C-00-00-0C BICC-Remote-bridge-STA-802.1(D)-Rev8
-09-00-4C-00-00-0F BICC-Remote-bridge-ADAPTIVE-ROUTING
-09-00-56-FF-00-00/32 Stanford-V-Kernel,-version-6.0
-09-00-6A-00-01-00 TOP-NetBIOS.
-09-00-77-00-00-00 Retix-Bridge-Local-Management-System
-09-00-77-00-00-01 Retix-spanning-tree-bridges
-09-00-77-00-00-02 Retix-Bridge-Adaptive-routing
-09-00-7C-01-00-01 Vitalink-DLS-Multicast
-09-00-7C-01-00-03 Vitalink-DLS-Inlink
-09-00-7C-01-00-04 Vitalink-DLS-and-non-DLS-Multicast
-09-00-7C-02-00-05 Vitalink-diagnostics
-09-00-7C-05-00-01 Vitalink-gateway?
-09-00-7C-05-00-02 Vitalink-Network-Validation-Message
-09-00-87-80-FF-FF Xyplex-Terminal-Servers
-09-00-87-90-FF-FF Xyplex-Terminal-Servers
-0C-00-0C-00-00/40 ISL-Frame
-0D-1E-15-BA-DD-06 HP
-20-52-45-43-56-00/40 Receive
-20-53-45-4E-44-00/40 Send
-33-33-00-00-00-00 IPv6-Neighbor-Discovery
-33-33-00-00-00-00/16 IPv6mcast
-AA-00-03-00-00-00/32 DEC-UNA
-AA-00-03-01-00-00/32 DEC-PROM-AA
-AA-00-03-03-00-00/32 DEC-NI20
-AB-00-00-01-00-00 DEC-MOP-Dump/Load-Assistance
-AB-00-00-02-00-00 DEC-MOP-Remote-Console
-AB-00-00-03-00-00 DECNET-Phase-IV-end-node-Hello-packets
-AB-00-00-04-00-00 DECNET-Phase-IV-Router-Hello-packets
-AB-00-03-00-00-00 DEC-Local-Area-Transport-(LAT)-old
-AB-00-04-01-00-00/32 DEC-Local-Area-VAX-Cluster-groups-SCA
-CF-00-00-00-00-00 Ethernet-Configuration-Test-protocol-(Loopback)
-FF-FF-00-60-00-04 Lantastic
-FF-FF-00-40-00-01 Lantastic
-FF-FF-01-E0-00-04 Lantastic
-
-FF-FF-FF-FF-FF-FF Broadcast
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi
index 1d80a167c3..1a8565c846 100755
--- a/packaging/nsis/uninstall.nsi
+++ b/packaging/nsis/uninstall.nsi
@@ -222,6 +222,7 @@ Delete "$INSTDIR\AUTHORS-SHORT-FORMAT"
Delete "$INSTDIR\README*"
Delete "$INSTDIR\NEWS.txt"
Delete "$INSTDIR\manuf"
+Delete "$INSTDIR\wka"
Delete "$INSTDIR\services"
Delete "$INSTDIR\pdml2html.xsl"
Delete "$INSTDIR\pcrepattern.3.txt"
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index c7e19f049a..fa7379fe57 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -431,6 +431,7 @@ File "${STAGING_DIR}\README.txt"
File "${STAGING_DIR}\README.windows.txt"
File "${STAGING_DIR}\AUTHORS-SHORT"
File "${STAGING_DIR}\manuf"
+File "${STAGING_DIR}\wka"
File "${STAGING_DIR}\services"
File "${STAGING_DIR}\pdml2html.xsl"
File "${STAGING_DIR}\ws.css"
diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi
index 127efdfd7d..3220eb3fee 100644
--- a/packaging/wix/ComponentGroups.wxi
+++ b/packaging/wix/ComponentGroups.wxi
@@ -50,6 +50,9 @@
<Component Id="cmpManuf" Guid="*">
<File Id="filManuf" KeyPath="yes" Source="$(var.Staging.Dir)\manuf" />
</Component>
+ <Component Id="cmpWka" Guid="*">
+ <File Id="filWka" KeyPath="yes" Source="$(var.Staging.Dir)\wka" />
+ </Component>
<Component Id="cmpServices" Guid="*">
<File Id="filServices" KeyPath="yes" Source="$(var.Staging.Dir)\services" />
</Component>
@@ -93,6 +96,7 @@
<ComponentRef Id="cmpREADME_windows_txt" />
<ComponentRef Id="cmpAUTHORS_SHORT" />
<ComponentRef Id="cmpManuf" />
+ <ComponentRef Id="cmpWka" />
<ComponentRef Id="cmpServices" />
<ComponentRef Id="cmpPdml2html_xsl" />
<ComponentRef Id="cmpWs_css" />
diff --git a/tools/make-manuf b/tools/make-manuf
index ac6c559bf1..081dc2ba27 100755
--- a/tools/make-manuf
+++ b/tools/make-manuf
@@ -36,7 +36,6 @@ $agent->env_proxy;
$agent->agent("Wireshark make-manuf");
$template = "manuf.tmpl";
-$wkatmpl = "wka.tmpl";
$outfile = "manuf";
$inheader = 1;
$oui_url = "http://standards.ieee.org/develop/regauth/oui/oui.txt";
@@ -267,29 +266,13 @@ open (OUT, "> $outfile") ||
die "Couldn't open output file for writing ($outfile)\n";
print(OUT "# This file was generated by running ./make-manuf.\n");
-print(OUT "# Don't change it directly, change manuf.tmpl and wka.tmpl instead.\n#\n");
+print(OUT "# Don't change it directly, change manuf.tmpl instead.\n#\n");
print(OUT "$header");
foreach $oui (sort(keys %oui_list)) {
print(OUT "$oui\t$oui_list{$oui}\n");
}
-# Write out a blank line separating the OUIs from the well-known
-# addresses, and then read the well-known address template file
-# and write it to the manuf file.
-
-open (WKATMPL, "< $wkatmpl") ||
- die "Couldn't open well-known address template file for reading ($wkatmpl)\n";
-
-# XXX - it'd be nice to get this from the Cavebear file, but inferring
-# the address mask from entries in that file involves some work.
-#
-print(OUT "\n");
-while ($line = <WKATMPL>) {
- chomp($line);
- print(OUT "$line\n");
-}
-
print <<"Fin"
Original entries : $tmpl_added
IEEE OUI added : $oui_added
diff --git a/wka.tmpl b/wka
index 50c5506ec3..8d69f48c44 100644
--- a/wka.tmpl
+++ b/wka
@@ -9,12 +9,12 @@
# 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.
@@ -246,7 +246,7 @@
20-53-45-4E-44-00/40 Send
33-33-00-00-00-00 IPv6-Neighbor-Discovery
33-33-00-00-00-00/16 IPv6mcast
-AA-00-03-00-00-00/32 DEC-UNA
+AA-00-03-00-00-00/32 DEC-UNA
AA-00-03-01-00-00/32 DEC-PROM-AA
AA-00-03-03-00-00/32 DEC-NI20
AB-00-00-01-00-00 DEC-MOP-Dump/Load-Assistance
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 14:56:03 +0000