diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /lib/libsdp | |
| parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
| parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
| download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz | |
Merge sync of head
Diffstat (limited to 'lib/libsdp')
| -rw-r--r-- | lib/libsdp/search.c | 1 | ||||
| -rw-r--r-- | lib/libsdp/service.c | 1 | ||||
| -rw-r--r-- | lib/libsdp/session.c | 5 | ||||
| -rw-r--r-- | lib/libsdp/util.c | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/lib/libsdp/search.c b/lib/libsdp/search.c index 868fbe5..fa2a92d 100644 --- a/lib/libsdp/search.c +++ b/lib/libsdp/search.c @@ -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> diff --git a/lib/libsdp/service.c b/lib/libsdp/service.c index 2667966..53c8909 100644 --- a/lib/libsdp/service.c +++ b/lib/libsdp/service.c @@ -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> diff --git a/lib/libsdp/session.c b/lib/libsdp/session.c index a31f327..a74ce5f 100644 --- a/lib/libsdp/session.c +++ b/lib/libsdp/session.c @@ -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; diff --git a/lib/libsdp/util.c b/lib/libsdp/util.c index b996bd2..5ef4a1d 100644 --- a/lib/libsdp/util.c +++ b/lib/libsdp/util.c @@ -30,6 +30,7 @@ */ #include <netinet/in.h> +#define L2CAP_SOCKET_CHECKED #include <bluetooth.h> #include <stdio.h> #include <sdp.h> |
