aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2020-12-22 18:21:00 +0900
committerKazuki Yamaguchi <k@rhe.jp>2023-10-11 17:53:49 +0900
commit297e7f9cdb98575a11397bea45a336a8ace845db (patch)
treed90e46ca6000bbd9f93efa12979bbc2fdcdcce79
parent0e1fbaa5b21db8e5c64a732dbaf0b8afe707a147 (diff)
downloadbird-ky/bfd-logging-include-ifname.tar.gz
BFD: Include interface name in tracesky/bfd-logging-include-ifname
-rw-r--r--proto/bfd/bfd.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index 97eb2d9b..e810ad23 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -150,8 +150,9 @@ bfd_session_update_state(struct bfd_session *s, uint state, uint diag)
if (state == old_state)
return;
- TRACE(D_EVENTS, "Session to %I changed state from %s to %s",
- s->addr, bfd_state_names[old_state], bfd_state_names[state]);
+ TRACE(D_EVENTS, "Session to %I%J changed state from %s to %s",
+ s->addr, s->ifa->iface,
+ bfd_state_names[old_state], bfd_state_names[state]);
bfd_lock_sessions(p);
s->loc_state = state;
@@ -320,7 +321,7 @@ bfd_session_timeout(struct bfd_session *s)
{
struct bfd_proto *p = s->ifa->bfd;
- TRACE(D_EVENTS, "Session to %I expired", s->addr);
+ TRACE(D_EVENTS, "Session to %I%J expired", s->addr, s->ifa->iface);
s->rem_state = BFD_STATE_DOWN;
s->rem_id = 0;
@@ -452,7 +453,7 @@ bfd_add_session(struct bfd_proto *p, ip_addr addr, ip_addr local, struct iface *
init_list(&s->request_list);
s->last_state_change = current_time();
- TRACE(D_EVENTS, "Session to %I added", s->addr);
+ TRACE(D_EVENTS, "Session to %I%J added", s->addr, s->ifa->iface);
birdloop_leave(p->loop);
@@ -490,6 +491,7 @@ static void
bfd_remove_session(struct bfd_proto *p, struct bfd_session *s)
{
ip_addr ip = s->addr;
+ struct iface *iface = s->ifa->iface;
/* Caller should ensure that request list is empty */
@@ -510,7 +512,7 @@ bfd_remove_session(struct bfd_proto *p, struct bfd_session *s)
sl_free(s);
- TRACE(D_EVENTS, "Session to %I removed", ip);
+ TRACE(D_EVENTS, "Session to %I%J removed", ip, iface);
birdloop_leave(p->loop);
}
@@ -536,7 +538,7 @@ bfd_reconfigure_session(struct bfd_proto *p, struct bfd_session *s)
birdloop_leave(p->loop);
- TRACE(D_EVENTS, "Session to %I reconfigured", s->addr);
+ TRACE(D_EVENTS, "Session to %I%J reconfigured", s->addr, s->ifa->iface);
}