summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FAQ45
-rw-r--r--help/faq.txt45
-rw-r--r--manuf62
-rw-r--r--wka.tmpl3
4 files changed, 127 insertions, 28 deletions
diff --git a/FAQ b/FAQ
index af062b310e..68aac62095 100644
--- a/FAQ
+++ b/FAQ
@@ -255,15 +255,16 @@
Q 1.5: What protocols are currently supported?
- A: There are currently 683 supported protocols and media, listed below.
+ A: There are currently 706 supported protocols and media, listed below.
Descriptions can be found in the ethereal(1) man page.
3Com XNS Encapsulation
3GPP2 A11
- 802.1q Virtual LAN
- 802.1x Authentication
+ 802.1Q Virtual LAN
+ 802.1X Authentication
AAL type 2 signalling protocol - Capability set 1 (Q.2630.1)
ACN
+ ACSE
AFS (4.0) Replication Server call declarations
AIM Administrative
AIM Advertisements
@@ -314,8 +315,8 @@
Alteon - Transparent Proxy Cache Protocol
Andrew File System (AFS)
Apache JServ Protocol v1.3
+ Apple Filing Protocol
Apple IP-over-IEEE 1394
- AppleTalk Filing Protocol
AppleTalk Session Protocol
AppleTalk Transaction Protocol packet
Appletalk Address Resolution Protocol
@@ -324,6 +325,7 @@
Aruba - Aruba Discovery Protocol
Async data over ISDN (V.120)
Asynchronous Layered Coding
+ AudioCodes Trunk Trace
Authentication Header
BACnet Virtual Link Control
BEA Tuxedo
@@ -353,6 +355,7 @@
CBAPhysicalDevice
CCSDS
CDS Clerk Server Calls
+ CSM_ENCAPS
Camel
Cast Client Control Protocol
Certificate Management Protocol
@@ -421,12 +424,17 @@ cies
DCOM IDispatch
DCOM IRemoteActivation
DCOM OXID Resolver
+ DEC DNA Routing Protocol
DEC Spanning Tree Protocol
DFS Calls
DG Gryphon Protocol
DHCP Failover
DHCPv6
DICOM
+ DLT_USER_A
+ DLT_USER_B
+ DLT_USER_C
+ DLT_USER_D
DNS Control Program Server
DOCSIS 1.1
DOCSIS Appendix C TLV's
@@ -466,6 +474,7 @@ cies
Distance Vector Multicast Routing Protocol
Distcc Distributed Compiler
Distributed Checksum Clearinghouse Protocol
+ Distributed Interactive Simulation
Distributed Network Protocol 3.0
Domain Name Service
Dynamic DNS Tools Protocol
@@ -484,6 +493,7 @@ cies
FC Extended Link Svc
FC Fabric Configuration Server
FCIP
+ FTAM
FTP Data
FTServer Operations
Fiber Distributed Data Interface
@@ -507,14 +517,15 @@ cies
GSM A-I/F BSSMAP
GSM A-I/F DTAP
GSM A-I/F RP
+ GSM Mobile Application
GSM SMS TPDU (GSM 03.40)
GSM Short Message Service User Data
- GSM_MobileAPplication
+ GSS-API Generic Security Service Application Program Interface
General Inter-ORB Protocol
Generic Routing Encapsulation
- Generic Security Service Application Program Interface
Gnutella Protocol
H.248 MEGACO
+ H221NonStandard
H235-SECURITY-MESSAGES
HP Extended Local-Link Control
HP Remote Maintenance Protocol
@@ -575,6 +586,7 @@ cies
ISO 8602 CLTP ConnectionLess Transport Protocol
ISO 8823 OSI Presentation Protocol
ISO 9542 ESIS Routeing Information Exchange Protocol
+ ISUP Thin Protocol
ISystemActivator ISystemActivator Resolver
ITU-T E.164 number
ITU-T Recommendation H.261
@@ -606,11 +618,16 @@ cies
IrDA Link Access Protocol
IrDA Link Management Protocol
JPEG File Interchange Format
+ JXTA Connection Welcome Message
+ JXTA Message
+ JXTA Message Framing
JXTA P2P
+ JXTA UDP
Jabber XML Messaging
Java RMI
Java Serialization
Juniper
+ K12xx
Kerberized Internet Negotiation of Key
Kerberos
Kerberos Administration
@@ -643,6 +660,7 @@ cies
MDS Header
MEGACO
MIME Multipart Media Encapsulation
+ MMS
MMS Message Encapsulation
MS Kpasswd
MS Proxy Protocol
@@ -654,8 +672,8 @@ cies
MTP2 Peer Adaptation Layer
Media Gateway Control Protocol
Media Type
- Media Type: application/x-jxta-msg
Media Type: message/http
+ Message Session Relay Protocol
Message Transfer Part Level 2
Message Transfer Part Level 3
Message Transfer Part Level 3 Management
@@ -668,6 +686,7 @@ cies
Microsoft File Replication Service
Microsoft File Replication Service API
Microsoft Local Security Architecture
+ Microsoft Media Server
Microsoft Messenger Service
Microsoft Network Logon
Microsoft Plug and Play service
@@ -723,8 +742,6 @@ cies
Novell Distributed Print System
Novell Modular Authentication Service
Null/Loopback
- OSI ISO 8571 FTAM Protocol
- OSI ISO/IEC 10035-1 ACSE Protocol
Online Certificate Status Protocol
Open Policy Service Interface
Open Shortest Path First
@@ -767,6 +784,7 @@ cies
Packed Encoding Rules (ASN.1 X.691)
Packet Cable Lawful Intercept
PacketCable
+ Parlay Dissector Using GIOP API
Plan 9 9P
Point-to-Point Protocol
Point-to-Point Tunnelling Protocol
@@ -871,6 +889,7 @@ cies
Subnetwork Dependent Convergence Protocol
Symantec Enterprise Firewall
Synchronous Data Link Control (SDLC)
+ Synergy
Syslog message
Systems Network Architecture
Systems Network Architecture XID
@@ -879,11 +898,13 @@ cies
TACACS+
TDMA RTmac Discipline
TEI Management Procedure, Channel D (LAPD)
- TPKT
+ TPKT - ISO on TCP - RFC1006
Tabular Data Stream
+ Tango Dissector Using GIOP API
Tazmen Sniffer Protocol
Telnet
Teredo IPv6 over UDP tunneling
+ The Armagetron Advanced OpenGL Tron clone
Time Protocol
Time Synchronization Protocol
Tiny Transport Protocol
@@ -915,6 +936,7 @@ cies
Wireless Session Protocol
Wireless Transaction Protocol
Wireless Transport Layer Security
+ Wlan Certificate Extension
X Display Manager Control Protocol
X.25
X.25 over TCP
@@ -940,6 +962,7 @@ cies
h225
h245
h450
+ iFCP
iSCSI
iSNS
@@ -2149,4 +2172,4 @@ cies
ethereal-users[AT]ethereal.com mailing list.
For corrections/additions/suggestions for this web page (and not Ethereal
support questions), please send email to ethereal-web[AT]ethereal.com .
- Last modified: Wed, May 25 2005.
+ Last modified: Thu, August 25 2005.
diff --git a/help/faq.txt b/help/faq.txt
index af062b310e..68aac62095 100644
--- a/help/faq.txt
+++ b/help/faq.txt
@@ -255,15 +255,16 @@
Q 1.5: What protocols are currently supported?
- A: There are currently 683 supported protocols and media, listed below.
+ A: There are currently 706 supported protocols and media, listed below.
Descriptions can be found in the ethereal(1) man page.
3Com XNS Encapsulation
3GPP2 A11
- 802.1q Virtual LAN
- 802.1x Authentication
+ 802.1Q Virtual LAN
+ 802.1X Authentication
AAL type 2 signalling protocol - Capability set 1 (Q.2630.1)
ACN
+ ACSE
AFS (4.0) Replication Server call declarations
AIM Administrative
AIM Advertisements
@@ -314,8 +315,8 @@
Alteon - Transparent Proxy Cache Protocol
Andrew File System (AFS)
Apache JServ Protocol v1.3
+ Apple Filing Protocol
Apple IP-over-IEEE 1394
- AppleTalk Filing Protocol
AppleTalk Session Protocol
AppleTalk Transaction Protocol packet
Appletalk Address Resolution Protocol
@@ -324,6 +325,7 @@
Aruba - Aruba Discovery Protocol
Async data over ISDN (V.120)
Asynchronous Layered Coding
+ AudioCodes Trunk Trace
Authentication Header
BACnet Virtual Link Control
BEA Tuxedo
@@ -353,6 +355,7 @@
CBAPhysicalDevice
CCSDS
CDS Clerk Server Calls
+ CSM_ENCAPS
Camel
Cast Client Control Protocol
Certificate Management Protocol
@@ -421,12 +424,17 @@ cies
DCOM IDispatch
DCOM IRemoteActivation
DCOM OXID Resolver
+ DEC DNA Routing Protocol
DEC Spanning Tree Protocol
DFS Calls
DG Gryphon Protocol
DHCP Failover
DHCPv6
DICOM
+ DLT_USER_A
+ DLT_USER_B
+ DLT_USER_C
+ DLT_USER_D
DNS Control Program Server
DOCSIS 1.1
DOCSIS Appendix C TLV's
@@ -466,6 +474,7 @@ cies
Distance Vector Multicast Routing Protocol
Distcc Distributed Compiler
Distributed Checksum Clearinghouse Protocol
+ Distributed Interactive Simulation
Distributed Network Protocol 3.0
Domain Name Service
Dynamic DNS Tools Protocol
@@ -484,6 +493,7 @@ cies
FC Extended Link Svc
FC Fabric Configuration Server
FCIP
+ FTAM
FTP Data
FTServer Operations
Fiber Distributed Data Interface
@@ -507,14 +517,15 @@ cies
GSM A-I/F BSSMAP
GSM A-I/F DTAP
GSM A-I/F RP
+ GSM Mobile Application
GSM SMS TPDU (GSM 03.40)
GSM Short Message Service User Data
- GSM_MobileAPplication
+ GSS-API Generic Security Service Application Program Interface
General Inter-ORB Protocol
Generic Routing Encapsulation
- Generic Security Service Application Program Interface
Gnutella Protocol
H.248 MEGACO
+ H221NonStandard
H235-SECURITY-MESSAGES
HP Extended Local-Link Control
HP Remote Maintenance Protocol
@@ -575,6 +586,7 @@ cies
ISO 8602 CLTP ConnectionLess Transport Protocol
ISO 8823 OSI Presentation Protocol
ISO 9542 ESIS Routeing Information Exchange Protocol
+ ISUP Thin Protocol
ISystemActivator ISystemActivator Resolver
ITU-T E.164 number
ITU-T Recommendation H.261
@@ -606,11 +618,16 @@ cies
IrDA Link Access Protocol
IrDA Link Management Protocol
JPEG File Interchange Format
+ JXTA Connection Welcome Message
+ JXTA Message
+ JXTA Message Framing
JXTA P2P
+ JXTA UDP
Jabber XML Messaging
Java RMI
Java Serialization
Juniper
+ K12xx
Kerberized Internet Negotiation of Key
Kerberos
Kerberos Administration
@@ -643,6 +660,7 @@ cies
MDS Header
MEGACO
MIME Multipart Media Encapsulation
+ MMS
MMS Message Encapsulation
MS Kpasswd
MS Proxy Protocol
@@ -654,8 +672,8 @@ cies
MTP2 Peer Adaptation Layer
Media Gateway Control Protocol
Media Type
- Media Type: application/x-jxta-msg
Media Type: message/http
+ Message Session Relay Protocol
Message Transfer Part Level 2
Message Transfer Part Level 3
Message Transfer Part Level 3 Management
@@ -668,6 +686,7 @@ cies
Microsoft File Replication Service
Microsoft File Replication Service API
Microsoft Local Security Architecture
+ Microsoft Media Server
Microsoft Messenger Service
Microsoft Network Logon
Microsoft Plug and Play service
@@ -723,8 +742,6 @@ cies
Novell Distributed Print System
Novell Modular Authentication Service
Null/Loopback
- OSI ISO 8571 FTAM Protocol
- OSI ISO/IEC 10035-1 ACSE Protocol
Online Certificate Status Protocol
Open Policy Service Interface
Open Shortest Path First
@@ -767,6 +784,7 @@ cies
Packed Encoding Rules (ASN.1 X.691)
Packet Cable Lawful Intercept
PacketCable
+ Parlay Dissector Using GIOP API
Plan 9 9P
Point-to-Point Protocol
Point-to-Point Tunnelling Protocol
@@ -871,6 +889,7 @@ cies
Subnetwork Dependent Convergence Protocol
Symantec Enterprise Firewall
Synchronous Data Link Control (SDLC)
+ Synergy
Syslog message
Systems Network Architecture
Systems Network Architecture XID
@@ -879,11 +898,13 @@ cies
TACACS+
TDMA RTmac Discipline
TEI Management Procedure, Channel D (LAPD)
- TPKT
+ TPKT - ISO on TCP - RFC1006
Tabular Data Stream
+ Tango Dissector Using GIOP API
Tazmen Sniffer Protocol
Telnet
Teredo IPv6 over UDP tunneling
+ The Armagetron Advanced OpenGL Tron clone
Time Protocol
Time Synchronization Protocol
Tiny Transport Protocol
@@ -915,6 +936,7 @@ cies
Wireless Session Protocol
Wireless Transaction Protocol
Wireless Transport Layer Security
+ Wlan Certificate Extension
X Display Manager Control Protocol
X.25
X.25 over TCP
@@ -940,6 +962,7 @@ cies
h225
h245
h450
+ iFCP
iSCSI
iSNS
@@ -2149,4 +2172,4 @@ cies
ethereal-users[AT]ethereal.com mailing list.
For corrections/additions/suggestions for this web page (and not Ethereal
support questions), please send email to ethereal-web[AT]ethereal.com .
- Last modified: Wed, May 25 2005.
+ Last modified: Thu, August 25 2005.
diff --git a/manuf b/manuf
index f679b338f4..e927df491c 100644
--- a/manuf
+++ b/manuf
@@ -1316,7 +1316,7 @@
00:04:EF Polestar # Polestar Corp.
00:04:F0 Internatio # International Computers, Ltd
00:04:F1 Wherenet
-00:04:F2 CircaCommu # Circa Communications, Ltd.
+00:04:F2 Polycom
00:04:F3 FsForth-Sy # FS FORTH-SYSTEME GmbH
00:04:F4 InfiniteEl # Infinite Electronics Inc.
00:04:F5 SnowshoreN # SnowShore Networks, Inc.
@@ -1727,7 +1727,7 @@
00:06:8A NeuronnetR # NeuronNet Co. Ltd. R&D Center
00:06:8B AirrunnerT # AirRunner Technologies, Inc.
00:06:8C 3com # 3Com Corporation
-00:06:8D Sangate # SANgate Systems
+00:06:8D Sepaton # SEPATON, Inc.
00:06:8E Hid # HID Corporation
00:06:8F Telemonito # Telemonitor, Inc.
00:06:90 EuracomCom # Euracom Communication GmbH
@@ -2653,7 +2653,7 @@
00:0A:4F BrainBoxes # Brain Boxes Limited
00:0A:50 Remotek # REMOTEK CORPORATION
00:0A:51 Gyrosignal # GyroSignal Technology Co., Ltd.
-00:0A:52 Venitek # Venitek Co. Ltd.
+00:0A:52 Asiarf # AsiaRF Ltd.
00:0A:53 Intronics # Intronics, Incorporated
00:0A:54 LagunaHill # Laguna Hills, Inc.
00:0A:55 Markem # MARKEM Corporation
@@ -5510,6 +5510,57 @@
00:15:79 LunatoneIn # Lunatone Industrielle Elektronik GmbH
00:15:7A TelefinSPA # Telefin S.p.A.
00:15:7B LeuzeElect # Leuze electronic GmbH + Co. KG
+00:15:7C DaveNetwor # Dave Networks, Inc.
+00:15:7D Posdata # POSDATA CO., LTD.
+00:15:7E HeyfraElec # HEYFRA ELECTRONIC gmbH
+00:15:7F ChuangInte # ChuanG International Holding CO.,LTD.
+00:15:80 U-Way # U-WAY CORPORATION
+00:15:81 Makus # MAKUS Inc.
+00:15:82 Tvonics # TVonics Ltd
+00:15:83 Ivt # IVT corporation
+00:15:84 SchenckPro # Schenck Process GmbH
+00:15:85 AonvisionT # Aonvision Technolopy Corp.
+00:15:86 XiamenOver # Xiamen Overseas Chinese Electronic Co., Ltd.
+00:15:87 TakenakaSe # Takenaka Seisakusho Co.,Ltd
+00:15:88 Balda-Thon # Balda-Thong Fook Solutions Sdn. Bhd.
+00:15:89 D-MaxTechn # D-MAX Technology Co.,Ltd
+00:15:8A SurecomTec # SURECOM Technology Corp.
+00:15:8B ParkAir # Park Air Systems Ltd
+00:15:8C LiabAps # Liab ApS
+00:15:8D Jennic # Jennic Ltd
+00:15:8E Plustek # Plustek.INC
+00:15:8F NttAdvance # NTT Advanced Technology Corporation
+00:15:90 Hectronic # Hectronic GmbH
+00:15:91 Rlw # RLW Inc.
+00:15:92 FacomUkMel # Facom UK Ltd (Melksham)
+00:15:93 U4eaTechno # U4EA Technologies Inc.
+00:15:94 Bixolon # BIXOLON CO.,LTD
+00:15:95 QuesterTan # Quester Tangent Corporation
+00:15:96 ArrisInter # ARRIS International
+00:15:97 AetaAudio # AETA AUDIO SYSTEMS
+00:15:98 KolektorGr # Kolektor group
+00:15:99 SamsungEle # Samsung Electronics Co., LTD
+00:15:9A MotorolaCh # Motorola CHS
+00:15:9B Nortel
+00:15:9C B-KyungSys # B-KYUNG SYSTEM Co.,Ltd.
+00:15:9D MinicomAdv # Minicom Advanced Systems ltd
+00:15:9E Saitek # Saitek plc
+00:15:9F Terascala # Terascala, Inc.
+00:15:A0 NokiaDanma # Nokia Danmark A/S
+00:15:A1 SintersSas # SINTERS SAS
+00:15:A2 ArrisInter # ARRIS International
+00:15:A3 ArrisInter # ARRIS International
+00:15:A4 ArrisInter # ARRIS International
+00:15:A5 Dci # DCI Co., Ltd.
+00:15:A6 DigitalEle # Digital Electronics Products Ltd.
+00:15:A7 Robatech # Robatech AG
+00:15:A8 MotorolaMo # Motorola Mobile Devices
+00:15:A9 KwangWooI& # KWANG WOO I&C CO.,LTD
+00:15:AA Rextechnik # Rextechnik International Co.,
+00:15:AB ProSound # PRO CO SOUND INC
+00:15:AC Capelon # Capelon AB
+00:15:AD AccedianNe # Accedian Networks
+00:15:AE KyungIl # kyung il
00:17:00 Kabel
00:1C:7C Perq # PERQ SYSTEMS CORPORATION
00:20:00 LexmarkInt # LEXMARK INTERNATIONAL, INC.
@@ -7652,7 +7703,7 @@
00:C0:36 RaytechEle # RAYTECH ELECTRONIC CORP.
00:C0:37 Dynatem
00:C0:38 RasterImag # RASTER IMAGE PROCESSING SYSTEM
-00:C0:39 TdkSemicon # TDK SEMICONDUCTOR CORPORATION
+00:C0:39 TeridianSe # Teridian Semiconductor Corporation
00:C0:3A Men-MikroE # MEN-MIKRO ELEKTRONIK GMBH
00:C0:3B Multiacces # MULTIACCESS COMPUTING CORP.
00:C0:3C TowerTechS # TOWER TECH S.R.L.
@@ -8620,8 +8671,9 @@ EC:10:00 EnanceSour # Enance Source Co., Ltd. PC clones(?)
00-00-0C-07-AC/40 All-HSRP-routers
00-00-5E-00-01/40 IETF-VRRP-virtual-router-VRID
00-E0-2B-00-00-00 Extreme-EDP
+00-E0-2B-00-00-01 Extreme-EAPS-Source
00-E0-2B-00-00-02 Extreme-ESRP-Client
-00-E0-2B-00-00-04 Extreme-EAPS-Host
+00-E0-2B-00-00-04 Extreme-EAPSv1
00-E0-2B-00-00-08 Extreme-ESRP-Master
01-00-0C-CC-CC-CC CDP/VTP
01-00-0C-DD-DD-DD CGMP
diff --git a/wka.tmpl b/wka.tmpl
index 4bca06e8c3..eb9fef69d5 100644
--- a/wka.tmpl
+++ b/wka.tmpl
@@ -35,8 +35,9 @@
00-00-0C-07-AC/40 All-HSRP-routers
00-00-5E-00-01/40 IETF-VRRP-virtual-router-VRID
00-E0-2B-00-00-00 Extreme-EDP
+00-E0-2B-00-00-01 Extreme-EAPS-Source
00-E0-2B-00-00-02 Extreme-ESRP-Client
-00-E0-2B-00-00-04 Extreme-EAPS-Host
+00-E0-2B-00-00-04 Extreme-EAPSv1
00-E0-2B-00-00-08 Extreme-ESRP-Master
01-00-0C-CC-CC-CC CDP/VTP
01-00-0C-DD-DD-DD CGMP