aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--manuf52
-rw-r--r--wka.tmpl11
2 files changed, 59 insertions, 4 deletions
diff --git a/manuf b/manuf
index 90adf08ba4..8d5d402337 100644
--- a/manuf
+++ b/manuf
@@ -1,7 +1,7 @@
#
# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
#
-# $Id: manuf,v 1.42 2004/06/03 16:35:57 jmayer Exp $
+# $Id: manuf,v 1.43 2004/06/18 14:27:13 jmayer Exp $
#
# Laurent Deniel <laurent.deniel [AT] free.fr>
#
@@ -3485,7 +3485,7 @@
00:0D:92 ArimaCommu # Arima Communication Corporation
00:0D:93 AppleCompu # Apple Computer
00:0D:94 AfarCommun # AFAR Communications,Inc
-00:0D:95 Private
+00:0D:95 Opti-Cell # Opti-cell, Inc.
00:0D:96 VteraTechn # Vtera Technology Inc.
00:0D:97 TroposNetw # Tropos Networks, Inc.
00:0D:98 SWACSchmit # S.W.A.C. Schmitt-Walter Automation Consult GmbH
@@ -4490,6 +4490,42 @@
00:11:80 MotorolaBc # Motorola BCS
00:11:81 Interenerg # InterEnergy Co.Ltd,
00:11:82 ImiNorgren # IMI Norgren Ltd
+00:11:83 PscScannin # PSC Scanning, Inc
+00:11:84 HumoLabora # Humo Laboratory,Ltd.
+00:11:85 HewlettPac # Hewlett Packard
+00:11:86 Prime # Prime Systems, Inc.
+00:11:87 CategorySo # Category Solutions, Inc
+00:11:88 Enterasys
+00:11:89 Aerotech # Aerotech Inc
+00:11:8A ViewtranTe # Viewtran Technology Limited
+00:11:8B Netdevices # NetDevices Inc.
+00:11:8C MissouriDe # Missouri Department of Transportation
+00:11:8D HanchangSy # Hanchang System Corp.
+00:11:8E HalytechMa # Halytech Mace
+00:11:8F EutechInst # EUTECH INSTRUMENTS PTE. LTD.
+00:11:90 DigitalDes # Digital Design Corporation
+00:11:91 Cts-ClimaT # CTS-Clima Temperatur Systeme GmbH
+00:11:92 Cisco # Cisco Systems
+00:11:93 Cisco # Cisco Systems
+00:11:94 ChiMeiComm # Chi Mei Communication Systems, Inc.
+00:11:95 AlphaNetwo # Alpha Networks Inc.
+00:11:96 Actuality # Actuality Systems, Inc.
+00:11:97 Monitoring # Monitoring Technologies Limited
+00:11:98 PrismMedia # Prism Media Products Limited
+00:11:99 2wcom # 2wcom GmbH
+00:11:9A AlkeriaSrl # Alkeria srl
+00:11:9B Telesynerg # Telesynergy Research Inc.
+00:11:9C Ep&TEnergy # EP&T Energy
+00:11:9D DiginfoTec # Diginfo Technology Corporation
+00:11:9E SolectronB # Solectron Brazil
+00:11:9F NokiaDanma # Nokia Danmark A/S
+00:11:A0 VtechEngin # Vtech Engineering Canada Ltd
+00:11:A1 VisionNetw # VISION NETWARE CO.,LTD
+00:11:A2 Manufactur # Manufacturing Technology Inc
+00:11:A3 LanreadyTe # LanReady Technologies Inc.
+00:11:A4 JstreamTec # JStream Technologies Inc.
+00:11:A5 FortunaEle # Fortuna Electronic Corp.
+00:11:A6 SypixxNetw # Sypixx Networks
00:17:00 Kabel
00:1C:7C Perq # PERQ SYSTEMS CORPORATION
00:20:00 LexmarkInt # LEXMARK INTERNATIONAL, INC.
@@ -7564,7 +7600,7 @@ EC:10:00 EnanceSour # Enance Source Co., Ltd. PC clones(?)
#
# Well-known addresses.
#
-# $Id: manuf,v 1.42 2004/06/03 16:35:57 jmayer Exp $
+# $Id: manuf,v 1.43 2004/06/18 14:27:13 jmayer Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald [AT] ethereal.com>
@@ -7590,6 +7626,11 @@ EC:10:00 EnanceSour # Enance Source Co., Ltd. PC clones(?)
# <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-virtual-router-VRID
01-00-0C-CC-CC-CC CDP/VTP
@@ -7617,6 +7658,9 @@ EC:10:00 EnanceSour # Enance Source Co., Ltd. PC clones(?)
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
+# 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-Loadbalancing
# [ The following block of addresses (03-...) are used by various ]
# [ standards. Some (marked [TR?]) are suspected of only being ]
@@ -7645,7 +7689,9 @@ EC:10:00 EnanceSour # Enance Source Co., Ltd. PC clones(?)
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-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-Loadbalancing-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
diff --git a/wka.tmpl b/wka.tmpl
index 6f39f20481..fe742d5ac1 100644
--- a/wka.tmpl
+++ b/wka.tmpl
@@ -1,7 +1,7 @@
#
# Well-known addresses.
#
-# $Id: wka.tmpl,v 1.3 2004/06/15 18:25:04 gerald Exp $
+# $Id: wka.tmpl,v 1.4 2004/06/18 14:27:12 jmayer Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald [AT] ethereal.com>
@@ -27,6 +27,11 @@
# <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-virtual-router-VRID
01-00-0C-CC-CC-CC CDP/VTP
@@ -54,6 +59,9 @@
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
+# 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-Loadbalancing
# [ The following block of addresses (03-...) are used by various ]
# [ standards. Some (marked [TR?]) are suspected of only being ]
@@ -84,6 +92,7 @@
03-00-00-80-00-00 Discovery-Client
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-Loadbalancing-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