aboutsummaryrefslogtreecommitdiff
path: root/src/dv
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-02-06 11:29:53 +0000
committerChristian Grothoff <christian@grothoff.org>2013-02-06 11:29:53 +0000
commit3ebf3a0b891dc78eb3e270efe98687ef8e59c029 (patch)
treef175fa7d80bceeedda5fc45ab53735620f073987 /src/dv
parent75decc5f5504a40b8331b6a9c88d7808796ef599 (diff)
downloadgnunet-3ebf3a0b891dc78eb3e270efe98687ef8e59c029.tar.gz
gnunet-3ebf3a0b891dc78eb3e270efe98687ef8e59c029.zip
-make dv compile again
Diffstat (limited to 'src/dv')
-rw-r--r--src/dv/dv.h2
-rw-r--r--src/dv/gnunet-service-dv.c22
2 files changed, 12 insertions, 12 deletions
diff --git a/src/dv/dv.h b/src/dv/dv.h
index 0d42505bc..948845bf7 100644
--- a/src/dv/dv.h
+++ b/src/dv/dv.h
@@ -205,7 +205,7 @@ typedef struct
205 /** 205 /**
206 * PublicKey of neighbor. 206 * PublicKey of neighbor.
207 */ 207 */
208 struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey; 208 struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
209 209
210 /** 210 /**
211 * Neighbor ID to use when sending to this peer 211 * Neighbor ID to use when sending to this peer
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c
index ca881aa91..9efd3cde6 100644
--- a/src/dv/gnunet-service-dv.c
+++ b/src/dv/gnunet-service-dv.c
@@ -292,7 +292,7 @@ struct DirectNeighbor
292 /** 292 /**
293 * PublicKey of neighbor. 293 * PublicKey of neighbor.
294 */ 294 */
295 struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey; 295 struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
296 296
297 /** 297 /**
298 * Head of DLL of nodes that this direct neighbor referred to us. 298 * Head of DLL of nodes that this direct neighbor referred to us.
@@ -364,7 +364,7 @@ struct DistantNeighbor
364 /** 364 /**
365 * PublicKey of neighbor. 365 * PublicKey of neighbor.
366 */ 366 */
367 struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pkey; 367 struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *pkey;
368 368
369 /** 369 /**
370 * Last time we received routing information from this peer 370 * Last time we received routing information from this peer
@@ -1775,7 +1775,7 @@ neighbor_send_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
1775 message->neighbor_id = htonl (about->our_id); 1775 message->neighbor_id = htonl (about->our_id);
1776 1776
1777 memcpy (&message->pkey, about->pkey, 1777 memcpy (&message->pkey, about->pkey,
1778 sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)); 1778 sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
1779 memcpy (&message->neighbor, &about->identity, 1779 memcpy (&message->neighbor, &about->identity,
1780 sizeof (struct GNUNET_PeerIdentity)); 1780 sizeof (struct GNUNET_PeerIdentity));
1781 1781
@@ -2322,15 +2322,15 @@ core_init (void *cls, struct GNUNET_CORE_Handle *server,
2322static int 2322static int
2323add_pkey_to_extended (void *cls, const struct GNUNET_HashCode * key, void *abs_value) 2323add_pkey_to_extended (void *cls, const struct GNUNET_HashCode * key, void *abs_value)
2324{ 2324{
2325 struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pkey = cls; 2325 struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *pkey = cls;
2326 struct DistantNeighbor *distant_neighbor = abs_value; 2326 struct DistantNeighbor *distant_neighbor = abs_value;
2327 2327
2328 if (distant_neighbor->pkey == NULL) 2328 if (distant_neighbor->pkey == NULL)
2329 { 2329 {
2330 distant_neighbor->pkey = 2330 distant_neighbor->pkey =
2331 GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)); 2331 GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
2332 memcpy (distant_neighbor->pkey, pkey, 2332 memcpy (distant_neighbor->pkey, pkey,
2333 sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)); 2333 sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
2334 } 2334 }
2335 2335
2336 return GNUNET_YES; 2336 return GNUNET_YES;
@@ -2507,7 +2507,7 @@ generate_hello_address (void *cls, size_t max, void *buf)
2507 */ 2507 */
2508static struct DistantNeighbor * 2508static struct DistantNeighbor *
2509addUpdateNeighbor (const struct GNUNET_PeerIdentity *peer, 2509addUpdateNeighbor (const struct GNUNET_PeerIdentity *peer,
2510 struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pkey, 2510 struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *pkey,
2511 unsigned int referrer_peer_id, 2511 unsigned int referrer_peer_id,
2512 struct DirectNeighbor *referrer, unsigned int cost) 2512 struct DirectNeighbor *referrer, unsigned int cost)
2513{ 2513{
@@ -2624,9 +2624,9 @@ addUpdateNeighbor (const struct GNUNET_PeerIdentity *peer,
2624 { 2624 {
2625 neighbor->pkey = 2625 neighbor->pkey =
2626 GNUNET_malloc (sizeof 2626 GNUNET_malloc (sizeof
2627 (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)); 2627 (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
2628 memcpy (neighbor->pkey, pkey, 2628 memcpy (neighbor->pkey, pkey,
2629 sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)); 2629 sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
2630 } 2630 }
2631 else 2631 else
2632 neighbor->pkey = pkey; 2632 neighbor->pkey = pkey;
@@ -3036,9 +3036,9 @@ process_peerinfo (void *cls, const struct GNUNET_PeerIdentity *peer,
3036 { 3036 {
3037 distant->pkey = 3037 distant->pkey =
3038 GNUNET_malloc (sizeof 3038 GNUNET_malloc (sizeof
3039 (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)); 3039 (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
3040 memcpy (distant->pkey, &neighbor->pkey, 3040 memcpy (distant->pkey, &neighbor->pkey,
3041 sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)); 3041 sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
3042 } 3042 }
3043 3043
3044 sent = 3044 sent =