diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-04-26 20:30:05 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-04-26 20:37:47 +0200 |
| commit | 4020ee614cfe248010764028902d80b4a9091f7d (patch) | |
| tree | d0bc8cb336401d1d87b60ab66a2595f0294aaddf /src/protocols/ec25519_fhmqvc | |
| parent | 1ea5ef8944db5da3ff9eeb2d72bcf8a887599925 (diff) | |
| download | fastd-4020ee614cfe248010764028902d80b4a9091f7d.tar fastd-4020ee614cfe248010764028902d80b4a9091f7d.zip | |
Revise shell command API
Diffstat (limited to 'src/protocols/ec25519_fhmqvc')
| -rw-r--r-- | src/protocols/ec25519_fhmqvc/ec25519_fhmqvc.h | 2 | ||||
| -rw-r--r-- | src/protocols/ec25519_fhmqvc/handshake.c | 2 | ||||
| -rw-r--r-- | src/protocols/ec25519_fhmqvc/util.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/protocols/ec25519_fhmqvc/ec25519_fhmqvc.h b/src/protocols/ec25519_fhmqvc/ec25519_fhmqvc.h index e7c80e0..fcf9b56 100644 --- a/src/protocols/ec25519_fhmqvc/ec25519_fhmqvc.h +++ b/src/protocols/ec25519_fhmqvc/ec25519_fhmqvc.h @@ -95,7 +95,7 @@ void fastd_protocol_ec25519_fhmqvc_send_empty(fastd_peer_t *peer, protocol_sessi void fastd_protocol_ec25519_fhmqvc_generate_key(void); void fastd_protocol_ec25519_fhmqvc_show_key(void); -void fastd_protocol_ec25519_fhmqvc_set_shell_env(const fastd_peer_t *peer); +void fastd_protocol_ec25519_fhmqvc_set_shell_env(fastd_shell_env_t *env, const fastd_peer_t *peer); bool fastd_protocol_ec25519_fhmqvc_describe_peer(const fastd_peer_t *peer, char *buf, size_t len); diff --git a/src/protocols/ec25519_fhmqvc/handshake.c b/src/protocols/ec25519_fhmqvc/handshake.c index 37c753f..c4177b4 100644 --- a/src/protocols/ec25519_fhmqvc/handshake.c +++ b/src/protocols/ec25519_fhmqvc/handshake.c @@ -524,7 +524,7 @@ void fastd_protocol_ec25519_fhmqvc_handshake_init(const fastd_socket_t *sock, co fastd_handshake_add(&buffer, RECORD_SENDER_HANDSHAKE_KEY, PUBLICKEYBYTES, &ctx.protocol_state->handshake_key.key.public); if (!peer || !fastd_peer_is_established(peer)) - fastd_shell_command_exec(&conf.on_connect, peer, (local_addr && local_addr->sa.sa_family) ? local_addr : sock->bound_addr, remote_addr); + fastd_peer_exec_shell_command(&conf.on_connect, peer, (local_addr && local_addr->sa.sa_family) ? local_addr : sock->bound_addr, remote_addr); fastd_send_handshake(sock, local_addr, remote_addr, peer, buffer); } diff --git a/src/protocols/ec25519_fhmqvc/util.c b/src/protocols/ec25519_fhmqvc/util.c index 8d11eeb..a53513f 100644 --- a/src/protocols/ec25519_fhmqvc/util.c +++ b/src/protocols/ec25519_fhmqvc/util.c @@ -64,18 +64,18 @@ void fastd_protocol_ec25519_fhmqvc_show_key(void) { print_hexdump("Public: ", conf.protocol_config->key.public.u8); } -void fastd_protocol_ec25519_fhmqvc_set_shell_env(const fastd_peer_t *peer) { +void fastd_protocol_ec25519_fhmqvc_set_shell_env(fastd_shell_env_t *env, const fastd_peer_t *peer) { char buf[65]; hexdump(buf, conf.protocol_config->key.public.u8); - setenv("LOCAL_KEY", buf, 1); + fastd_shell_env_set(env, "LOCAL_KEY", buf); if (peer && peer->protocol_config) { hexdump(buf, peer->protocol_config->public_key.u8); - setenv("PEER_KEY", buf, 1); + fastd_shell_env_set(env, "PEER_KEY", buf); } else { - unsetenv("PEER_KEY"); + fastd_shell_env_set(env, "PEER_KEY", NULL); } } |