/etc/services: attempt to bring the database to this century 1/2.

This is the result of splitting r358153 in two, in order to avoid a build
system bug and being able to merge the change to previous releases..

Document better this file, updating the URL to the IANA registry and closely
match the official services.

For system ports (0 to 1023) we now try to follow the registry closely, noting
some historical differences where applicable.

As a side effect: drop references to unofficial Kerberos IV which was EOL'ed
on Oct 2006[1]. While it is conceivable some people may still use it in some
very old FreeBSD machines that can't be replaced easily, the use of it is
considered a security risk. Also drop the unofficial netatalk, which we
supported long ago in the kernel but was dropped long ago.

Leave for now smtps, even though it conflicts with IANA's submissions.
The change should have very little visibility, if any, but should be a
step closer to the current IANA database.

[1] https://web.mit.edu/kerberos/krb4-end-of-life.html

MFC after:	2 weeks

1 files changed, 177 insertions, 585 deletions

diff --git a/usr.sbin/services_mkdb/services b/usr.sbin/services_mkdb/services
index 4122cc0adaf7..0737c87329ce 100644
--- a/usr.sbin/services_mkdb/services
+++ b/usr.sbin/services_mkdb/services
@@ -1,65 +1,62 @@
 #
 # Network services, Internet style
 #
-# 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.
+# Service names and port numbers are used to distinguish between different
+# services that run over transport protocols such as TCP, UDP, DCCP, and
+# SCTP.
 #
 # The latest IANA port assignments can be gotten from
 #
-#	http://www.iana.org/assignments/port-numbers
+#	https://www.iana.org/assignments/service-names-port-numbers/
 #
-# The Well Known Ports are those from 0 through 1023.
-# The Registered Ports are those from 1024 through 49151
-# The Dynamic and/or Private Ports are those from 49152 through 65535
+# System Ports are those from 0 through 1023.
+# User Ports are those from 1024 through 49151.
+# Dynamic and/or Private Ports are those from 49152 through 65535.
 #
-# Kerberos services are for Kerberos v4, and are unofficial.  Sites running
-# v5 should uncomment v5 entries and comment v4 entries.
+# 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.
 #
 # $FreeBSD$
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
 #
-rtmp		  1/ddp	   #Routing Table Maintenance Protocol
 tcpmux		  1/tcp	   #TCP Port Service Multiplexer
 tcpmux		  1/udp	   #TCP Port Service Multiplexer
-nbp		  2/ddp	   #Name Binding Protocol
 compressnet	  2/tcp	   #Management Utility
 compressnet	  2/udp	   #Management Utility
 compressnet	  3/tcp	   #Compression Process
 compressnet	  3/udp	   #Compression Process
-echo		  4/ddp	   #AppleTalk Echo Protocol
 rje		  5/tcp	   #Remote Job Entry
 rje		  5/udp	   #Remote Job Entry
-zip		  6/ddp	   #Zone Information Protocol
-echo		  7/sctp
 echo		  7/tcp
 echo		  7/udp
-discard		  9/sctp   sink null
+echo		  7/sctp
 discard		  9/tcp	   sink null
 discard		  9/udp	   sink null
+discard		  9/sctp   sink null
 systat		 11/tcp	   users	#Active Users
 systat		 11/udp	   users	#Active Users
-daytime		 13/sctp
 daytime		 13/tcp
 daytime		 13/udp
+daytime		 13/sctp
 qotd		 17/tcp	   quote	#Quote of the Day
 qotd		 17/udp	   quote	#Quote of the Day
 msp		 18/tcp	   #Message Send Protocol
 msp		 18/udp	   #Message Send Protocol
-chargen		 19/sctp   ttytst source	#Character Generator
 chargen		 19/tcp	   ttytst source	#Character Generator
 chargen		 19/udp	   ttytst source	#Character Generator
-ftp-data	 20/sctp   #File Transfer [Default Data]
+chargen		 19/sctp   ttytst source	#Character Generator
 ftp-data	 20/tcp	   #File Transfer [Default Data]
 ftp-data	 20/udp	   #File Transfer [Default Data]
-ftp		 21/sctp   #File Transfer [Control]
+ftp-data	 20/sctp   #File Transfer [Default Data]
 ftp		 21/tcp	   #File Transfer [Control]
 ftp		 21/udp	   #File Transfer [Control]
-ssh		 22/sctp   #Secure Shell Login
+ftp		 21/sctp   #File Transfer [Control]
 ssh		 22/tcp	   #Secure Shell Login
 ssh		 22/udp	   #Secure Shell Login
+ssh		 22/sctp   #Secure Shell Login
 telnet		 23/tcp
 telnet		 23/udp
 #		 24/tcp	   any private mail system
@@ -114,24 +111,22 @@ isi-gl		 55/tcp	   #ISI Graphics Language
 isi-gl		 55/udp	   #ISI Graphics Language
 xns-auth	 56/tcp	   #XNS Authentication
 xns-auth	 56/udp	   #XNS Authentication
-#		 57/tcp    any private terminal access
-#		 57/udp    any private terminal access
+#		 57/tcp	   any private terminal access
+#		 57/udp	   any private terminal access
 xns-mail	 58/tcp	   #XNS Mail
 xns-mail	 58/udp	   #XNS Mail
 #		 59/tcp	   any private file service
 #		 59/udp	   any private file service
-ni-mail		 61/tcp	   #NI MAIL
-ni-mail		 61/udp	   #NI MAIL
 acas		 62/tcp	   #ACA Services
 acas		 62/udp	   #ACA Services
-whois++		 63/tcp
-whois++		 63/udp
+whoispp		 63/tcp	   whois++
+whoispp		 63/udp	   whois++
 covia		 64/tcp	   #Communications Integrator (CI)
 covia		 64/udp	   #Communications Integrator (CI)
 tacacs-ds	 65/tcp	   #TACACS-Database Service
 tacacs-ds	 65/udp	   #TACACS-Database Service
-sql*net		 66/tcp	   #Oracle SQL*NET
-sql*net		 66/udp	   #Oracle SQL*NET
+sql-net		 66/tcp	   sql*net #Oracle SQL*NET / replacement
+sql-net		 66/udp	   sql*net #Oracle SQL*NET replacement
 bootps		 67/tcp	   dhcps	#Bootstrap Protocol Server
 bootps		 67/udp	   dhcps	#Bootstrap Protocol Server
 bootpc		 68/tcp	   dhcpc	#Bootstrap Protocol Client
@@ -158,11 +153,9 @@ vettcp		 78/tcp
 vettcp		 78/udp
 finger		 79/tcp
 finger		 79/udp
-http		 80/sctp   www www-http	#World Wide Web HTTP
 http		 80/tcp	   www www-http	#World Wide Web HTTP
 http		 80/udp	   www www-http	#World Wide Web HTTP
-hosts2-ns	 81/tcp	   #HOSTS2 Name Server
-hosts2-ns	 81/udp	   #HOSTS2 Name Server
+http		 80/sctp   www www-http	#World Wide Web HTTP
 xfer		 82/tcp	   #XFER Utility
 xfer		 82/udp	   #XFER Utility
 mit-ml-dev	 83/tcp	   #MIT ML Device
@@ -195,8 +188,8 @@ dixie		 96/tcp	   #DIXIE Protocol Specification
 dixie		 96/udp	   #DIXIE Protocol Specification
 swift-rvf	 97/tcp	   #Swift Remote Virtural File Protocol
 swift-rvf	 97/udp	   #Swift Remote Virtural File Protocol
-tacnews		 98/tcp	   #TAC News, Unofficial: Red Hat linuxconf
-tacnews		 98/udp	   #TAC News, Unofficial: Red Hat linuxconf
+tacnews		 98/tcp	   #TAC News
+tacnews		 98/udp	   #TAC News
 metagram	 99/tcp	   #Metagram Relay
 metagram	 99/udp	   #Metagram Relay
 newacct		100/tcp	   #[unauthorized use]
@@ -248,8 +241,8 @@ ansatrader	124/tcp	   #ANSA REX Trader
 ansatrader	124/udp	   #ANSA REX Trader
 locus-map	125/tcp	   #Locus PC-Interface Net Map Ser
 locus-map	125/udp	   #Locus PC-Interface Net Map Ser
-unitary		126/tcp	   #Unisys Unitary Login
-unitary		126/udp	   #Unisys Unitary Login
+nxedit		126/tcp	   #NXEdit
+nxedit		126/udp	   #NXEdit
 locus-con	127/tcp	   #Locus PC-Interface Conn Server
 locus-con	127/udp	   #Locus PC-Interface Conn Server
 gss-xlicen	128/tcp	   #GSS X License Verification
@@ -266,8 +259,8 @@ statsrv		133/tcp	   #Statistics Service
 statsrv		133/udp	   #Statistics Service
 ingres-net	134/tcp	   #INGRES-NET Service
 ingres-net	134/udp	   #INGRES-NET Service
-loc-srv		135/tcp	   epmap	#Location Service
-loc-srv		135/udp	   epmap	#Location Service
+epmap		135/tcp	   #DCE endpoint resolution
+epmap		135/udp	   #DCE endpoint resolution
 profile		136/tcp	   #PROFILE Naming System
 profile		136/udp	   #PROFILE Naming System
 netbios-ns	137/tcp	   #NETBIOS Name Service
@@ -284,20 +277,16 @@ bl-idm		142/tcp	   #Britton-Lee IDM
 bl-idm		142/udp	   #Britton-Lee IDM
 imap		143/tcp	   imap2 imap4	#Interim Mail Access Protocol v2
 imap		143/udp	   imap2 imap4	#Interim Mail Access Protocol v2
-NeWS		144/tcp	   # Window System
-NeWS		144/udp	   # Window System
-#PROBLEMS!==============================================================
-#uma		144/tcp	   #Universal Management Architecture
-#uma		144/udp	   #Universal Management Architecture
-#PROBLEMS!==============================================================
+uma		144/tcp	   #Universal Management Architecture
+uma		144/udp	   #Universal Management Architecture
 uaac		145/tcp	   #UAAC Protocol
 uaac		145/udp	   #UAAC Protocol
 iso-tp0		146/tcp
 iso-tp0		146/udp
 iso-ip		147/tcp
 iso-ip		147/udp
-cronus		148/tcp	   jargon	#CRONUS-SUPPORT
-cronus		148/udp	   jargon	#CRONUS-SUPPORT
+jargon		148/tcp	   #Jargon
+jargon		148/udp	   #Jargon
 aed-512		149/tcp	   #AED 512 Emulation Service
 aed-512		149/udp	   #AED 512 Emulation Service
 sql-net		150/tcp
@@ -356,11 +345,11 @@ genrad-mux	176/tcp
 genrad-mux	176/udp
 xdmcp		177/tcp	   #X Display Manager Control Protocol
 xdmcp		177/udp	   #X Display Manager Control Protocol
-NextStep	178/tcp	   nextstep NeXTStep	#NextStep Window Server
-NextStep	178/udp	   nextstep NeXTStep	#NextStep Window Server
-bgp		179/sctp   #Border Gateway Protocol
+nextstep	178/tcp	   #NextStep Window Server
+nextstep	178/udp	   #NextStep Window Server
 bgp		179/tcp	   #Border Gateway Protocol
 bgp		179/udp	   #Border Gateway Protocol
+bgp		179/sctp   #Border Gateway Protocol
 ris		180/tcp	   #Intergraph
 ris		180/udp	   #Intergraph
 unify		181/tcp
@@ -421,14 +410,10 @@ at-8		208/tcp	   #AppleTalk Unused
 at-8		208/udp	   #AppleTalk Unused
 qmtp		209/tcp	   #The Quick Mail Transfer Protocol
 qmtp		209/udp	   #The Quick Mail Transfer Protocol
-#PROBLEMS!==============================================================
-#tam		209/tcp	   #Trivial Authenticated Mail Protocol
-#tam		209/udp	   #Trivial Authenticated Mail Protocol
-#PROBLEMS!==============================================================
-z39.50		210/tcp	   wais		#ANSI Z39.50
-z39.50		210/udp	   wais		#ANSI Z39.50
-914c/g		211/tcp	   #Texas Instruments 914C/G Terminal
-914c/g		211/udp	   #Texas Instruments 914C/G Terminal
+z39-50		210/tcp	   z39.50 wais	#ANSI Z39.50
+z39-50		210/udp	   z39.50 wais	#ANSI Z39.50
+914c-g		211/tcp	   914c/g	#Texas Instruments 914C/G Terminal
+914c-g		211/udp	   914c/g	#Texas Instruments 914C/G Terminal
 anet		212/tcp	   #ATEXSSTR
 anet		212/udp	   #ATEXSSTR
 ipx		213/tcp
@@ -459,14 +444,14 @@ direct		242/tcp
 direct		242/udp
 sur-meas	243/tcp	   #Survey Measurement
 sur-meas	243/udp	   #Survey Measurement
-dayna		244/tcp
-dayna		244/udp
+inbusiness	244/tcp
+inbusiness	244/udp
 link		245/tcp
 link		245/udp
 dsp3270		246/tcp	   #Display Systems Protocol
 dsp3270		246/udp	   #Display Systems Protocol
-subntbcst_tftp	247/tcp	   #subntbcst_tftp
-subntbcst_tftp	247/udp	   #subntbcst_tftp
+subntbcst-tftp	247/tcp	   subntbcst_tftp #subntbcst_tftp
+subntbcst-tftp	247/udp	   subntbcst_tftp #subntbcst_tftp
 bhfhs		248/tcp
 bhfhs		248/udp
 #		249-255	   reserved
@@ -494,7 +479,11 @@ td-service	267/tcp    #Tobit David Service Layer
 td-service	267/udp    #Tobit David Service Layer
 td-replica	268/tcp    #Tobit David Replica
 td-replica	268/udp    #Tobit David Replica
-#		269-279	   unassigned
+manet		269/tcp    #MANET Protocols [RFC5498]
+manet		269/ucp    #MANET Protocols [RFC5498]
+gist		270/ucp    #Q-mode encapsulation for [RFC5971]
+pt-tls		271/tcp    #Assessment (NEA) Posture
+#		272-279	   unassigned
 http-mgmt	280/tcp
 http-mgmt	280/udp
 personal-link	281/tcp
@@ -541,9 +530,11 @@ pip		321/tcp
 pip		321/udp
 rtsps		322/tcp
 rtsps		322/udp
-#		323-332	   #unassigned
-texar		333/tcp    #Texar Security Port
-texar		333/udp    #Texar Security Port
+rpki-rtr	323/tcp	   #Resource PKI to Router Protocol
+rpki-rtr-tls	324/tcp	   #Resource PKI to Router Protocol over TLS
+#		325-332	   #unassigned
+texar		333/tcp	   #Texar Security Port
+texar		333/udp	   #Texar Security Port
 #		334-343	   #unassigned
 pdap		344/tcp	   #Prospero Data Access Protocol
 pdap		344/udp	   #Prospero Data Access Protocol
@@ -579,8 +570,8 @@ bhevent		357/tcp
 bhevent		357/udp
 shrinkwrap	358/tcp
 shrinkwrap	358/udp
-tenebris_nts	359/tcp	   #Tenebris Network Trace Service
-tenebris_nts	359/udp	   #Tenebris Network Trace Service
+nsrmp		359/tcp	   #Network Security Risk Management Protocol
+nsrmp		359/udp	   #Network Security Risk Management Protocol
 scoi2odialog	360/tcp
 scoi2odialog	360/udp
 semantix	361/tcp
@@ -641,14 +632,14 @@ unidata-ldm	388/tcp	   #Unidata LDM Version 4
 unidata-ldm	388/udp	   #Unidata LDM Version 4
 ldap		389/tcp	   #Lightweight Directory Access Protocol
 ldap		389/udp	   #Lightweight Directory Access Protocol
-uis		390/tcp
-uis		390/udp
+uis		390/tcp	   #UIS
+uis		390/udp	   #UIS
 synotics-relay	391/tcp	   #SynOptics SNMP Relay Port
 synotics-relay	391/udp	   #SynOptics SNMP Relay Port
 synotics-broker	392/tcp	   #SynOptics Port Broker Port
 synotics-broker	392/udp	   #SynOptics Port Broker Port
-dis		393/tcp	   #Data Interpretation System
-dis		393/udp	   #Data Interpretation System
+meta5		393/tcp	   #Meta5
+meta5		393/udp	   #Meta5
 embl-ndt	394/tcp	   #EMBL Nucleic Data Transfer
 embl-ndt	394/udp	   #EMBL Nucleic Data Transfer
 netcp		395/tcp	   #NETscout Control Protocol
@@ -661,8 +652,8 @@ kryptolan	398/tcp
 kryptolan	398/udp
 iso-tsap-c2	399/tcp	   #ISO-TSAP Class 2
 iso-tsap-c2	399/udp	   #ISO-TSAP Class 2
-work-sol	400/tcp	   #Workstation Solutions
-work-sol	400/udp	   #Workstation Solutions
+osb-sd		400/tcp	   #Oracle Secure Backup
+osb-sd		400/udp	   #Oracle Secure Backup
 ups		401/tcp	   #Uninterruptible Power Supply
 ups		401/udp	   #Uninterruptible Power Supply
 genie		402/tcp	   #Genie Protocol
@@ -747,9 +738,9 @@ decvms-sysmgt	441/tcp
 decvms-sysmgt	441/udp
 cvc_hostd	442/tcp
 cvc_hostd	442/udp
-https		443/sctp
 https		443/tcp
 https		443/udp
+https		443/sctp
 snpp		444/tcp	   #Simple Network Paging Protocol
 snpp		444/udp	   #Simple Network Paging Protocol
 #			   [RFC1568]
@@ -792,15 +783,16 @@ datasurfsrvsec	462/udp
 alpes		463/tcp
 alpes		463/udp
 #
-kpasswd5	464/tcp	   # Kerberos (v5)
-kpasswd5	464/udp	   # Kerberos (v5)
+kpasswd		464/tcp	kpasswd5   # Kerberos (v5)
+kpasswd		464/udp	kpasswd5   # Kerberos (v5)
 #PROBLEMS!==============================================================
-# IANA has officially assigned these two ports as ``kpasswd''
-#kpasswd	464/tcp	   # Kerberos (v5)
-#kpasswd	464/udp	   # Kerberos (v5)
+# IANA has officially assigned these two ports
+smtps		465/tcp    #smtp protocol over TLS/SSL (was ssmtp)
+smtps		465/udp    #smtp protocol over TLS/SSL (was ssmtp)
 #PROBLEMS!==============================================================
-smtps		465/tcp	   #smtp protocol over TLS/SSL (was ssmtp)
-smtps		465/udp	   #smtp protocol over TLS/SSL (was ssmtp)
+urd		465/tcp	   #URL Rendezvous Directory for SSM
+submissions	465/tcp	   #Message Submission over TLS
+igmpv3lite	465/udp	   #IGMP over UDP for SSM
 digital-vrc	466/tcp
 digital-vrc	466/udp
 mylex-mapd	467/tcp
@@ -857,14 +849,14 @@ ticf-1		492/tcp	   #Transport Independent Convergence for FNA
 ticf-1		492/udp	   #Transport Independent Convergence for FNA
 ticf-2		493/tcp	   #Transport Independent Convergence for FNA
 ticf-2		493/udp	   #Transport Independent Convergence for FNA
-pov-ray		494/tcp
-pov-ray		494/udp
+pov-ray		494/tcp	   #POV-Ray
+pov-ray		494/udp	   #POV-Ray
 intecourier	495/tcp
 intecourier	495/udp
 pim-rp-disc	496/tcp
 pim-rp-disc	496/udp
-dantz		497/tcp
-dantz		497/udp
+retrospect	497/tcp	   #Retrospect backup and restore service
+retrospect	497/udp	   #Retrospect backup and restore service
 siam		498/tcp
 siam		498/udp
 iso-ill		499/tcp	   #ISO ILL Protocol
@@ -964,8 +956,8 @@ netnews		532/tcp	   readnews
 netnews		532/udp	   readnews
 netwall		533/tcp	   #for emergency broadcasts
 netwall		533/udp	   #for emergency broadcasts
-mm-admin	534/tcp	   #MegaMedia Admin
-mm-admin	534/udp	   #MegaMedia Admin
+windream	534/tcp	   #windream Admin
+windream	534/udp	   #windream Admin
 iiop		535/tcp
 iiop		535/udp
 opalis-rdv	536/tcp
@@ -1000,8 +992,8 @@ new-rwho	550/tcp	   new-who
 new-rwho	550/udp	   new-who
 cybercash	551/tcp
 cybercash	551/udp
-deviceshare	552/tcp
-deviceshare	552/udp
+devshr-nts	552/tcp	   deviceshare
+devshr-nts	552/udp	   deviceshare
 pirp		553/tcp
 pirp		553/udp
 rtsp		554/tcp	   #Real Time Stream Control Protocol
@@ -1066,9 +1058,6 @@ philips-vc	583/tcp	   #Philips Video-Conferencing
 philips-vc	583/udp	   #Philips Video-Conferencing
 keyserver	584/tcp
 keyserver	584/udp
-#imap4-ssl@585 never should have been allocated. See PR 46294.
-#imap4-ssl	585/tcp	   #IMAP4+SSL (use of 585 is not recommended,
-#imap4-ssl	585/udp	   #		use 993 instead)
 password-chg	586/tcp
 password-chg	586/udp
 submission	587/tcp
@@ -1147,8 +1136,8 @@ asf-rmcp	623/tcp    #ASF Remote Management and Control Protocol
 asf-rmcp	623/udp    #ASF Remote Management and Control Protocol
 cryptoadmin	624/tcp    #Crypto Admin
 cryptoadmin	624/udp    #Crypto Admin
-dec_dlm		625/tcp    #DEC DLM
-dec_dlm		625/udp    #DEC DLM
+dec-dlm		625/tcp    dec_dlm	#DEC DLM
+dec-dlm		625/udp    dec_dlm	#DEC DLM
 asia		626/tcp
 asia		626/udp
 passgo-tivoli	627/tcp    #PassGo Tivoli
@@ -1159,8 +1148,8 @@ qmqp		628/udp
 3com-amp3	629/udp    #3Com AMP3
 rda		630/tcp
 rda		630/udp
-ipp		631/tcp	   #IPP (Internet Printing Protocol)
-ipp		631/udp	   #IPP (Internet Printing Protocol)
+ipp		631/tcp	   ipps	#IPP (Internet Printing Protocol)
+ipp		631/udp	   ipps	#IPP (Internet Printing Protocol)
 bmpp		632/tcp
 bmpp		632/udp
 servstat	633/tcp    #Service Status update (Sterling Software)
@@ -1327,14 +1316,17 @@ iris-xpcs	714/tcp    #IRIS over XPCS
 iris-xpcs	714/udp    #IRIS over XPCS
 iris-lwz	715/tcp
 iris-lwz	715/udp
+pana		716/udp	   #PANA Messages
+#		717-728	   #unassigned
 netviewdm1	729/tcp	   #IBM NetView DM/6000 Server/Client
 netviewdm1	729/udp	   #IBM NetView DM/6000 Server/Client
 netviewdm2	730/tcp	   #IBM NetView DM/6000 send/tcp
 netviewdm2	730/udp	   #IBM NetView DM/6000 send/tcp
 netviewdm3	731/tcp	   #IBM NetView DM/6000 receive/tcp
 netviewdm3	731/udp	   #IBM NetView DM/6000 receive/tcp
-netgw		741/tcp
-netgw		741/udp
+#		732-740	   #unassigned
+netgw		741/tcp	   #netGW
+netgw		741/udp	   #netGW
 netrcs		742/tcp	   #Network based Rev. Cont. Sys.
 netrcs		742/udp	   #Network based Rev. Cont. Sys.
 flexlm		744/tcp	   #Flexible License Manager
@@ -1345,18 +1337,11 @@ ris-cm		748/tcp	   #Russell Info Sci Calendar Manager
 ris-cm		748/udp	   #Russell Info Sci Calendar Manager
 kerberos-adm	749/tcp	   #Kerberos administration (v5)
 kerberos-adm	749/udp	   #Kerberos administration (v5)
+rfile		750/tcp
+loadav		750/udp
 kerberos-iv	750/udp	   kdc		# Kerberos (v4)
-kerberos-iv	750/tcp	   kdc		# Kerberos (v4)
-#PROBLEMS!========================================================
-#rfile		750/tcp
-#loadav		750/udp
-#PROBLEMS!========================================================
-kerberos_master	751/tcp	   # Kerberos `kadmin' (v4)
-kerberos_master	751/udp	   # Kerberos `kadmin' (v4)
-#PROBLEMS!========================================================
 pump		751/tcp
 pump		751/udp
-#PROBLEMS!========================================================
 qrh		752/tcp
 qrh		752/udp
 rrh		753/tcp
@@ -1366,19 +1351,14 @@ krb_prop	754/tcp	   krb5_prop	# kerberos/v5 server propagation
 tell		754/tcp	   #send
 #PROBLEMS!========================================================
 tell		754/udp	   #send
+#		755-757    #unassigned
 nlogin		758/tcp
 nlogin		758/udp
 con		759/tcp
 con		759/udp
-krbupdate	760/tcp	   kreg		# Kerberos (v4) registration
-#PROBLEMS!========================================================
 ns		760/tcp
-#PROBLEMS!========================================================
 ns		760/udp
-kpasswd		761/tcp	   kpwd		# Kerberos (v4) "passwd"
-#PROBLEMS!========================================================
 rxe		761/tcp
-#PROBLEMS!========================================================
 rxe		761/udp
 quotad		762/tcp
 quotad		762/udp
@@ -1401,17 +1381,17 @@ cycleserv2	772/udp
 submit		773/tcp
 notify		773/udp
 rpasswd		774/tcp
-acmaint_dbd	774/udp
+acmaint-dbd	774/udp    acmaint_dbd
 entomb		775/tcp
-acmaint_transd	775/udp
+acmaint-transd	775/udp    acmaint_transd
 wpages		776/tcp
 wpages		776/udp
 multiling-http	777/tcp    #Multiling HTTP
 multiling-http	777/udp    #Multiling HTTP
 wpgs		780/tcp
 wpgs		780/udp
-mdbs_daemon	800/tcp
-mdbs_daemon	800/udp
+mdbs-daemon	800/tcp    mdbs_daemon
+mdbs-daemon	800/udp    mdbs_daemon
 device		801/tcp
 device		801/udp
 mbap-s		802/tcp    # Modbus Application Protocol Secure
@@ -1434,11 +1414,18 @@ dhcp-failover2	847/tcp    #dhcp-failover 2
 dhcp-failover2	847/udp    #dhcp-failover 2
 gdoi		848/tcp
 gdoi		848/udp
+#		849-852    #unassigned
+domain-s	853/tcp    #DNS query-response protocol
+domain-s	853/udp    #DNS query-response protocol
+#		855-859    #unassigned
 iscsi		860/tcp
 iscsi		860/udp
 owamp-control	861/tcp
 owamp-control	861/udp
-supfilesrv	871/tcp	   # for SUP
+twamp-control	862/tcp
+twamp-control	862/udp
+#		863-872    #unassigned
+supfilesrv	871/tcp    # for SUP
 rsync		873/tcp
 rsync		873/udp
 iclcnet-locate	886/tcp    #ICL coNETion locate server
@@ -1491,477 +1478,106 @@ puprouter	999/tcp
 puprouter	999/udp
 cadlock2	1000/tcp
 cadlock2	1000/udp
+webpush		1001/tcp   #HTTP Web Push
 surf		1010/tcp
 surf		1010/udp
 exp1		1021/tcp   #RFC3692-style Experiment 1 (*)    [RFC4727]
 exp1		1021/udp   #RFC3692-style Experiment 1 (*)    [RFC4727]
+exp1		1021/sctp  #RFC3692-style Experiment 1 (*)    [RFC4727]
 exp2		1022/tcp   #RFC3692-style Experiment 2 (*)    [RFC4727]
 exp2		1022/udp   #RFC3692-style Experiment 2 (*)    [RFC4727]
+exp2		1022/sctp  #RFC3692-style Experiment 2 (*)    [RFC4727]
 #
 # REGISTERED PORT NUMBERS
 #
 blackjack	1025/tcp   #network blackjack
 blackjack	1025/udp   #network blackjack
-iad1		1030/tcp   #BBN IAD
-iad1		1030/udp   #BBN IAD
-iad2		1031/tcp   #BBN IAD
-iad2		1031/udp   #BBN IAD
-iad3		1032/tcp   #BBN IAD
-iad3		1032/udp   #BBN IAD
+cap		1026/tcp   #Calendar Access Protocol
+cap		1026/udp   #Calendar Access Protocol
+6a44		1027/udp   #IPv6 Behind NAT44 CPEs
+boinc-client	1043/tcp   #BOINC Client Control
+boinc-client	1043/udp   #BOINC Client Control
 nim		1058/tcp
 nim		1058/udp
 nimreg		1059/tcp
 nimreg		1059/udp
-instl_boots	1067/tcp   #Installation Bootstrap Proto. Serv.
-instl_boots	1067/udp   #Installation Bootstrap Proto. Serv.
-instl_bootc	1068/tcp   #Installation Bootstrap Proto. Cli.
-instl_bootc	1068/udp   #Installation Bootstrap Proto. Cli.
+instl-boots	1067/tcp   instl_boots	#Installation Bootstrap Proto. Serv.
+instl-boots	1067/udp   instl_boots	#Installation Bootstrap Proto. Serv.
+instl-bootc	1068/tcp   instl_bootc	#Installation Bootstrap Proto. Cli.
+instl-bootc	1068/udp   instl_bootc	#Installation Bootstrap Proto. Cli.
 socks		1080/tcp
 socks		1080/udp
-ansoft-lm-1	1083/tcp   #Anasoft License Manager
-ansoft-lm-1	1083/udp   #Anasoft License Manager
-ansoft-lm-2	1084/tcp   #Anasoft License Manager
-ansoft-lm-2	1084/udp   #Anasoft License Manager
 webobjects	1085/tcp   #Web Objects
 webobjects	1085/udp   #Web Objects
+ff-annunc	1089/tcp   #FF Annunciation 
+ff-annunc	1089/udp   #FF Annunciation 
+ff-fms		1090/tcp   #FF Fieldbus Message Specification 
+ff-fms		1090/udp   #FF Fieldbus Message Specification
+ff-sm		1091/tcp   #FF System Management
+ff-sm		1091/udp   #FF System Management
+cnrprotocol	1096/tcp   #Common Name Resolution Protocol
+cnrprotocol	1096/udp   #Common Name Resolution Protocol
+rmiactivation	1098/tcp   #RMI Activation
+rmiactivation	1098/udp   #RMI Activation
+rmiregistry	1099/tcp   #RMI Registry
+rmiregistry	1099/udp   #RMI Registry
+mctp		1100/tcp   #MCTP 
+mctp		1100/udp   #MCTP
 kpop		1109/tcp   #Unofficial
 kpop		1109/udp   #Unofficial
 nfsd-status	1110/tcp   #Cluster status info
 nfsd-keepalive	1110/udp   #Client status info
 supfiledbg	1127/tcp   # for SUP
+c1222-acse	1153/tcp   #ANSI C12.22 Port
+c1222-acse	1153/udp   #ANSI C12.22 Port
 nfa		1155/tcp   #Network File Access
 nfa		1155/udp   #Network File Access
-cisco-ipsla	1167/sctp  #Cisco IP SLAs Control Protocol
 cisco-ipsla	1167/tcp   #Cisco IP SLAs Control Protocol
 cisco-ipsla	1167/udp   #Cisco IP SLAs Control Protocol
+cisco-ipsla	1167/sctp  #Cisco IP SLAs Control Protocol
+tripwire	1169/tcp   #TRIPWIRE
+tripwire	1169/udp   #TRIPWIRE
 skkserv		1178/tcp   #SKK (kanji input)
+mysql-cluster	1186/tcp   #MySQL Cluster Manager
+mysql-cluster	1186/udp   #MySQL Cluster Manager
 openvpn		1194/tcp   #OpenVPN
 openvpn		1194/udp   #OpenVPN
-lupa		1212/tcp
-lupa		1212/udp
-nerv		1222/tcp   #SNI R&D network
-nerv		1222/udp   #SNI R&D network
-hermes		1248/tcp
-hermes		1248/udp
+rsf-1		1195/tcp   #RSF-1 clustering
+rsf-1		1195/udp   #RSF-1 clustering
+qt-serveradmin	1220/tcp   #QT SERVER ADMIN
+qt-serveradmin	1220/udp   #QT SERVER ADMIN
 healthd		1281/tcp   #healthd
 healthd		1281/udp   #healthd
-alta-ana-lm	1346/tcp   #Alta Analytics License Manager
-alta-ana-lm	1346/udp   #Alta Analytics License Manager
-bbn-mmc		1347/tcp   #multi media conferencing
-bbn-mmc		1347/udp   #multi media conferencing
-bbn-mmx		1348/tcp   #multi media conferencing
-bbn-mmx		1348/udp   #multi media conferencing
-sbook		1349/tcp   #Registration Network Protocol
-sbook		1349/udp   #Registration Network Protocol
-editbench	1350/tcp   #Registration Network Protocol
-editbench	1350/udp   #Registration Network Protocol
-equationbuilder	1351/tcp   #Digital Tool Works (MIT)
-equationbuilder	1351/udp   #Digital Tool Works (MIT)
-lotusnote	1352/tcp   #Lotus Note
-lotusnote	1352/udp   #Lotus Note
-relief		1353/tcp   #Relief Consulting
-relief		1353/udp   #Relief Consulting
-rightbrain	1354/tcp   #RightBrain Software
-rightbrain	1354/udp   #RightBrain Software
-intuitive-edge	1355/tcp   #Intuitive Edge
-intuitive-edge	1355/udp   #Intuitive Edge
-cuillamartin	1356/tcp   #CuillaMartin Company
-cuillamartin	1356/udp   #CuillaMartin Company
-pegboard	1357/tcp   #Electronic PegBoard
-pegboard	1357/udp   #Electronic PegBoard
-connlcli	1358/tcp
-connlcli	1358/udp
-ftsrv		1359/tcp
-ftsrv		1359/udp
-mimer		1360/tcp
-mimer		1360/udp
-linx		1361/tcp
-linx		1361/udp
-timeflies	1362/tcp
-timeflies	1362/udp
-ndm-requester	1363/tcp   #Network DataMover Requester
-ndm-requester	1363/udp   #Network DataMover Requester
-ndm-server	1364/tcp   #Network DataMover Server
-ndm-server	1364/udp   #Network DataMover Server
-adapt-sna	1365/tcp   #Network Software Associates
-adapt-sna	1365/udp   #Network Software Associates
-netware-csp	1366/tcp   #Novell NetWare Comm Service Platform
-netware-csp	1366/udp   #Novell NetWare Comm Service Platform
-dcs		1367/tcp
-dcs		1367/udp
-screencast	1368/tcp
-screencast	1368/udp
-gv-us		1369/tcp   #GlobalView to Unix Shell
-gv-us		1369/udp   #GlobalView to Unix Shell
-us-gv		1370/tcp   #Unix Shell to GlobalView
-us-gv		1370/udp   #Unix Shell to GlobalView
-fc-cli		1371/tcp   #Fujitsu Config Protocol
-fc-cli		1371/udp   #Fujitsu Config Protocol
-fc-ser		1372/tcp   #Fujitsu Config Protocol
-fc-ser		1372/udp   #Fujitsu Config Protocol
-chromagrafx	1373/tcp
-chromagrafx	1373/udp
-molly		1374/tcp   #EPI Software Systems
-molly		1374/udp   #EPI Software Systems
-bytex		1375/tcp
-bytex		1375/udp
-ibm-pps		1376/tcp   #IBM Person to Person Software
-ibm-pps		1376/udp   #IBM Person to Person Software
-cichlid		1377/tcp   #Cichlid License Manager
-cichlid		1377/udp   #Cichlid License Manager
-elan		1378/tcp   #Elan License Manager
-elan		1378/udp   #Elan License Manager
-dbreporter	1379/tcp   #Integrity Solutions
-dbreporter	1379/udp   #Integrity Solutions
-telesis-licman	1380/tcp   #Telesis Network License Manager
-telesis-licman	1380/udp   #Telesis Network License Manager
-apple-licman	1381/tcp   #Apple Network License Manager
-apple-licman	1381/udp   #Apple Network License Manager
-#udt_os		1382/tcp
-#udt_os		1382/udp
-gwha		1383/tcp   #GW Hannaway Network License Manager
-gwha		1383/udp   #GW Hannaway Network License Manager
-os-licman	1384/tcp   #Objective Solutions License Manager
-os-licman	1384/udp   #Objective Solutions License Manager
-atex_elmd	1385/tcp   #Atex Publishing License Manager
-atex_elmd	1385/udp   #Atex Publishing License Manager
-checksum	1386/tcp   #CheckSum License Manager
-checksum	1386/udp   #CheckSum License Manager
-cadsi-lm	1387/tcp   #Computer Aided Design Software Inc LM
-cadsi-lm	1387/udp   #Computer Aided Design Software Inc LM
-objective-dbc	1388/tcp   #Objective Solutions DataBase Cache
-objective-dbc	1388/udp   #Objective Solutions DataBase Cache
-iclpv-dm	1389/tcp   #Document Manager
-iclpv-dm	1389/udp   #Document Manager
-iclpv-sc	1390/tcp   #Storage Controller
-iclpv-sc	1390/udp   #Storage Controller
-iclpv-sas	1391/tcp   #Storage Access Server
-iclpv-sas	1391/udp   #Storage Access Server
-iclpv-pm	1392/tcp   #Print Manager
-iclpv-pm	1392/udp   #Print Manager
-iclpv-nls	1393/tcp   #Network Log Server
-iclpv-nls	1393/udp   #Network Log Server
-iclpv-nlc	1394/tcp   #Network Log Client
-iclpv-nlc	1394/udp   #Network Log Client
-iclpv-wsm	1395/tcp   #PC Workstation Manager software
-iclpv-wsm	1395/udp   #PC Workstation Manager software
-dvl-activemail	1396/tcp   #DVL Active Mail
-dvl-activemail	1396/udp   #DVL Active Mail
-audio-activmail	1397/tcp   #Audio Active Mail
-audio-activmail	1397/udp   #Audio Active Mail
-video-activmail	1398/tcp   #Video Active Mail
-video-activmail	1398/udp   #Video Active Mail
-cadkey-licman	1399/tcp   #Cadkey License Manager
-cadkey-licman	1399/udp   #Cadkey License Manager
-cadkey-tablet	1400/tcp   #Cadkey Tablet Daemon
-cadkey-tablet	1400/udp   #Cadkey Tablet Daemon
-goldleaf-licman	1401/tcp   #Goldleaf License Manager
-goldleaf-licman	1401/udp   #Goldleaf License Manager
-prm-sm-np	1402/tcp   #Prospero Resource Manager
-prm-sm-np	1402/udp   #Prospero Resource Manager
-prm-nm-np	1403/tcp   #Prospero Resource Manager
-prm-nm-np	1403/udp   #Prospero Resource Manager
-igi-lm		1404/tcp   #Infinite Graphics License Manager
-igi-lm		1404/udp   #Infinite Graphics License Manager
-ibm-res		1405/tcp   #IBM Remote Execution Starter
-ibm-res		1405/udp   #IBM Remote Execution Starter
-netlabs-lm	1406/tcp   #NetLabs License Manager
-netlabs-lm	1406/udp   #NetLabs License Manager
-dbsa-lm		1407/tcp   #DBSA License Manager
-dbsa-lm		1407/udp   #DBSA License Manager
-sophia-lm	1408/tcp   #Sophia License Manager
-sophia-lm	1408/udp   #Sophia License Manager
-here-lm		1409/tcp   #Here License Manager
-here-lm		1409/udp   #Here License Manager
-hiq		1410/tcp   #HiQ License Manager
-hiq		1410/udp   #HiQ License Manager
-af		1411/tcp   #AudioFile
-af		1411/udp   #AudioFile
-innosys		1412/tcp
-innosys		1412/udp
-innosys-acl	1413/tcp
-innosys-acl	1413/udp
-ibm-mqseries	1414/tcp   #IBM MQSeries
-ibm-mqseries	1414/udp   #IBM MQSeries
-dbstar		1415/tcp
-dbstar		1415/udp
-novell-lu6.2	1416/tcp   #Novell LU6.2
-novell-lu6.2	1416/udp   #Novell LU6.2
-timbuktu-srv1	1417/tcp   #Timbuktu Service 1 Port
-timbuktu-srv1	1417/udp   #Timbuktu Service 1 Port
-timbuktu-srv2	1418/tcp   #Timbuktu Service 2 Port
-timbuktu-srv2	1418/udp   #Timbuktu Service 2 Port
-timbuktu-srv3	1419/tcp   #Timbuktu Service 3 Port
-timbuktu-srv3	1419/udp   #Timbuktu Service 3 Port
-timbuktu-srv4	1420/tcp   #Timbuktu Service 4 Port
-timbuktu-srv4	1420/udp   #Timbuktu Service 4 Port
-gandalf-lm	1421/tcp   #Gandalf License Manager
-gandalf-lm	1421/udp   #Gandalf License Manager
-autodesk-lm	1422/tcp   #Autodesk License Manager
-autodesk-lm	1422/udp   #Autodesk License Manager
-essbase		1423/tcp   #Essbase Arbor Software
-essbase		1423/udp   #Essbase Arbor Software
-hybrid		1424/tcp   #Hybrid Encryption Protocol
-hybrid		1424/udp   #Hybrid Encryption Protocol
-zion-lm		1425/tcp   #Zion Software License Manager
-zion-lm		1425/udp   #Zion Software License Manager
-sas-1		1426/tcp   #Satellite-data Acquisition System 1
-sas-1		1426/udp   #Satellite-data Acquisition System 1
-mloadd		1427/tcp   #mloadd monitoring tool
-mloadd		1427/udp   #mloadd monitoring tool
-informatik-lm	1428/tcp   #Informatik License Manager
-informatik-lm	1428/udp   #Informatik License Manager
-nms		1429/tcp   #Hypercom NMS
-nms		1429/udp   #Hypercom NMS
-tpdu		1430/tcp   #Hypercom TPDU
-tpdu		1430/udp   #Hypercom TPDU
-rgtp		1431/tcp   #Reverse Gossip Transport
-rgtp		1431/udp   #Reverse Gossip Transport
-blueberry-lm	1432/tcp   #Blueberry Software License Manager
-blueberry-lm	1432/udp   #Blueberry Software License Manager
+pkt-krb-ipsec	1293/tcp   #PKT-KRB-IPSec
+pkt-krb-ipsec	1293/udp   #PKT-KRB-IPSec
+h323hostcallsc	1300/tcp   #H323 Host Call Secure
+h323hostcallsc	1300/udp   #H323 Host Call Secure
+jtag-server	1309/tcp   #JTAG server
+jtag-server	1309/udp   #JTAG server
+hkrb5gatekeeper	1318/tcp   #krb5gatekeeper
+krb5gatekeeper	1318/udp   #krb5gatekeeper
+netdb-export	1329/tcp   #netdb-export
+netdb-export	1329/udp   #netdb-export
+digital-notary	1335/tcp   #Digital Notary Protocol
+digital-notary	1335/udp   #Digital Notary Protocol
+icap		1344/tcp   #ICAP
+icap		1344/udp   #ICAP
 ms-sql-s	1433/tcp   #Microsoft-SQL-Server
 ms-sql-s	1433/udp   #Microsoft-SQL-Server
 ms-sql-m	1434/tcp   #Microsoft-SQL-Monitor
 ms-sql-m	1434/udp   #Microsoft-SQL-Monitor
-ibm-cics	1435/tcp
-ibm-cics	1435/udp
-sas-2		1436/tcp   #Satellite-data Acquisition System 2
-sas-2		1436/udp   #Satellite-data Acquisition System 2
-tabula		1437/tcp
-tabula		1437/udp
-eicon-server	1438/tcp   #Eicon Security Agent/Server
-eicon-server	1438/udp   #Eicon Security Agent/Server
-eicon-x25	1439/tcp   #Eicon X25/SNA Gateway
-eicon-x25	1439/udp   #Eicon X25/SNA Gateway
-eicon-slp	1440/tcp   #Eicon Service Location Protocol
-eicon-slp	1440/udp   #Eicon Service Location Protocol
-cadis-1		1441/tcp   #Cadis License Management
-cadis-1		1441/udp   #Cadis License Management
-cadis-2		1442/tcp   #Cadis License Management
-cadis-2		1442/udp   #Cadis License Management
-ies-lm		1443/tcp   #Integrated Engineering Software
-ies-lm		1443/udp   #Integrated Engineering Software
-marcam-lm	1444/tcp   #Marcam  License Management
-marcam-lm	1444/udp   #Marcam  License Management
-proxima-lm	1445/tcp   #Proxima License Manager
-proxima-lm	1445/udp   #Proxima License Manager
-ora-lm		1446/tcp   #Optical Research Associates License Manager
-ora-lm		1446/udp   #Optical Research Associates License Manager
-apri-lm		1447/tcp   #Applied Parallel Research LM
-apri-lm		1447/udp   #Applied Parallel Research LM
-oc-lm		1448/tcp   #OpenConnect License Manager
-oc-lm		1448/udp   #OpenConnect License Manager
-peport		1449/tcp
-peport		1449/udp
-dwf		1450/tcp   #Tandem Distributed Workbench Facility
-dwf		1450/udp   #Tandem Distributed Workbench Facility
-infoman		1451/tcp   #IBM Information Management
-infoman		1451/udp   #IBM Information Management
-gtegsc-lm	1452/tcp   #GTE Government Systems License Man
-gtegsc-lm	1452/udp   #GTE Government Systems License Man
-genie-lm	1453/tcp   #Genie License Manager
-genie-lm	1453/udp   #Genie License Manager
-interhdl_elmd	1454/tcp   #interHDL License Manager
-interhdl_elmd	1454/udp   #interHDL License Manager
-esl-lm		1455/tcp   #ESL License Manager
-esl-lm		1455/udp   #ESL License Manager
-dca		1456/tcp
-dca		1456/udp
-valisys-lm	1457/tcp   #Valisys License Manager
-valisys-lm	1457/udp   #Valisys License Manager
-nrcabq-lm	1458/tcp   #Nichols Research Corp.
-nrcabq-lm	1458/udp   #Nichols Research Corp.
-proshare1	1459/tcp   #Proshare Notebook Application
-proshare1	1459/udp   #Proshare Notebook Application
-proshare2	1460/tcp   #Proshare Notebook Application
-proshare2	1460/udp   #Proshare Notebook Application
-ibm_wrless_lan	1461/tcp   #IBM Wireless LAN
-ibm_wrless_lan	1461/udp   #IBM Wireless LAN
-world-lm	1462/tcp   #World License Manager
-world-lm	1462/udp   #World License Manager
-nucleus		1463/tcp
-nucleus		1463/udp
-msl_lmd		1464/tcp   #MSL License Manager
-msl_lmd		1464/udp   #MSL License Manager
-pipes		1465/tcp   #Pipes Platform
-pipes		1465/udp   #Pipes Platform  mfarlin@peerlogic.com
-oceansoft-lm	1466/tcp   #Ocean Software License Manager
-oceansoft-lm	1466/udp   #Ocean Software License Manager
-csdmbase	1467/tcp
-csdmbase	1467/udp
-csdm		1468/tcp
-csdm		1468/udp
-aal-lm		1469/tcp   #Active Analysis Limited License Manager
-aal-lm		1469/udp   #Active Analysis Limited License Manager
-uaiact		1470/tcp   #Universal Analytics
-uaiact		1470/udp   #Universal Analytics
-csdmbase	1471/tcp
-csdmbase	1471/udp
-csdm		1472/tcp
-csdm		1472/udp
-openmath	1473/tcp
-openmath	1473/udp
-telefinder	1474/tcp
-telefinder	1474/udp
-taligent-lm	1475/tcp   #Taligent License Manager
-taligent-lm	1475/udp   #Taligent License Manager
-clvm-cfg	1476/tcp
-clvm-cfg	1476/udp
-ms-sna-server	1477/tcp
-ms-sna-server	1477/udp
-ms-sna-base	1478/tcp
-ms-sna-base	1478/udp
-dberegister	1479/tcp
-dberegister	1479/udp
-pacerforum	1480/tcp
-pacerforum	1480/udp
-airs		1481/tcp
-airs		1481/udp
-miteksys-lm	1482/tcp   #Miteksys License Manager
-miteksys-lm	1482/udp   #Miteksys License Manager
-afs		1483/tcp   #AFS License Manager
-afs		1483/udp   #AFS License Manager
-confluent	1484/tcp   #Confluent License Manager
-confluent	1484/udp   #Confluent License Manager
-lansource	1485/tcp
-lansource	1485/udp
-nms_topo_serv	1486/tcp
-nms_topo_serv	1486/udp
-localinfosrvr	1487/tcp
-localinfosrvr	1487/udp
-docstor		1488/tcp
-docstor		1488/udp
-dmdocbroker	1489/tcp
-dmdocbroker	1489/udp
-insitu-conf	1490/tcp
-insitu-conf	1490/udp
-anynetgateway	1491/tcp
-anynetgateway	1491/udp
-stone-design-1	1492/tcp
-stone-design-1	1492/udp
-netmap_lm	1493/tcp
-netmap_lm	1493/udp
-ica		1494/tcp
-ica		1494/udp
-cvc		1495/tcp
-cvc		1495/udp
-liberty-lm	1496/tcp
-liberty-lm	1496/udp
-rfx-lm		1497/tcp
-rfx-lm		1497/udp
-watcom-sql	1498/tcp
-watcom-sql	1498/udp
-fhc		1499/tcp   #Federico Heinz Consultora
-fhc		1499/udp   #Federico Heinz Consultora
-vlsi-lm		1500/tcp   #VLSI License Manager
-vlsi-lm		1500/udp   #VLSI License Manager
-sas-3		1501/tcp   #Satellite-data Acquisition System 3
-sas-3		1501/udp   #Satellite-data Acquisition System 3
-shivadiscovery	1502/tcp   #Shiva
-shivadiscovery	1502/udp   #Shiva
-imtc-mcs	1503/tcp   #Databeam
-imtc-mcs	1503/udp   #Databeam
-evb-elm		1504/tcp   #EVB Software Engineering License Manager
-evb-elm		1504/udp   #EVB Software Engineering License Manager
-funkproxy	1505/tcp   #Funk Software, Inc.
-funkproxy	1505/udp   #Funk Software, Inc.
-utcd		1506/tcp   #Universal Time daemon (utcd)
-utcd		1506/udp   #Universal Time daemon (utcd)
-symplex		1507/tcp
-symplex		1507/udp
-diagmond	1508/tcp
-diagmond	1508/udp
-robcad-lm	1509/tcp   #Robcad, Ltd. License Manager
-robcad-lm	1509/udp   #Robcad, Ltd. License Manager
-mvx-lm		1510/tcp   #Midland Valley Exploration Ltd. Lic. Man.
-mvx-lm		1510/udp   #Midland Valley Exploration Ltd. Lic. Man.
-3l-l1		1511/tcp
-3l-l1		1511/udp
-wins		1512/tcp   #Microsoft's Windows Internet Name Service
-wins		1512/udp   #Microsoft's Windows Internet Name Service
-fujitsu-dtc	1513/tcp   #Fujitsu Systems Business of America, Inc
-fujitsu-dtc	1513/udp   #Fujitsu Systems Business of America, Inc
-fujitsu-dtcns	1514/tcp   #Fujitsu Systems Business of America, Inc
-fujitsu-dtcns	1514/udp   #Fujitsu Systems Business of America, Inc
-ifor-protocol	1515/tcp
-ifor-protocol	1515/udp
-vpad		1516/tcp   #Virtual Places Audio data
-vpad		1516/udp   #Virtual Places Audio data
-vpac		1517/tcp   #Virtual Places Audio control
-vpac		1517/udp   #Virtual Places Audio control
-vpvd		1518/tcp   #Virtual Places Video data
-vpvd		1518/udp   #Virtual Places Video data
-vpvc		1519/tcp   #Virtual Places Video control
-vpvc		1519/udp   #Virtual Places Video control
-atm-zip-office	1520/tcp   #atm zip office
-atm-zip-office	1520/udp   #atm zip office
-ncube-lm	1521/tcp   #nCube License Manager
-ncube-lm	1521/udp   #nCube License Manager
-rna-lm		1522/tcp   #Ricardo North America License Manager
-rna-lm		1522/udp   #Ricardo North America License Manager
-cichild-lm	1523/tcp
-cichild-lm	1523/udp
 ingreslock	1524/tcp   #ingres
 ingreslock	1524/udp   #ingres
-prospero-np	1525/tcp   #Prospero Directory Service non-priv
-prospero-np	1525/udp   #Prospero Directory Service non-priv
 #PROBLEMS!========================================================
 orasrv		1525/tcp   #oracle
 orasrv		1525/udp   #oracle
 #PROBLEMS!========================================================
+prospero-np	1525/tcp   #Prospero Directory Service non-priv
+prospero-np	1525/udp   #Prospero Directory Service non-priv
 pdap-np		1526/tcp   #Prospero Data Access Prot non-priv
 pdap-np		1526/udp   #Prospero Data Access Prot non-priv
 tlisrv		1527/tcp   #oracle
 tlisrv		1527/udp   #oracle
-mciautoreg	1528/tcp
-mciautoreg	1528/udp
-support		1529/tcp   prmsd gnatsd	# cygnus bug tracker
-coauthor	1529/tcp   #oracle
-coauthor	1529/udp   #oracle
-rap-service	1530/tcp
-rap-service	1530/udp
-rap-listen	1531/tcp
-rap-listen	1531/udp
-miroconnect	1532/tcp
-miroconnect	1532/udp
-virtual-places	1533/tcp   #Virtual Places Software
-virtual-places	1533/udp   #Virtual Places Software
-micromuse-lm	1534/tcp
-micromuse-lm	1534/udp
-ampr-info	1535/tcp
-ampr-info	1535/udp
-ampr-inter	1536/tcp
-ampr-inter	1536/udp
-sdsc-lm		1537/tcp
-sdsc-lm		1537/udp
-3ds-lm		1538/tcp
-3ds-lm		1538/udp
-intellistor-lm	1539/tcp   #Intellistor License Manager
-intellistor-lm	1539/udp   #Intellistor License Manager
-rds		1540/tcp
-rds		1540/udp
-rds2		1541/tcp
-rds2		1541/udp
-gridgen-elmd	1542/tcp
-gridgen-elmd	1542/udp
-simba-cs	1543/tcp
-simba-cs	1543/udp
-aspeclmd	1544/tcp
-aspeclmd	1544/udp
-vistium-share	1545/tcp
-vistium-share	1545/udp
-abbaccuray	1546/tcp
-abbaccuray	1546/udp
-laplink		1547/tcp
-laplink		1547/udp
-axon-lm		1548/tcp   #Axon License Manager
-axon-lm		1548/udp   #Axon License Manager
-shivahose	1549/tcp   #Shiva Hose
-shivasound	1549/udp   #Shiva Sound
-3m-image-lm	1550/tcp   #Image Storage license manager 3M Company
-3m-image-lm	1550/udp   #Image Storage license manager 3M Company
-hecmtl-db	1551/tcp
-hecmtl-db	1551/udp
 pciarray	1552/tcp
 pciarray	1552/udp
 issd		1600/tcp
@@ -1978,30 +1594,6 @@ shiva_confsrvr	1651/tcp
 shiva_confsrvr	1651/udp
 xnmp		1652/tcp
 xnmp		1652/udp
-netview-aix-1	1661/tcp
-netview-aix-1	1661/udp
-netview-aix-2	1662/tcp
-netview-aix-2	1662/udp
-netview-aix-3	1663/tcp
-netview-aix-3	1663/udp
-netview-aix-4	1664/tcp
-netview-aix-4	1664/udp
-netview-aix-5	1665/tcp
-netview-aix-5	1665/udp
-netview-aix-6	1666/tcp
-netview-aix-6	1666/udp
-netview-aix-7	1667/tcp
-netview-aix-7	1667/udp
-netview-aix-8	1668/tcp
-netview-aix-8	1668/udp
-netview-aix-9	1669/tcp
-netview-aix-9	1669/udp
-netview-aix-10	1670/tcp
-netview-aix-10	1670/udp
-netview-aix-11	1671/tcp
-netview-aix-11	1671/udp
-netview-aix-12	1672/tcp
-netview-aix-12	1672/udp
 l2f		1701/tcp   #l2f
 l2f		1701/udp   #l2f
 l2tp		1701/tcp   #Layer 2 Tunnelling Protocol
@@ -2203,12 +1795,12 @@ m2ua		2904/tcp   #M2UA
 m2ua		2904/udp   #M2UA
 m3ua		2905/sctp  #M3UA
 m3ua		2905/tcp   #M3UA
-megaco-h248	2944/sctp  #Megaco-H.248 text
 megaco-h248	2944/tcp   #Megaco H-248
 megaco-h248	2944/udp   #Megaco H-248
-h248-binary	2945/sctp  #Megaco/H.248 binary
+megaco-h248	2944/sctp  #Megaco-H.248 text
 h248-binary	2945/tcp   #H248 Binary
 h248-binary	2945/udp   #H248 Binary
+h248-binary	2945/sctp  #Megaco/H.248 binary
 eppc		3031/tcp   #Remote AppleEvents/PPC Toolbox
 eppc		3031/udp   #Remote AppleEvents/PPC Toolbox
 NSWS		3049/tcp
@@ -2240,17 +1832,17 @@ nut		3493/tcp   #Network UPS Tools
 nut		3493/udp   #Network UPS Tools
 lsp-ping	3503/tcp   #MPLS LSP-echo (RFC8029)
 lsp-ping	3503/udp   #MPLS LSP-echo (RFC8029)
-m2pa		3565/sctp  #M2PA
 m2pa		3565/tcp   #M2PA
+m2pa		3565/sctp  #M2PA
 tsp		3653/tcp   #Tunnel Setup Protocol
 tsp		3653/udp   #Tunnel Setup Protocol
 svn		3690/tcp   #Subversion
 svn		3690/udp   #Subversion
-asap		3863/sctp  #asap sctp
 asap		3863/tcp   #asap tcp port
 asap		3863/udp   #asap udp port
-asap-tls	3864/sctp  #asap-sctp/tls
+asap		3863/sctp  #asap sctp
 asap-tls	3864/tcp   #asap/tls tcp port
+asap-tls	3864/sctp  #asap-sctp/tls
 diameter	3868/tcp   #DIAMETER
 diameter	3868/sctp  #DIAMETER
 udt_os		3900/tcp   #Unidata UDT OS
@@ -2289,12 +1881,12 @@ fax		4557/tcp   #FAX transmission service
 hylafax		4559/tcp   #HylaFAX client-server protocol
 rfa		4672/tcp   #remote file access server
 rfa		4672/udp   #remote file access server
-ipfix		4739/sctp  #IP Flow Info Export
 ipfix		4739/tcp   #IP Flow Info Export
 ipfix		4739/udp   #IP Flow Info Export
-ipfixs		4740/sctp  #ipfix protocol over DTLS
+ipfix		4739/sctp  #IP Flow Info Export
 ipfixs		4740/tcp   #ipfix protocol over TLS
 ipfixs		4740/udp   #ipfix protocol over DTLS
+ipfixs		4740/sctp  #ipfix protocol over DTLS
 vxlan		4789/udp   #Virtual eXtensible Local Area Network (VXLAN)
 commplex-main	5000/tcp
 commplex-main	5000/udp
@@ -2353,12 +1945,12 @@ postgresql	5432/udp   #PostgreSQL Database
 vami		5480/tcp   #VMware Appliance Management Interface, HTTPS-like
 vami		5480/udp   #VMware Appliance Management Interface, HTTPS-like
 rplay		5555/udp
-amqp		5672/sctp  #AMQP
 amqp		5672/tcp   #AMQP
 amqp		5672/udp   #AMQP
-v5ua		5675/sctp  #V5UA application port
+amqp		5672/sctp  #AMQP
 v5ua		5675/tcp   #V5UA application port
 v5ua		5675/udp   #V5UA application port
+v5ua		5675/sctp  #V5UA application port
 canna		5680/tcp   #Canna (Japanese Input)
 proshareaudio	5713/tcp   #proshare conf audio
 proshareaudio	5713/udp   #proshare conf audio
@@ -2444,16 +2036,16 @@ fodms		7200/tcp   #FODMS FLIP
 fodms		7200/udp   #FODMS FLIP
 dlip		7201/tcp
 dlip		7201/udp
-simco		7626/sctp  #SImple Middlebox COnfiguration (SIMCO)
 simco		7626/tcp   #SImple Middlebox COnfiguration (SIMCO) Server
+simco		7626/sctp  #SImple Middlebox COnfiguration (SIMCO)
 ftp-proxy	8021/tcp   # FTP proxy
-pim		8471/sctp  #PIM over Reliable Transport
 pim		8471/tcp   #PIM over Reliable Transport
+pim		8471/sctp  #PIM over Reliable Transport
 natd		8668/divert # Network Address Translation
 lcs-ap		9082/sctp  #LCS Application Protocol
-aurora		9084/sctp  #IBM AURORA Performance Visualizer
 aurora		9084/tcp   #IBM AURORA Performance Visualizer
 aurora		9084/udp   #IBM AURORA Performance Visualizer
+aurora		9084/sctp  #IBM AURORA Performance Visualizer
 jetdirect	9100/tcp   #HP JetDirect card
 prom-sysctl	9124/tcp   #prometheus_sysctl_exporter(8)
 git		9418/tcp   #git pack transfer service
@@ -2462,11 +2054,11 @@ man		9535/tcp
 man		9535/udp
 sd		9876/tcp   #Session Director
 sd		9876/udp   #Session Director
-iua		9900/sctp  #IUA
 iua		9900/tcp   #IUA
 iua		9900/udp   #IUA
-enrp		9901/sctp  #enrp server channel
+iua		9900/sctp  #IUA
 enrp		9901/udp   #enrp server channel
+enrp		9901/sctp  #enrp server channel
 enrp-tls	9902/sctp  #enrp/tls server channel
 amanda		10080/tcp  #Dump server control
 amanda		10080/udp  #Dump server control
@@ -2477,19 +2069,19 @@ wmedistribution	11998/sctp #WorldMailExpress
 wmereporting	11999/sctp #WorldMailExpress
 bpcd		13782/tcp  #Veritas NetBackup
 bpcd		13782/udp  #Veritas NetBackup
-sua		14001/sctp #SUA
 sua		14001/tcp  #SUA
+sua		14001/sctp #SUA
 isode-dua	17007/tcp
 isode-dua	17007/udp
 biimenu		18000/tcp  #Beckman Instruments, Inc.
 biimenu		18000/udp  #Beckman Instruments, Inc.
-nfsrdma		20049/sctp #Network File System (NFS) over RDMA
 nfsrdma		20049/tcp  #Network File System (NFS) over RDMA
 nfsrdma		20049/udp  #Network File System (NFS) over RDMA
-wnn4		22273/tcp  wnn6		#Wnn4 (Japanese input)
-wnn4_Cn		22289/tcp  wnn6_Cn	#Wnn4 (Chinese input)
-wnn4_Kr		22305/tcp  wnn6_Kr	#Wnn4 (Korean input)
-wnn4_Tw		22321/tcp  wnn6_Tw	#Wnn4 (Taiwanse input)
+nfsrdma		20049/sctp #Network File System (NFS) over RDMA
+wnn6		22273/tcp  wnn4		#Wnn4 (Japanese input)
+wnn6_Cn		22289/tcp  wnn4_Cn	#Wnn4 (Chinese input)
+wnn6_Kr		22305/tcp  wnn4_Kr	#Wnn4 (Korean input)
+wnn6_Tw		22321/tcp  wnn4_Tw	#Wnn4 (Taiwanse input)
 wnn6_DS		26208/tcp  #Wnn6 (Dserver)
 sgsap		29118/sctp #SGsAP in 3GPP
 sbcap		29168/sctp #SBcAP in 3GPP