 @@ -1,14 +1,14 @@
-.\" $NetBSD: rfcomm_sppd.1,v 1.8 2010/11/02 19:44:09 plunky Exp $
+.\" $NetBSD: rfcomm_sppd.1,v 1.9 2010/11/03 08:27:27 plunky Exp $
 .\"
 .\" Copyright (c) 2006 Itronix Inc.
 .\" 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.
 .\" 3. The name of Itronix Inc. may not be used to endorse
 @@ -55,63 +55,63 @@
 .Dd November 2, 2010
 .Dt RFCOMM_SPPD 1
 .Os
 .Sh NAME
 .Nm rfcomm_sppd
 .Nd RFCOMM Serial Port Profile daemon
 .Sh SYNOPSIS
 .Nm
 .Op Fl d Ar device
 .Op Fl m Ar mode
 .Op Fl p Ar psm
 .Op Fl s Ar service
 .Op Fl t Ar tty
-.Brq Fl a Ar address | Fl c Ar channel
+.Brq Fl a Ar address | Op Fl c Ar channel
 .Sh DESCRIPTION
 The
 .Nm
 utility is a Serial Port Profile daemon, providing serial access over
 an RFCOMM connection to a remote device.
 .Nm
 can work in client or server mode.
 .Pp
 In client mode,
 .Nm
 initiates an RFCOMM connection to the
 .Ar service
 at the remote
 .Ar address .
 .Pp
 In server mode,
 .Nm
 registers the
 .Ar service
 with the local SDP server and listens on the specified RFCOMM
 .Ar channel
-for an incoming connection.
+for an incoming connection, or the first unused channel if none
 was given.
 .Pp
 The options are as follows:
 .Bl -tag -width ".Fl c Ar channel"
 .It Fl a Ar address
 Client mode.
 Specify the address of the remote RFCOMM device.
 The address can be specified as BD_ADDR or name.
 If given as a name, then the
 .Nm
 utility will attempt to resolve the name via
 .Xr bt_gethostbyname 3 .
 .It Fl c Ar channel
-Server mode.
+In server mode, specify the RFCOMM channel number to listen on.
 Specify the RFCOMM channel number to listen on.
 .Nm
 will register the service with the local
 .Xr sdpd 8
 daemon.
 Note that registering services with
 .Xr sdpd 8
 is a privileged operation.
 .It Fl d Ar device
 Use the local device with the specified address.
 The device can be specified by BD_ADDR or device name.
 See
 .Xr btconfig 8
 for a list of available devices.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rfcomm_sppd.c,v 1.12 2009/09/24 18:30:37 plunky Exp $	*/
+/*	$NetBSD: rfcomm_sppd.c,v 1.13 2010/11/03 08:27:27 plunky Exp $	*/
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * 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.
 @@ -52,27 +52,27 @@
  * 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>
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc.\
   Copyright (c) 2007 Iain Hibbert.\
   Copyright (c) 2006 Itronix, Inc.\
   Copyright (c) 2003 Maksim Yevmenkin m_evmenkin@yahoo.com.\
   All rights reserved.");
-__RCSID("$NetBSD: rfcomm_sppd.c,v 1.12 2009/09/24 18:30:37 plunky Exp $");
+__RCSID("$NetBSD: rfcomm_sppd.c,v 1.13 2010/11/03 08:27:27 plunky Exp $");
 #include <sys/param.h>
 #include <bluetooth.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
 #include <limits.h>
 #include <paths.h>
 #include <sdp.h>
 #include <signal.h>
 @@ -118,48 +118,50 @@ main(int argc, char *argv[])
 	struct termios		t;
 	bdaddr_t		laddr, raddr;
 	fd_set			rdset;
 	const char		*service;
 	char			*ep, *tty;
 	int			lm, n, rfcomm, tty_in, tty_out;
 	uint16_t		psm;
 	uint8_t			channel;
 	bdaddr_copy(&laddr, BDADDR_ANY);
 	bdaddr_copy(&raddr, BDADDR_ANY);
 	service = "SP";
 	tty = NULL;
-	channel = 0;
+	channel = RFCOMM_CHANNEL_ANY;
 	psm = L2CAP_PSM_RFCOMM;
 	lm = 0;
 	/* Parse command line options */
 	while ((n = getopt(argc, argv, "a:c:d:hm:p:s:t:")) != -1) {
 		switch (n) {
 		case 'a': /* remote device address */
 			if (!bt_aton(optarg, &raddr)) {
 				struct hostent	*he = NULL;
 				if ((he = bt_gethostbyname(optarg)) == NULL)
 					errx(EXIT_FAILURE, "%s: %s", optarg,
 					    hstrerror(h_errno));
 				bdaddr_copy(&raddr, (bdaddr_t *)he->h_addr);
+			}
 			break;
 		case 'c': /* RFCOMM channel */
 			channel = strtoul(optarg, &ep, 10);
-			if (*ep != '\0' || channel < 1 || channel > 30)
+			if (*ep != '\0'
 			    || channel < RFCOMM_CHANNEL_MIN
 			    || channel > RFCOMM_CHANNEL_MAX)
 				errx(EXIT_FAILURE, "Invalid channel: %s", optarg);
 			break;
 		case 'd': /* local device address */
 			if (!bt_devaddr(optarg, &laddr))
 				err(EXIT_FAILURE, "%s", optarg);
 			break;
 		case 'm': /* Link Mode */
 			if (strcasecmp(optarg, "auth") == 0)
 				lm = RFCOMM_LM_AUTH;
 @@ -190,45 +192,44 @@ main(int argc, char *argv[])
 				tty = optarg;
 			break;
 		case 'h':
 		default:
 			usage();
 			/* NOT REACHED */
+		}
+	}
 	/*
 	 * validate options:
-	 *	must have channel or remote address but not both
+	 *	cannot have remote address if channel was given
 	 */
-	if ((channel == 0 && bdaddr_any(&raddr))
+	if (channel != RFCOMM_CHANNEL_ANY && !bdaddr_any(&raddr))
 	    || (channel != 0 && !bdaddr_any(&raddr)))
 		usage();
 	/*
 	 * grab ttys before we start the bluetooth
 	 */
 	if (tty == NULL) {
 		tty_in = STDIN_FILENO;
 		tty_out = STDOUT_FILENO;
 	} else {
 		tty_in = open_tty(tty);
 		tty_out = tty_in;
+	}
 	/* open RFCOMM */
-	if (channel == 0)
+	if (!bdaddr_any(&raddr))
 		rfcomm = open_client(&laddr, &raddr, lm, psm, service);
 	else
 		rfcomm = open_server(&laddr, psm, channel, lm, service);
 	/*
 	 * now we are ready to go, so either detach or maybe turn
 	 * off some input processing, so that rfcomm_sppd can
 	 * be used directly with stdio
 	 */
 	if (tty == NULL) {
 		if (tcgetattr(tty_in, &t) < 0)
 			err(EXIT_FAILURE, "tcgetattr");
 @@ -423,48 +424,54 @@ open_server(bdaddr_t *laddr, uint16_t ps
 	sa.bt_psm = psm;
 	sa.bt_channel = channel;
 	bdaddr_copy(&sa.bt_bdaddr, laddr);
 	if (bind(sv, (struct sockaddr *)&sa, sizeof(sa)) < 0)
 		err(EXIT_FAILURE, "bind(%s, 0x%04x, %d)",
 		    bt_ntoa(laddr, NULL), psm, channel);
 	if (setsockopt(sv, BTPROTO_RFCOMM, SO_RFCOMM_LM, &lm, sizeof(lm)) < 0)
 		err(EXIT_FAILURE, "link mode");
 	if (listen(sv, 1) < 0)
 		err(EXIT_FAILURE, "listen()");
 	len = sizeof(sa);
 	if (getsockname(sv, (struct sockaddr *)&sa, &len) < 0)
 		err(EXIT_FAILURE, "getsockname()");
 	if (len != sizeof(sa))
 		errx(EXIT_FAILURE, "getsockname()");
 	/* Build SDP record */
 	rec.next = buffer;
 	rec.end = buffer + sizeof(buffer);
 	sdp_put_uint16(&rec, SDP_ATTR_SERVICE_RECORD_HANDLE);
 	sdp_put_uint32(&rec, 0x00000000);
 	sdp_put_uint16(&rec, SDP_ATTR_SERVICE_CLASS_ID_LIST);
 	sdp_put_seq(&rec, 3);
 	sdp_put_uuid16(&rec, s->class);
 	len = (psm == L2CAP_PSM_RFCOMM ? 0 : 3);
 	sdp_put_uint16(&rec, SDP_ATTR_PROTOCOL_DESCRIPTOR_LIST);
 	sdp_put_seq(&rec, 12 + len);
 	sdp_put_seq(&rec, 3 + len);
 	sdp_put_uuid16(&rec, SDP_UUID_PROTOCOL_L2CAP);
 	if (len > 0)
 		sdp_put_uint16(&rec, psm);
 	sdp_put_seq(&rec, 5);
 	sdp_put_uuid16(&rec, SDP_UUID_PROTOCOL_RFCOMM);
-	sdp_put_uint8(&rec, channel);
+	sdp_put_uint8(&rec, sa.bt_channel);
 	sdp_put_uint16(&rec, SDP_ATTR_BROWSE_GROUP_LIST);
 	sdp_put_seq(&rec, 3);
 	sdp_put_uuid16(&rec, SDP_SERVICE_CLASS_PUBLIC_BROWSE_GROUP);
 	sdp_put_uint16(&rec, SDP_ATTR_LANGUAGE_BASE_ATTRIBUTE_ID_LIST);
 	sdp_put_seq(&rec, 9);
 	sdp_put_uint16(&rec, 0x656e);	/* "en" */
 	sdp_put_uint16(&rec, 106);	/* UTF-8 */
 	sdp_put_uint16(&rec, SDP_ATTR_PRIMARY_LANGUAGE_BASE_ID);
 	if (s->class == SDP_SERVICE_CLASS_LAN_ACCESS_USING_PPP) {
 		sdp_put_uint16(&rec, SDP_ATTR_SERVICE_AVAILABILITY);
 @@ -661,27 +668,27 @@ void
 reset_tio(void)
+{
 	tcsetattr(STDIN_FILENO, TCSAFLUSH, &tio);
+}
 void
 usage(void)
+{
 	const char *cmd = getprogname();
 	struct service *s;
 	fprintf(stderr, "Usage: %s [-d device] [-m mode] [-p psm] [-s service] [-t tty]\n"
-			"       %*s {-a bdaddr | -c channel}\n"
+			"       %*s {-a bdaddr | [-c channel]}\n"
 			"\n"
 			"Where:\n"
 			"\t-a bdaddr    remote device address\n"
 			"\t-c channel   local RFCOMM channel\n"
 			"\t-d device    local device address\n"
 			"\t-m mode      link mode\n"
 			"\t-p psm       protocol/service multiplexer\n"
 			"\t-s service   service class\n"
 			"\t-t tty       run in background using pty\n"
 			"\n", cmd, (int)strlen(cmd), "");
 	fprintf(stderr, "Known service classes:\n");
 	for (s = services ; s->name != NULL ; s++)