diff options
| author | Gerald Combs <gerald@wireshark.org> | 2010-10-04 20:15:48 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2010-10-04 20:15:48 +0000 |
| commit | 5769b521bdb0e29677cc9fae717d061fc694d299 (patch) | |
| tree | 73ef56b101f081e73d8c0de507c0cf8e45679351 | |
| parent | 3e84ad5147b08c6dd3ed684bf99cc4818841494b (diff) | |
| download | wireshark-5769b521bdb0e29677cc9fae717d061fc694d299.tar.gz wireshark-5769b521bdb0e29677cc9fae717d061fc694d299.tar.bz2 wireshark-5769b521bdb0e29677cc9fae717d061fc694d299.zip | |
Stig pointed out that we need to exclude some entries.
svn path=/trunk/; revision=34372
| -rw-r--r-- | services | 19 | ||||
| -rwxr-xr-x | tools/make-services.pl | 32 |
2 files changed, 43 insertions, 8 deletions
@@ -14,7 +14,7 @@ PORT NUMBERS -(last updated 2010-10-01) +(last updated 2010-10-04) The port numbers are divided into three ranges: the Well Known Ports, the Registered Ports, and the Dynamic and/or Private Ports. @@ -82,8 +82,9 @@ Keyword Decimal Description References 0/tcp Reserved 0/udp Reserved # Jon Postel <postel&isi.edu> -spr-itunes 0/tcp Shirt Pocket netTunes -spl-itunes 0/tcp Shirt Pocket launchTunes +# Excluded by ./tools/make-services.pl +# spr-itunes 0/tcp Shirt Pocket netTunes +# spl-itunes 0/tcp Shirt Pocket launchTunes # David Nanian <dnanian&shirt-pocket.com> 28 September 2007 tcpmux 1/tcp TCP Port Service Multiplexer tcpmux 1/udp TCP Port Service Multiplexer @@ -5125,8 +5126,9 @@ dls 2047/udp dls-monitor 2048/tcp dls-monitor 2048/udp # <== NOTE Conflict on 2049 ! -shilp 2049/tcp -shilp 2049/udp +# Excluded by ./tools/make-services.pl +# shilp 2049/tcp +# shilp 2049/udp nfs 2049/tcp Network File System - Sun Microsystems nfs 2049/udp Network File System - Sun Microsystems # Brent Callaghan <brent&terra.eng.sun.com> @@ -15910,7 +15912,11 @@ biimenu 18000/udp Beckman Instruments, Inc. radpdf 18104/tcp RAD PDF Service # Christopher Truxaw <ctruxaw&ctdeveloping.com> 13 April 2010 # 18104/udp Reserved -# 18105-18180 Unassigned +# 18105-18135 Unassigned +racf 18136/tcp z/OS Resource Access Control Facility +# Bruce Wells <brwells&us.ibm.com> 04 October 2010 +# 18136/udp Reserved +# 18137-18180 Unassigned opsec-cvp 18181/tcp OPSEC CVP opsec-cvp 18181/udp OPSEC CVP opsec-ufp 18182/tcp OPSEC UFP @@ -16986,4 +16992,3 @@ References [] - diff --git a/tools/make-services.pl b/tools/make-services.pl index 6b30cb2224..fa9459ebc7 100755 --- a/tools/make-services.pl +++ b/tools/make-services.pl @@ -22,10 +22,16 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. use strict; +use English; my $svc_file = "services"; my $in = shift; my $min_size = 8000000; # Size was 833397 on 2010-10-04 +my @exclude_pats = qw( + ^spr-itunes + ^spl-itunes + ^shilp +); $in = "http://www.iana.org/assignments/port-numbers" unless(defined $in); @@ -52,7 +58,31 @@ if($in =~ m/^http:/i) { if ($result->code eq 200) { warn "done fetching $in\n"; - $body = $result->content; + my @in_lines = split /\n/, $result->content; + my $prefix = ""; + my $exclude_match; + my $line; + my $pat; + foreach $line (@in_lines) { + chomp($line); + $exclude_match = 0; + foreach $pat (@exclude_pats) { + if ($line =~ $pat) { + $exclude_match = 1; + last; + } + } + if ($exclude_match) { + if ($prefix eq "") { + $body .= "# Excluded by $PROGRAM_NAME\n"; + } + $prefix = "# "; + } else { + $prefix = ""; + } + + $body .= $prefix . $line . "\n"; + } } elsif ($result->code eq 304) { warn "$svc_file was up-to-date\n"; exit 0; |