Index | Thread | Search

From:
Claudio Jeker <cjeker@diehard.n-r-g.com>
Subject:
bgpd rtr log fixes
To:
tech@openbsd.org
Date:
Thu, 4 Jan 2024 17:51:47 +0100

Download raw body.

Thread
  • Claudio Jeker:

    bgpd rtr log fixes

rtr_send_error() should use a similar log message as rtr_parse_error().
Especially log_rtr_error() should be used to get a nice error message.

Also the FSM state changes are too noisy, change it to log_debug().
-- 
:wq Claudio

Index: rtr_proto.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/rtr_proto.c,v
diff -u -p -r1.22 rtr_proto.c
--- rtr_proto.c	4 Jan 2024 14:30:09 -0000	1.22
+++ rtr_proto.c	4 Jan 2024 16:48:57 -0000
@@ -299,8 +299,8 @@ rtr_send_error(struct rtr_session *rs, e
 		goto fail;
 	ibuf_close(&rs->w, buf);
 
-	log_warnx("rtr %s: sending error report[%u] %s", log_rtr(rs), err,
-	    msg ? msg : "");
+	log_warnx("rtr %s: sending error: %s%s%s", log_rtr(rs),
+	    log_rtr_error(err), msg ? ": " : "", msg ? msg : "");
 
 	rtr_fsm(rs, RTR_EVNT_SEND_ERROR);
 	return;
@@ -1096,7 +1096,7 @@ rtr_fsm(struct rtr_session *rs, enum rtr
 		break;
 	}
 
-	log_info("rtr %s: state change %s -> %s, reason: %s",
+	log_debug("rtr %s: state change %s -> %s, reason: %s",
 	    log_rtr(rs), rtr_statenames[prev_state], rtr_statenames[rs->state],
 	    rtr_eventnames[event]);
 }