[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29735 - in gnunet/src: dns exit include pt
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29735 - in gnunet/src: dns exit include pt |
Date: |
Tue, 1 Oct 2013 00:10:54 +0200 |
Author: grothoff
Date: 2013-10-01 00:10:54 +0200 (Tue, 01 Oct 2013)
New Revision: 29735
Modified:
gnunet/src/dns/plugin_block_dns.c
gnunet/src/exit/gnunet-daemon-exit.c
gnunet/src/include/block_dns.h
gnunet/src/pt/gnunet-daemon-pt.c
Log:
-fixing build issues in pt/exit/vpn related to #3047
Modified: gnunet/src/dns/plugin_block_dns.c
===================================================================
--- gnunet/src/dns/plugin_block_dns.c 2013-09-30 22:08:51 UTC (rev 29734)
+++ gnunet/src/dns/plugin_block_dns.c 2013-09-30 22:10:54 UTC (rev 29735)
@@ -93,7 +93,7 @@
GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_DNS_RECORD,
&ad->purpose,
&ad->signature,
- &ad->peer))
+ &ad->peer.public_key))
{
GNUNET_break_op (0);
return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
Modified: gnunet/src/exit/gnunet-daemon-exit.c
===================================================================
--- gnunet/src/exit/gnunet-daemon-exit.c 2013-09-30 22:08:51 UTC (rev
29734)
+++ gnunet/src/exit/gnunet-daemon-exit.c 2013-09-30 22:10:54 UTC (rev
29735)
@@ -3574,7 +3574,7 @@
dht = GNUNET_DHT_connect (cfg, 1);
peer_key = GNUNET_CRYPTO_ecc_key_create_from_configuration (cfg);
GNUNET_CRYPTO_ecc_key_get_public_for_signature (peer_key,
- &dns_advertisement.peer);
+
&dns_advertisement.peer.public_key);
dns_advertisement.purpose.size = htonl (sizeof (struct
GNUNET_DNS_Advertisement) -
sizeof (struct
GNUNET_CRYPTO_EccSignature));
dns_advertisement.purpose.purpose = htonl
(GNUNET_SIGNATURE_PURPOSE_DNS_RECORD);
Modified: gnunet/src/include/block_dns.h
===================================================================
--- gnunet/src/include/block_dns.h 2013-09-30 22:08:51 UTC (rev 29734)
+++ gnunet/src/include/block_dns.h 2013-09-30 22:10:54 UTC (rev 29735)
@@ -53,7 +53,7 @@
/**
* The peer providing this service
*/
- struct GNUNET_CRYPTO_EccPublicSignKey peer;
+ struct GNUNET_PeerIdentity peer;
};
GNUNET_NETWORK_STRUCT_END
Modified: gnunet/src/pt/gnunet-daemon-pt.c
===================================================================
--- gnunet/src/pt/gnunet-daemon-pt.c 2013-09-30 22:08:51 UTC (rev 29734)
+++ gnunet/src/pt/gnunet-daemon-pt.c 2013-09-30 22:10:54 UTC (rev 29735)
@@ -1193,7 +1193,6 @@
size_t size, const void *data)
{
const struct GNUNET_DNS_Advertisement *ad;
- struct GNUNET_PeerIdentity pid;
struct MeshExit *exit;
if (sizeof (struct GNUNET_DNS_Advertisement) != size)
@@ -1202,18 +1201,15 @@
return;
}
ad = data;
- GNUNET_CRYPTO_hash (&ad->peer,
- sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
- &pid.hashPubKey);
for (exit = exit_head; NULL != exit; exit = exit->next)
- if (0 == memcmp (&pid,
+ if (0 == memcmp (&ad->peer,
&exit->peer,
sizeof (struct GNUNET_PeerIdentity)))
break;
if (NULL == exit)
{
exit = GNUNET_new (struct MeshExit);
- exit->peer = pid;
+ exit->peer = ad->peer;
/* tunnel is closed, so insert at the end */
GNUNET_CONTAINER_DLL_insert_tail (exit_head,
exit_tail,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29735 - in gnunet/src: dns exit include pt,
gnunet <=