Update devel/bluetooth-libs and net/bluetooth-tools to match the kernel
This time, the userland tools and libraries are being ported from NetBSD (which in turn is also based on FreeBSD code). Both packages represent work in progress and are not fully functional yet. ok jasper@ for the new ports, grange@ for taking over maintainership
This commit is contained in:
uwe
parent
ac4dfd6001
commit
9d15d6f23e
@ -1,12 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.4 2006/01/06 13:38:06 bernd Exp $
|
||||
# $OpenBSD: Makefile,v 1.5 2007/06/06 21:12:23 uwe Exp $
|
||||
|
||||
COMMENT= "bluetooth network libraries"
|
||||
DISTNAME= bluetooth-libs-20050716
|
||||
SHARED_LIBS= bluetooth 1.0 \
|
||||
sdp 1.0
|
||||
COMMENT= bluetooth network libraries
|
||||
DISTNAME= bluetooth-libs-20070606
|
||||
SHARED_LIBS= bluetooth 2.0 \
|
||||
sdp 2.0
|
||||
|
||||
CATEGORIES= devel net
|
||||
MAINTAINER= Alexander Yurchenko <grange@openbsd.org>
|
||||
MAINTAINER= Uwe Stuehler <uwe@openbsd.org>
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
@ -14,20 +14,27 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES= http://www.disorder.ru/openbsd/distfiles/
|
||||
MASTER_SITES= http://www.bsdx.de/openbsd/distfiles/
|
||||
|
||||
MAKE_ENV= LIBDIR=${TRUEPREFIX}/lib MANDIR=${TRUEPREFIX}/man/cat \
|
||||
MAKE_ENV= LIBDIR=${TRUEPREFIX}/lib \
|
||||
MANDIR=${TRUEPREFIX}/man/cat \
|
||||
LIBbluetooth_VERSION=${LIBbluetooth_VERSION} \
|
||||
LIBsdp_VERSION=${LIBsdp_VERSION}
|
||||
FAKE_FLAGS= DEBUGLIBS=No
|
||||
NO_REGRESS= Yes
|
||||
|
||||
pre-build:
|
||||
@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR},g" \
|
||||
${WRKSRC}/libbluetooth/*.[ch3]
|
||||
@perl -pi -e "s,/etc,${SYSCONFDIR},g" \
|
||||
${WRKSRC}/libbluetooth/*.[ch3] \
|
||||
${WRKSRC}/libsdp/*.[ch3]
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA} ${WRKSRC}/libbluetooth/bluetooth.h ${PREFIX}/include
|
||||
${INSTALL_DATA} ${WRKSRC}/libsdp/sdp.h ${PREFIX}/include
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bluetooth
|
||||
${INSTALL_DATA} ${WRKSRC}/examples/hosts \
|
||||
${PREFIX}/share/examples/bluetooth
|
||||
${INSTALL_DATA} ${WRKSRC}/examples/protocols \
|
||||
${PREFIX}/share/examples/bluetooth
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (bluetooth-libs-20050716.tar.gz) = e02/WWexXrnbUGSMFelRZQ==
|
||||
RMD160 (bluetooth-libs-20050716.tar.gz) = 2EOA+TKWHmMwA/Lq+zjh4pleM4U=
|
||||
SHA1 (bluetooth-libs-20050716.tar.gz) = bSiNREeo/HuzxxWXt/hN1fHS/5I=
|
||||
SHA256 (bluetooth-libs-20050716.tar.gz) = mlVmAgsCEpyCBnIOa9ifV9lbnVrAyM/I2p3PO5+9tHc=
|
||||
SIZE (bluetooth-libs-20050716.tar.gz) = 20295
|
||||
MD5 (bluetooth-libs-20070606.tar.gz) = q33/V25BnqCotrjWRRvdHw==
|
||||
RMD160 (bluetooth-libs-20070606.tar.gz) = c46QH8IMplev3zt2S4nv1qLt3mM=
|
||||
SHA1 (bluetooth-libs-20070606.tar.gz) = ouWMB87kGBjjkEHgjiaqj9zVa6A=
|
||||
SHA256 (bluetooth-libs-20070606.tar.gz) = cDeQ+TN62q1LpjLgY13pa5niWDcQTMpbsssjmiO+F2I=
|
||||
SIZE (bluetooth-libs-20070606.tar.gz) = 22219
|
||||
|
||||
@ -1,96 +0,0 @@
|
||||
$OpenBSD: patch-libbluetooth_bluetooth_3,v 1.1 2005/09/06 18:59:19 grange Exp $
|
||||
--- libbluetooth/bluetooth.3.orig Sat Jul 16 00:17:58 2005
|
||||
+++ libbluetooth/bluetooth.3 Tue Jul 26 23:36:52 2005
|
||||
@@ -106,13 +106,13 @@ argument specifies the address family of
|
||||
.Dv AF_BLUETOOTH .
|
||||
.Pp
|
||||
The structure returned contains the information obtained from a line in
|
||||
-.Pa /etc/bluetooth/hosts
|
||||
+.Pa %%SYSCONFDIR%%/bluetooth/hosts
|
||||
file.
|
||||
.Pp
|
||||
The
|
||||
.Fn bt_sethostent
|
||||
function controls whether
|
||||
-.Pa /etc/bluetooth/hosts
|
||||
+.Pa %%SYSCONFDIR%%/bluetooth/hosts
|
||||
file should stay open after each call to
|
||||
.Fn bt_gethostbyname
|
||||
or
|
||||
@@ -124,7 +124,7 @@ flag is non-zero, the file will not be c
|
||||
The
|
||||
.Fn bt_endhostent
|
||||
function closes the
|
||||
-.Pa /etc/bluetooth/hosts
|
||||
+.Pa %%SYSCONFDIR%%/bluetooth/hosts
|
||||
file.
|
||||
.Pp
|
||||
The
|
||||
@@ -151,13 +151,13 @@ argument passed to
|
||||
should have numeric value of the desired Bluetooth Protocol Service Multiplexor.
|
||||
.Pp
|
||||
The structure returned contains the information obtained from a line in
|
||||
-.Pa /etc/bluetooth/protocols
|
||||
+.Pa %%SYSCONFDIR%%/bluetooth/protocols
|
||||
file.
|
||||
.Pp
|
||||
The
|
||||
.Fn bt_setprotoent
|
||||
function controls whether
|
||||
-.Pa /etc/bluetooth/protocols
|
||||
+.Pa %%SYSCONFDIR%%/bluetooth/protocols
|
||||
file should stay open after each call to
|
||||
.Fn bt_getprotobyname
|
||||
or
|
||||
@@ -169,7 +169,7 @@ flag is non-zero, the file will not be c
|
||||
The
|
||||
.Fn bt_endprotoent
|
||||
function closes the
|
||||
-.Pa /etc/bluetooth/protocols
|
||||
+.Pa %%SYSCONFDIR%%/bluetooth/protocols
|
||||
file.
|
||||
.Pp
|
||||
The
|
||||
@@ -187,9 +187,9 @@ string representing the address into the
|
||||
It is up to the caller to ensure that provided buffer has enough space.
|
||||
If no buffer was provided then internal static buffer will be used.
|
||||
.Sh FILES
|
||||
-.Bl -tag -width ".Pa /etc/bluetooth/hosts" -compact
|
||||
-.It Pa /etc/bluetooth/hosts
|
||||
-.It Pa /etc/bluetooth/protocols
|
||||
+.Bl -tag -width ".Pa %%SYSCONFDIR%%/bluetooth/hosts" -compact
|
||||
+.It Pa %%SYSCONFDIR%%/bluetooth/hosts
|
||||
+.It Pa %%SYSCONFDIR%%/bluetooth/protocols
|
||||
.El
|
||||
.Sh EXAMPLES
|
||||
Print out the hostname associated with a specific BD_ADDR:
|
||||
@@ -261,25 +261,25 @@ on EOF or error.
|
||||
The
|
||||
.Fn bt_gethostent
|
||||
function reads the next line of
|
||||
-.Pa /etc/bluetooth/hosts ,
|
||||
+.Pa %%SYSCONFDIR%%/bluetooth/hosts ,
|
||||
opening the file if necessary.
|
||||
.Pp
|
||||
The
|
||||
.Fn bt_sethostent
|
||||
function opens and/or rewinds the
|
||||
-.Pa /etc/bluetooth/hosts
|
||||
+.Pa %%SYSCONFDIR%%/bluetooth/hosts
|
||||
file.
|
||||
.Pp
|
||||
The
|
||||
.Fn bt_getprotoent
|
||||
function reads the next line of
|
||||
-.Pa /etc/bluetooth/protocols ,
|
||||
+.Pa %%SYSCONFDIR%%/bluetooth/protocols ,
|
||||
opening the file if necessary.
|
||||
.Pp
|
||||
The
|
||||
.Fn bt_setprotoent
|
||||
function opens and/or rewinds the
|
||||
-.Pa /etc/bluetooth/protocols
|
||||
+.Pa %%SYSCONFDIR%%/bluetooth/protocols
|
||||
file.
|
||||
.Sh AUTHORS
|
||||
.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-libbluetooth_bluetooth_c,v 1.1 2005/09/06 18:59:19 grange Exp $
|
||||
--- libbluetooth/bluetooth.c.orig Sat Jul 16 00:17:58 2005
|
||||
+++ libbluetooth/bluetooth.c Tue Jul 26 23:36:18 2005
|
||||
@@ -34,8 +34,8 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
-#define _PATH_BT_HOSTS "/etc/bluetooth/hosts"
|
||||
-#define _PATH_BT_PROTOCOLS "/etc/bluetooth/protocols"
|
||||
+#define _PATH_BT_HOSTS "%%SYSCONFDIR%%/bluetooth/hosts"
|
||||
+#define _PATH_BT_PROTOCOLS "%%SYSCONFDIR%%/bluetooth/protocols"
|
||||
#define MAXALIASES 35
|
||||
|
||||
static FILE *hostf = NULL;
|
||||
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-libbluetooth_bluetooth_h,v 1.1.1.1 2005/07/16 20:45:39 grange Exp $
|
||||
--- libbluetooth/bluetooth.h.orig Sat Jul 16 00:17:58 2005
|
||||
+++ libbluetooth/bluetooth.h Sat Jul 16 00:22:38 2005
|
||||
@@ -33,14 +33,24 @@
|
||||
#define _BLUETOOTH_H_
|
||||
|
||||
#include <sys/types.h>
|
||||
+#ifdef __FreeBSD__
|
||||
#include <sys/bitstring.h>
|
||||
+#else
|
||||
+#include <bitstring.h>
|
||||
+#endif
|
||||
#include <sys/endian.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
#include <netdb.h>
|
||||
+#ifdef __FreeBSD__
|
||||
#include <netgraph/bluetooth/include/ng_hci.h>
|
||||
#include <netgraph/bluetooth/include/ng_l2cap.h>
|
||||
#include <netgraph/bluetooth/include/ng_btsocket.h>
|
||||
+#elif __OpenBSD__
|
||||
+#include <netbt/hci.h>
|
||||
+#include <netbt/l2cap.h>
|
||||
+#include <netbt/bt.h>
|
||||
+#endif
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-libsdp_Makefile,v 1.1.1.1 2005/07/16 20:45:39 grange Exp $
|
||||
--- libsdp/Makefile.orig Sat Jul 16 00:37:04 2005
|
||||
+++ libsdp/Makefile Sat Jul 16 00:37:23 2005
|
||||
@@ -5,7 +5,7 @@ LIB= sdp
|
||||
MAN= sdp.3
|
||||
|
||||
WARNS?= 2
|
||||
-CFLAGS+= -I${.CURDIR}
|
||||
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libbluetooth
|
||||
|
||||
SHLIB_MAJOR= 1
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-libsdp_search_c,v 1.1.1.1 2005/07/16 20:45:39 grange Exp $
|
||||
--- libsdp/search.c.orig Sat Jul 16 00:35:53 2005
|
||||
+++ libsdp/search.c Sat Jul 16 00:41:50 2005
|
||||
@@ -29,6 +29,7 @@
|
||||
* $FreeBSD: src/lib/libsdp/search.c,v 1.7 2004/12/09 18:57:12 emax Exp $
|
||||
*/
|
||||
|
||||
+#include <sys/types.h>
|
||||
#include <sys/uio.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
@@ -188,7 +189,11 @@ sdp_search(void *xss,
|
||||
return (-1);
|
||||
}
|
||||
if (len < sizeof(xpdu)) {
|
||||
+#ifdef __FreeBSD__
|
||||
ss->error = ENOMSG;
|
||||
+#else
|
||||
+ ss->error = EAGAIN;
|
||||
+#endif
|
||||
return (-1);
|
||||
}
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-libsdp_service_c,v 1.1.1.1 2005/07/16 20:45:39 grange Exp $
|
||||
--- libsdp/service.c.orig Sat Jul 16 00:42:01 2005
|
||||
+++ libsdp/service.c Sat Jul 16 00:42:14 2005
|
||||
@@ -29,6 +29,7 @@
|
||||
* $FreeBSD: src/lib/libsdp/service.c,v 1.1 2004/01/20 20:48:25 emax Exp $
|
||||
*/
|
||||
|
||||
+#include <sys/types.h>
|
||||
#include <sys/uio.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-libsdp_util_c,v 1.1.1.1 2005/07/16 20:45:39 grange Exp $
|
||||
--- libsdp/util.c.orig Sat Jul 16 00:42:27 2005
|
||||
+++ libsdp/util.c Sat Jul 16 00:42:39 2005
|
||||
@@ -29,6 +29,7 @@
|
||||
* $FreeBSD: src/lib/libsdp/util.c,v 1.5 2005/05/27 19:11:33 emax Exp $
|
||||
*/
|
||||
|
||||
+#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
#include <bluetooth.h>
|
||||
#include <stdio.h>
|
||||
@ -1,9 +1,9 @@
|
||||
bluetooth-libs package consists of a few Bluetooth network
|
||||
libraries derived from FreeBSD.
|
||||
The bluetooth-libs package consists of a few Bluetooth network libraries
|
||||
derived from NetBSD, and originally from FreeBSD.
|
||||
|
||||
libbluetooth library provides a set of common routines to
|
||||
be used in the Bluetooth network applications similar to
|
||||
the libc network routines like gethostbyname(3).
|
||||
libbluetooth provides a set of common routines to be used in the
|
||||
Bluetooth network applications similar to the libc network routines like
|
||||
gethostbyname(3).
|
||||
|
||||
libsdp library provides a set of routines dealing with the
|
||||
Bluetooth Service Discovery Protocol.
|
||||
libsdp provides a set of routines that deal with the Bluetooth Service
|
||||
Discovery Protocol.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/07/16 20:45:39 grange Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2007/06/06 21:12:23 uwe Exp $
|
||||
%%SHARED%%
|
||||
include/bluetooth.h
|
||||
include/sdp.h
|
||||
@ -20,6 +20,8 @@ lib/libsdp_pic.a
|
||||
@man man/cat3/SDP_PUT8.0
|
||||
@man man/cat3/bluetooth.0
|
||||
@man man/cat3/bt_aton.0
|
||||
@man man/cat3/bt_devaddr.0
|
||||
@man man/cat3/bt_devname.0
|
||||
@man man/cat3/bt_endhostent.0
|
||||
@man man/cat3/bt_endprotoent.0
|
||||
@man man/cat3/bt_gethostbyaddr.0
|
||||
@ -42,3 +44,9 @@ lib/libsdp_pic.a
|
||||
@man man/cat3/sdp_search.0
|
||||
@man man/cat3/sdp_unregister_service.0
|
||||
@man man/cat3/sdp_uuid2desc.0
|
||||
share/examples/bluetooth/
|
||||
@sample ${SYSCONFDIR}/bluetooth/
|
||||
share/examples/bluetooth/hosts
|
||||
@sample ${SYSCONFDIR}/bluetooth/hosts
|
||||
share/examples/bluetooth/protocols
|
||||
@sample ${SYSCONFDIR}/bluetooth/protocols
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.4 2006/08/03 23:15:57 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.5 2007/06/06 21:12:23 uwe Exp $
|
||||
|
||||
COMMENT= "bluetooth network tools"
|
||||
DISTNAME= bluetooth-tools-20050725
|
||||
COMMENT= bluetooth network tools
|
||||
DISTNAME= bluetooth-tools-20070606
|
||||
CATEGORIES= net
|
||||
MAINTAINER= Alexander Yurchenko <grange@openbsd.org>
|
||||
MAINTAINER= Uwe Stuehler <uwe@openbsd.org>
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
@ -11,21 +11,16 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES= http://www.disorder.ru/openbsd/distfiles/
|
||||
MASTER_SITES= http://www.bsdx.de/openbsd/distfiles/
|
||||
|
||||
WANTLIB= c
|
||||
LIB_DEPENDS= bluetooth.>=1.0::devel/bluetooth-libs
|
||||
WANTLIB= c util
|
||||
LIB_DEPENDS= bluetooth.>=2.0,sdp.>=2.0::devel/bluetooth-libs
|
||||
|
||||
MAKE_ENV= BINDIR=${TRUEPREFIX}/bin SBINDIR=${TRUEPREFIX}/sbin \
|
||||
MAKE_ENV= BINDIR=${TRUEPREFIX}/bin \
|
||||
SBINDIR=${TRUEPREFIX}/sbin \
|
||||
MANDIR=${TRUEPREFIX}/man/cat \
|
||||
COPTS=-I${LOCALBASE}/include LDADD=-L${LOCALBASE}/lib
|
||||
COPTS=-I${LOCALBASE}/include \
|
||||
LDADD=-L${LOCALBASE}/lib
|
||||
NO_REGRESS= Yes
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bluetooth
|
||||
${INSTALL_DATA} ${WRKSRC}/etc/bluetooth/hosts \
|
||||
${PREFIX}/share/examples/bluetooth
|
||||
${INSTALL_DATA} ${WRKSRC}/etc/bluetooth/protocols \
|
||||
${PREFIX}/share/examples/bluetooth
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (bluetooth-tools-20050725.tar.gz) = fAM3RG7x4+lqraZIM2QoLg==
|
||||
RMD160 (bluetooth-tools-20050725.tar.gz) = bHWySSf7YXUQPzPilNT9gAgAr+g=
|
||||
SHA1 (bluetooth-tools-20050725.tar.gz) = wc4DknO4uV5KckR1pkTCIP0xrb4=
|
||||
SHA256 (bluetooth-tools-20050725.tar.gz) = DV9UAHpmUM1LI+mEarA+GNZhIvPYUzlkQ2W0bCC8ZrU=
|
||||
SIZE (bluetooth-tools-20050725.tar.gz) = 27579
|
||||
MD5 (bluetooth-tools-20070606.tar.gz) = Z+enEF7HYPrhEg0JLLaK2g==
|
||||
RMD160 (bluetooth-tools-20070606.tar.gz) = KlKRiFBtOKaaAEVdm4LmiPWnrIY=
|
||||
SHA1 (bluetooth-tools-20070606.tar.gz) = j9+M+LnSfpJr6FDu0oIGRxEhKho=
|
||||
SHA256 (bluetooth-tools-20070606.tar.gz) = P06x0+LAm5XBM7wKcKM66MhIB+iIZoHLhNmm5rUiM+I=
|
||||
SIZE (bluetooth-tools-20070606.tar.gz) = 53389
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-hccontrol_Makefile,v 1.1.1.1 2005/07/16 20:49:46 grange Exp $
|
||||
--- hccontrol/Makefile.orig Sat Jul 16 01:22:54 2005
|
||||
+++ hccontrol/Makefile Sat Jul 16 01:23:01 2005
|
||||
@@ -9,6 +9,6 @@ SRCS= send_recv.c link_policy.c link_co
|
||||
WARNS?= 2
|
||||
|
||||
DPADD= ${LIBBLUETOOTH}
|
||||
-LDADD= -lbluetooth
|
||||
+LDADD+= -lbluetooth
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
@ -1,67 +0,0 @@
|
||||
$OpenBSD: patch-hccontrol_hccontrol_8,v 1.1 2005/07/17 18:20:29 grange Exp $
|
||||
--- hccontrol/hccontrol.8.orig Sun Jul 17 22:08:51 2005
|
||||
+++ hccontrol/hccontrol.8 Sun Jul 17 22:12:56 2005
|
||||
@@ -30,20 +30,17 @@
|
||||
.Os
|
||||
.Sh NAME
|
||||
.Nm hccontrol
|
||||
-.Nd HCI configuration utility
|
||||
+.Nd Bluetooth HCI control utility
|
||||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
.Op Fl hN
|
||||
-.Fl n Ar HCI_node_name
|
||||
+.Fl n Ar interface
|
||||
.Ar command
|
||||
.Op Ar parameters ...
|
||||
.Sh DESCRIPTION
|
||||
The
|
||||
.Nm
|
||||
-utility connects to the specified Netgraph node of type
|
||||
-.Dv HCI
|
||||
-and attempts to send specified command to the HCI Netgraph node or to the
|
||||
-associated Bluetooth device.
|
||||
+utility sends specified command to the Bluetooth network interface.
|
||||
The
|
||||
.Nm
|
||||
utility will print results to the standard output and error messages to
|
||||
@@ -58,8 +55,8 @@ Show Bluetooth addresses as numbers.
|
||||
Normally
|
||||
.Nm
|
||||
attempts to resolve Bluetooth addresses, and display them symbolically.
|
||||
-.It Fl n Ar HCI_node_name
|
||||
-Connect to the specified HCI Netgraph node.
|
||||
+.It Fl n Ar interface
|
||||
+Use specified network interface, e.g. ubt0.
|
||||
.It Ar command
|
||||
One of the supported commands (see below).
|
||||
Special command
|
||||
@@ -81,7 +78,7 @@ The currently supported HCI commands in
|
||||
.Nm
|
||||
are:
|
||||
.Pp
|
||||
-.Bl -tag -offset indent -compact
|
||||
+.Bl -tag -width indent -compact
|
||||
.It Cm Inquiry
|
||||
.It Cm Create_Connection
|
||||
.It Cm Disconnect
|
||||
@@ -148,7 +145,7 @@ The currently supported node commands in
|
||||
.Nm
|
||||
are:
|
||||
.Pp
|
||||
-.Bl -tag -offset indent -compact
|
||||
+.Bl -tag -width indent -compact
|
||||
.It Cm Read_Node_State
|
||||
.It Cm Initialize
|
||||
.It Cm Read_Debug_Level
|
||||
@@ -172,9 +169,7 @@ are:
|
||||
.Ex -std
|
||||
.Sh SEE ALSO
|
||||
.Xr bluetooth 3 ,
|
||||
-.Xr netgraph 3 ,
|
||||
-.Xr netgraph 4 ,
|
||||
-.Xr ng_hci 4 ,
|
||||
+.Xr ubt 4 ,
|
||||
.Xr hcseriald 8
|
||||
.Sh AUTHORS
|
||||
.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
|
||||
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-hccontrol_hccontrol_c,v 1.2 2005/07/17 18:20:29 grange Exp $
|
||||
--- hccontrol/hccontrol.c.orig Sat Jul 16 00:54:41 2005
|
||||
+++ hccontrol/hccontrol.c Sun Jul 17 22:13:37 2005
|
||||
@@ -135,6 +135,7 @@ socket_open(char const *node)
|
||||
(void * const) &filter, sizeof(filter)) < 0)
|
||||
err(4, "Could not setsockopt()");
|
||||
|
||||
+#ifdef __FreeBSD__
|
||||
size = (sizeof(mib)/sizeof(mib[0]));
|
||||
if (sysctlnametomib("net.bluetooth.hci.command_timeout",mib,&size) < 0)
|
||||
err(5, "Could not sysctlnametomib()");
|
||||
@@ -142,6 +143,7 @@ socket_open(char const *node)
|
||||
if (sysctl(mib, sizeof(mib)/sizeof(mib[0]),
|
||||
(void *) &timeout, &size, NULL, 0) < 0)
|
||||
err(6, "Could not sysctl()");
|
||||
+#endif
|
||||
|
||||
timeout ++;
|
||||
|
||||
@@ -268,7 +270,7 @@ print_hci_command(struct hci_command *ca
|
||||
static void
|
||||
usage(void)
|
||||
{
|
||||
- fprintf(stdout, "Usage: hccontrol -n HCI_node_name [-h] cmd [p1] [..]]\n");
|
||||
+ fprintf(stdout, "Usage: hccontrol -n interface [-h] cmd [p1] [..]]\n");
|
||||
exit(255);
|
||||
} /* usage */
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-hccontrol_hccontrol_h,v 1.1.1.1 2005/07/16 20:49:46 grange Exp $
|
||||
--- hccontrol/hccontrol.h.orig Sat Jul 16 01:18:28 2005
|
||||
+++ hccontrol/hccontrol.h Sat Jul 16 01:18:56 2005
|
||||
@@ -32,6 +32,10 @@
|
||||
#ifndef _HCCONTROL_H_
|
||||
#define _HCCONTROL_H_
|
||||
|
||||
+#ifdef __OpenBSD__
|
||||
+#define le16toh letoh16
|
||||
+#endif
|
||||
+
|
||||
#define OK 0 /* everything was OK */
|
||||
#define ERROR 1 /* could not execute command */
|
||||
#define FAILED 2 /* error was reported */
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-hccontrol_send_recv_c,v 1.1.1.1 2005/07/16 20:49:46 grange Exp $
|
||||
--- hccontrol/send_recv.c.orig Sat Jul 16 01:05:06 2005
|
||||
+++ hccontrol/send_recv.c Sat Jul 16 01:05:33 2005
|
||||
@@ -35,7 +35,11 @@
|
||||
#include <sys/endian.h>
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
+#ifdef __FreeBSD__
|
||||
#include <netgraph/bluetooth/include/ng_hci.h>
|
||||
+#elif __OpenBSD__
|
||||
+#include <netbt/hci.h>
|
||||
+#endif
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include "hccontrol.h"
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-hccontrol_status_c,v 1.1.1.1 2005/07/16 20:49:46 grange Exp $
|
||||
--- hccontrol/status.c.orig Sat Jul 16 01:13:05 2005
|
||||
+++ hccontrol/status.c Sat Jul 16 01:13:37 2005
|
||||
@@ -32,7 +32,11 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/endian.h>
|
||||
#include <errno.h>
|
||||
+#ifdef __FreeBSD__
|
||||
#include <netgraph/bluetooth/include/ng_hci.h>
|
||||
+#elif __OpenBSD__
|
||||
+#include <netbt/hci.h>
|
||||
+#endif
|
||||
#include <stdio.h>
|
||||
#include "hccontrol.h"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
bluetooth-tools package consists of a few Bluetooth network
|
||||
tools derived from FreeBSD.
|
||||
bluetooth-tools package consists of a few Bluetooth network tools
|
||||
derived from FreeBSD.
|
||||
|
||||
hccontrol program allows to send HCI layer commands directly
|
||||
to the Bluetooth adapter.
|
||||
hccontrol program allows to send HCI layer commands directly to the
|
||||
Bluetooth adapter.
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2005/09/06 18:59:19 grange Exp $
|
||||
bin/hccontrol
|
||||
@man man/cat8/hccontrol.0
|
||||
share/examples/bluetooth/
|
||||
@sample ${SYSCONFDIR}/bluetooth/
|
||||
share/examples/bluetooth/hosts
|
||||
@sample ${SYSCONFDIR}/bluetooth/hosts
|
||||
share/examples/bluetooth/protocols
|
||||
@sample ${SYSCONFDIR}/bluetooth/protocols
|
||||
@comment $OpenBSD: PLIST,v 1.3 2007/06/06 21:12:23 uwe Exp $
|
||||
bin/btpin
|
||||
bin/rfcomm_sppd
|
||||
bin/sdpquery
|
||||
@man man/cat1/btpin.0
|
||||
@man man/cat1/rfcomm_sppd.0
|
||||
@man man/cat1/sdpquery.0
|
||||
@man man/cat8/btconfig.0
|
||||
@man man/cat8/bthcid.0
|
||||
@man man/cat8/sdpd.0
|
||||
sbin/btconfig
|
||||
sbin/bthcid
|
||||
sbin/sdpd
|
||||
|
||||
Loading…
Reference in New Issue
Block a user