summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2008-06-18 17:50:01 +0000
committerGuy Harris <guy@alum.mit.edu>2008-06-18 17:50:01 +0000
commit90b41941680e6ab6f5d2c40319a6545048156f02 (patch)
treef9b22f2e9a33e95d5e83795d864960b792a95f5b /services
parent6ded2a5d899ff82b073c8a9a19763114179474c1 (diff)
downloadwireshark-90b41941680e6ab6f5d2c40319a6545048156f02.tar.gz
Comment out the "shilp" entry in the services file, so that port 2049
gets reported as NFS rather than "shilp", whatever *that* is. svn path=/trunk/; revision=25476
Diffstat (limited to 'services')
-rw-r--r--services7
1 files changed, 5 insertions, 2 deletions
diff --git a/services b/services
index 3d77dd8df0..adcbb0dcbe 100644
--- a/services
+++ b/services
@@ -5084,8 +5084,11 @@ dls 2047/udp
dls-monitor 2048/tcp
dls-monitor 2048/udp
# <== NOTE Conflict on 2049 !
-shilp 2049/tcp
-shilp 2049/udp
+# We resolve the conflict by commenting out the "shilp" entry; I can't
+# find much about "shilp" with Google, and there's no reference for it,
+# but NFS is a very well-known protocol and used a lot.
+#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>