Roll back siphash, fix version output (#67)

* Roll back siphash, fix version output

* unref

CMakeLists.txt

@@ -134,7 +134,7 @@ else()
 endif()
 
 set(FM_SRC_LIST
-   fm_formats.c fm_dump.c siphash.c string_conversion.c fm_get.c xml.c
+   fm_formats.c fm_dump.c lookup3.c string_conversion.c fm_get.c xml.c
    ${FM_SOCKET_IO} ${FFS_FILE_IO})
 foreach(FM_SRC ${FM_SRC_LIST})
   list(APPEND FM_MASTER_SRC_LIST fm/${FM_SRC} )

fm/fm_formats.c

@@ -1946,20 +1946,12 @@ register_data_format(FMContext context, FMStructDescList struct_list)
 
 INT4 FFS_self_server_IP_addr = 0;
 
-#include "siphash.h"
-
-static void hashlittle2( 
-  const void *data,       /* the data to hash */
-  size_t      length,    /* length of the data */
+extern void hashlittle2( 
+  const void *key,       /* the key to hash */
+  size_t      length,    /* length of the key */
   INT4   *pc,        /* IN: primary initval, OUT: primary hash */
-  INT4   *pb)
-{
-    static const uint64_t skey[2] = {0xECB8FF2F434B2FBB, 0xB4E298A99A71F723 };
-    INT4 output[2];
-    siphash(data, length, &skey, (uint8_t*) &output[0], sizeof(output));
-    *pc = output[0];
-    *pb = output[1];
-}
+  INT4   *pb)        /* IN: secondary initval, OUT: secondary hash */;
+
 
 extern void
 generate_format3_server_ID(server_ID_type *server_ID,
@@ -1990,7 +1982,7 @@ generate_format3_server_ID(server_ID_type *server_ID,
     ((version_3_format_ID *) server_ID->value)->rep_len = 
 	htons((short)(server_format_rep_length >> 2));   // Mod length by 4
     ((version_3_format_ID *) server_ID->value)->top_byte_rep_len = (unsigned char)
-	htons((short)(server_format_rep_length >> 18));  // Essentially, we capture the top 26 bytes of the server length
+	0xff & (server_format_rep_length >> 18);
     ((version_3_format_ID *) server_ID->value)->hash1 = htonl(hash1);
     ((version_3_format_ID *) server_ID->value)->hash2 = htonl(hash2);
 }
@@ -3961,11 +3953,12 @@ stringify_server_ID(unsigned char *ID, char *buffer, int len)
 	    break;
 	}
     case 2:{
-	version_2_format_ID *id2 = (version_2_format_ID*)ID;
+	version_3_format_ID *id3 = (version_3_format_ID*)ID;
 	if (len < 3+3+6+10+6+50) /* approx size */ return;
-	snprintf(buffer, len, "<ID ver=%d, unused %d, rep_len %d, hash1 %x, hash2 %x>\n",
-	       id2->version, id2->unused, ntohs(id2->rep_len) << 2,
-	       ntohl(id2->hash1), ntohl(id2->hash2));
+	int rep_len = get_rep_len_format_ID(ID);
+	snprintf(buffer, len, "<ID ver=%d, rep_len %d, hash1 %x, hash2 %x>\n",
+	       id3->version, rep_len,
+	       ntohl(id3->hash1), ntohl(id3->hash2));
 	    break;
 	}
     default:
@@ -4029,11 +4022,10 @@ get_rep_len_format_ID(void *format_ID)
 {
     switch (version_of_format_ID(format_ID)) {
     case 2:{
-	    version_2_format_ID *id2 = (version_2_format_ID *) format_ID;
-	    short tmp;
-	    memcpy(&tmp, &id2->rep_len, 2);
-		tmp = ntohs(tmp);
-	    return tmp << 2;
+	    version_3_format_ID *id3 = (version_3_format_ID *) format_ID;
+	    int rep_len = htons(id3->rep_len);
+	    rep_len += (id3->top_byte_rep_len << 16);
+	    return rep_len << 2;
 	}
     case 0:
     case 1: