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/dvmrpd/graft_ack.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/dvmrpd/graft_ack.c')
| -rw-r--r-- | usr.sbin/dvmrpd/graft_ack.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/dvmrpd/graft_ack.c b/usr.sbin/dvmrpd/graft_ack.c index 682293273da..70154b80cca 100644 --- a/usr.sbin/dvmrpd/graft_ack.c +++ b/usr.sbin/dvmrpd/graft_ack.c @@ -1,4 +1,4 @@ -/* $OpenBSD: graft_ack.c,v 1.1 2006/06/01 14:12:20 norby Exp $ */ +/* $OpenBSD: graft_ack.c,v 1.2 2010/05/26 13:56:07 nicm Exp $ */ /* * Copyright (c) 2006 Esben Norby <norby@openbsd.org> @@ -37,7 +37,7 @@ int send_graft_ack(struct iface *iface, struct in_addr addr, void *data, int len) { struct sockaddr_in dst; - struct buf *buf; + struct ibuf *buf; struct dvmrp_hdr *dvmrp_hdr; int ret = 0; @@ -47,7 +47,7 @@ send_graft_ack(struct iface *iface, struct in_addr addr, void *data, int len) if (iface->passive) return (0); - if ((buf = buf_open(iface->mtu - sizeof(struct ip))) == NULL) + if ((buf = ibuf_open(iface->mtu - sizeof(struct ip))) == NULL) fatal("send_graft_ack"); /* DVMRP header */ @@ -59,15 +59,15 @@ send_graft_ack(struct iface *iface, struct in_addr addr, void *data, int len) dst.sin_addr.s_addr = addr.s_addr; /* update chksum */ - dvmrp_hdr = buf_seek(buf, 0, sizeof(dvmrp_hdr)); + dvmrp_hdr = ibuf_seek(buf, 0, sizeof(dvmrp_hdr)); dvmrp_hdr->chksum = in_cksum(buf->buf, buf->wpos); ret = send_packet(iface, buf->buf, buf->wpos, &dst); - buf_free(buf); + ibuf_free(buf); return (ret); fail: log_warn("send_graft_ack"); - buf_free(buf); + ibuf_free(buf); return (-1); } |