[GNUnet-SVN] r26040 - gnunet/src/dv

[gnunet]

Author: grothoff
Date: 2013-02-06 12:29:53 +0100 (Wed, 06 Feb 2013)
New Revision: 26040

Modified:
   gnunet/src/dv/dv.h
   gnunet/src/dv/gnunet-service-dv.c
Log:
-make dv compile again

Modified: gnunet/src/dv/dv.h
===================================================================
--- gnunet/src/dv/dv.h  2013-02-06 10:38:48 UTC (rev 26039)
+++ gnunet/src/dv/dv.h  2013-02-06 11:29:53 UTC (rev 26040)
@@ -205,7 +205,7 @@
   /**
    * PublicKey of neighbor.
    */
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
 
   /**
    * Neighbor ID to use when sending to this peer

Modified: gnunet/src/dv/gnunet-service-dv.c
===================================================================
--- gnunet/src/dv/gnunet-service-dv.c   2013-02-06 10:38:48 UTC (rev 26039)
+++ gnunet/src/dv/gnunet-service-dv.c   2013-02-06 11:29:53 UTC (rev 26040)
@@ -292,7 +292,7 @@
   /**
    * PublicKey of neighbor.
    */
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
 
   /**
    * Head of DLL of nodes that this direct neighbor referred to us.
@@ -364,7 +364,7 @@
   /**
    * PublicKey of neighbor.
    */
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pkey;
+  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *pkey;
 
   /**
    * Last time we received routing information from this peer
@@ -1775,7 +1775,7 @@
     message->neighbor_id = htonl (about->our_id);
 
     memcpy (&message->pkey, about->pkey,
-            sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+            sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
     memcpy (&message->neighbor, &about->identity,
             sizeof (struct GNUNET_PeerIdentity));
 
@@ -2322,15 +2322,15 @@
 static int
 add_pkey_to_extended (void *cls, const struct GNUNET_HashCode * key, void 
*abs_value)
 {
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pkey = cls;
+  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *pkey = cls;
   struct DistantNeighbor *distant_neighbor = abs_value;
 
   if (distant_neighbor->pkey == NULL)
   {
     distant_neighbor->pkey =
-        GNUNET_malloc (sizeof (struct 
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+        GNUNET_malloc (sizeof (struct 
GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
     memcpy (distant_neighbor->pkey, pkey,
-            sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+            sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
   }
 
   return GNUNET_YES;
@@ -2507,7 +2507,7 @@
  */
 static struct DistantNeighbor *
 addUpdateNeighbor (const struct GNUNET_PeerIdentity *peer,
-                   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pkey,
+                   struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *pkey,
                    unsigned int referrer_peer_id,
                    struct DirectNeighbor *referrer, unsigned int cost)
 {
@@ -2624,9 +2624,9 @@
     {
       neighbor->pkey =
           GNUNET_malloc (sizeof
-                         (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+                         (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
       memcpy (neighbor->pkey, pkey,
-              sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+              sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
     }
     else
       neighbor->pkey = pkey;
@@ -3036,9 +3036,9 @@
     {
       distant->pkey =
           GNUNET_malloc (sizeof
-                         (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+                         (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
       memcpy (distant->pkey, &neighbor->pkey,
-              sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+              sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
     }
 
     sent =