fastd/fastd
1
0
Fork 0
mirror of https://github.com/neocturne/fastd.git synced 2025-05-15 04:35:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make log levels verbose and info more useful

Browse source
This commit is contained in:
Matthias Schiffer 2014-05-31 05:52:07 +02:00
parent ae429e372a
commit 6c656c7394
5 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/capabilities.c
View file

@ -68,7 +68,7 @@ static void try_cap(cap_value_t cap) {
goto end_free; goto end_free;
} }
pr_verbose("Acquired capability %s.", name); pr_verbose("acquired capability %s", name);
end_free: end_free:
cap_free(caps); cap_free(caps);
@ -95,7 +95,7 @@ void fastd_cap_drop(void) {
pr_debug_errno("cap_set_proc"); pr_debug_errno("cap_set_proc");
} }
else { else {
pr_verbose("Dropped capabilities."); pr_verbose("dropped capabilities");
} }
cap_free(caps); cap_free(caps);

4
src/fastd.c
View file

@ -345,7 +345,7 @@ static void set_user(void) {
if (setuid(conf.uid) < 0) if (setuid(conf.uid) < 0)
exit_errno("setuid"); exit_errno("setuid");
pr_info("Changed to UID %i, GID %i.", conf.uid, conf.gid); pr_info("changed to UID %i, GID %i", (int)conf.uid, (int)conf.gid);
} }
} }
@ -673,6 +673,8 @@ static inline void run(void) {
valgrind as easy as possible. valgrind as easy as possible.
*/ */
static inline void cleanup(void) { static inline void cleanup(void) {
pr_info("terminating fastd");
on_down(); on_down();
delete_peers(); delete_peers();

5
src/peer.c
View file

@ -304,8 +304,10 @@ static bool is_peer_in_group(const fastd_peer_t *peer, const fastd_peer_group_t
After a call to reset_peer a peer must be deleted by delete_peer or re-initialized by setup_peer. After a call to reset_peer a peer must be deleted by delete_peer or re-initialized by setup_peer.
*/ */
static void reset_peer(fastd_peer_t *peer) { static void reset_peer(fastd_peer_t *peer) {
if (fastd_peer_is_established(peer)) if (fastd_peer_is_established(peer)) {
on_disestablish(peer); on_disestablish(peer);
pr_info("connection with %P disestablished.", peer);
}
free_socket(peer); free_socket(peer);
@ -794,7 +796,6 @@ static void send_handshake(fastd_peer_t *peer, fastd_remote_t *next_remote) {
return; return;
} }
pr_debug("sending handshake to %P[%I]...", peer, &peer->address);
peer->last_handshake_timeout = fastd_in_seconds(MIN_HANDSHAKE_INTERVAL); peer->last_handshake_timeout = fastd_in_seconds(MIN_HANDSHAKE_INTERVAL);
peer->last_handshake_address = peer->address; peer->last_handshake_address = peer->address;
conf.protocol->handshake_init(peer->sock, &peer->local_address, &peer->address, peer); conf.protocol->handshake_init(peer->sock, &peer->local_address, &peer->address, peer);

10
src/protocols/ec25519_fhmqvc/handshake.c
View file

@ -523,10 +523,14 @@ void fastd_protocol_ec25519_fhmqvc_handshake_init(fastd_socket_t *sock, const fa
fastd_handshake_add(&buffer, RECORD_SENDER_KEY, PUBLICKEYBYTES, &conf.protocol_config->key.public); fastd_handshake_add(&buffer, RECORD_SENDER_KEY, PUBLICKEYBYTES, &conf.protocol_config->key.public);
if (peer) if (peer) {
fastd_handshake_add(&buffer, RECORD_RECIPIENT_KEY, PUBLICKEYBYTES, &peer->protocol_config->public_key); fastd_handshake_add(&buffer, RECORD_RECIPIENT_KEY, PUBLICKEYBYTES, &peer->protocol_config->public_key);
else
pr_debug("sending handshake to unknown peer %I", remote_addr); pr_verbose("sending handshake to %P[%I]...", peer, remote_addr);
}
else {
pr_verbose("sending handshake to unknown peer %I", remote_addr);
}
fastd_handshake_add(&buffer, RECORD_SENDER_HANDSHAKE_KEY, PUBLICKEYBYTES, &ctx.protocol_state->handshake_key.key.public); fastd_handshake_add(&buffer, RECORD_SENDER_HANDSHAKE_KEY, PUBLICKEYBYTES, &ctx.protocol_state->handshake_key.key.public);

8
src/receive.c
View file

@ -131,8 +131,10 @@ static inline void handle_socket_receive_known(fastd_socket_t *sock, const fastd
if (!fastd_peer_is_established(peer) || !fastd_peer_address_equal(&peer->local_address, local_addr)) { if (!fastd_peer_is_established(peer) || !fastd_peer_address_equal(&peer->local_address, local_addr)) {
fastd_buffer_free(buffer); fastd_buffer_free(buffer);
if (!backoff_unknown(remote_addr)) if (!backoff_unknown(remote_addr)) {
pr_debug("unexpectedly received payload data from %P[%I]", peer, remote_addr);
conf.protocol->handshake_init(sock, local_addr, remote_addr, NULL); conf.protocol->handshake_init(sock, local_addr, remote_addr, NULL);
}
return; return;
} }
@ -158,8 +160,10 @@ static inline void handle_socket_receive_unknown(fastd_socket_t *sock, const fas
case PACKET_DATA: case PACKET_DATA:
fastd_buffer_free(buffer); fastd_buffer_free(buffer);
if (!backoff_unknown(remote_addr)) if (!backoff_unknown(remote_addr)) {
pr_debug("unexpectedly received payload data from unknown address %I", remote_addr);
conf.protocol->handshake_init(sock, local_addr, remote_addr, NULL); conf.protocol->handshake_init(sock, local_addr, remote_addr, NULL);
}
break; break;
case PACKET_HANDSHAKE: case PACKET_HANDSHAKE: