X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhello%2Fhello.c;h=7f77067132f698d4eef28553fdf253171262a9da;hb=e80da3ab091fdaaf65222689d10e73ef210b5f23;hp=fc27e446bc6c30b84eb02001748079a019e1e4d7;hpb=c303b97bd731aef372ec24ebe8b47ee014ada23b;p=oweals%2Fgnunet.git diff --git a/src/hello/hello.c b/src/hello/hello.c index fc27e446b..7f7706713 100644 --- a/src/hello/hello.c +++ b/src/hello/hello.c @@ -40,14 +40,14 @@ GNUNET_NETWORK_STRUCT_BEGIN * 1) transport-name (0-terminated) * 2) address-length (uint16_t, network byte order; possibly * unaligned!) - * 3) address expiration (GNUNET_TIME_AbsoluteNBO); possibly + * 3) address expiration (`struct GNUNET_TIME_AbsoluteNBO`); possibly * unaligned!) * 4) address (address-length bytes; possibly unaligned!) */ struct GNUNET_HELLO_Message { /** - * Type will be GNUNET_MESSAGE_TYPE_HELLO. + * Type will be #GNUNET_MESSAGE_TYPE_HELLO. */ struct GNUNET_MessageHeader header; @@ -59,7 +59,7 @@ struct GNUNET_HELLO_Message /** * The public key of the peer. */ - struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded publicKey; + struct GNUNET_CRYPTO_EddsaPublicKey publicKey; }; GNUNET_NETWORK_STRUCT_END @@ -93,7 +93,7 @@ struct GNUNET_HELLO_ParseUriContext const char *pos; /** - * Set to GNUNET_SYSERR to indicate parse errors. + * Set to #GNUNET_SYSERR to indicate parse errors. */ int ret; @@ -107,7 +107,7 @@ struct GNUNET_HELLO_ParseUriContext /** Return HELLO type * * @param h HELLO Message to test - * @return GNUNET_YES or GNUNET_NO + * @return #GNUNET_YES or #GNUNET_NO */ int GNUNET_HELLO_is_friend_only (const struct GNUNET_HELLO_Message *h) @@ -124,8 +124,8 @@ GNUNET_HELLO_is_friend_only (const struct GNUNET_HELLO_Message *h) * the given buffer using the format of HELLOs. * * @param address the address - * @param expiration expiration for the address - * @param target where to copy the address + * @param expiration expiration for the @a address + * @param target where to copy the @a address * @param max maximum number of bytes to copy to target * @return number of bytes copied, 0 if * the target buffer was not big enough. @@ -165,7 +165,9 @@ GNUNET_HELLO_add_address (const struct GNUNET_HELLO_Address *address, * @return size of the entry, or 0 if max is not large enough */ static size_t -get_hello_address_size (const char *buf, size_t max, uint16_t * ralen) +get_hello_address_size (const char *buf, + size_t max, + uint16_t *ralen) { const char *pos; uint16_t alen; @@ -181,7 +183,7 @@ get_hello_address_size (const char *buf, size_t max, uint16_t * ralen) pos++; slen++; } - if (left == 0) + if (0 == left) { /* 0-termination not found */ GNUNET_break_op (0); @@ -216,8 +218,7 @@ get_hello_address_size (const char *buf, size_t max, uint16_t * ralen) * @return the hello message */ struct GNUNET_HELLO_Message * -GNUNET_HELLO_create (const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded - *publicKey, +GNUNET_HELLO_create (const struct GNUNET_CRYPTO_EddsaPublicKey *publicKey, GNUNET_HELLO_GenerateAddressListCallback addrgen, void *addrgen_cls, int friend_only) @@ -248,7 +249,7 @@ GNUNET_HELLO_create (const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded hello->friend_only = htonl (friend_only); memcpy (&hello->publicKey, publicKey, - sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded)); + sizeof (struct GNUNET_CRYPTO_EddsaPublicKey)); memcpy (&hello[1], buffer, used); return hello; } @@ -261,7 +262,8 @@ GNUNET_HELLO_create (const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded * @param return_modified if a modified copy should be returned, * otherwise NULL will be returned * @param it iterator to call on each address - * @param it_cls closure for it + * @param it_cls closure for @a it + * @return modified HELLO message */ struct GNUNET_HELLO_Message * GNUNET_HELLO_iterate_addresses (const struct GNUNET_HELLO_Message *msg, @@ -294,13 +296,11 @@ GNUNET_HELLO_iterate_addresses (const struct GNUNET_HELLO_Message *msg, insize = msize - sizeof (struct GNUNET_HELLO_Message); wpos = 0; woff = (ret != NULL) ? (char *) &ret[1] : NULL; - GNUNET_CRYPTO_hash (&msg->publicKey, - sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), - &address.peer.hashPubKey); + address.peer.public_key = msg->publicKey; 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) { @@ -382,8 +383,8 @@ copy_latest (void *cls, const struct GNUNET_HELLO_Address *address, ec.found = GNUNET_NO; GNUNET_HELLO_iterate_addresses (mc->other, GNUNET_NO, &get_match_exp, &ec); if ((ec.found == GNUNET_NO) || - (ec.expiration.abs_value < expiration.abs_value) || - ((ec.expiration.abs_value == expiration.abs_value) && + (ec.expiration.abs_value_us < expiration.abs_value_us) || + ((ec.expiration.abs_value_us == expiration.abs_value_us) && (mc->take_equal == GNUNET_YES))) { mc->ret += @@ -465,8 +466,8 @@ delta_match (void *cls, const struct GNUNET_HELLO_Address *address, GNUNET_HELLO_iterate_addresses (dc->old_hello, GNUNET_NO, &get_match_exp, &ec); if ((ec.found == GNUNET_YES) && - ((ec.expiration.abs_value > expiration.abs_value) || - (ec.expiration.abs_value >= dc->expiration_limit.abs_value))) + ((ec.expiration.abs_value_us > expiration.abs_value_us) || + (ec.expiration.abs_value_us >= dc->expiration_limit.abs_value_us))) return GNUNET_YES; /* skip */ ret = dc->it (dc->it_cls, address, expiration); return ret; @@ -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_EccPublicKeyBinaryEncoded *publicKey) + struct GNUNET_CRYPTO_EddsaPublicKey *publicKey) { uint16_t ret = ntohs (hello->header.size); @@ -547,7 +548,7 @@ GNUNET_HELLO_get_key (const struct GNUNET_HELLO_Message *hello, * * @param hello the hello message * @param peer where to store the peer's identity - * @return GNUNET_SYSERR if the HELLO was malformed + * @return #GNUNET_SYSERR if the HELLO was malformed */ int GNUNET_HELLO_get_id (const struct GNUNET_HELLO_Message *hello, @@ -558,9 +559,7 @@ GNUNET_HELLO_get_id (const struct GNUNET_HELLO_Message *hello, if ((ret < sizeof (struct GNUNET_HELLO_Message)) || (ntohs (hello->header.type) != GNUNET_MESSAGE_TYPE_HELLO)) return GNUNET_SYSERR; - GNUNET_CRYPTO_hash (&hello->publicKey, - sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), - &peer->hashPubKey); + peer->public_key = hello->publicKey; return GNUNET_OK; } @@ -609,12 +608,12 @@ find_other_matching (void *cls, const struct GNUNET_HELLO_Address *address, { struct EqualsContext *ec = cls; - if (expiration.abs_value < ec->expiration_limit.abs_value) + if (expiration.abs_value_us < ec->expiration_limit.abs_value_us) return GNUNET_YES; if (0 == GNUNET_HELLO_address_cmp (address, ec->address)) { ec->found = GNUNET_YES; - if (expiration.abs_value < ec->expiration.abs_value) + if (expiration.abs_value_us < ec->expiration.abs_value_us) ec->result = GNUNET_TIME_absolute_min (expiration, ec->result); return GNUNET_SYSERR; } @@ -628,7 +627,7 @@ find_matching (void *cls, const struct GNUNET_HELLO_Address *address, { struct EqualsContext *ec = cls; - if (expiration.abs_value < ec->expiration_limit.abs_value) + if (expiration.abs_value_us < ec->expiration_limit.abs_value_us) return GNUNET_YES; ec->address = address; ec->expiration = expiration; @@ -671,13 +670,13 @@ GNUNET_HELLO_equals (const struct GNUNET_HELLO_Message *h1, if (0 != memcmp (&h1->publicKey, &h2->publicKey, - sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded))) + sizeof (struct GNUNET_CRYPTO_EddsaPublicKey))) return GNUNET_TIME_UNIT_ZERO_ABS; ec.expiration_limit = now; ec.result = GNUNET_TIME_UNIT_FOREVER_ABS; ec.h2 = h2; GNUNET_HELLO_iterate_addresses (h1, GNUNET_NO, &find_matching, &ec); - if (ec.result.abs_value == GNUNET_TIME_UNIT_ZERO.rel_value) + if (ec.result.abs_value_us == GNUNET_TIME_UNIT_ZERO.rel_value_us) return ec.result; ec.h2 = h1; GNUNET_HELLO_iterate_addresses (h2, GNUNET_NO, &find_matching, &ec); @@ -707,7 +706,7 @@ GNUNET_HELLO_get_last_expiration (const struct GNUNET_HELLO_Message *msg) { struct GNUNET_TIME_Absolute ret; - ret.abs_value = 0; + ret.abs_value_us = 0; GNUNET_HELLO_iterate_addresses (msg, GNUNET_NO, &find_min_expire, &ret); return ret; } @@ -718,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!!

]...". * These URIs can be used to add a peer record to peerinfo service. * PEER is the string representation of peer's public key. @@ -728,29 +727,29 @@ GNUNET_HELLO_get_last_expiration (const struct GNUNET_HELLO_Message *msg) * TYPE is a transport type. * ADDRESS is the address, its format depends upon the transport type. * The concrete transport types and corresponding address formats are: - * + * * - * + * * 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 - * + * *

*/ @@ -810,7 +809,10 @@ add_address_to_uri (void *cls, const struct GNUNET_HELLO_Address *address, const char *addr; char *uri_addr; char *ret; + char *addr_dup; + char *pos; char tbuf[16] = ""; + char *client_str = "_client"; struct tm *t; time_t seconds; @@ -828,12 +830,19 @@ add_address_to_uri (void *cls, const struct GNUNET_HELLO_Address *address, return GNUNET_OK; } addr = papi->address_to_string (papi->cls, address->address, address->address_length); + if ( (addr == NULL) || (strlen(addr) == 0) ) return GNUNET_OK; + + addr_dup = GNUNET_strdup (addr); + if (NULL != (pos = strstr (addr_dup, "_server"))) + memcpy (pos, client_str, strlen(client_str)); /* Replace all server addresses with client addresses */ + /* For URIs we use '(' and ')' instead of '[' and ']' as brackets are reserved characters in URIs */ - uri_addr = map_characters (addr, "[]", "()"); - seconds = expiration.abs_value / 1000; + uri_addr = map_characters (addr_dup, "[]", "()"); + GNUNET_free (addr_dup); + seconds = expiration.abs_value_us / 1000LL / 1000LL; t = gmtime (&seconds); GNUNET_asprintf (&ret, @@ -863,10 +872,11 @@ 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_key_to_string (&(hello->publicKey)); + char *pkey = GNUNET_CRYPTO_eddsa_public_key_to_string (&(hello->publicKey)); + GNUNET_asprintf (&(ctx.uri), "%s%s", - GNUNET_HELLO_URI_PREFIX, + (GNUNET_YES == GNUNET_HELLO_is_friend_only (hello)) ? GNUNET_FRIEND_HELLO_URI_PREFIX : GNUNET_HELLO_URI_PREFIX, pkey); GNUNET_free (pkey); @@ -945,7 +955,7 @@ add_address_to_hello (void *cls, size_t max, void *buffer) GNUNET_break (0); return 0; } - expire.abs_value = expiration_seconds * 1000; + expire.abs_value_us = expiration_seconds * 1000LL * 1000LL; } if ('!' != tname[0]) { @@ -1035,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_EccPublicKeyBinaryEncoded *pubkey, + struct GNUNET_CRYPTO_EddsaPublicKey *pubkey, struct GNUNET_HELLO_Message **hello, GNUNET_HELLO_TransportPluginsFind plugins_find) {