aboutsummaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2008-06-18 17:50:01 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2008-06-18 17:50:01 +0000
commit316ecf7b552150d2b37708b9fbcdff19feee5f44 (patch)
treef9b22f2e9a33e95d5e83795d864960b792a95f5b /services
parenta6f481ac17d17a4874f7c832297c7506d71017ef (diff)
Comment out the "shilp" entry in the services file, so that port 2049
gets reported as NFS rather than "shilp", whatever *that* is. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25476 f5534014-38df-0310-8fa8-9805f1628bb7
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>