Update to version Feb, 9th

svn path=/trunk/; revision=7165

2 files changed, 252 insertions, 178 deletions

diff --git a/FAQ b/FAQ
index e4e056234e..58cd170416 100644
--- a/FAQ
+++ b/FAQ
@@ -3,7 +3,7 @@
 
    Note: This is just an ASCII snapshot of the faq and may not be up to
          date. Please go to http://www.ethereal.com/faq for the up to
-         date version. The version of the snapshot can be found at the
+         date version. The version of this snapshot can be found at the
          end of this document.
 
    INDEX
@@ -160,61 +160,68 @@
 
    Q 1.2: What protocols are currently supported?
 
-   A: There are currently 340 supported protocols and media, listed
+   A: There are currently 355 supported protocols and media, listed
    below. Descriptions can be found in the ethereal(1) man page.
 
             802.1q Virtual LAN
             802.1x Authentication
-            AFS (4.0) Replication Server call declarations
-            AOL Instant Messenger
-            ARCNET
-            ATM
-            ATM LAN Emulation
-            AVS WLAN Capture header
+            Address Resolution Protocol
             Ad hoc On-demand Distance Vector Routing Protocol
             Ad hoc On-demand Distance Vector Routing Protocol v6
-            Address Resolution Protocol
+            AFS (4.0) Replication Server call declarations
             Aggregate Server Access Protocol
             Andrew File System (AFS)
+            AOL Instant Messenger
             Apache JServ Protocol v1.3
+            Appletalk Address Resolution Protocol
             AppleTalk Filing Protocol
             AppleTalk Session Protocol
             AppleTalk Transaction Protocol packet
-            Appletalk Address Resolution Protocol
+            ARCNET
             Async data over ISDN (V.120)
+            ATM
+            ATM AAL1
+            ATM AAL3/4
+            ATM LAN Emulation
+            ATM OAM AAL
             Authentication Header
+            AVS WLAN Capture header
             BACnet Virtual Link Control
             Banyan Vines
             Banyan Vines Fragmentation Protocol
             Banyan Vines SPP
             Blocks Extensible Exchange Protocol
+            Boardwalk
             Boot Parameters
             Bootstrap Protocol
             Border Gateway Protocol
             Building Automation and Control Network APDU
             Building Automation and Control Network NPDU
             CDS Clerk Server Calls
-            Check Point High Availability Protocol
             Checkpoint FW-1
+            Check Point High Availability Protocol
             Cisco Auto-RP
             Cisco Discovery Protocol
             Cisco Group Management Protocol
             Cisco HDLC
             Cisco Hot Standby Router Protocol
-            Cisco ISL
             Cisco Interior Gateway Routing Protocol
+            Cisco ISL
             Cisco NetFlow
             Cisco SLARP
             Clearcase NFS
-            CoSine IPNOS L2 debug output
             Common Open Policy Service
             Common Unix Printing System (CUPS) Browsing Protocol
+            CoSine IPNOS L2 debug output
+            Data
+            Datagram Delivery Protocol
+            Data Link SWitching
+            Data Stream Interface
             DCE DFS Calls
             DCE Distributed Time Service Local Server
             DCE Distributed Time Service Provider
             DCE Name Service
             DCE RPC
-            DCE Security ID Mapper
             DCE/RPC BOS Server
             DCE/RPC CDS Solicitation
             DCE/RPC Conversation Manager
@@ -223,25 +230,22 @@
             DCE/RPC FLDB UBIK TRANSFER
             DCE/RPC FLDB UBIKVOTE
             DCE/RPC Kerberos V
+            DCE/RPC Remote Management
+            DCE/RPC Repserver Calls
             DCE/RPC RS_ACCT
             DCE/RPC RS_MISC
             DCE/RPC RS_UNIX
-            DCE/RPC Remote Management
-            DCE/RPC Repserver Calls
             DCE/RPC TokenServer Calls
             DCE/RPC UpServer
+            DCE Security ID Mapper
             DCOM OXID Resolver
             DCOM Remote Activation
             DEC Spanning Tree Protocol
             DHCPv6
-            DNS Control Program Server
-            Data
-            Data Link SWitching
-            Data Stream Interface
-            Datagram Delivery Protocol
             Diameter Protocol
             Distance Vector Multicast Routing Protocol
             Distributed Checksum Clearinghouse Prototocl
+            DNS Control Program Server
             Domain Name Service
             Dummy Protocol
             Dynamic DNS Tools Protocol
@@ -250,26 +254,30 @@
             Ethernet
             Extensible Authentication Protocol
             FC Extended Link Svc
+            FC Fabric Configuration Server
             FCIP
-            FTP Data
-            FTServer Operations
             Fiber Distributed Data Interface
             Fibre Channel
+            Fibre Channel Common Transport
+            Fibre Channel Fabric Zone Server
+            Fibre Channel Name Server
             Fibre Channel Protocol for SCSI
             Fibre Channel SW_ILS
             File Transfer Protocol (FTP)
             Financial Information eXchange Protocol
             Frame
             Frame Relay
+            FTP Data
+            FTServer Operations
             GARP Multicast Registration Protocol
             GARP VLAN Registration Protocol
-            GPRS Tunneling Protocol
-            GPRS Tunnelling Protocol v0
-            GPRS Tunnelling Protocol v1
             General Inter-ORB Protocol
             Generic Routing Encapsulation
             Generic Security Service Application Program Interface
             Gnutella Protocol
+            GPRS Tunneling Protocol
+            GPRS Tunnelling Protocol v0
+            GPRS Tunnelling Protocol v1
             Hummingbird NFS Daemon
             HyperSCSI
             Hypertext Transfer Protocol
@@ -277,19 +285,6 @@
             IEEE 802.11 wireless LAN
             IEEE 802.11 wireless LAN management frame
             ILMI
-            IP Over FC
-            IP Payload Compression
-            IPX Message
-            IPX Routing Information Protocol
-            ISDN
-            ISDN Q.921-User Adaptation Layer
-            ISDN User Part
-            ISO 10589 ISIS InTRA Domain Routeing Information Exchange Protocol
-            ISO 8073 COTP Connection-Oriented Transport Protocol
-            ISO 8473 CLNP ConnectionLess Network Protocol
-            ISO 8602 CLTP ConnectionLess Transport Protocol
-            ISO 9542 ESIS Routeing Information Exchange Protocol
-            ITU-T Recommendation H.261
             Inter-Access-Point Protocol
             Interbase
             Internet Cache Protocol
@@ -304,6 +299,20 @@
             Internet Relay Chat
             Internet Security Association and Key Management Protocol
             Internetwork Packet eXchange
+            IP Over FC
+            IP Payload Compression
+            IPX Message
+            IPX Routing Information Protocol
+            iSCSI
+            ISDN
+            ISDN Q.921-User Adaptation Layer
+            ISDN User Part
+            ISO 10589 ISIS InTRA Domain Routeing Information Exchange Protocol
+            ISO 8073 COTP Connection-Oriented Transport Protocol
+            ISO 8473 CLNP ConnectionLess Network Protocol
+            ISO 8602 CLTP ConnectionLess Transport Protocol
+            ISO 9542 ESIS Routeing Information Exchange Protocol
+            ITU-T Recommendation H.261
             Java RMI
             Java Serialization
             Kerberos
@@ -312,8 +321,8 @@
             Layer 2 Tunneling Protocol
             Lightweight Directory Access Protocol
             Line Printer Daemon Protocol
-            Link Access Procedure Balanced (LAPB)
             Link Access Procedure Balanced Ethernet (LAPBETHER)
+            Link Access Procedure Balanced (LAPB)
             Link Access Procedure, Channel D (LAPD)
             Link Aggregation Control Protocol
             Link Management Protocol (LMP)
@@ -322,15 +331,10 @@
             LocalTalk Link Access Protocol
             Logical-Link Control
             Lucent/Ascend debug output
-            MMS Message Encapsulation
-            MS Proxy Protocol
-            MSNIP: Multicast Source Notification of Interest Protocol
-            MTP 2 Transparent Proxy
-            MTP 2 User Adaptation Layer
-            MTP 3 User Adaptation Layer
-            MTP2 Peer Adaptation Layer
+            MDS Header
             Message Transfer Part Level 2
             Message Transfer Part Level 3
+            Message Transfer Part Level 3 Management
             Microsoft Distributed File System
             Microsoft Exchange MAPI
             Microsoft Local Security Architecture
@@ -345,25 +349,27 @@
             Microsoft Windows Lanman Remote API Protocol
             Microsoft Windows Logon Protocol
             Microsoft Workstation Service
+            MMS Message Encapsulation
             Mobile IP
             Modbus/TCP
             Mount Service
-            MultiProtocol Label Switching Header
+            MSNIP: Multicast Source Notification of Interest Protocol
+            MS Proxy Protocol
+            MTP2 Peer Adaptation Layer
+            MTP 2 Transparent Proxy
+            MTP 2 User Adaptation Layer
+            MTP 3 User Adaptation Layer
             Multicast Router DISCovery protocol
             Multicast Source Discovery Protocol
-            NFSACL
-            NFSAUTH
-            NIS+
-            NIS+ Callback
-            NSPI
-            NTLM Secure Service Provider
+            MultiProtocol Label Switching Header
+            MySQL Protocol
             Name Binding Protocol
             Name Management Protocol over IPX
             NetBIOS
             NetBIOS Datagram Service
             NetBIOS Name Service
-            NetBIOS Session Service
             NetBIOS over IPX
+            NetBIOS Session Service
             NetWare Core Protocol
             Network Data Management Protocol
             Network File System
@@ -372,15 +378,25 @@
             Network Status Monitor CallBack Protocol
             Network Status Monitor Protocol
             Network Time Protocol
+            NFSACL
+            NFSAUTH
+            NIS+
+            NIS+ Callback
             Novell Distributed Print System
+            NSPI
+            NTLM Secure Service Provider
             Null/Loopback
-            Open Shortest Path First
             OpenBSD Packet Filter log file
+            Open Shortest Path First
             PC NFS
+            Point-to-Point Protocol
+            Point-to-Point Tunnelling Protocol
+            Portmap
+            Post Office Protocol
             PPP Bandwidth Allocation Control Protocol
             PPP Bandwidth Allocation Protocol
-            PPP CDP Control Protocol
             PPP Callback Control Protocol
+            PPP CDP Control Protocol
             PPP Challenge Handshake Authentication Protocol
             PPP Compressed Datagram
             PPP Compression Control Protocol
@@ -390,62 +406,48 @@
             PPP MPLS Control Protocol
             PPP Multilink Protocol
             PPP Multiplexing
-            PPP Password Authentication Protocol
-            PPP VJ Compression
+            PPPMux Control Protocol
             PPP-over-Ethernet Discovery
             PPP-over-Ethernet Session
-            PPPMux Control Protocol
-            Point-to-Point Protocol
-            Point-to-Point Tunnelling Protocol
-            Portmap
-            Post Office Protocol
+            PPP Password Authentication Protocol
+            PPP VJ Compression
             Pragmatic General Multicast
             Prism
             Privilege Server operations
             Protocol Independent Multicast
             Q.2931
             Q.931
-            Quake II Network Protocol
             Quake III Arena Network Protocol
+            Quake II Network Protocol
             Quake Network Protocol
             QuakeWorld Network Protocol
             Qualified Logical Link Control
-            RFC 2250 MPEG1
-            RIPng
-            RPC Browser
-            RSTAT
-            RX Protocol
             Radio Access Network Application Part
             Radius Protocol
             Raw packet data
             Real Time Streaming Protocol
-            Real-Time Transport Protocol
             Real-time Transport Control Protocol
-            Registry Server Attributes Manipulation Interface
+            Real-Time Transport Protocol
             Registry server administration operations.
+            Registry Server Attributes Manipulation Interface
             Remote Override interface
             Remote Procedure Call
             Remote Program Load
             Remote Quota
+            Remote sec_login preauth interface.
             Remote Shell
             Remote Wall protocol
-            Remote sec_login preauth interface.
             Resource ReserVation Protocol (RSVP)
+            RFC 2250 MPEG1
+            RIPng
             Rlogin Protocol
             Routing Information Protocol
             Routing Table Maintenance Protocol
+            RPC Browser
+            RSTAT
+            RX Protocol
             SADMIND
             SCSI
-            SGI Mount Service
-            SMB (Server Message Block Protocol)
-            SMB MailSlot Protocol
-            SMB Pipe Protocol
-            SNA-over-Ethernet
-            SNMP Multiplex Protocol
-            SPNEGO-KRB5
-            SPRAY
-            SS7 SCCP-User Adaptation Layer
-            SSCOP
             Secure Socket Layer
             Sequenced Packet eXchange
             Service Advertisement Protocol
@@ -453,6 +455,7 @@
             Session Announcement Protocol
             Session Description Protocol
             Session Initiation Protocol
+            SGI Mount Service
             Short Message Peer to Peer
             Signalling Connection Control Part
             Signalling Connection Control Part Management
@@ -461,21 +464,32 @@
             Sinec H1 Protocol
             Skinny Client Control Protocol
             SliMP3 Communication Protocol
+            SMB MailSlot Protocol
+            SMB Pipe Protocol
+            SMB (Server Message Block Protocol)
+            SNA-over-Ethernet
+            SNMP Multiplex Protocol
             Socks Protocol
             Spanning Tree Protocol
             Spnego
+            SPNEGO-KRB5
+            SPRAY
+            SS7 SCCP-User Adaptation Layer
+            SSCOP
             Stream Control Transmission Protocol
+            Synchronous Data Link Control (SDLC)
             Syslog message
             Systems Network Architecture
+            Tabular Data Stream
             TACACS
             TACACS+
-            TPKT
-            Tabular Data Stream
+            Tazmen Sniffer Protocol
             Telnet
             Time Protocol
             Time Synchronization Protocol
             Token-Ring
             Token-Ring Media Access Control
+            TPKT
             Transmission Control Protocol
             Transparent Network Substrate Protocol
             Trivial File Transfer Protocol
@@ -485,15 +499,17 @@
             Virtual Trunking Protocol
             Web Cache Coordination Protocol
             Wellfleet Compression
+            Wellfleet HDLC
             Who
             Windows 2000 DNS
             Wireless Session Protocol
             Wireless Transaction Protocol
             Wireless Transport Layer Security
-            X Display Manager Control Protocol
+            X11
             X.25
             X.25 over TCP
-            X11
+            X.29
+            X Display Manager Control Protocol
             Xyplex
             Yahoo Messenger Protocol
             Yellow Pages Bind
@@ -502,7 +518,6 @@
             Yellow Pages Transfer
             Zebra Protocol
             Zone Information Protocol
-            iSCSI
 
    Q 1.3: Are there any plans to support {your favorite protocol}?
 
@@ -744,6 +759,18 @@
    this. See, for example, this documentation from Cisco on the Switched
    Port Analyzer (SPAN) feature on Catalyst switches.
 
+   Note also that many firewall/NAT boxes have a switch built into them;
+   this includes many of the "cable/DSL router" boxes. If you have a box
+   of that sort, that has a switch with some number of Ethernet ports
+   into which you plug machines on your network, and another Ethernet
+   port used to connect to a cable or DSL modem, you can, at least, sniff
+   traffic between the machines on your network and the Internet by
+   plugging the Ethernet port on the router going to the modem, the
+   Ethernet port on the modem, and the machine on which you're running
+   Ethereal into a hub (make sure it's not a switching hub, and that, if
+   it's a dual-speed hub, all three of those ports are running at the
+   same speed.
+
    If your machine is not plugged into a switched network or a dual-speed
    hub, or it is plugged into a switched network but the port is set up
    to have all traffic replicated to it, the problem might be that the
@@ -1006,6 +1033,16 @@
        you should uninstall WinPcap, download and install the current
        version of WinPcap, and then install the latest version of
        Ethereal.
+     * On Windows 95, 98, or Me, sometimes more than one interface will
+       be given the same name; if that is the case, you will only be able
+       to capture on one of those interfaces - it's not clear to which
+       one the name, when used in a WinPcap application, will refer. For
+       example, if you have a PPP serial interface and a VPN interface,
+       they might show up with the same name, for example "ppp-mac", and
+       if you try to capture on "ppp-mac", it might not capture on the
+       interface you're currently using. In that case, you might, for
+       example, have to remove the VPN interface from the system in order
+       to capture on the PPP serial interface.
      * WinPcap doesn't support PPP WAN interfaces on Windows
        NT/2000/XP/Server, so Ethereal cannot capture packets on those
        devices when running on Windows NT/2000/XP/Server. Regular dial-up
@@ -1429,4 +1466,4 @@ echo "Mode: ess" >/proc/driver/aironet/ethN/Config
    list. 
    For corrections/additions/suggestions for this page, please send email
    to: ethereal-web[AT]ethereal.com
-   Last modified: Thu, January 16 2003.
+   Last modified: Sun, February 09 2003.
diff --git a/FAQ.include b/FAQ.include
index efd686813d..8f48dfd316 100644
--- a/FAQ.include
+++ b/FAQ.include
@@ -3,7 +3,7 @@
 "\n"
 "   Note: This is just an ASCII snapshot of the faq and may not be up to\n"
 "         date. Please go to http://www.ethereal.com/faq for the up to\n"
-"         date version. The version of the snapshot can be found at the\n"
+"         date version. The version of this snapshot can be found at the\n"
 "         end of this document.\n"
 "\n"
 "   INDEX\n"
@@ -160,61 +160,68 @@
 "\n"
 "   Q 1.2: What protocols are currently supported?\n"
 "\n"
-"   A: There are currently 340 supported protocols and media, listed\n"
+"   A: There are currently 355 supported protocols and media, listed\n"
 "   below. Descriptions can be found in the ethereal(1) man page.\n"
 "\n"
 "            802.1q Virtual LAN\n"
 "            802.1x Authentication\n"
-"            AFS (4.0) Replication Server call declarations\n"
-"            AOL Instant Messenger\n"
-"            ARCNET\n"
-"            ATM\n"
-"            ATM LAN Emulation\n"
-"            AVS WLAN Capture header\n"
+"            Address Resolution Protocol\n"
 "            Ad hoc On-demand Distance Vector Routing Protocol\n"
 "            Ad hoc On-demand Distance Vector Routing Protocol v6\n"
-"            Address Resolution Protocol\n"
+"            AFS (4.0) Replication Server call declarations\n"
 "            Aggregate Server Access Protocol\n"
 "            Andrew File System (AFS)\n"
+"            AOL Instant Messenger\n"
 "            Apache JServ Protocol v1.3\n"
+"            Appletalk Address Resolution Protocol\n"
 "            AppleTalk Filing Protocol\n"
 "            AppleTalk Session Protocol\n"
 "            AppleTalk Transaction Protocol packet\n"
-"            Appletalk Address Resolution Protocol\n"
+"            ARCNET\n"
 "            Async data over ISDN (V.120)\n"
+"            ATM\n"
+"            ATM AAL1\n"
+"            ATM AAL3/4\n"
+"            ATM LAN Emulation\n"
+"            ATM OAM AAL\n"
 "            Authentication Header\n"
+"            AVS WLAN Capture header\n"
 "            BACnet Virtual Link Control\n"
 "            Banyan Vines\n"
 "            Banyan Vines Fragmentation Protocol\n"
 "            Banyan Vines SPP\n"
 "            Blocks Extensible Exchange Protocol\n"
+"            Boardwalk\n"
 "            Boot Parameters\n"
 "            Bootstrap Protocol\n"
 "            Border Gateway Protocol\n"
 "            Building Automation and Control Network APDU\n"
 "            Building Automation and Control Network NPDU\n"
 "            CDS Clerk Server Calls\n"
-"            Check Point High Availability Protocol\n"
 "            Checkpoint FW-1\n"
+"            Check Point High Availability Protocol\n"
 "            Cisco Auto-RP\n"
 "            Cisco Discovery Protocol\n"
 "            Cisco Group Management Protocol\n"
 "            Cisco HDLC\n"
 "            Cisco Hot Standby Router Protocol\n"
-"            Cisco ISL\n"
 "            Cisco Interior Gateway Routing Protocol\n"
+"            Cisco ISL\n"
 "            Cisco NetFlow\n"
 "            Cisco SLARP\n"
 "            Clearcase NFS\n"
-"            CoSine IPNOS L2 debug output\n"
 "            Common Open Policy Service\n"
 "            Common Unix Printing System (CUPS) Browsing Protocol\n"
+"            CoSine IPNOS L2 debug output\n"
+"            Data\n"
+"            Datagram Delivery Protocol\n"
+"            Data Link SWitching\n"
+"            Data Stream Interface\n"
 "            DCE DFS Calls\n"
 "            DCE Distributed Time Service Local Server\n"
 "            DCE Distributed Time Service Provider\n"
 "            DCE Name Service\n"
 "            DCE RPC\n"
-"            DCE Security ID Mapper\n"
 "            DCE/RPC BOS Server\n"
 "            DCE/RPC CDS Solicitation\n"
 "            DCE/RPC Conversation Manager\n"
@@ -223,25 +230,22 @@
 "            DCE/RPC FLDB UBIK TRANSFER\n"
 "            DCE/RPC FLDB UBIKVOTE\n"
 "            DCE/RPC Kerberos V\n"
+"            DCE/RPC Remote Management\n"
+"            DCE/RPC Repserver Calls\n"
 "            DCE/RPC RS_ACCT\n"
 "            DCE/RPC RS_MISC\n"
 "            DCE/RPC RS_UNIX\n"
-"            DCE/RPC Remote Management\n"
-"            DCE/RPC Repserver Calls\n"
 "            DCE/RPC TokenServer Calls\n"
 "            DCE/RPC UpServer\n"
+"            DCE Security ID Mapper\n"
 "            DCOM OXID Resolver\n"
 "            DCOM Remote Activation\n"
 "            DEC Spanning Tree Protocol\n"
 "            DHCPv6\n"
-"            DNS Control Program Server\n"
-"            Data\n"
-"            Data Link SWitching\n"
-"            Data Stream Interface\n"
-"            Datagram Delivery Protocol\n"
 "            Diameter Protocol\n"
 "            Distance Vector Multicast Routing Protocol\n"
 "            Distributed Checksum Clearinghouse Prototocl\n"
+"            DNS Control Program Server\n"
 "            Domain Name Service\n"
 "            Dummy Protocol\n"
 "            Dynamic DNS Tools Protocol\n"
@@ -250,26 +254,30 @@
 "            Ethernet\n"
 "            Extensible Authentication Protocol\n"
 "            FC Extended Link Svc\n"
+"            FC Fabric Configuration Server\n"
 "            FCIP\n"
-"            FTP Data\n"
-"            FTServer Operations\n"
 "            Fiber Distributed Data Interface\n"
 "            Fibre Channel\n"
+"            Fibre Channel Common Transport\n"
+"            Fibre Channel Fabric Zone Server\n"
+"            Fibre Channel Name Server\n"
 "            Fibre Channel Protocol for SCSI\n"
 "            Fibre Channel SW_ILS\n"
 "            File Transfer Protocol (FTP)\n"
 "            Financial Information eXchange Protocol\n"
 "            Frame\n"
 "            Frame Relay\n"
+"            FTP Data\n"
+"            FTServer Operations\n"
 "            GARP Multicast Registration Protocol\n"
 "            GARP VLAN Registration Protocol\n"
-"            GPRS Tunneling Protocol\n"
-"            GPRS Tunnelling Protocol v0\n"
-"            GPRS Tunnelling Protocol v1\n"
 "            General Inter-ORB Protocol\n"
 "            Generic Routing Encapsulation\n"
 "            Generic Security Service Application Program Interface\n"
 "            Gnutella Protocol\n"
+"            GPRS Tunneling Protocol\n"
+"            GPRS Tunnelling Protocol v0\n"
+"            GPRS Tunnelling Protocol v1\n"
 "            Hummingbird NFS Daemon\n"
 "            HyperSCSI\n"
 "            Hypertext Transfer Protocol\n"
@@ -277,19 +285,6 @@
 "            IEEE 802.11 wireless LAN\n"
 "            IEEE 802.11 wireless LAN management frame\n"
 "            ILMI\n"
-"            IP Over FC\n"
-"            IP Payload Compression\n"
-"            IPX Message\n"
-"            IPX Routing Information Protocol\n"
-"            ISDN\n"
-"            ISDN Q.921-User Adaptation Layer\n"
-"            ISDN User Part\n"
-"            ISO 10589 ISIS InTRA Domain Routeing Information Exchange Protocol\n"
-"            ISO 8073 COTP Connection-Oriented Transport Protocol\n"
-"            ISO 8473 CLNP ConnectionLess Network Protocol\n"
-"            ISO 8602 CLTP ConnectionLess Transport Protocol\n"
-"            ISO 9542 ESIS Routeing Information Exchange Protocol\n"
-"            ITU-T Recommendation H.261\n"
 "            Inter-Access-Point Protocol\n"
 "            Interbase\n"
 "            Internet Cache Protocol\n"
@@ -304,6 +299,20 @@
 "            Internet Relay Chat\n"
 "            Internet Security Association and Key Management Protocol\n"
 "            Internetwork Packet eXchange\n"
+"            IP Over FC\n"
+"            IP Payload Compression\n"
+"            IPX Message\n"
+"            IPX Routing Information Protocol\n"
+"            iSCSI\n"
+"            ISDN\n"
+"            ISDN Q.921-User Adaptation Layer\n"
+"            ISDN User Part\n"
+"            ISO 10589 ISIS InTRA Domain Routeing Information Exchange Protocol\n"
+"            ISO 8073 COTP Connection-Oriented Transport Protocol\n"
+"            ISO 8473 CLNP ConnectionLess Network Protocol\n"
+"            ISO 8602 CLTP ConnectionLess Transport Protocol\n"
+"            ISO 9542 ESIS Routeing Information Exchange Protocol\n"
+"            ITU-T Recommendation H.261\n"
 "            Java RMI\n"
 "            Java Serialization\n"
 "            Kerberos\n"
@@ -312,8 +321,8 @@
 "            Layer 2 Tunneling Protocol\n"
 "            Lightweight Directory Access Protocol\n"
 "            Line Printer Daemon Protocol\n"
-"            Link Access Procedure Balanced (LAPB)\n"
 "            Link Access Procedure Balanced Ethernet (LAPBETHER)\n"
+"            Link Access Procedure Balanced (LAPB)\n"
 "            Link Access Procedure, Channel D (LAPD)\n"
 "            Link Aggregation Control Protocol\n"
 "            Link Management Protocol (LMP)\n"
@@ -322,15 +331,10 @@
 "            LocalTalk Link Access Protocol\n"
 "            Logical-Link Control\n"
 "            Lucent/Ascend debug output\n"
-"            MMS Message Encapsulation\n"
-"            MS Proxy Protocol\n"
-"            MSNIP: Multicast Source Notification of Interest Protocol\n"
-"            MTP 2 Transparent Proxy\n"
-"            MTP 2 User Adaptation Layer\n"
-"            MTP 3 User Adaptation Layer\n"
-"            MTP2 Peer Adaptation Layer\n"
+"            MDS Header\n"
 "            Message Transfer Part Level 2\n"
 "            Message Transfer Part Level 3\n"
+"            Message Transfer Part Level 3 Management\n"
 "            Microsoft Distributed File System\n"
 "            Microsoft Exchange MAPI\n"
 "            Microsoft Local Security Architecture\n"
@@ -345,25 +349,27 @@
 "            Microsoft Windows Lanman Remote API Protocol\n"
 "            Microsoft Windows Logon Protocol\n"
 "            Microsoft Workstation Service\n"
+"            MMS Message Encapsulation\n"
 "            Mobile IP\n"
 "            Modbus/TCP\n"
 "            Mount Service\n"
-"            MultiProtocol Label Switching Header\n"
+"            MSNIP: Multicast Source Notification of Interest Protocol\n"
+"            MS Proxy Protocol\n"
+"            MTP2 Peer Adaptation Layer\n"
+"            MTP 2 Transparent Proxy\n"
+"            MTP 2 User Adaptation Layer\n"
+"            MTP 3 User Adaptation Layer\n"
 "            Multicast Router DISCovery protocol\n"
 "            Multicast Source Discovery Protocol\n"
-"            NFSACL\n"
-"            NFSAUTH\n"
-"            NIS+\n"
-"            NIS+ Callback\n"
-"            NSPI\n"
-"            NTLM Secure Service Provider\n"
+"            MultiProtocol Label Switching Header\n"
+"            MySQL Protocol\n"
 "            Name Binding Protocol\n"
 "            Name Management Protocol over IPX\n"
 "            NetBIOS\n"
 "            NetBIOS Datagram Service\n"
 "            NetBIOS Name Service\n"
-"            NetBIOS Session Service\n"
 "            NetBIOS over IPX\n"
+"            NetBIOS Session Service\n"
 "            NetWare Core Protocol\n"
 "            Network Data Management Protocol\n"
 "            Network File System\n"
@@ -372,15 +378,25 @@
 "            Network Status Monitor CallBack Protocol\n"
 "            Network Status Monitor Protocol\n"
 "            Network Time Protocol\n"
+"            NFSACL\n"
+"            NFSAUTH\n"
+"            NIS+\n"
+"            NIS+ Callback\n"
 "            Novell Distributed Print System\n"
+"            NSPI\n"
+"            NTLM Secure Service Provider\n"
 "            Null/Loopback\n"
-"            Open Shortest Path First\n"
 "            OpenBSD Packet Filter log file\n"
+"            Open Shortest Path First\n"
 "            PC NFS\n"
+"            Point-to-Point Protocol\n"
+"            Point-to-Point Tunnelling Protocol\n"
+"            Portmap\n"
+"            Post Office Protocol\n"
 "            PPP Bandwidth Allocation Control Protocol\n"
 "            PPP Bandwidth Allocation Protocol\n"
-"            PPP CDP Control Protocol\n"
 "            PPP Callback Control Protocol\n"
+"            PPP CDP Control Protocol\n"
 "            PPP Challenge Handshake Authentication Protocol\n"
 "            PPP Compressed Datagram\n"
 "            PPP Compression Control Protocol\n"
@@ -390,62 +406,48 @@
 "            PPP MPLS Control Protocol\n"
 "            PPP Multilink Protocol\n"
 "            PPP Multiplexing\n"
-"            PPP Password Authentication Protocol\n"
-"            PPP VJ Compression\n"
+"            PPPMux Control Protocol\n"
 "            PPP-over-Ethernet Discovery\n"
 "            PPP-over-Ethernet Session\n"
-"            PPPMux Control Protocol\n"
-"            Point-to-Point Protocol\n"
-"            Point-to-Point Tunnelling Protocol\n"
-"            Portmap\n"
-"            Post Office Protocol\n"
+"            PPP Password Authentication Protocol\n"
+"            PPP VJ Compression\n"
 "            Pragmatic General Multicast\n"
 "            Prism\n"
 "            Privilege Server operations\n"
 "            Protocol Independent Multicast\n"
 "            Q.2931\n"
 "            Q.931\n"
-"            Quake II Network Protocol\n"
 "            Quake III Arena Network Protocol\n"
+"            Quake II Network Protocol\n"
 "            Quake Network Protocol\n"
 "            QuakeWorld Network Protocol\n"
 "            Qualified Logical Link Control\n"
-"            RFC 2250 MPEG1\n"
-"            RIPng\n"
-"            RPC Browser\n"
-"            RSTAT\n"
-"            RX Protocol\n"
 "            Radio Access Network Application Part\n"
 "            Radius Protocol\n"
 "            Raw packet data\n"
 "            Real Time Streaming Protocol\n"
-"            Real-Time Transport Protocol\n"
 "            Real-time Transport Control Protocol\n"
-"            Registry Server Attributes Manipulation Interface\n"
+"            Real-Time Transport Protocol\n"
 "            Registry server administration operations.\n"
+"            Registry Server Attributes Manipulation Interface\n"
 "            Remote Override interface\n"
 "            Remote Procedure Call\n"
 "            Remote Program Load\n"
 "            Remote Quota\n"
+"            Remote sec_login preauth interface.\n"
 "            Remote Shell\n"
 "            Remote Wall protocol\n"
-"            Remote sec_login preauth interface.\n"
 "            Resource ReserVation Protocol (RSVP)\n"
+"            RFC 2250 MPEG1\n"
+"            RIPng\n"
 "            Rlogin Protocol\n"
 "            Routing Information Protocol\n"
 "            Routing Table Maintenance Protocol\n"
+"            RPC Browser\n"
+"            RSTAT\n"
+"            RX Protocol\n"
 "            SADMIND\n"
 "            SCSI\n"
-"            SGI Mount Service\n"
-"            SMB (Server Message Block Protocol)\n"
-"            SMB MailSlot Protocol\n"
-"            SMB Pipe Protocol\n"
-"            SNA-over-Ethernet\n"
-"            SNMP Multiplex Protocol\n"
-"            SPNEGO-KRB5\n"
-"            SPRAY\n"
-"            SS7 SCCP-User Adaptation Layer\n"
-"            SSCOP\n"
 "            Secure Socket Layer\n"
 "            Sequenced Packet eXchange\n"
 "            Service Advertisement Protocol\n"
@@ -453,6 +455,7 @@
 "            Session Announcement Protocol\n"
 "            Session Description Protocol\n"
 "            Session Initiation Protocol\n"
+"            SGI Mount Service\n"
 "            Short Message Peer to Peer\n"
 "            Signalling Connection Control Part\n"
 "            Signalling Connection Control Part Management\n"
@@ -461,21 +464,32 @@
 "            Sinec H1 Protocol\n"
 "            Skinny Client Control Protocol\n"
 "            SliMP3 Communication Protocol\n"
+"            SMB MailSlot Protocol\n"
+"            SMB Pipe Protocol\n"
+"            SMB (Server Message Block Protocol)\n"
+"            SNA-over-Ethernet\n"
+"            SNMP Multiplex Protocol\n"
 "            Socks Protocol\n"
 "            Spanning Tree Protocol\n"
 "            Spnego\n"
+"            SPNEGO-KRB5\n"
+"            SPRAY\n"
+"            SS7 SCCP-User Adaptation Layer\n"
+"            SSCOP\n"
 "            Stream Control Transmission Protocol\n"
+"            Synchronous Data Link Control (SDLC)\n"
 "            Syslog message\n"
 "            Systems Network Architecture\n"
+"            Tabular Data Stream\n"
 "            TACACS\n"
 "            TACACS+\n"
-"            TPKT\n"
-"            Tabular Data Stream\n"
+"            Tazmen Sniffer Protocol\n"
 "            Telnet\n"
 "            Time Protocol\n"
 "            Time Synchronization Protocol\n"
 "            Token-Ring\n"
 "            Token-Ring Media Access Control\n"
+"            TPKT\n"
 "            Transmission Control Protocol\n"
 "            Transparent Network Substrate Protocol\n"
 "            Trivial File Transfer Protocol\n"
@@ -485,15 +499,17 @@
 "            Virtual Trunking Protocol\n"
 "            Web Cache Coordination Protocol\n"
 "            Wellfleet Compression\n"
+"            Wellfleet HDLC\n"
 "            Who\n"
 "            Windows 2000 DNS\n"
 "            Wireless Session Protocol\n"
 "            Wireless Transaction Protocol\n"
 "            Wireless Transport Layer Security\n"
-"            X Display Manager Control Protocol\n"
+"            X11\n"
 "            X.25\n"
 "            X.25 over TCP\n"
-"            X11\n"
+"            X.29\n"
+"            X Display Manager Control Protocol\n"
 "            Xyplex\n"
 "            Yahoo Messenger Protocol\n"
 "            Yellow Pages Bind\n"
@@ -502,7 +518,6 @@
 "            Yellow Pages Transfer\n"
 "            Zebra Protocol\n"
 "            Zone Information Protocol\n"
-"            iSCSI\n"
 "\n"
 "   Q 1.3: Are there any plans to support {your favorite protocol}?\n"
 "\n"
@@ -744,6 +759,18 @@
 "   this. See, for example, this documentation from Cisco on the Switched\n"
 "   Port Analyzer (SPAN) feature on Catalyst switches.\n"
 "\n"
+"   Note also that many firewall/NAT boxes have a switch built into them;\n"
+"   this includes many of the \"cable/DSL router\" boxes. If you have a box\n"
+"   of that sort, that has a switch with some number of Ethernet ports\n"
+"   into which you plug machines on your network, and another Ethernet\n"
+"   port used to connect to a cable or DSL modem, you can, at least, sniff\n"
+"   traffic between the machines on your network and the Internet by\n"
+"   plugging the Ethernet port on the router going to the modem, the\n"
+"   Ethernet port on the modem, and the machine on which you're running\n"
+"   Ethereal into a hub (make sure it's not a switching hub, and that, if\n"
+"   it's a dual-speed hub, all three of those ports are running at the\n"
+"   same speed.\n"
+"\n"
 "   If your machine is not plugged into a switched network or a dual-speed\n"
 "   hub, or it is plugged into a switched network but the port is set up\n"
 "   to have all traffic replicated to it, the problem might be that the\n"
@@ -1006,6 +1033,16 @@
 "       you should uninstall WinPcap, download and install the current\n"
 "       version of WinPcap, and then install the latest version of\n"
 "       Ethereal.\n"
+"     * On Windows 95, 98, or Me, sometimes more than one interface will\n"
+"       be given the same name; if that is the case, you will only be able\n"
+"       to capture on one of those interfaces - it's not clear to which\n"
+"       one the name, when used in a WinPcap application, will refer. For\n"
+"       example, if you have a PPP serial interface and a VPN interface,\n"
+"       they might show up with the same name, for example \"ppp-mac\", and\n"
+"       if you try to capture on \"ppp-mac\", it might not capture on the\n"
+"       interface you're currently using. In that case, you might, for\n"
+"       example, have to remove the VPN interface from the system in order\n"
+"       to capture on the PPP serial interface.\n"
 "     * WinPcap doesn't support PPP WAN interfaces on Windows\n"
 "       NT/2000/XP/Server, so Ethereal cannot capture packets on those\n"
 "       devices when running on Windows NT/2000/XP/Server. Regular dial-up\n"
@@ -1429,4 +1466,4 @@
 "   list. \n"
 "   For corrections/additions/suggestions for this page, please send email\n"
 "   to: ethereal-web[AT]ethereal.com\n"
-"   Last modified: Thu, January 16 2003.\n"
+"   Last modified: Sun, February 09 2003.\n"