 @@ -1,14 +1,14 @@
-/*	$NetBSD: bnep.c,v 1.3 2009/02/04 19:24:18 plunky Exp $	*/
+/*	$NetBSD: bnep.c,v 1.4 2009/05/02 20:07:51 plunky Exp $	*/
 /*-
  * Copyright (c) 2008 Iain Hibbert
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,27 +16,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: bnep.c,v 1.3 2009/02/04 19:24:18 plunky Exp $");
+__RCSID("$NetBSD: bnep.c,v 1.4 2009/05/02 20:07:51 plunky Exp $");
 #include <bluetooth.h>
 #include <sdp.h>
 #include <stdarg.h>
 #include <string.h>
 #include "btpand.h"
 #include "bnep.h"
 static bool bnep_recv_extension(packet_t *);
 static size_t bnep_recv_control(channel_t *, uint8_t *, size_t, bool);
 static size_t bnep_recv_control_command_not_understood(channel_t *, uint8_t *, size_t);
 static size_t bnep_recv_setup_connection_req(channel_t *, uint8_t *, size_t);
 @@ -565,27 +565,27 @@ bnep_recv_filter_multi_addr_rsp(channel_
 	    ether_ntoa((struct ether_addr *)chan->raddr), rsp);
 	/* we did not send any filter_multi_addr_set message */
 	return 2;
+}
 void
 bnep_send_control(channel_t *chan, uint8_t type, ...)
+{
 	packet_t *pkt;
 	uint8_t *p;
 	va_list ap;
-	_DIAGASSERT(chan->state != CHANNEL_CLOSED);
+	assert(chan->state != CHANNEL_CLOSED);
 	pkt = packet_alloc(chan);
 	if (pkt == NULL)
 		return;
 	p = pkt->ptr;
 	va_start(ap, type);
 	*p++ = BNEP_CONTROL;
 	*p++ = type;
 	switch(type) {
 	case BNEP_CONTROL_COMMAND_NOT_UNDERSTOOD:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: channel.c,v 1.1 2008/08/17 13:20:57 plunky Exp $	*/
+/*	$NetBSD: channel.c,v 1.2 2009/05/02 20:07:51 plunky Exp $	*/
 /*-
  * Copyright (c) 2008 Iain Hibbert
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,27 +16,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: channel.c,v 1.1 2008/08/17 13:20:57 plunky Exp $");
+__RCSID("$NetBSD: channel.c,v 1.2 2009/05/02 20:07:51 plunky Exp $");
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include "btpand.h"
 static struct chlist	channel_list;
 static int		channel_count;
 static int		channel_tick;
 static void channel_start(int, short, void *);
 static void channel_read(int, short, void *);
 @@ -66,28 +66,28 @@ channel_alloc(void)
 	chan->state = CHANNEL_CLOSED;
 	LIST_INSERT_HEAD(&channel_list, chan, next);
 	server_update(++channel_count);
 	return chan;
+}
 bool
 channel_open(channel_t *chan, int fd)
+{
 	int n;
-	_DIAGASSERT(chan->refcnt == 0);
+	assert(chan->refcnt == 0);
-	_DIAGASSERT(chan->state != CHANNEL_CLOSED);
+	assert(chan->state != CHANNEL_CLOSED);
 	if (chan->mtu > 0) {
 		chan->sendbuf = malloc(chan->mtu);
 		if (chan->sendbuf == NULL) {
 			log_err("Could not malloc channel sendbuf: %m");
 			return false;
+		}
+	}
 	n = 1;
 	if (ioctl(fd, FIONBIO, &n) == -1) {
 		log_err("Could not set non-blocking IO: %m");
 		return false;
 @@ -104,55 +104,55 @@ channel_open(channel_t *chan, int fd)
 	chan->refcnt++;
 	chan->fd = fd;
 	log_debug("(fd#%d)", chan->fd);
 	return true;
+}
 void
 channel_close(channel_t *chan)
+{
 	pkthdr_t *ph;
-	_DIAGASSERT(chan->state != CHANNEL_CLOSED);
+	assert(chan->state != CHANNEL_CLOSED);
 	log_debug("(fd#%d)", chan->fd);
 	chan->state = CHANNEL_CLOSED;
 	event_del(&chan->rd_ev);
 	event_del(&chan->wr_ev);
 	close(chan->fd);
 	chan->refcnt--;
 	chan->tick = 0;
 	while ((ph = STAILQ_FIRST(&chan->pktlist)) != NULL) {
 		STAILQ_REMOVE_HEAD(&chan->pktlist, next);
 		pkthdr_free(ph);
 		chan->qlen--;
+	}
 	if (chan->refcnt == 0)
 		channel_free(chan);
+}
 void
 channel_free(channel_t *chan)
+{
-	_DIAGASSERT(chan->refcnt == 0);
+	assert(chan->refcnt == 0);
-	_DIAGASSERT(chan->state == CHANNEL_CLOSED);
+	assert(chan->state == CHANNEL_CLOSED);
-	_DIAGASSERT(chan->qlen == 0);
+	assert(chan->qlen == 0);
-	_DIAGASSERT(STAILQ_EMPTY(&chan->pktlist));
+	assert(STAILQ_EMPTY(&chan->pktlist));
 	LIST_REMOVE(chan, next);
 	free(chan->pfilter);
 	free(chan->mfilter);
 	free(chan->sendbuf);
 	free(chan);
 	server_update(--channel_count);
 	if (server_limit == 0) {
 		log_info("connection closed, exiting");
 		exit(EXIT_SUCCESS);
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: packet.c,v 1.1 2008/08/17 13:20:57 plunky Exp $	*/
+/*	$NetBSD: packet.c,v 1.2 2009/05/02 20:07:51 plunky Exp $	*/
 /*-
  * Copyright (c) 2008 Iain Hibbert
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,27 +16,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: packet.c,v 1.1 2008/08/17 13:20:57 plunky Exp $");
+__RCSID("$NetBSD: packet.c,v 1.2 2009/05/02 20:07:51 plunky Exp $");
 #include "btpand.h"
 packet_t *
 packet_alloc(channel_t *chan)
+{
 	packet_t *pkt;
 	pkt = malloc(sizeof(packet_t) + chan->mru);
 	if (pkt == NULL) {
 		log_err("%s() failed: %m", __func__);
 		return NULL;
+	}
 @@ -65,28 +65,28 @@ packet_free(packet_t *pkt)
+	}
 	pkt->chan->refcnt--;
 	if (pkt->chan->refcnt == 0)
 		channel_free(pkt->chan);
 	free(pkt);
+}
 void
 packet_adj(packet_t *pkt, size_t size)
+{
-	_DIAGASSERT(pkt->refcnt == 0);
+	assert(pkt->refcnt == 0);
-	_DIAGASSERT(pkt->len >= size);
+	assert(pkt->len >= size);
 	pkt->ptr += size;
 	pkt->len -= size;
+}
 pkthdr_t *
 pkthdr_alloc(packet_t *pkt)
+{
 	pkthdr_t *ph;
 	ph = malloc(sizeof(pkthdr_t));
 	if (ph == NULL) {
 		log_err("%s() failed: %m", __func__);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tap.c,v 1.2 2009/03/10 22:12:17 plunky Exp $	*/
+/*	$NetBSD: tap.c,v 1.3 2009/05/02 20:07:51 plunky Exp $	*/
 /*-
  * Copyright (c) 2008 Iain Hibbert
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,27 +16,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: tap.c,v 1.2 2009/03/10 22:12:17 plunky Exp $");
+__RCSID("$NetBSD: tap.c,v 1.3 2009/05/02 20:07:51 plunky Exp $");
 #include <sys/ioctl.h>
 #include <sys/uio.h>
 #include <net/if_dl.h>
 #include <net/if_tap.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <util.h>
 #include "btpand.h"
 @@ -128,27 +128,27 @@ tap_send(channel_t *chan, packet_t *pkt)
 	ssize_t nw;
 	iov[0].iov_base = pkt->dst;
 	iov[0].iov_len = ETHER_ADDR_LEN;
 	iov[1].iov_base = pkt->src;
 	iov[1].iov_len = ETHER_ADDR_LEN;
 	iov[2].iov_base = pkt->type;
 	iov[2].iov_len = ETHER_TYPE_LEN;
 	iov[3].iov_base = pkt->ptr;
 	iov[3].iov_len = pkt->len;
 	/* tap device write never fails */
 	nw = writev(chan->fd, iov, __arraycount(iov));
-	_DIAGASSERT(nw > 0);
+	assert(nw > 0);
 	return true;
+}
 static bool
 tap_recv(packet_t *pkt)
+{
 	if (pkt->len < ETHER_HDR_LEN)
 		return false;
 	pkt->dst = pkt->ptr;
 	packet_adj(pkt, ETHER_ADDR_LEN);