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/igmp.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/igmp.c')
| -rw-r--r-- | usr.sbin/dvmrpd/igmp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/dvmrpd/igmp.c b/usr.sbin/dvmrpd/igmp.c index da0f3e3d0b7..b9594ee8400 100644 --- a/usr.sbin/dvmrpd/igmp.c +++ b/usr.sbin/dvmrpd/igmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: igmp.c,v 1.1 2006/06/01 14:12:20 norby Exp $ */ +/* $OpenBSD: igmp.c,v 1.2 2010/05/26 13:56:07 nicm Exp $ */ /* * Copyright (c) 2005, 2006 Esben Norby <norby@openbsd.org> @@ -40,7 +40,7 @@ send_igmp_query(struct iface *iface, struct group *group) { struct igmp_hdr igmp_hdr; struct sockaddr_in dst; - struct buf *buf; + struct ibuf *buf; int ret = 0; log_debug("send_igmp_query: interface %s", iface->name); @@ -48,7 +48,7 @@ send_igmp_query(struct iface *iface, struct group *group) 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_igmp_query"); /* IGMP header */ @@ -77,7 +77,7 @@ send_igmp_query(struct iface *iface, struct group *group) /* update chksum */ igmp_hdr.chksum = in_cksum(&igmp_hdr, sizeof(igmp_hdr)); - buf_add(buf, &igmp_hdr, sizeof(igmp_hdr)); + ibuf_add(buf, &igmp_hdr, sizeof(igmp_hdr)); /* set destination address */ dst.sin_family = AF_INET; @@ -85,7 +85,7 @@ send_igmp_query(struct iface *iface, struct group *group) inet_aton(AllSystems, &dst.sin_addr); ret = send_packet(iface, buf->buf, buf->wpos, &dst); - buf_free(buf); + ibuf_free(buf); return (ret); } |