diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2009-03-13 03:58:27 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2009-03-13 03:58:27 +0000 |
| commit | f9270beec5fabc0aff1d89276829eb09bbd79815 (patch) | |
| tree | 3121fa9da5764d553128afb9cdec078cb988c2b1 | |
| parent | 5f0974ea653864873910bb35894c608c176201d7 (diff) | |
When commiting the buf_left() change adding len to the check was dropped and
so a warning later on could be hit in some cases. Found by dlg@ OK dlg@
| -rw-r--r-- | usr.sbin/ospfd/lsupdate.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/ospfd/lsupdate.c b/usr.sbin/ospfd/lsupdate.c index ee9a67552b0..80cec73580e 100644 --- a/usr.sbin/ospfd/lsupdate.c +++ b/usr.sbin/ospfd/lsupdate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lsupdate.c,v 1.35 2009/01/31 11:44:49 claudio Exp $ */ +/* $OpenBSD: lsupdate.c,v 1.36 2009/03/13 03:58:26 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -36,7 +36,8 @@ extern struct ospfd_conf *oeconf; extern struct imsgbuf *ibuf_rde; struct buf *prepare_ls_update(struct iface *); -int add_ls_update(struct buf *, struct iface *, void *, int, u_int16_t); +int add_ls_update(struct buf *, struct iface *, void *, u_int16_t, + u_int16_t); int send_ls_update(struct buf *, struct iface *, struct in_addr, u_int32_t); void ls_retrans_list_insert(struct nbr *, struct lsa_entry *); @@ -170,13 +171,13 @@ fail: } int -add_ls_update(struct buf *buf, struct iface *iface, void *data, int len, +add_ls_update(struct buf *buf, struct iface *iface, void *data, u_int16_t len, u_int16_t older) { void *lsage; u_int16_t age; - if (buf_left(buf) < MD5_DIGEST_LENGTH) + if (buf_left(buf) < (size_t)len + MD5_DIGEST_LENGTH) return (0); lsage = buf_reserve(buf, 0); @@ -600,4 +601,3 @@ lsa_cache_look(struct lsa_hdr *lsa_hdr) return (NULL); } - |