diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-05-26 13:56:09 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-05-26 13:56:09 +0000 |
| commit | 4b9cf3ab192c7e5b1ee8b915d25de6b18cbd1f7e (patch) | |
| tree | c8f546660680faabd30571e97e67f49483698059 /usr.sbin/ospfd/hello.c | |
| parent | f11125202098e763efa8b52b0e92bfac7a124175 (diff) | |
Rename some imsg bits to make namespace collisions less likely buf to
ibuf, buf_read to ibuf_read, READ_BUF_SIZE to IBUF_READ_SIZE.
ok henning gilles claudio jacekm deraadt
Diffstat (limited to 'usr.sbin/ospfd/hello.c')
| -rw-r--r-- | usr.sbin/ospfd/hello.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/ospfd/hello.c b/usr.sbin/ospfd/hello.c index 5bb3201404c..20b16f964f0 100644 --- a/usr.sbin/ospfd/hello.c +++ b/usr.sbin/ospfd/hello.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hello.c,v 1.18 2010/05/13 22:51:56 sthen Exp $ */ +/* $OpenBSD: hello.c,v 1.19 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 sockaddr_in dst; struct hello_hdr hello; struct nbr *nbr; - struct buf *buf; + struct ibuf *buf; int ret; dst.sin_family = AF_INET; @@ -64,8 +64,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 */ @@ -90,13 +90,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; } @@ -105,11 +105,11 @@ send_hello(struct iface *iface) goto fail; ret = send_packet(iface, buf, &dst); - buf_free(buf); + ibuf_free(buf); return (ret); fail: log_warn("send_hello"); - buf_free(buf); + ibuf_free(buf); return (-1); } |