Use node_get_curve25519_onion_key() in extend_info_from_node()

In legacy/trac#23577 (moved), we are going to implement a node_get_curve25519_onion_key() function. We can use this in extend_info_from_node() if we want to.

changed milestone to %Tor: 0.3.3.x-final in legacy/trac

added component::core tor/tor in Legacy / Trac easy in Legacy / Trac milestone::Tor: 0.3.3.x-final in Legacy / Trac priority::medium in Legacy / Trac refactor in Legacy / Trac resolution::implemented in Legacy / Trac review-group-26 in Legacy / Trac severity::normal in Legacy / Trac status::closed in Legacy / Trac type::enhancement in Legacy / Trac labels

Maybe call it node_get_ntor_key() instead?

If we do this, we should rename the existing node_has_curve25519_onion_key() to node_has_ntor_key().

ntor_key, ntor_onion_key, curve25519_ntor_key, and curve25519_onion_key are also good names for this key -- we just shouldn't call it curve25519_key (with no indication of its purpose).

Modify the name for consistency with node_has_curve25519_onion_key().

Trac:
Keywords: N/A deleted, easy added
Summary: Use node_get_curve25519_key() in extend_info_from_node() to Use node_get_curve25519_onion_key() in extend_info_from_node()
Description: In legacy/trac#23577 (moved), we are going to implement a node_get_curve25519_key() function. We can use this in extend_info_from_node() if we want to.

to

In legacy/trac#23577 (moved), we are going to implement a node_get_curve25519_onion_key() function. We can use this in extend_info_from_node() if we want to.

Removing the parent and spurious keywords.

Trac:
Keywords: single-onion, prop224, tor-hs, ipv6 deleted, N/A added
Parent: legacy/trac#23577 (moved) to N/A

Trac:
001-node_get_extend_info.patch

Patch to introduce node_get_curve25519_onion_key() in extend_info_from_node()

I have a patch to resolve this. The filename is 001-node_get_extend_info.patch.

Hi neel, thanks for the patch!

node_get_curve25519_onion_key() returns a const pointer, so the variable also has to be const. Otherwise, some compilers will complain.

The rest of the patch looks good!

Trac:
Status: new to needs_revision

Trac:
002-node_get_extend_info-r1.patch

Patch to introduce node_get_curve25519_onion_key() in extend_info_from_node() (Revision 1)

I have an updated patch under the filename 002-node_get_extend_info-r1.patch which makes curve_pubkey a const.

Ok, looks good to me.

Do you want to write a changes file? Any code changes get a changes file, even simple refactoring.

Also, we should check this compiles and passes the tests before we merge.

Trac:
003-node_get_extend_info-r2.patch

Patch to introduce node_get_curve25519_onion_key() in extend_info_from_node() (Revision 2)

I have a new patch which includes a changes file. The filename is 003-node_get_extend_info-r2.patch.

Hi,

When I try to compile this, I get the following errors:

src/or/circuitbuild.c:2699:5: error: implicit declaration of function
      'node_get_curve25519_onion_key' is invalid in C99
      [-Werror,-Wimplicit-function-declaration]
    node_get_curve25519_onion_key(node);
    ^
src/or/circuitbuild.c:2699:5: note: did you mean
      'node_has_curve25519_onion_key'?
./src/or/nodelist.h:78:5: note: 'node_has_curve25519_onion_key' declared here
int node_has_curve25519_onion_key(const node_t *node);
    ^
src/or/circuitbuild.c:2698:34: error: incompatible integer to pointer conversion
      initializing 'const curve25519_public_key_t *' (aka 'const struct
      curve25519_public_key_t *') with an expression of type 'int'
      [-Werror,-Wint-conversion]
  const curve25519_public_key_t *curve_pubkey =
                                 ^

Please import the correct header for node_get_curve25519_onion_key(), or put a declaration in the correct header.

Oops, my master branch was about 1500 commits behind. Not sure how that happened. Sorry for any confusion.

This is fine, it passes make check and make test-network. Let's get it merged.

It's branch bug23760_nc in my github if you prefer branches.

Trac:
Status: needs_revision to merge_ready