diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2023-10-11 17:57:50 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2023-10-11 17:57:50 +0900 |
commit | 62002560f83b2a4af7b4e973b268bf59be3b087a (patch) | |
tree | 3919500edbfd48b7d72e67dc7ef2019c84bc30f2 | |
parent | 7d493302812570fce67073e937f455e4fc2e8e3b (diff) | |
parent | 297e7f9cdb98575a11397bea45a336a8ace845db (diff) | |
download | bird-62002560f83b2a4af7b4e973b268bf59be3b087a.tar.gz |
Merge branch 'ky/bfd-logging-include-ifname' into pu
* ky/bfd-logging-include-ifname:
BFD: Include interface name in traces
-rw-r--r-- | proto/bfd/bfd.c | 14 |
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); } |