Sync with the sources

svn path=/trunk/; revision=10394

3 files changed, 146 insertions, 9 deletions

diff --git a/FAQ b/FAQ
index c498e9ab7c..8adf58497b 100644
--- a/FAQ
+++ b/FAQ
@@ -215,7 +215,7 @@ General Questions
 
    Q 1.2: What protocols are currently supported?
 
-   A: There are currently 442 supported protocols and media, listed
+   A: There are currently 472 supported protocols and media, listed
    below. Descriptions can be found in the ethereal(1) man page.
 
             802.1q Virtual LAN
@@ -230,6 +230,7 @@ General Questions
             ANSI Mobile Application Part
             AOL Instant Messenger
             ARCNET
+            ASN.1 BER
             ATM
             ATM AAL1
             ATM AAL3/4
@@ -273,6 +274,7 @@ General Questions
             Building Automation and Control Network NPDU
             CCSDS
             CDS Clerk Server Calls
+            Cast Client Control Protocol
             Check Point High Availability Protocol
             Checkpoint FW-1
             Cisco Auto-RP
@@ -288,9 +290,9 @@ General Questions
             CoSine IPNOS L2 debug output
             Common Open Policy Service
             Common Unix Printing System (CUPS) Browsing Protocol
+            Compuserve GIF
             Connectionless Lightweight Directory Access Protocol
             Cross Point Frame Injector
-            DCE DFS Calls
             DCE Distributed Time Service Local Server
             DCE Distributed Time Service Provider
             DCE Name Service
@@ -301,6 +303,7 @@ General Questions
             DCE/RPC BUTC
             DCE/RPC CDS Solicitation
             DCE/RPC Conversation Manager
+            DCE/RPC Directory Acl Interface
             DCE/RPC Endpoint Mapper
             DCE/RPC Endpoint Mapper4
             DCE/RPC FLDB
@@ -308,11 +311,20 @@ General Questions
             DCE/RPC FLDB UBIKVOTE
             DCE/RPC ICL RPC
             DCE/RPC Kerberos V
+            DCE/RPC NCS 1.5.1 Local Location Broker
+            DCE/RPC Operations between registry server replicas
+            DCE/RPC Prop Attr
             DCE/RPC RS_ACCT
             DCE/RPC RS_BIND
             DCE/RPC RS_MISC
             DCE/RPC RS_PROP_ACCT
             DCE/RPC RS_UNIX
+            DCE/RPC Registry Password Management
+            DCE/RPC Registry Server Attributes Schema
+            DCE/RPC Registry server propagation interface - ACLs.
+            DCE/RPC Registry server propagation interface - PGO items
+            DCE/RPC Registry server propagation interface - properties and poli
+cies
             DCE/RPC Remote Management
             DCE/RPC Repserver Calls
             DCE/RPC TokenServer Calls
@@ -320,6 +332,7 @@ General Questions
             DCOM OXID Resolver
             DCOM Remote Activation
             DEC Spanning Tree Protocol
+            DFS Calls
             DHCPv6
             DNS Control Program Server
             Data
@@ -366,6 +379,7 @@ General Questions
             GSM A-I/F RP
             GSM Mobile Application Part
             GSM SMS TPDU (GSM 03.40)
+            GSM Short Message Service User Data
             General Inter-ORB Protocol
             Generic Routing Encapsulation
             Generic Security Service Application Program Interface
@@ -378,7 +392,9 @@ General Questions
             Hummingbird NFS Daemon
             HyperSCSI
             Hypertext Transfer Protocol
+            IAX2
             ICQ Protocol
+            IEEE 802.11 Radiotap Capture header
             IEEE 802.11 wireless LAN
             IEEE 802.11 wireless LAN management frame
             ILMI
@@ -395,6 +411,7 @@ General Questions
             ISO 8327-1 OSI Session Protocol
             ISO 8473 CLNP ConnectionLess Network Protocol
             ISO 8602 CLTP ConnectionLess Transport Protocol
+            ISO 8823 OSI Presentation Protocol
             ISO 9542 ESIS Routeing Information Exchange Protocol
             ITU-T Recommendation H.261
             ITU-T Recommendation H.263 RTP Payload header (RFC2190)
@@ -402,6 +419,7 @@ General Questions
             Intel ANS probe
             Intelligent Platform Management Interface
             Inter-Access-Point Protocol
+            InterSwitch Message Protocol
             Interbase
             Internet Cache Protocol
             Internet Content Adaptation Protocol
@@ -416,6 +434,7 @@ General Questions
             Internet Relay Chat
             Internet Security Association and Key Management Protocol
             Internetwork Packet eXchange
+            JPEG File Interchange Format
             Jabber XML Messaging
             Java RMI
             Java Serialization
@@ -430,6 +449,7 @@ General Questions
             Layer 2 Tunneling Protocol
             Lightweight Directory Access Protocol
             Line Printer Daemon Protocol
+            Line-based text data
             Link Access Procedure Balanced (LAPB)
             Link Access Procedure Balanced Ethernet (LAPBETHER)
             Link Access Procedure, Channel D (LAPD)
@@ -441,6 +461,7 @@ General Questions
             Logical-Link Control
             Lucent/Ascend debug output
             MDS Header
+            MIME Multipart Media Encapsulation
             MMS Message Encapsulation
             MS Kpasswd
             MS Proxy Protocol
@@ -450,11 +471,13 @@ General Questions
             MTP 2 User Adaptation Layer
             MTP 3 User Adaptation Layer
             MTP2 Peer Adaptation Layer
+            Media Type: message/http
             Message Transfer Part Level 2
             Message Transfer Part Level 3
             Message Transfer Part Level 3 Management
             Microsoft Directory Replication Service
             Microsoft Distributed File System
+            Microsoft Distributed Link Tracking Server Service
             Microsoft Exchange MAPI
             Microsoft Local Security Architecture
             Microsoft Local Security Architecture (Directory Services)
@@ -494,6 +517,7 @@ General Questions
             NetBIOS over IPX
             NetWare Core Protocol
             NetWare Link Services Protocol
+            NetWare Serialization Protocol
             Network Data Management Protocol
             Network File System
             Network Lock Manager Protocol
@@ -504,11 +528,14 @@ General Questions
             Nortel SONMP
             Novell Distributed Print System
             Null/Loopback
+            OSI ISO/IEC 10035-1 ACSE Protocol
             Open Shortest Path First
             OpenBSD Encapsulating device
             OpenBSD Packet Filter log file
             OpenBSD Packet Filter log file, pre 3.4
+            Optimized Link State Routing Protocol
             PC NFS
+            POSTGRESQL
             PPP Bandwidth Allocation Control Protocol
             PPP Bandwidth Allocation Protocol
             PPP CDP Control Protocol
@@ -602,9 +629,11 @@ General Questions
             Simple Network Management Protocol
             Simple Traversal of UDP Through NAT
             Sinec H1 Protocol
+            Sipfrag
             Skinny Client Control Protocol
             SliMP3 Communication Protocol
             Socks Protocol
+            SoulSeek Protocol
             Spanning Tree Protocol
             Spnego
             Stream Control Transmission Protocol
@@ -615,6 +644,7 @@ General Questions
             T38
             TACACS
             TACACS+
+            TEI Management Procedure, Channel D (LAPD)
             TEREDO Tunneling IPv6 over UDP through NATs
             TPKT
             Tabular Data Stream
@@ -634,6 +664,7 @@ General Questions
             Virtual Router Redundancy Protocol
             Virtual Trunking Protocol
             WAP Binary XML
+            WAP Session Initiation Request
             Web Cache Coordination Protocol
             Wellfleet Breath of Life
             Wellfleet Compression
@@ -2028,4 +2059,4 @@ echo "Mode: ess">/proc/driver/aironet/ethN/Config
    For corrections/additions/suggestions for this web page page (and not
    Ethereal support questions), please send email to
    ethereal-web[AT]ethereal.com .
-   Last modified: Mon, February 16 2004.
+   Last modified: Sat, March 13 2004.
diff --git a/help/faq.txt b/help/faq.txt
index c498e9ab7c..8adf58497b 100644
--- a/help/faq.txt
+++ b/help/faq.txt
@@ -215,7 +215,7 @@ General Questions
 
    Q 1.2: What protocols are currently supported?
 
-   A: There are currently 442 supported protocols and media, listed
+   A: There are currently 472 supported protocols and media, listed
    below. Descriptions can be found in the ethereal(1) man page.
 
             802.1q Virtual LAN
@@ -230,6 +230,7 @@ General Questions
             ANSI Mobile Application Part
             AOL Instant Messenger
             ARCNET
+            ASN.1 BER
             ATM
             ATM AAL1
             ATM AAL3/4
@@ -273,6 +274,7 @@ General Questions
             Building Automation and Control Network NPDU
             CCSDS
             CDS Clerk Server Calls
+            Cast Client Control Protocol
             Check Point High Availability Protocol
             Checkpoint FW-1
             Cisco Auto-RP
@@ -288,9 +290,9 @@ General Questions
             CoSine IPNOS L2 debug output
             Common Open Policy Service
             Common Unix Printing System (CUPS) Browsing Protocol
+            Compuserve GIF
             Connectionless Lightweight Directory Access Protocol
             Cross Point Frame Injector
-            DCE DFS Calls
             DCE Distributed Time Service Local Server
             DCE Distributed Time Service Provider
             DCE Name Service
@@ -301,6 +303,7 @@ General Questions
             DCE/RPC BUTC
             DCE/RPC CDS Solicitation
             DCE/RPC Conversation Manager
+            DCE/RPC Directory Acl Interface
             DCE/RPC Endpoint Mapper
             DCE/RPC Endpoint Mapper4
             DCE/RPC FLDB
@@ -308,11 +311,20 @@ General Questions
             DCE/RPC FLDB UBIKVOTE
             DCE/RPC ICL RPC
             DCE/RPC Kerberos V
+            DCE/RPC NCS 1.5.1 Local Location Broker
+            DCE/RPC Operations between registry server replicas
+            DCE/RPC Prop Attr
             DCE/RPC RS_ACCT
             DCE/RPC RS_BIND
             DCE/RPC RS_MISC
             DCE/RPC RS_PROP_ACCT
             DCE/RPC RS_UNIX
+            DCE/RPC Registry Password Management
+            DCE/RPC Registry Server Attributes Schema
+            DCE/RPC Registry server propagation interface - ACLs.
+            DCE/RPC Registry server propagation interface - PGO items
+            DCE/RPC Registry server propagation interface - properties and poli
+cies
             DCE/RPC Remote Management
             DCE/RPC Repserver Calls
             DCE/RPC TokenServer Calls
@@ -320,6 +332,7 @@ General Questions
             DCOM OXID Resolver
             DCOM Remote Activation
             DEC Spanning Tree Protocol
+            DFS Calls
             DHCPv6
             DNS Control Program Server
             Data
@@ -366,6 +379,7 @@ General Questions
             GSM A-I/F RP
             GSM Mobile Application Part
             GSM SMS TPDU (GSM 03.40)
+            GSM Short Message Service User Data
             General Inter-ORB Protocol
             Generic Routing Encapsulation
             Generic Security Service Application Program Interface
@@ -378,7 +392,9 @@ General Questions
             Hummingbird NFS Daemon
             HyperSCSI
             Hypertext Transfer Protocol
+            IAX2
             ICQ Protocol
+            IEEE 802.11 Radiotap Capture header
             IEEE 802.11 wireless LAN
             IEEE 802.11 wireless LAN management frame
             ILMI
@@ -395,6 +411,7 @@ General Questions
             ISO 8327-1 OSI Session Protocol
             ISO 8473 CLNP ConnectionLess Network Protocol
             ISO 8602 CLTP ConnectionLess Transport Protocol
+            ISO 8823 OSI Presentation Protocol
             ISO 9542 ESIS Routeing Information Exchange Protocol
             ITU-T Recommendation H.261
             ITU-T Recommendation H.263 RTP Payload header (RFC2190)
@@ -402,6 +419,7 @@ General Questions
             Intel ANS probe
             Intelligent Platform Management Interface
             Inter-Access-Point Protocol
+            InterSwitch Message Protocol
             Interbase
             Internet Cache Protocol
             Internet Content Adaptation Protocol
@@ -416,6 +434,7 @@ General Questions
             Internet Relay Chat
             Internet Security Association and Key Management Protocol
             Internetwork Packet eXchange
+            JPEG File Interchange Format
             Jabber XML Messaging
             Java RMI
             Java Serialization
@@ -430,6 +449,7 @@ General Questions
             Layer 2 Tunneling Protocol
             Lightweight Directory Access Protocol
             Line Printer Daemon Protocol
+            Line-based text data
             Link Access Procedure Balanced (LAPB)
             Link Access Procedure Balanced Ethernet (LAPBETHER)
             Link Access Procedure, Channel D (LAPD)
@@ -441,6 +461,7 @@ General Questions
             Logical-Link Control
             Lucent/Ascend debug output
             MDS Header
+            MIME Multipart Media Encapsulation
             MMS Message Encapsulation
             MS Kpasswd
             MS Proxy Protocol
@@ -450,11 +471,13 @@ General Questions
             MTP 2 User Adaptation Layer
             MTP 3 User Adaptation Layer
             MTP2 Peer Adaptation Layer
+            Media Type: message/http
             Message Transfer Part Level 2
             Message Transfer Part Level 3
             Message Transfer Part Level 3 Management
             Microsoft Directory Replication Service
             Microsoft Distributed File System
+            Microsoft Distributed Link Tracking Server Service
             Microsoft Exchange MAPI
             Microsoft Local Security Architecture
             Microsoft Local Security Architecture (Directory Services)
@@ -494,6 +517,7 @@ General Questions
             NetBIOS over IPX
             NetWare Core Protocol
             NetWare Link Services Protocol
+            NetWare Serialization Protocol
             Network Data Management Protocol
             Network File System
             Network Lock Manager Protocol
@@ -504,11 +528,14 @@ General Questions
             Nortel SONMP
             Novell Distributed Print System
             Null/Loopback
+            OSI ISO/IEC 10035-1 ACSE Protocol
             Open Shortest Path First
             OpenBSD Encapsulating device
             OpenBSD Packet Filter log file
             OpenBSD Packet Filter log file, pre 3.4
+            Optimized Link State Routing Protocol
             PC NFS
+            POSTGRESQL
             PPP Bandwidth Allocation Control Protocol
             PPP Bandwidth Allocation Protocol
             PPP CDP Control Protocol
@@ -602,9 +629,11 @@ General Questions
             Simple Network Management Protocol
             Simple Traversal of UDP Through NAT
             Sinec H1 Protocol
+            Sipfrag
             Skinny Client Control Protocol
             SliMP3 Communication Protocol
             Socks Protocol
+            SoulSeek Protocol
             Spanning Tree Protocol
             Spnego
             Stream Control Transmission Protocol
@@ -615,6 +644,7 @@ General Questions
             T38
             TACACS
             TACACS+
+            TEI Management Procedure, Channel D (LAPD)
             TEREDO Tunneling IPv6 over UDP through NATs
             TPKT
             Tabular Data Stream
@@ -634,6 +664,7 @@ General Questions
             Virtual Router Redundancy Protocol
             Virtual Trunking Protocol
             WAP Binary XML
+            WAP Session Initiation Request
             Web Cache Coordination Protocol
             Wellfleet Breath of Life
             Wellfleet Compression
@@ -2028,4 +2059,4 @@ echo "Mode: ess">/proc/driver/aironet/ethN/Config
    For corrections/additions/suggestions for this web page page (and not
    Ethereal support questions), please send email to
    ethereal-web[AT]ethereal.com .
-   Last modified: Mon, February 16 2004.
+   Last modified: Sat, March 13 2004.
diff --git a/manuf b/manuf
index f187c5a765..bfbeb918be 100644
--- a/manuf
+++ b/manuf
@@ -1,7 +1,7 @@
 # 
 # /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
 #
-# $Id: manuf,v 1.38 2004/02/18 00:33:12 jmayer Exp $
+# $Id: manuf,v 1.39 2004/03/17 18:13:42 jmayer Exp $
 #
 # Laurent Deniel <laurent.deniel [AT] free.fr>
 #
@@ -3880,7 +3880,7 @@
 00:0F:1D	CosmoTechs             # Cosmo Techs Co., Ltd.
 00:0F:1E	ChengduKtE             # Chengdu KT Electric Co.of High & New Technology
 00:0F:1F	WwPcbaTest             # WW PCBA Test
-00:0F:20	WwOps                  # WW Ops
+00:0F:20	HewlettPac             # Hewlett Packard
 00:0F:21	Scientific             # Scientific Atlanta, Inc
 00:0F:22	Helius                 # Helius, Inc.
 00:0F:23	Cisco                  # Cisco Systems
@@ -3985,6 +3985,81 @@
 00:0F:86	Private
 00:0F:87	MaxcessInt             # Maxcess International
 00:0F:88	Ametek                 # AMETEK, Inc.
+00:0F:89	WinnertecS             # Winnertec System Co., Ltd.
+00:0F:8A	Wideview
+00:0F:8B	OrionMulti             # Orion MultiSystems Inc
+00:0F:8C	Gigawavete             # Gigawavetech Pte Ltd
+00:0F:8D	FastTv-Ser             # FAST TV-Server AG
+00:0F:8E	DongyangTe             # DONGYANG TELECOM CO.,LTD.
+00:0F:8F	Cisco                  # Cisco Systems
+00:0F:90	Cisco                  # Cisco Systems
+00:0F:91	Aeroteleco             # Aerotelecom Co.,Ltd.
+00:0F:92	Microhard              # Microhard Systems Inc.
+00:0F:93	Landis+Gyr             # Landis+Gyr Ltd.
+00:0F:94	Genexis
+00:0F:95	ElecomLane             # ELECOM Co.,LTD Laneed Division
+00:0F:96	CriticalTe             # Critical Telecom Corp.
+00:0F:97	Avanex                 # Avanex Corporation
+00:0F:98	Avamax                 # Avamax Co. Ltd.
+00:0F:99	ApacOptoEl             # APAC opto Electronics Inc.
+00:0F:9A	Synchrony              # Synchrony, Inc.
+00:0F:9B	RossVideo              # Ross Video Limited
+00:0F:9C	Panduit                # Panduit Corp
+00:0F:9D	NewnhamRes             # Newnham Research Ltd
+00:0F:9E	Murrelektr             # Murrelektronik GmbH
+00:0F:9F	MotorolaBc             # Motorola BCS
+00:0F:A0	LotteCanon             # Lotte Canon Co., Ltd.
+00:0F:A1	Gigabit                # Gigabit Systems Inc.
+00:0F:A2	DigitalPat             # Digital Path Networks
+00:0F:A3	AlphaNetwo             # Alpha Networks Inc.
+00:0F:A4	SprecherAu             # Sprecher Automation GmbH
+00:0F:A5	Smp/BwaTec             # SMP / BWA Technology GmbH
+00:0F:A6	S2Security             # S2 Security Corporation
+00:0F:A7	RaptorNetw             # Raptor Networks Technology
+00:0F:A8	Photometri             # Photometrics, Inc.
+00:0F:A9	PcFabrik               # PC Fabrik
+00:0F:AA	NexusTechn             # Nexus Technologies
+00:0F:AB	KyushuElec             # Kyushu Electronics Systems Inc.
+00:0F:AC	Ieee80211              # IEEE 802.11
+00:0F:AD	FmnCommuni             # FMN communications GmbH
+00:0F:AE	E2oCommuni             # E2O Communications
+00:0F:AF	Dialog                 # Dialog Inc.
+00:0F:B0	CompalElec             # Compal Electronics,INC.
+00:0F:B1	Cognio                 # Cognio Inc.
+00:0F:B2	BroadbandP             # Broadband Pacenet (India) Pvt. Ltd.
+00:0F:B3	ActiontecE             # Actiontec Electronics, Inc
+00:0F:B4	TimespaceT             # Timespace Technology
+00:0F:B5	Netgear                # NETGEAR Inc
+00:0F:B6	EuroplexTe             # Europlex Technologies
+00:0F:B7	CaviumNetw             # Cavium Networks
+00:0F:B8	Callurl                # CallURL Inc.
+00:0F:B9	AdaptiveIn             # Adaptive Instruments
+00:0F:BA	Tevebox                # Tevebox AB
+00:0F:BB	SiemensIcn             # Siemens AG, ICN M&L TDC EP
+00:0F:BC	OnkeyTechn             # Onkey Technologies, Inc.
+00:0F:BD	MrvCommuni             # MRV Communications (Networks) LTD
+00:0F:BE	E-W/You                # e-w/you Inc.
+00:0F:BF	DgtSpZOO               # DGT Sp. z o.o.
+00:0F:C0	Delcomp
+00:0F:C1	Wave                   # WAVE Corporation
+00:0F:C2	Uniwell                # Uniwell Corporation
+00:0F:C3	PalmpalmTe             # PalmPalm Technology, Inc.
+00:0F:C4	Nst                    # NST co.,LTD.
+00:0F:C5	Keymed                 # KeyMed Ltd
+00:0F:C6	EurocomInd             # Eurocom Industries A/S
+00:0F:C7	DionicaR&D             # Dionica R&D Ltd.
+00:0F:C8	ChantryNet             # Chantry Networks
+00:0F:C9	Allnet                 # Allnet GmbH
+00:0F:CA	A-JinTechl             # A-JIN TECHLINE CO, LTD
+00:0F:CB	3comEurope             # 3COM EUROPE LTD
+00:0F:CC	Netopia                # Netopia, Inc.
+00:0F:CD	NortelNetw             # Nortel Networks
+00:0F:CE	KikusuiEle             # Kikusui Electronics Corp.
+00:0F:CF	DatawindRe             # Datawind Research
+00:0F:D0	Astri
+00:0F:D1	AppliedWir             # Applied Wireless Identifications Group, Inc.
+00:0F:D2	EwaTechnol             # EWA Technologies, Inc.
+00:0F:D3	Digium
 00:10:00	CableTelev             # CABLE TELEVISION LABORATORIES, INC.
 00:10:01	MckCommuni             # MCK COMMUNICATIONS
 00:10:02	Actia
@@ -7313,7 +7388,7 @@ EC:10:00	EnanceSour             # Enance Source Co., Ltd.	PC clones(?)
 #
 # Well-known addresses.
 #
-# $Id: manuf,v 1.38 2004/02/18 00:33:12 jmayer Exp $
+# $Id: manuf,v 1.39 2004/03/17 18:13:42 jmayer Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald [AT] ethereal.com>