Change descriptions of NTP Reference Identifier Codes for stratum 1

servers to match IANA assignment / RFC 5905.  A number of codes already
in Wireshark that aren't assigned were left intact.


svn path=/trunk/; revision=36136

1 files changed, 22 insertions, 16 deletions

diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c
index c4bb580f26..6ee922b36c 100644
--- a/epan/dissectors/packet-ntp.c
+++ b/epan/dissectors/packet-ntp.c
@@ -194,31 +194,37 @@ static const struct {
 	const char *id;
 	const char *data;
 } primary_sources[] = {
+	/* IANA / RFC 5905 */
+	{ "GOES",	"Geostationary Orbit Environment Satellite" },
+	{ "GPS\0",	"Global Position System" },
+	{ "GAL\0",	"Galileo Positioning System" },
+	{ "PPS\0",	"Generic pulse-per-second" },
+	{ "IRIG",	"Inter-Range Instrumentation Group" },
+	{ "WWVB",	"LF Radio WWVB Ft. Collins, CO 60 kHz" },
+	{ "DCF\0",	"LF Radio DCF77 Mainflingen, DE 77.5 kHz" },
+	{ "HBG\0",	"LF Radio HBG Prangins, HB 75 kHz" },
+	{ "MSF\0",	"LF Radio MSF Anthorn, UK 60 kHz" },
+	{ "JJY\0",	"LF Radio JJY Fukushima, JP 40 kHz, Saga, JP 60 kHz" },
+	{ "LORC",	"MF Radio LORAN C station, 100 kHz" },
+	{ "TDF\0",	"MF Radio Allouis, FR 162 kHz" },
+	{ "CHU\0",	"HF Radio CHU Ottawa, Ontario" },
+	{ "WWV\0",	"HF Radio WWV Ft. Collins, CO" },
+	{ "WWVH",	"HF Radio WWVH Kauai, HI" },
+	{ "NIST",	"NIST telephone modem" },
+	{ "ACTS",	"NIST telephone modem" },
+	{ "USNO",	"USNO telephone modem" },
+	{ "PTB\0",	"European telephone modem" },
+
+	/* Unofficial codes */
 	{ "LOCL",	"uncalibrated local clock" },
 	{ "CESM",	"calibrated Cesium clock" },
 	{ "RBDM",	"calibrated Rubidium clock" },
-	{ "PPS\0",	"calibrated quartz clock or other pulse-per-second source" },
-	{ "ACTS",	"NIST dialup modem service" },
-	{ "USNO",	"USNO modem service" },
-	{ "PTB\0",	"PTB (Germany) modem service" },
-	{ "TDF\0",	"Allouis (France) Radio 164 kHz" },
-	{ "DCF\0",	"Mainflingen (Germany) Radio 77.5 kHz" },
-	{ "MSF\0",	"Anthorn (UK) Radio 60 kHz" },
-	{ "WWV\0",	"Ft. Collins (US) Radio 2.5, 5, 10, 15, 20 MHz" },
-	{ "WWVB",	"Boulder (US) Radio 60 kHz" },
-	{ "WWVH",	"Kauai Hawaii (US) Radio 2.5, 5, 10, 15 MHz" },
-	{ "CHU\0",	"Ottawa (Canada) Radio 3330, 7335, 14670 kHz" },
-	{ "LORC",	"LORAN-C radionavigation system" },
 	{ "OMEG",	"OMEGA radionavigation system" },
-	{ "GPS\0",	"Global Positioning Service" },
-	{ "GOES",	"Geostationary Orbit Environment Satellite" },
 	{ "DCN\0",	"DCN routing protocol" },
-	{ "NIST",	"NIST public modem" },
 	{ "TSP\0",	"TSP time protocol" },
 	{ "DTS\0",	"Digital Time Service" },
 	{ "ATOM",	"Atomic clock (calibrated)" },
 	{ "VLF\0",	"VLF radio (OMEGA,, etc.)" },
-	{ "IRIG",	"IRIG-B timecode" },
 	{ "1PPS",	"External 1 PPS input" },
 	{ "FREE",	"(Internal clock)" },
 	{ "INIT",	"(Initialization)" },