Added a whole bunch of common protocols and ports from the latest edition of

Assigned Numbers.

diff --git a/etc/protocols b/etc/protocols
index 8db17cf..135a5b7 100644 (file)
--- a/etc/protocols
+++ b/etc/protocols
@@ -1,11 +1,17 @@
 #
 # Internet (IP) protocols
 #
 #
 # Internet (IP) protocols
 #

-#      @(#)protocols   5.1 (Berkeley) 4/17/89
+#      $Id$
+#      from: @(#)protocols     5.1 (Berkeley) 4/17/89
+#
+# Updated for FreeBSD based on RFC 1340, Assigned Numbers (July 1992).

 #
 ip     0       IP              # internet protocol, pseudo protocol number
 icmp   1       ICMP            # internet control message protocol
 #
 ip     0       IP              # internet protocol, pseudo protocol number
 icmp   1       ICMP            # internet control message protocol

+igmp   2       IGMP            # Internet Group Management

 ggp    3       GGP             # gateway-gateway protocol
 ggp    3       GGP             # gateway-gateway protocol

+ipencap        4       IP-ENCAP        # IP encapsulated in IP (officially ``IP'')
+st     5       ST              # ST datagram mode

 tcp    6       TCP             # transmission control protocol
 egp    8       EGP             # exterior gateway protocol
 pup    12      PUP             # PARC universal packet protocol
 tcp    6       TCP             # transmission control protocol
 egp    8       EGP             # exterior gateway protocol
 pup    12      PUP             # PARC universal packet protocol


@@ -13,3 +19,10 @@ udp  17      UDP             # user datagram protocol
 hmp    20      HMP             # host monitoring protocol
 xns-idp        22      XNS-IDP         # Xerox NS IDP
 rdp    27      RDP             # "reliable datagram" protocol
 hmp    20      HMP             # host monitoring protocol
 xns-idp        22      XNS-IDP         # Xerox NS IDP
 rdp    27      RDP             # "reliable datagram" protocol

+iso-tp4        29      ISO-TP4         # ISO Transport Protocol class 4
+xtp    36      XTP             # Xpress Tranfer Protocol
+idpr-cmtp      39      IDPR-CMTP       # IDPR Control Message Transport
+vmtp   81      VMTP            # Versatile Message Transport
+ospf   89      OSPFIGP         # Open Shortest Path First IGP
+ipip   94      IPIP            # Yet Another IP encapsulation
+encap  98      ENCAP           # Yet Another IP encapsulation

diff --git a/etc/services b/etc/services
index cd7509f..561928b 100644 (file)
--- a/etc/services
+++ b/etc/services
@@ -1,8 +1,16 @@
 #
 # Network services, Internet style
 #
 #
 # Network services, Internet style
 #

-#      @(#)services    5.8 (Berkeley) 5/9/91
+# Note that it is presently the policy of IANA to assign a single well-known
+# port number for both TCP and UDP; hence, most entries here have two entries
+# even if the protocol doesn't support UDP operations.
+# Updated from RFC 1340, ``Assigned Numbers'' (July 1992).  Not all ports
+# are included, only the more common ones.

 #
 #

+#      $Id$
+#      From: @(#)services      5.8 (Berkeley) 5/9/91
+#
+tcpmux         1/tcp           # TCP port service multiplexer

 echo           7/tcp
 echo           7/udp
 discard                9/tcp           sink null
 echo           7/tcp
 echo           7/udp
 discard                9/tcp           sink null


@@ -12,11 +20,16 @@ daytime             13/tcp
 daytime                13/udp
 netstat                15/tcp
 qotd           17/tcp          quote
 daytime                13/udp
 netstat                15/tcp
 qotd           17/tcp          quote

+msp            18/tcp          # message send protocol
+msp            18/udp          # message send protocol

 chargen                19/tcp          ttytst source
 chargen                19/udp          ttytst source
 ftp            21/tcp
 chargen                19/tcp          ttytst source
 chargen                19/udp          ttytst source
 ftp            21/tcp

+# 22 - unassigned

 telnet         23/tcp
 telnet         23/tcp

+# 24 - private

 smtp           25/tcp          mail
 smtp           25/tcp          mail

+# 26 - unassigned

 time           37/tcp          timserver
 time           37/udp          timserver
 rlp            39/udp          resource        # resource location
 time           37/tcp          timserver
 time           37/udp          timserver
 rlp            39/udp          resource        # resource location


@@ -25,28 +38,82 @@ whois               43/tcp          nicname
 domain         53/tcp          nameserver      # name-domain server
 domain         53/udp          nameserver
 mtp            57/tcp                          # deprecated
 domain         53/tcp          nameserver      # name-domain server
 domain         53/udp          nameserver
 mtp            57/tcp                          # deprecated

-# Bootp experimental (sellgren@vangogh)
-bootp          67/udp                          # bootp server
-#bootpc                68/udp                          # bootp client
-#
+bootps         67/tcp          # BOOTP server
+bootps         67/udp
+bootpc         68/tcp          # BOOTP client
+bootpc         68/udp

 tftp           69/udp
 tftp           69/udp

+gopher         70/tcp          # Internet Gopher
+gopher         70/udp

 rje            77/tcp          netrjs
 finger         79/tcp
 rje            77/tcp          netrjs
 finger         79/tcp

+www            80/tcp          http    # WorldWideWeb HTTP
+www            80/udp                  # HyperText Transfer Protocol

 link           87/tcp          ttylink
 link           87/tcp          ttylink

+kerberos       88/tcp          krb5    # Kerberos v5
+kerberos       88/udp

 supdup         95/tcp
 supdup         95/tcp

+# 100 - reserved

 hostnames      101/tcp         hostname        # usually from sri-nic
 hostnames      101/tcp         hostname        # usually from sri-nic

-tsap           102/tcp                         # part of ISODE.
-#csnet-cs      105/?
-pop            109/tcp         postoffice
+iso-tsap       102/tcp         tsap            # part of ISODE.
+csnet-ns       105/tcp         cso-ns  # also used by CSO name server
+csnet-ns       105/udp         cso-ns
+rtelnet                107/tcp         # Remote Telnet
+rtelnet                107/udp
+pop2           109/tcp         postoffice      # POP version 2
+pop2           109/udp
+pop3           110/tcp         # POP version 3
+pop3           110/udp

 sunrpc         111/tcp
 sunrpc         111/udp
 auth           113/tcp         authentication
 sftp           115/tcp
 uucp-path      117/tcp
 nntp           119/tcp         readnews untp   # USENET News Transfer Protocol
 sunrpc         111/tcp
 sunrpc         111/udp
 auth           113/tcp         authentication
 sftp           115/tcp
 uucp-path      117/tcp
 nntp           119/tcp         readnews untp   # USENET News Transfer Protocol

+ntp            123/tcp

 ntp            123/udp                         # Network Time Protocol
 ntp            123/udp                         # Network Time Protocol

-snmp           161/udp
-snmp-trap      162/udp
+netbios-ns     137/tcp                         # NETBIOS Name Service
+netbios-ns     137/udp
+netbios-dgm    138/tcp                         # NETBIOS Datagram Service
+netbios-dgm    138/udp
+netbios-ssn    139/tcp                         # NETBIOS session service
+netbios-ssn    139/udp
+imap2          143/tcp                         # Interim Mail Access Proto v2
+imap2          143/udp
+snmp           161/udp                         # Simple Net Mgmt Proto
+snmp-trap      162/udp         snmptrap        # Traps for SNMP
+cmip-man       163/tcp                         # ISO mgmt over IP (CMOT)
+cmip-man       163/udp
+cmip-agent     164/tcp
+cmip-agent     164/udp
+xdmcp          177/tcp                         # X Display Mgr. Control Proto
+xdmcp          177/udp
+nextstep       178/tcp         NeXTStep NextStep       # NeXTStep window
+nextstep       178/udp         NeXTStep NextStep       # server
+bgp            179/tcp                         # Border Gateway Proto.
+bgp            179/udp
+prospero       191/tcp                         # Cliff Neuman's Prospero
+prospero       191/udp
+irc            194/tcp                         # Internet Relay Chat
+irc            194/udp
+smux           199/tcp                         # SNMP Unix Multiplexer
+smux           199/udp
+at-rtmp                201/tcp                         # AppleTalk routing
+at-rtmp                201/udp
+at-nbp         202/tcp                         # AppleTalk name binding
+at-nbp         202/udp
+at-echo                204/tcp                         # AppleTalk echo
+at-echo                204/udp
+at-zis         206/tcp                         # AppleTalk zone information
+at-zis         206/udp
+z3950          210/tcp         wais            # NISO Z39.50 database
+z3950          210/udp         wais
+ipx            213/tcp                         # IPX
+ipx            213/udp
+imap3          220/tcp                         # Interactive Mail Access
+imap3          220/udp                         # Protocol v3
+ulistserv      372/tcp                         # UNIX Listserv
+ulistserv      372/udp

 #
 # UNIX specific services
 #
 #
 # UNIX specific services
 #


@@ -59,7 +126,7 @@ syslog               514/udp
 printer                515/tcp         spooler         # line printer spooler
 talk           517/udp
 ntalk          518/udp
 printer                515/tcp         spooler         # line printer spooler
 talk           517/udp
 ntalk          518/udp

-route          520/udp         router routed
+route          520/udp         router routed   # RIP

 timed          525/udp         timeserver
 tempo          526/tcp         newdate
 courier                530/tcp         rpc
 timed          525/udp         timeserver
 tempo          526/tcp         newdate
 courier                530/tcp         rpc


@@ -68,15 +135,43 @@ netnews            532/tcp         readnews
 netwall                533/udp                         # -for emergency broadcasts
 uucp           540/tcp         uucpd           # uucp daemon
 remotefs       556/tcp         rfs_server rfs  # Brunhoff remote filesystem
 netwall                533/udp                         # -for emergency broadcasts
 uucp           540/tcp         uucpd           # uucp daemon
 remotefs       556/tcp         rfs_server rfs  # Brunhoff remote filesystem

-
+klogin         543/tcp                         # Kerberized `rlogin' (v5)
+kshell         544/tcp                         # Kerberized `rsh' (v5)
+kerberos-adm   749/tcp                         # Kerberos `kadmin' (v5)
+#
+webster                765/tcp                         # Network dictionary
+webster                765/udp
+#
+# From ``Assigned Numbers'':
+#
+#> The Registered Ports are not controlled by the IANA and on most systems
+#> can be used by ordinary user processes or programs executed by ordinary
+#> users.
+#
+#> Ports are used in the TCP [45,106] to name the ends of logical
+#> connections which carry long term conversations.  For the purpose of
+#> providing services to unknown callers, a service contact port is
+#> defined.  This list specifies the port used by the server process as its
+#> contact port.  While the IANA can not control uses of these ports it
+#> does register or list uses of these ports as a convienence to the
+#> community.
+#

 ingreslock     1524/tcp
 ingreslock     1524/tcp

+ingreslock     1524/udp
+prospero-np    1525/tcp                # Prospero non-privileged
+prospero-np    1525/udp
+rfe            5002/tcp                # Radio Free Ethernet
+rfe            5002/udp                # Actually uses UDP only
+#

 #
 # Kerberos (Project Athena/MIT) services
 #
 # Kerberos (Project Athena/MIT) services

+# Note that these are for Kerberos v4, and are unofficial.  Sites running
+# v4 should uncomment these and comment out the v5 entries above.

 #
 #

-kerberos       750/udp         kdc     # Kerberos (server) udp
-kerberos       750/tcp         kdc     # Kerberos (server) tcp
+#kerberos      750/udp         kdc     # Kerberos (server) udp
+#kerberos      750/tcp         kdc     # Kerberos (server) tcp

 krbupdate      760/tcp         kreg    # Kerberos registration
 kpasswd                761/tcp         kpwd    # Kerberos "passwd"
 krbupdate      760/tcp         kreg    # Kerberos registration
 kpasswd                761/tcp         kpwd    # Kerberos "passwd"

-klogin         543/tcp                 # Kerberos rlogin
+#klogin                543/tcp                 # Kerberos rlogin

 eklogin                2105/tcp                # Kerberos encrypted rlogin
 eklogin                2105/tcp                # Kerberos encrypted rlogin

-kshell         544/tcp         krcmd   # Kerberos remote shell
+#kshell                544/tcp         krcmd   # Kerberos remote shell