X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fhello%2Fhello.c;h=e964ec1a3312d67f80e8c46ffc614570dbdcb7e8;hb=0778d7e951b20f42af01597ae41ba8d2d26857d0;hp=9e246d47344e912ea1ac681aceabf99db44810e9;hpb=427dd6f998fb1fde515a3b5c800f9f6d308197b2;p=oweals%2Fgnunet.git diff --git a/src/hello/hello.c b/src/hello/hello.c index 9e246d473..e964ec1a3 100644 --- a/src/hello/hello.c +++ b/src/hello/hello.c @@ -59,7 +59,7 @@ struct GNUNET_HELLO_Message /** * The public key of the peer. */ - struct GNUNET_CRYPTO_EccPublicSignKey publicKey; + struct GNUNET_CRYPTO_EddsaPublicKey publicKey; }; GNUNET_NETWORK_STRUCT_END @@ -166,7 +166,7 @@ GNUNET_HELLO_add_address (const struct GNUNET_HELLO_Address *address, */ static size_t get_hello_address_size (const char *buf, - size_t max, + size_t max, uint16_t *ralen) { const char *pos; @@ -183,7 +183,7 @@ get_hello_address_size (const char *buf, pos++; slen++; } - if (left == 0) + if (0 == left) { /* 0-termination not found */ GNUNET_break_op (0); @@ -218,7 +218,7 @@ get_hello_address_size (const char *buf, * @return the hello message */ struct GNUNET_HELLO_Message * -GNUNET_HELLO_create (const struct GNUNET_CRYPTO_EccPublicSignKey *publicKey, +GNUNET_HELLO_create (const struct GNUNET_CRYPTO_EddsaPublicKey *publicKey, GNUNET_HELLO_GenerateAddressListCallback addrgen, void *addrgen_cls, int friend_only) @@ -249,7 +249,7 @@ GNUNET_HELLO_create (const struct GNUNET_CRYPTO_EccPublicSignKey *publicKey, hello->friend_only = htonl (friend_only); memcpy (&hello->publicKey, publicKey, - sizeof (struct GNUNET_CRYPTO_EccPublicSignKey)); + sizeof (struct GNUNET_CRYPTO_EddsaPublicKey)); memcpy (&hello[1], buffer, used); return hello; } @@ -300,7 +300,7 @@ GNUNET_HELLO_iterate_addresses (const struct GNUNET_HELLO_Message *msg, while (insize > 0) { esize = get_hello_address_size (inptr, insize, &alen); - if (esize == 0) + if (0 == esize) { GNUNET_break (0); GNUNET_free_non_null (ret); @@ -312,6 +312,7 @@ GNUNET_HELLO_iterate_addresses (const struct GNUNET_HELLO_Message *msg, address.address = &inptr[esize - alen]; address.address_length = alen; address.transport_name = inptr; + address.local_info = GNUNET_HELLO_ADDRESS_INFO_NONE; iret = it (it_cls, &address, GNUNET_TIME_absolute_ntoh (expire)); if (iret == GNUNET_SYSERR) { @@ -530,7 +531,7 @@ GNUNET_HELLO_size (const struct GNUNET_HELLO_Message *hello) */ int GNUNET_HELLO_get_key (const struct GNUNET_HELLO_Message *hello, - struct GNUNET_CRYPTO_EccPublicSignKey *publicKey) + struct GNUNET_CRYPTO_EddsaPublicKey *publicKey) { uint16_t ret = ntohs (hello->header.size); @@ -669,7 +670,7 @@ GNUNET_HELLO_equals (const struct GNUNET_HELLO_Message *h1, if (0 != memcmp (&h1->publicKey, &h2->publicKey, - sizeof (struct GNUNET_CRYPTO_EccPublicSignKey))) + sizeof (struct GNUNET_CRYPTO_EddsaPublicKey))) return GNUNET_TIME_UNIT_ZERO_ABS; ec.expiration_limit = now; ec.result = GNUNET_TIME_UNIT_FOREVER_ABS; @@ -684,12 +685,12 @@ GNUNET_HELLO_equals (const struct GNUNET_HELLO_Message *h1, static int -find_min_expire (void *cls, const struct GNUNET_HELLO_Address *address, +find_max_expire (void *cls, const struct GNUNET_HELLO_Address *address, struct GNUNET_TIME_Absolute expiration) { - struct GNUNET_TIME_Absolute *min = cls; + struct GNUNET_TIME_Absolute *max = cls; - *min = GNUNET_TIME_absolute_min (*min, expiration); + *max = GNUNET_TIME_absolute_max (*max, expiration); return GNUNET_OK; } @@ -706,7 +707,7 @@ GNUNET_HELLO_get_last_expiration (const struct GNUNET_HELLO_Message *msg) struct GNUNET_TIME_Absolute ret; ret.abs_value_us = 0; - GNUNET_HELLO_iterate_addresses (msg, GNUNET_NO, &find_min_expire, &ret); + GNUNET_HELLO_iterate_addresses (msg, GNUNET_NO, &find_max_expire, &ret); return ret; } @@ -716,9 +717,9 @@ GNUNET_HELLO_get_last_expiration (const struct GNUNET_HELLO_Message *msg) * maybe differenciated into additional subcategories if applicable. * This module only deals with hello identifiers (MODULE = "hello"). *
- *
+ *
* The concrete URI format is:
- *
+ *
* "gnunet://hello/PEER[!YYYYMMDDHHMMSS!
*/
@@ -871,7 +872,7 @@ GNUNET_HELLO_compose_uri (const struct GNUNET_HELLO_Message *hello,
struct GNUNET_HELLO_ComposeUriContext ctx;
ctx.plugins_find = plugins_find;
- char *pkey = GNUNET_CRYPTO_ecc_public_sign_key_to_string (&(hello->publicKey));
+ char *pkey = GNUNET_CRYPTO_eddsa_public_key_to_string (&(hello->publicKey));
GNUNET_asprintf (&(ctx.uri),
"%s%s",
@@ -1044,7 +1045,7 @@ add_address_to_hello (void *cls, size_t max, void *buffer)
*/
int
GNUNET_HELLO_parse_uri (const char *uri,
- struct GNUNET_CRYPTO_EccPublicSignKey *pubkey,
+ struct GNUNET_CRYPTO_EddsaPublicKey *pubkey,
struct GNUNET_HELLO_Message **hello,
GNUNET_HELLO_TransportPluginsFind plugins_find)
{
- *
+ *
* The encoding for hexadecimal values is defined in the crypto_hash.c
* module in the gnunetutil library and discussed there.
- *
+ *
* Examples:
- *
+ *
* gnunet://hello/0430205UC7D56PTQK8NV05776671CNN44FK4TL6D0GQ35OMF8MEN4RNMKA5UF6AL3DQO8B1SC5AQF50SQ2MABIRU4HC8H2HAJKJ59JL1JVRJAK308F9GASRFLMGUBB5TQ5AKR94AS5T3MDG8B9O1EMPRKB0HVCG7T6QPP4CDJ913LAEHVJ2DI1TOBB15Q1JIT5ARBOD12U4SIGRFDV3Q7T66G4TBVSJJ90UQF1BG29TGJJKLGEIMSPHHKO544D6EALQ4F2K0416311JC22GVAD48R616I7VK03K7MP7N0RS2MBV1TE9JV8CK1LSQMR7KCDRTLDA6917UGA67DHTGHERIACCGQ54TGSR48RMSGS9BA5HLMOKASFC1I6V4TT09TUGCU8GNDHQF0JF3H7LPV59UL5I38QID040G000!20120302010059!TCP!192.168.0.1:2086!TCP!64.23.8.174:0
* gnunet://hello/0430205UC7D56PTQK8NV05776671CNN44FK4TL6D0GQ35OMF8MEN4RNMKA5UF6AL3DQO8B1SC5AQF50SQ2MABIRU4HC8H2HAJKJ59JL1JVRJAK308F9GASRFLMGUBB5TQ5AKR94AS5T3MDG8B9O1EMPRKB0HVCG7T6QPP4CDJ913LAEHVJ2DI1TOBB15Q1JIT5ARBOD12U4SIGRFDV3Q7T66G4TBVSJJ90UQF1BG29TGJJKLGEIMSPHHKO544D6EALQ4F2K0416311JC22GVAD48R616I7VK03K7MP7N0RS2MBV1TE9JV8CK1LSQMR7KCDRTLDA6917UGA67DHTGHERIACCGQ54TGSR48RMSGS9BA5HLMOKASFC1I6V4TT09TUGCU8GNDHQF0JF3H7LPV59UL5I38QID040G000!20120302010059!TCP!(2001:db8:85a3:8d3:1319:8a2e:370:7348):2086
- *
+ *
*