diff options
Diffstat (limited to 'usr.sbin/ospfd')
| -rw-r--r-- | usr.sbin/ospfd/rde.c | 9 | ||||
| -rw-r--r-- | usr.sbin/ospfd/rde_lsdb.c | 12 |
2 files changed, 3 insertions, 18 deletions
diff --git a/usr.sbin/ospfd/rde.c b/usr.sbin/ospfd/rde.c index 67f4648826b..37bda4347c4 100644 --- a/usr.sbin/ospfd/rde.c +++ b/usr.sbin/ospfd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.53 2007/01/20 17:13:36 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.54 2007/01/24 10:48:47 claudio Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -483,14 +483,9 @@ rde_dispatch_imsg(int fd, short event, void *bula) memcpy(&lsa_hdr, imsg.data, sizeof(lsa_hdr)); aid.s_addr = lsa_hdr.ls_id; - log_debug("rde_dispatch_imsg: IMSG_LS_MAXAGE, " - "type %d ls_id %s", lsa_hdr.type, - inet_ntoa(aid)); - if (rde_nbr_loading(nbr->area)) { - log_debug("IMSG_LS_MAXAGE still loading"); + if (rde_nbr_loading(nbr->area)) break; - } v = lsa_find(nbr->area, lsa_hdr.type, lsa_hdr.ls_id, lsa_hdr.adv_rtr); diff --git a/usr.sbin/ospfd/rde_lsdb.c b/usr.sbin/ospfd/rde_lsdb.c index d1a1129dd3c..24782e652a2 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.35 2006/12/13 13:24:09 claudio Exp $ */ +/* $OpenBSD: rde_lsdb.c,v 1.36 2007/01/24 10:48:47 claudio Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -353,9 +353,6 @@ lsa_add(struct rde_nbr *nbr, struct lsa *lsa) RB_INSERT(lsa_tree, tree, new); new->deleted = 1; - log_debug("lsa_add: removing %p and putting %p on hold " - "queue (timeout %d)", old, new, res.tv_sec); - if (evtimer_add(&new->ev, &res) != 0) fatal("lsa_add"); return (1); @@ -396,8 +393,6 @@ lsa_del(struct rde_nbr *nbr, struct lsa_hdr *lsa) if (v == NULL) return; - log_debug("lsa_del: putting %p on hold queue", v); - v->deleted = 1; /* hold time to make sure that a new lsa is not added premature */ timerclear(&tv); @@ -563,7 +558,6 @@ lsa_dump(struct lsa_tree *tree, int imsg_type, pid_t pid) break; continue; default: - log_debug("%d", imsg_type); log_warnx("lsa_dump: unknown imsg type"); return; } @@ -583,7 +577,6 @@ lsa_timeout(int fd, short event, void *bula) if (v->deleted) { if (ntohs(v->lsa->hdr.age) >= MAX_AGE) { - log_debug("lsa_timeout: finally free %p", v); vertex_free(v); } else { v->deleted = 0; @@ -603,9 +596,6 @@ lsa_timeout(int fd, short event, void *bula) else tv.tv_sec = MAX_AGE - ntohs(v->lsa->hdr.age); - log_debug("lsa_timeout: flodding %p new timeout %d", - v, tv.tv_sec); - if (evtimer_add(&v->ev, &tv) != 0) fatal("lsa_add"); } |