d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check l2cap socket initialisation and define L2CAP_SOCKET_CHECKED

Browse Source 
This will fix build.
This commit is contained in:
takawata 2015-04-07 16:48:23 +00:00
parent 739c57d8c2
commit 411a5fdbb3
69 changed files with 84 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libbluetooth/bluetooth.c
View File

@ -30,7 +30,7 @@
* $Id: bluetooth.c,v 1.3 2003/05/20 23:04:30 max Exp $
* $FreeBSD$
*/
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <stdio.h>
#include <stdlib.h>

1
lib/libbluetooth/dev.c
View File

@ -30,6 +30,7 @@
* $FreeBSD$
*/
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <stdio.h>
#include <string.h>

1
lib/libbluetooth/hci.c
View File

@ -31,6 +31,7 @@
*/
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <inttypes.h>
#include <stdio.h>

1
lib/libsdp/search.c
View File

@ -32,6 +32,7 @@
#include <sys/uio.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <stdio.h>

1
lib/libsdp/service.c
View File

@ -32,6 +32,7 @@
#include <sys/uio.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <string.h>

5
lib/libsdp/session.c
View File

@ -28,7 +28,7 @@
* $Id: session.c,v 1.2 2003/09/04 22:12:13 max Exp $
* $FreeBSD$
*/
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <stdlib.h>
@ -62,6 +62,9 @@ sdp_open(bdaddr_t const *l, bdaddr_t const *r)
sa.l2cap_len = sizeof(sa);
sa.l2cap_family = AF_BLUETOOTH;
sa.l2cap_psm = 0;
sa.l2cap_cid = 0;
sa.l2cap_bdaddr_type = BDADDR_BREDR;
memcpy(&sa.l2cap_bdaddr, l, sizeof(sa.l2cap_bdaddr));
if (bind(ss->s, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
ss->error = errno;

1
lib/libsdp/util.c
View File

@ -30,6 +30,7 @@
*/
#include <netinet/in.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <stdio.h>
#include <sdp.h>

1
usr.bin/bluetooth/bthost/bthost.c
View File

@ -29,6 +29,7 @@
* $FreeBSD$
*/
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <stdio.h>
#include <stdlib.h>

1
usr.bin/bluetooth/btsockstat/btsockstat.c
View File

@ -39,6 +39,7 @@
#include <net/if.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <err.h>
#include <fcntl.h>

2
usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
View File

@ -28,7 +28,7 @@
* $Id: rfcomm_sdp.c,v 1.1 2003/09/07 18:15:55 max Exp $
* $FreeBSD$
*/
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <sdp.h>

1
usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
View File

@ -33,6 +33,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <ctype.h>
#include <err.h>

1
usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
View File

@ -31,6 +31,7 @@
#include <sys/queue.h>
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <err.h>
#include <errno.h>

1
usr.sbin/bluetooth/bthidcontrol/hid.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>

1
usr.sbin/bluetooth/bthidcontrol/sdp.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>

1
usr.sbin/bluetooth/bthidd/bthidd.c
View File

@ -34,6 +34,7 @@
#include <sys/time.h>
#include <sys/queue.h>
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <err.h>
#include <errno.h>

5
usr.sbin/bluetooth/bthidd/client.c
View File

@ -33,6 +33,7 @@
#include <sys/queue.h>
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <fcntl.h>
@ -236,7 +237,9 @@ client_socket(bdaddr_p bdaddr, uint16_t psm)
l2addr.l2cap_family = AF_BLUETOOTH;
memset(&l2addr.l2cap_bdaddr, 0, sizeof(l2addr.l2cap_bdaddr));
l2addr.l2cap_psm = 0;
l2addr.l2cap_bdaddr_type = BDADDR_BREDR;
l2addr.l2cap_cid = 0;
if (bind(s, (struct sockaddr *) &l2addr, sizeof(l2addr)) < 0) {
close(s);
return (-1);

1
usr.sbin/bluetooth/bthidd/hid.c
View File

@ -35,6 +35,7 @@
#include <sys/mouse.h>
#include <sys/queue.h>
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>

1
usr.sbin/bluetooth/bthidd/kbd.c
View File

@ -37,6 +37,7 @@
#include <sys/queue.h>
#include <sys/wait.h>
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>

2
usr.sbin/bluetooth/bthidd/lexer.l
View File

@ -31,7 +31,7 @@
* $Id: lexer.l,v 1.3 2006/09/07 21:06:53 max Exp $
* $FreeBSD$
*/
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <stdlib.h>
#include "parser.h"

1
usr.sbin/bluetooth/bthidd/parser.y
View File

@ -33,6 +33,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>

5
usr.sbin/bluetooth/bthidd/server.c
View File

@ -33,6 +33,7 @@
#include <sys/queue.h>
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <dev/vkbd/vkbd_var.h>
#include <errno.h>
@ -90,7 +91,9 @@ server_init(bthid_server_p srv)
l2addr.l2cap_family = AF_BLUETOOTH;
memcpy(&l2addr.l2cap_bdaddr, &srv->bdaddr, sizeof(l2addr.l2cap_bdaddr));
l2addr.l2cap_psm = htole16(0x11);
l2addr.l2cap_bdaddr_type = BDADDR_BREDR;
l2addr.l2cap_cid = 0;
if (bind(srv->ctrl, (struct sockaddr *) &l2addr, sizeof(l2addr)) < 0) {
syslog(LOG_ERR, "Could not bind control L2CAP socket. " \
"%s (%d)", strerror(errno), errno);

1
usr.sbin/bluetooth/bthidd/session.c
View File

@ -33,6 +33,7 @@
#include <sys/queue.h>
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <fcntl.h>

1
usr.sbin/bluetooth/btpand/bnep.c
View File

@ -31,6 +31,7 @@
__RCSID("$NetBSD: bnep.c,v 1.1 2008/08/17 13:20:57 plunky Exp $");
#include <sys/uio.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <stdarg.h>

1
usr.sbin/bluetooth/btpand/btpand.c
View File

@ -33,6 +33,7 @@ __RCSID("$NetBSD: btpand.c,v 1.1 2008/08/17 13:20:57 plunky Exp $");
#include <sys/wait.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <err.h>
#include <fcntl.h>

2
usr.sbin/bluetooth/btpand/channel.c
View File

@ -35,7 +35,7 @@ __RCSID("$NetBSD: channel.c,v 1.1 2008/08/17 13:20:57 plunky Exp $");
#include <libutil.h>
#include <unistd.h>
#define L2CAP_SOCKET_CHECKED
#include "btpand.h"
static struct chlist channel_list;

4
usr.sbin/bluetooth/btpand/client.c
View File

@ -30,6 +30,7 @@
#include <sys/cdefs.h>
__RCSID("$NetBSD: client.c,v 1.2 2008/12/06 20:01:14 plunky Exp $");
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <sdp.h>
@ -65,6 +66,9 @@ client_init(void)
memset(&sa, 0, sizeof(sa));
sa.l2cap_family = AF_BLUETOOTH;
sa.l2cap_len = sizeof(sa);
sa.l2cap_bdaddr_type = BDADDR_BREDR;
sa.l2cap_cid = 0;
bdaddr_copy(&sa.l2cap_bdaddr, &local_bdaddr);
if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
log_err("Could not bind client socket: %m");

1
usr.sbin/bluetooth/btpand/event.c
View File

@ -45,6 +45,7 @@
#include <syslog.h>
#include "event.h"
#define L2CAP_SOCKET_CHECKED
#include "btpand.h"
#define __event_link(ev) \

1
usr.sbin/bluetooth/btpand/packet.c
View File

@ -30,6 +30,7 @@
#include <sys/cdefs.h>
__RCSID("$NetBSD: packet.c,v 1.1 2008/08/17 13:20:57 plunky Exp $");
#define L2CAP_SOCKET_CHECKED
#include "btpand.h"
packet_t *

1
usr.sbin/bluetooth/btpand/sdp.c
View File

@ -32,6 +32,7 @@ __RCSID("$NetBSD: sdp.c,v 1.2 2008/12/06 20:01:14 plunky Exp $");
#include <string.h>
#define L2CAP_SOCKET_CHECKED
#include "sdp.h"
/*

4
usr.sbin/bluetooth/btpand/server.c
View File

@ -32,6 +32,7 @@ __RCSID("$NetBSD: server.c,v 1.2 2009/01/24 17:29:28 plunky Exp $");
#include <sys/ioctl.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <inttypes.h>
#include <errno.h>
@ -103,6 +104,9 @@ server_open(void)
sa.l2cap_family = AF_BLUETOOTH;
sa.l2cap_len = sizeof(sa);
sa.l2cap_psm = htole16(l2cap_psm);
sa.l2cap_bdaddr_type = BDADDR_BREDR;
sa.l2cap_cid = 0;
bdaddr_copy(&sa.l2cap_bdaddr, &local_bdaddr);
if (bind(server_fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
log_err("Could not bind server socket: %m");

1
usr.sbin/bluetooth/btpand/tap.c
View File

@ -43,6 +43,7 @@ __RCSID("$NetBSD: tap.c,v 1.1 2008/08/17 13:20:57 plunky Exp $");
#include <stdio.h>
#include <unistd.h>
#define L2CAP_SOCKET_CHECKED
#include "btpand.h"
static bool tap_send(channel_t *, packet_t *);

1
usr.sbin/bluetooth/hccontrol/hccontrol.c
View File

@ -29,6 +29,7 @@
* $FreeBSD$
*/
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sys/ioctl.h>
#include <sys/sysctl.h>

1
usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
View File

@ -29,6 +29,7 @@
* $FreeBSD$
*/
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <stdio.h>

1
usr.sbin/bluetooth/hccontrol/info.c
View File

@ -29,6 +29,7 @@
* $FreeBSD$
*/
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <stdio.h>

1
usr.sbin/bluetooth/hccontrol/link_control.c
View File

@ -29,6 +29,7 @@
* $FreeBSD$
*/
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <stdio.h>

1
usr.sbin/bluetooth/hccontrol/link_policy.c
View File

@ -29,6 +29,7 @@
* $FreeBSD$
*/
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <stdio.h>

1
usr.sbin/bluetooth/hccontrol/node.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/ioctl.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <netgraph/ng_message.h>

1
usr.sbin/bluetooth/hccontrol/util.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/param.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <stdio.h>
#include <string.h>

1
usr.sbin/bluetooth/hcsecd/hcsecd.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <err.h>
#include <errno.h>

1
usr.sbin/bluetooth/hcsecd/parser.y
View File

@ -32,6 +32,7 @@
#include <sys/fcntl.h>
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <limits.h>

1
usr.sbin/bluetooth/l2control/l2cap.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/ioctl.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <stdio.h>

1
usr.sbin/bluetooth/l2control/l2control.c
View File

@ -30,6 +30,7 @@
*/
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <err.h>
#include <errno.h>

1
usr.sbin/bluetooth/l2ping/l2ping.c
View File

@ -34,6 +34,7 @@
#include <arpa/inet.h>
#include <netinet/in.h>
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <err.h>
#include <errno.h>

2
usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
View File

@ -30,7 +30,7 @@
* $Id: rfcomm_pppd.c,v 1.5 2003/09/07 18:32:11 max Exp $
* $FreeBSD$
*/
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <ctype.h>
#include <err.h>

1
usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
View File

@ -30,6 +30,7 @@
*/
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <err.h>
#include <errno.h>

1
usr.sbin/bluetooth/sdpcontrol/search.c
View File

@ -30,6 +30,7 @@
*/
#include <netinet/in.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <ctype.h>
#include <sdp.h>

2
usr.sbin/bluetooth/sdpd/bgd.c
View File

@ -28,7 +28,7 @@
* $Id: bgd.c,v 1.4 2004/01/13 01:54:39 max Exp $
* $FreeBSD$
*/
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <string.h>

1
usr.sbin/bluetooth/sdpd/dun.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <string.h>

1
usr.sbin/bluetooth/sdpd/ftrn.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <string.h>

1
usr.sbin/bluetooth/sdpd/gn.c
View File

@ -32,6 +32,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <string.h>

1
usr.sbin/bluetooth/sdpd/irmc.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <string.h>

1
usr.sbin/bluetooth/sdpd/irmc_command.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <string.h>

1
usr.sbin/bluetooth/sdpd/lan.c
View File

@ -31,6 +31,7 @@
#include <arpa/inet.h>
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <stdio.h>

1
usr.sbin/bluetooth/sdpd/main.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/select.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <grp.h>

1
usr.sbin/bluetooth/sdpd/nap.c
View File

@ -32,6 +32,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <string.h>

1
usr.sbin/bluetooth/sdpd/opush.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <string.h>

1
usr.sbin/bluetooth/sdpd/panu.c
View File

@ -32,6 +32,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <string.h>

1
usr.sbin/bluetooth/sdpd/profile.c
View File

@ -32,6 +32,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <string.h>

1
usr.sbin/bluetooth/sdpd/provider.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <string.h>
#include <stdlib.h>

1
usr.sbin/bluetooth/sdpd/sar.c
View File

@ -34,6 +34,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <sdp.h>

1
usr.sbin/bluetooth/sdpd/scr.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <sdp.h>

1
usr.sbin/bluetooth/sdpd/sd.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <string.h>

1
usr.sbin/bluetooth/sdpd/server.c
View File

@ -38,6 +38,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <pwd.h>

1
usr.sbin/bluetooth/sdpd/sp.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <string.h>

1
usr.sbin/bluetooth/sdpd/srr.c
View File

@ -34,6 +34,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <sdp.h>

1
usr.sbin/bluetooth/sdpd/ssar.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <string.h>

1
usr.sbin/bluetooth/sdpd/ssr.c
View File

@ -34,6 +34,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <assert.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <sdp.h>

1
usr.sbin/bluetooth/sdpd/sur.c
View File

@ -30,6 +30,7 @@
*/
#include <sys/queue.h>
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <errno.h>
#include <sdp.h>

2
usr.sbin/bluetooth/sdpd/uuid.c
View File

@ -28,7 +28,7 @@
* $Id: uuid.c,v 1.1 2004/12/09 18:20:26 max Exp $
* $FreeBSD$
*/
#define L2CAP_SOCKET_CHECKED
#include <bluetooth.h>
#include <sdp.h>
#include <uuid.h>