summaryrefslogtreecommitdiff
path: root/usr.sbin/ospf6d/hello.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/ospf6d/hello.c')
-rw-r--r--usr.sbin/ospf6d/hello.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/ospf6d/hello.c b/usr.sbin/ospf6d/hello.c
index becf70ee21d..0b961719125 100644
--- a/usr.sbin/ospf6d/hello.c
+++ b/usr.sbin/ospf6d/hello.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hello.c,v 1.15 2010/02/01 10:22:06 jacekm Exp $ */
+/* $OpenBSD: hello.c,v 1.16 2010/05/26 13:56:08 nicm Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -41,7 +41,7 @@ send_hello(struct iface *iface)
struct in6_addr dst;
struct hello_hdr hello;
struct nbr *nbr;
- struct buf *buf;
+ struct ibuf *buf;
int ret;
u_int32_t opts;
@@ -62,8 +62,8 @@ send_hello(struct iface *iface)
fatalx("send_hello: unknown interface type");
}
- /* XXX READ_BUF_SIZE */
- if ((buf = buf_dynamic(PKG_DEF_SIZE, READ_BUF_SIZE)) == NULL)
+ /* XXX IBUF_READ_SIZE */
+ if ((buf = ibuf_dynamic(PKG_DEF_SIZE, IBUF_READ_SIZE)) == NULL)
fatal("send_hello");
/* OSPF header */
@@ -91,13 +91,13 @@ send_hello(struct iface *iface)
} else
hello.bd_rtr = 0;
- if (buf_add(buf, &hello, sizeof(hello)))
+ if (ibuf_add(buf, &hello, sizeof(hello)))
goto fail;
/* active neighbor(s) */
LIST_FOREACH(nbr, &iface->nbr_list, entry) {
if ((nbr->state >= NBR_STA_INIT) && (nbr != iface->self))
- if (buf_add(buf, &nbr->id, sizeof(nbr->id)))
+ if (ibuf_add(buf, &nbr->id, sizeof(nbr->id)))
goto fail;
}
@@ -107,11 +107,11 @@ send_hello(struct iface *iface)
ret = send_packet(iface, buf->buf, buf->wpos, &dst);
- buf_free(buf);
+ ibuf_free(buf);
return (ret);
fail:
log_warn("send_hello");
- buf_free(buf);
+ ibuf_free(buf);
return (-1);
}