summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2013-02-23 19:48:55 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2013-02-23 19:48:55 +0100
commiteeb1d34f36f622eee48c609ccc95faee4e451ae6 (patch)
tree08b82473521ee129e16326f750c60ed93f5ff8ce
parent14e1db6c5755d46cd43541c37e483b11d493b40a (diff)
downloadfastd-eeb1d34f36f622eee48c609ccc95faee4e451ae6.tar
fastd-eeb1d34f36f622eee48c609ccc95faee4e451ae6.zip
Implement simple peer dump triggered by SIGUSR1
-rw-r--r--src/fastd.c43
1 files changed, 42 insertions, 1 deletions
diff --git a/src/fastd.c b/src/fastd.c
index 704f383..9b3fd82 100644
--- a/src/fastd.c
+++ b/src/fastd.c
@@ -47,7 +47,7 @@
static volatile bool sighup = false;
static volatile bool terminate = false;
-
+static volatile bool dump = false;
static void on_sighup(int signo) {
@@ -58,6 +58,10 @@ static void on_terminate(int signo) {
terminate = true;
}
+static void on_sigusr1(int signo) {
+ dump = true;
+}
+
static void init_signals(fastd_context_t *ctx) {
struct sigaction action;
@@ -76,6 +80,10 @@ static void init_signals(fastd_context_t *ctx) {
if(sigaction(SIGINT, &action, NULL))
exit_errno(ctx, "sigaction");
+ action.sa_handler = on_sigusr1;
+ if(sigaction(SIGUSR1, &action, NULL))
+ exit_errno(ctx, "sigaction");
+
action.sa_handler = SIG_IGN;
if(sigaction(SIGPIPE, &action, NULL))
exit_errno(ctx, "sigaction");
@@ -657,6 +665,34 @@ static void delete_peers(fastd_context_t *ctx) {
}
}
+static void dump_peers(fastd_context_t *ctx) {
+ pr_info(ctx, "dumping peers...");
+
+ fastd_peer_t *peer;
+ for (peer = ctx->peers; peer; peer = peer->next) {
+ if (!fastd_peer_is_established(peer)) {
+ pr_info(ctx, "peer %P not connected, address: %I", peer, &peer->address);
+ continue;
+ }
+
+ if (ctx->conf->mode == MODE_TAP) {
+ unsigned int eth_addresses = 0;
+ size_t i;
+ for (i = 0; i < ctx->n_eth_addr; i++) {
+ if (ctx->eth_addr[i].peer == peer)
+ eth_addresses++;
+ }
+
+ pr_info(ctx, "peer %P connected, address: %I, associated MAC addresses: %u", peer, &peer->address, eth_addresses);
+ }
+ else {
+ pr_info(ctx, "peer %P connected, address: %I", peer, &peer->address);
+ }
+ }
+
+ pr_info(ctx, "peer dump finished.");
+}
+
static inline void update_time(fastd_context_t *ctx) {
clock_gettime(CLOCK_MONOTONIC, &ctx->now);
}
@@ -1169,6 +1205,11 @@ int main(int argc, char *argv[]) {
fastd_reconfigure(&ctx, &conf);
}
+ if (dump) {
+ dump = false;
+ dump_peers(&ctx);
+ }
+
pthread_sigmask(SIG_SETMASK, &oldset, NULL);
}