[GNUnet-SVN] r15120 - gnunet/src/vpn

[gnunet]

Author: toelke
Date: 2011-04-29 15:13:51 +0200 (Fri, 29 Apr 2011)
New Revision: 15120

Modified:
   gnunet/src/vpn/gnunet-daemon-exit.c
Log:
Better hashing for the services in -exit

Modified: gnunet/src/vpn/gnunet-daemon-exit.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-exit.c 2011-04-29 13:13:50 UTC (rev 15119)
+++ gnunet/src/vpn/gnunet-daemon-exit.c 2011-04-29 13:13:51 UTC (rev 15120)
@@ -274,12 +274,9 @@
       memcpy ((GNUNET_HashCode *) (desc + 1), &state->desc,
               sizeof (GNUNET_HashCode));
       *desc = ntohs (udp->spt);
-      GNUNET_HashCode hash;
-      //FIXME better hashing
-      GNUNET_CRYPTO_hash (desc, sizeof (GNUNET_HashCode) + 2, &hash);
       GNUNET_assert (GNUNET_OK ==
                      GNUNET_CONTAINER_multihashmap_put (udp_services,
-                                                        &hash, serv,
+                                                        
(GNUNET_HashCode*)desc, serv,
                                                         
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
 
       state->serv = serv;
@@ -484,8 +481,6 @@
 
           *desc = local_port;
 
-          GNUNET_CRYPTO_hash (desc, sizeof (GNUNET_HashCode) + 2, &hash);
-
           struct redirect_service *serv =
             GNUNET_malloc (sizeof (struct redirect_service));
           memset (serv, 0, sizeof (struct redirect_service));
@@ -531,16 +526,15 @@
                       *((unsigned long long *) (desc + 1)));
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Store with key2 %x\n",
                       *((unsigned long long *) &hash));
-          //FIXME better hashing
           if (UDP == proto)
             GNUNET_assert (GNUNET_OK ==
                            GNUNET_CONTAINER_multihashmap_put (udp_services,
-                                                              &hash, serv,
+                                                              
(GNUNET_HashCode*)desc, serv,
                                                               
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
           else
             GNUNET_assert (GNUNET_OK ==
                            GNUNET_CONTAINER_multihashmap_put (tcp_services,
-                                                              &hash, serv,
+                                                              
(GNUNET_HashCode*)desc, serv,
                                                               
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
 
         }
@@ -836,10 +830,8 @@
 
   memcpy (tcp_desc + 1, desc, sizeof (GNUNET_HashCode));
   *tcp_desc = ntohs (pkt->dpt);
-  //FIXME better hashing
-  GNUNET_CRYPTO_hash (tcp_desc, sizeof (GNUNET_HashCode) + 2, &hash);
   struct redirect_service *serv =
-    GNUNET_CONTAINER_multihashmap_get (tcp_services, &hash);
+    GNUNET_CONTAINER_multihashmap_get (tcp_services, 
(GNUNET_HashCode*)tcp_desc);
   if (NULL == serv)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -938,10 +930,8 @@
   uint16_t *udp_desc = alloca (sizeof (GNUNET_HashCode) + 2);
   memcpy (udp_desc + 1, desc, sizeof (GNUNET_HashCode));
   *udp_desc = ntohs (pkt->dpt);
-  //FIXME better hashing
-  GNUNET_CRYPTO_hash (udp_desc, sizeof (GNUNET_HashCode) + 2, &hash);
   struct redirect_service *serv =
-    GNUNET_CONTAINER_multihashmap_get (udp_services, &hash);
+    GNUNET_CONTAINER_multihashmap_get (udp_services, 
(GNUNET_HashCode*)udp_desc);
   if (NULL == serv)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,