diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-08-24 01:00:45 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-08-24 01:00:45 +0200 |
commit | a04bcf247f4be7e3da4fe3895200f0b9709fc0bb (patch) | |
tree | 5e749b81799bb82a751ed632d91b801abe624008 /src/protocols/ec25519_fhmqvc/util.c | |
parent | ad4999488eadac3a10de99caf50b732af8b771b9 (diff) | |
download | fastd-a04bcf247f4be7e3da4fe3895200f0b9709fc0bb.tar fastd-a04bcf247f4be7e3da4fe3895200f0b9709fc0bb.zip |
Merge peer config into peer structure
With this refactoring, the structure fastd_peer_config_t is merged into
fastd_peer_t, and fastd_remote_config_t into fastd_remote_t. This also means we
now create peers directly when reading their configurations, which significantly
simplifies the whole reload process, and prepares for some future optimizations
like a key hash table.
Note: This commit is too big, but I couldn't come up with a nice way to split it
into smaller pieces...
Diffstat (limited to 'src/protocols/ec25519_fhmqvc/util.c')
-rw-r--r-- | src/protocols/ec25519_fhmqvc/util.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/protocols/ec25519_fhmqvc/util.c b/src/protocols/ec25519_fhmqvc/util.c index c716916..f34f709 100644 --- a/src/protocols/ec25519_fhmqvc/util.c +++ b/src/protocols/ec25519_fhmqvc/util.c @@ -80,8 +80,8 @@ void fastd_protocol_ec25519_fhmqvc_set_shell_env(fastd_shell_env_t *env, const f hexdump(buf, conf.protocol_config->key.public.u8); fastd_shell_env_set(env, "LOCAL_KEY", buf); - if (peer && peer->config->protocol_config) { - hexdump(buf, peer->config->protocol_config->public_key.u8); + if (peer) { + hexdump(buf, peer->key->key.u8); fastd_shell_env_set(env, "PEER_KEY", buf); } else { @@ -97,14 +97,12 @@ void fastd_protocol_ec25519_fhmqvc_set_shell_env(fastd_shell_env_t *env, const f public key. */ bool fastd_protocol_ec25519_fhmqvc_describe_peer(const fastd_peer_t *peer, char *buf, size_t len) { - if (peer && peer->config->protocol_config) { - char dumpbuf[65]; - - hexdump(dumpbuf, peer->config->protocol_config->public_key.u8); - snprintf(buf, len, "%.16s", dumpbuf); - return true; - } - else { + if (!peer->key) return false; - } + + char dumpbuf[65]; + hexdump(dumpbuf, peer->key->key.u8); + snprintf(buf, len, "%.16s", dumpbuf); + + return true; } |