diff options
| -rw-r--r-- | usr.sbin/ospfd/database.c | 6 | ||||
| -rw-r--r-- | usr.sbin/ospfd/lsupdate.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ospfd/neighbor.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ospfd/rde.c | 15 | ||||
| -rw-r--r-- | usr.sbin/ospfd/rde_lsdb.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ospfd/rde_spf.c | 4 |
6 files changed, 20 insertions, 17 deletions
diff --git a/usr.sbin/ospfd/database.c b/usr.sbin/ospfd/database.c index 247ed323ed3..bd29a4bf4d2 100644 --- a/usr.sbin/ospfd/database.c +++ b/usr.sbin/ospfd/database.c @@ -1,4 +1,4 @@ -/* $OpenBSD: database.c,v 1.21 2007/10/11 12:19:31 claudio Exp $ */ +/* $OpenBSD: database.c,v 1.22 2008/02/11 12:37:37 norby Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -167,7 +167,7 @@ recv_db_description(struct nbr *nbr, char *buf, u_int16_t len) int dupe = 0; if (len < sizeof(dd_hdr)) { - log_warnx("recv_dd_description: " + log_warnx("recv_db_description: " "bad packet size, neighbor ID %s", inet_ntoa(nbr->id)); return; } @@ -177,7 +177,7 @@ recv_db_description(struct nbr *nbr, char *buf, u_int16_t len) /* db description packet sanity checks */ if (ntohs(dd_hdr.iface_mtu) > nbr->iface->mtu) { - log_warnx("recv_dd_description: invalid MTU %d sent by " + log_warnx("recv_db_description: invalid MTU %d sent by " "neighbor ID %s, expected %d", ntohs(dd_hdr.iface_mtu), inet_ntoa(nbr->id), nbr->iface->mtu); return; diff --git a/usr.sbin/ospfd/lsupdate.c b/usr.sbin/ospfd/lsupdate.c index 45ffe2462de..385162a052d 100644 --- a/usr.sbin/ospfd/lsupdate.c +++ b/usr.sbin/ospfd/lsupdate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lsupdate.c,v 1.32 2006/06/02 18:49:55 norby Exp $ */ +/* $OpenBSD: lsupdate.c,v 1.33 2008/02/11 12:37:37 norby Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -152,7 +152,7 @@ prepare_ls_update(struct iface *iface) struct buf *buf; if ((buf = buf_open(iface->mtu - sizeof(struct ip))) == NULL) - fatal("send_ls_update"); + fatal("prepare_ls_update"); /* OSPF header */ if (gen_ospf_hdr(buf, iface, PACKET_TYPE_LS_UPDATE)) diff --git a/usr.sbin/ospfd/neighbor.c b/usr.sbin/ospfd/neighbor.c index ce68f96e22a..08fbf1c16cc 100644 --- a/usr.sbin/ospfd/neighbor.c +++ b/usr.sbin/ospfd/neighbor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neighbor.c,v 1.36 2007/10/11 08:21:29 claudio Exp $ */ +/* $OpenBSD: neighbor.c,v 1.37 2008/02/11 12:37:37 norby Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -488,7 +488,7 @@ nbr_adj_ok(struct nbr *nbr) break; return (0); default: - fatalx("nbr_act_ok: unknown interface type"); + fatalx("nbr_adj_ok: unknown interface type"); } return (1); } diff --git a/usr.sbin/ospfd/rde.c b/usr.sbin/ospfd/rde.c index 81fa82e3287..5dd06236062 100644 --- a/usr.sbin/ospfd/rde.c +++ b/usr.sbin/ospfd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.72 2007/10/11 12:19:31 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.73 2008/02/11 12:37:37 norby Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -501,7 +501,7 @@ rde_dispatch_imsg(int fd, short event, void *bula) case IMSG_CTL_SHOW_DB_ASBR: if (imsg.hdr.len != IMSG_HEADER_SIZE && imsg.hdr.len != IMSG_HEADER_SIZE + sizeof(aid)) { - log_warnx("rde_dispatch: wrong imsg len"); + log_warnx("rde_dispatch_imsg: wrong imsg len"); break; } if (imsg.hdr.len == IMSG_HEADER_SIZE) { @@ -553,7 +553,7 @@ rde_dispatch_imsg(int fd, short event, void *bula) NULL, 0); break; default: - log_debug("rde_dispatch_msg: unexpected imsg %d", + log_debug("rde_dispatch_imsg: unexpected imsg %d", imsg.hdr.type); break; } @@ -609,7 +609,8 @@ rde_dispatch_parent(int fd, short event, void *bula) switch (imsg.hdr.type) { case IMSG_NETWORK_ADD: if (imsg.hdr.len != IMSG_HEADER_SIZE + sizeof(rr)) { - log_warnx("rde_dispatch: wrong imsg len"); + log_warnx("rde_dispatch_parent: " + "wrong imsg len"); break; } memcpy(&rr, imsg.data, sizeof(rr)); @@ -623,7 +624,8 @@ rde_dispatch_parent(int fd, short event, void *bula) break; case IMSG_NETWORK_DEL: if (imsg.hdr.len != IMSG_HEADER_SIZE + sizeof(rr)) { - log_warnx("rde_dispatch: wrong imsg len"); + log_warnx("rde_dispatch_parent: " + "wrong imsg len"); break; } memcpy(&rr, imsg.data, sizeof(rr)); @@ -642,7 +644,8 @@ rde_dispatch_parent(int fd, short event, void *bula) break; case IMSG_KROUTE_GET: if (imsg.hdr.len != IMSG_HEADER_SIZE + sizeof(kr)) { - log_warnx("rde_dispatch: wrong imsg len"); + log_warnx("rde_dispatch_parent: " + "wrong imsg len"); break; } memcpy(&kr, imsg.data, sizeof(kr)); diff --git a/usr.sbin/ospfd/rde_lsdb.c b/usr.sbin/ospfd/rde_lsdb.c index 9b494c6cb68..24e8e8fc254 100644 --- a/usr.sbin/ospfd/rde_lsdb.c +++ b/usr.sbin/ospfd/rde_lsdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_lsdb.c,v 1.39 2007/10/16 21:03:31 claudio Exp $ */ +/* $OpenBSD: rde_lsdb.c,v 1.40 2008/02/11 12:37:37 norby Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -601,7 +601,7 @@ lsa_timeout(int fd, short event, void *bula) tv.tv_sec = MAX_AGE - ntohs(v->lsa->hdr.age); if (evtimer_add(&v->ev, &tv) != 0) - fatal("lsa_add"); + fatal("lsa_timeout"); } return; } diff --git a/usr.sbin/ospfd/rde_spf.c b/usr.sbin/ospfd/rde_spf.c index 890388ce40d..3901838ee4b 100644 --- a/usr.sbin/ospfd/rde_spf.c +++ b/usr.sbin/ospfd/rde_spf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_spf.c,v 1.65 2007/10/01 08:35:12 norby Exp $ */ +/* $OpenBSD: rde_spf.c,v 1.66 2008/02/11 12:37:37 norby Exp $ */ /* * Copyright (c) 2005 Esben Norby <norby@openbsd.org> @@ -638,7 +638,7 @@ start_spf_holdtimer(struct ospfd_conf *conf) case SPF_HOLDQUEUE: fatalx("start_spf_holdtimer: invalid state"); default: - fatalx("spf_start_holdtimer: unknown state"); + fatalx("start_spf_holdtimer: unknown state"); } } |