Add time service to WKS

Author: k0ekk0ek

scripts/wks-hash.c

@@ -48,7 +48,8 @@ static const tuple_t services[] = {
   { "ftps-data", 989 },
   { "ftps", 990 },
   { "imaps", 993 },
-  { "pop3s", 995 }
+  { "pop3s", 995 },
+  { "time", 37 }
 };
 
 const uint64_t original_magic = 138261570llu; // established after first run

src/generic/wks.h

@@ -112,84 +112,84 @@ struct service {
 
 // FIXME: state we're not interested in reverse lookup for wks!
 static const service_t services[64] = {
-  SERVICE("imap", 143),
-  SERVICE("ftp", 21),
-  SERVICE("ntp", 123),
   UNKNOWN_SERVICE(),
-  UNKNOWN_SERVICE(),
-  SERVICE("ptp-general", 320),
-  SERVICE("nicname", 43),
+  SERVICE("snmptrap", 162),
+  SERVICE("pop3s", 995),
+  SERVICE("pop3", 110),
+  SERVICE("ldaps", 636),
+  SERVICE("domain", 53),
+  SERVICE("nntps", 563),
+  SERVICE("nntp", 119),
   UNKNOWN_SERVICE(),
   UNKNOWN_SERVICE(),
   UNKNOWN_SERVICE(),
   UNKNOWN_SERVICE(),
+  SERVICE("ftps-data", 989),
   UNKNOWN_SERVICE(),
-  SERVICE("ssh", 22),
-  SERVICE("https", 443),
-  SERVICE("http", 80),
   UNKNOWN_SERVICE(),
-  SERVICE("telnet", 23),
+  SERVICE("imaps", 993),
+  SERVICE("imap", 143),
+  SERVICE("time", 37),
   UNKNOWN_SERVICE(),
   UNKNOWN_SERVICE(),
-  SERVICE("snmptrap", 162),
-  SERVICE("lmtp", 24),
-  SERVICE("smtp", 25),
-  SERVICE("ftps-data", 989),
-  SERVICE("ptp-event", 319),
+  SERVICE("kerberos", 88),
   UNKNOWN_SERVICE(),
   UNKNOWN_SERVICE(),
+  SERVICE("ftp", 21),
+  SERVICE("ntp", 123),
+  SERVICE("whoispp", 63),
+  SERVICE("ssh", 22),
   UNKNOWN_SERVICE(),
+  SERVICE("nicname", 43),
   UNKNOWN_SERVICE(),
-  SERVICE("nntps", 563),
-  SERVICE("nntp", 119),
   UNKNOWN_SERVICE(),
-  SERVICE("nnsp", 433),
   UNKNOWN_SERVICE(),
-  SERVICE("npp", 92),
-  SERVICE("domain", 53),
+  SERVICE("ptp-general", 320),
   UNKNOWN_SERVICE(),
-  SERVICE("tcpmux", 1),
   UNKNOWN_SERVICE(),
-  SERVICE("submission", 587),
-  // submissions cannot be distinguished from submission by hash value because
-  // the shared prefix is too long. include length to generate a unique key
-  SERVICE("submissions", 465),
-  UNKNOWN_SERVICE(),
-  SERVICE("echo", 7),
   SERVICE("domain-s", 853),
+  SERVICE("ftp-data", 20),
+  SERVICE("ftps", 990),
+  UNKNOWN_SERVICE(),
   UNKNOWN_SERVICE(),
-  SERVICE("whoispp", 63),
   SERVICE("snmp", 161),
   UNKNOWN_SERVICE(),
-  SERVICE("ftp-data", 20),
   UNKNOWN_SERVICE(),
   UNKNOWN_SERVICE(),
   UNKNOWN_SERVICE(),
   SERVICE("bgmp", 264),
-  SERVICE("ftps", 990),
-  SERVICE("ldaps", 636),
+  SERVICE("echo", 7),
   UNKNOWN_SERVICE(),
+  SERVICE("nnsp", 433),
+  SERVICE("submission", 587),
+  // submissions cannot be distinguished from submission by hash value because
+  // the shared prefix is too long. include length to generate a unique key
+  SERVICE("submissions", 465),
   UNKNOWN_SERVICE(),
+  SERVICE("ptp-event", 319),
   UNKNOWN_SERVICE(),
-  SERVICE("pop3s", 995),
-  SERVICE("pop3", 110),
-  SERVICE("kerberos", 88),
+  SERVICE("npp", 92),
   UNKNOWN_SERVICE(),
+  SERVICE("https", 443),
+  SERVICE("http", 80),
   UNKNOWN_SERVICE(),
+  SERVICE("telnet", 23),
+  SERVICE("tcpmux", 1),
   UNKNOWN_SERVICE(),
-  SERVICE("imaps", 993),
+  SERVICE("lmtp", 24),
+  SERVICE("smtp", 25)
 };
 
 #undef SERVICE
 #undef UNKNOWN_SERVICE
 
-// magic (138261570) generated using wks-hash.c
+// magic (139898079) generated using wks-hash.c
 static really_inline uint8_t service_hash(uint64_t input, size_t length)
 {
   // le64toh is required for big endian, no-op on little endian
   input = le64toh(input);
   uint32_t input32 = (uint32_t)((input >> 32) ^ input);
-  return (((input32 * 138261570llu) >> 32) + length) & 0x3f;
+  return (((input32 * 139898079llu) >> 32) + length) & 0x3f;
 }
 
 nonnull((1,4))