From d528f6cfbe5e99a7e50e28d76b90654ecb955d9a Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Tue, 23 Feb 2021 14:29:47 +0100 Subject: HELLO: Fix netdb.h nonsense with h_addr --- src/hello/hello-ng.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/hello/hello-ng.c') diff --git a/src/hello/hello-ng.c b/src/hello/hello-ng.c index 85b304e18..96856a692 100644 --- a/src/hello/hello-ng.c +++ b/src/hello/hello-ng.c @@ -30,6 +30,7 @@ #include "gnunet_util_lib.h" #include "gnunet_ats_service.h" +GNUNET_NETWORK_STRUCT_BEGIN /** * Binary block we sign when we sign an address. */ @@ -48,9 +49,9 @@ struct SignedAddress /** * Hash of the address. */ - struct GNUNET_HashCode h_addr; + struct GNUNET_HashCode addr_hash GNUNET_PACKED; }; - +GNUNET_NETWORK_STRUCT_END /** * Build address record by signing raw information with private key. @@ -78,7 +79,7 @@ GNUNET_HELLO_sign_address ( sa.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_ADDRESS); sa.purpose.size = htonl (sizeof(sa)); sa.mono_time = GNUNET_TIME_absolute_hton (mono_time); - GNUNET_CRYPTO_hash (address, strlen (address), &sa.h_addr); + GNUNET_CRYPTO_hash (address, strlen (address), &sa.addr_hash); GNUNET_CRYPTO_eddsa_sign (private_key, &sa, &sig); sig_str = NULL; (void) GNUNET_STRINGS_base64_encode (&sig, sizeof(sig), &sig_str); @@ -161,7 +162,7 @@ GNUNET_HELLO_extract_address (const void *raw, sa.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_ADDRESS); sa.purpose.size = htonl (sizeof(sa)); sa.mono_time = GNUNET_TIME_absolute_hton (raw_mono_time); - GNUNET_CRYPTO_hash (raw_addr, strlen (raw_addr), &sa.h_addr); + GNUNET_CRYPTO_hash (raw_addr, strlen (raw_addr), &sa.addr_hash); if (GNUNET_YES != GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_ADDRESS, &sa, -- cgit v1.2.3