mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-14 01:27:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: use current dir on windows, enable le secure connections

Browse Source
This commit is contained in:
Matthias Ringwald 2018-08-24 10:56:45 +02:00
parent ddd7eb8cef
commit fb4ddcf3a9
3 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platform/daemon/src/daemon.c
View File

@ -117,10 +117,6 @@ const btstack_device_name_db_t * btstack_device_name_db_fs_instance(void);
const btstack_link_key_db_t * btstack_link_key_db_corefoundation_instance(void);
const btstack_link_key_db_t * btstack_link_key_db_fs_instance(void);
#ifndef BTSTACK_LOG_FILE
#define BTSTACK_LOG_FILE "/tmp/hci_dump.pklg"
#endif
// use logger: format HCI_DUMP_PACKETLOGGER, HCI_DUMP_BLUEZ or HCI_DUMP_STDOUT
#ifndef BTSTACK_LOG_TYPE
#define BTSTACK_LOG_TYPE HCI_DUMP_PACKETLOGGER
@ -1269,9 +1265,11 @@ static int btstack_command_handler(connection_t *connection, uint8_t *packet, ui
#endif
#ifdef ENABLE_BLE
case SM_SET_AUTHENTICATION_REQUIREMENTS:
log_info("set auth %x", packet[3]);
sm_set_authentication_requirements(packet[3]);
break;
case SM_SET_IO_CAPABILITIES:
log_info("set io %x", packet[3]);
sm_set_io_capabilities(packet[3]);
break;
case SM_BONDING_DECLINE:
@ -1902,7 +1900,11 @@ int btstack_server_run(int tcp_flag){
// handle default init
if (!btstack_server_storage_path){
#ifdef _WIN32
btstack_server_storage_path = strdup("");
#else
btstack_server_storage_path = strdup("/tmp");
#endif
}
// make stdout unbuffered

65
port/daemon/configure.ac
View File

@ -129,45 +129,46 @@ echo
# create btstack_config.h
rm -f btstack_config.h
echo "//" >> btstack_config.h
echo "// btstack_config.h" >> btstack_config.h
echo "// created by configure for BTstack " >> btstack_config.h
echo "//" `date` >> btstack_config.h
echo "//" >> btstack_config.h
echo >> btstack_config.h
echo "#ifndef __BTSTACK_CONFIG" >> btstack_config.h
echo "#define __BTSTACK_CONFIG" >> btstack_config.h
echo >> btstack_config.h
echo "//" >> btstack_config.h
echo "// btstack_config.h" >> btstack_config.h
echo "// created by configure for BTstack " >> btstack_config.h
echo "//" `date` >> btstack_config.h
echo "//" >> btstack_config.h
echo >> btstack_config.h
echo "#ifndef __BTSTACK_CONFIG" >> btstack_config.h
echo "#define __BTSTACK_CONFIG" >> btstack_config.h
echo >> btstack_config.h
echo "// Port related features" >> btstack_config.h
echo "#define HAVE_POSIX_FILE_IO" >> btstack_config.h
echo "#define HAVE_POSIX_TIME" >> btstack_config.h
echo "#define HAVE_MALLOC" >> btstack_config.h
echo "// Port related features" >> btstack_config.h
echo "#define HAVE_POSIX_FILE_IO" >> btstack_config.h
echo "#define HAVE_POSIX_TIME" >> btstack_config.h
echo "#define HAVE_MALLOC" >> btstack_config.h
if test "x$UNIX_SOCKETS" == xyes; then
echo "#define HAVE_UNIX_SOCKETS" >> btstack_config.h
echo "#define HAVE_UNIX_SOCKETS" >> btstack_config.h
fi
echo >> btstack_config.h
echo >> btstack_config.h
# todo: HAVE -> ENABLE in features below
echo "// BTstack features that can be enabled" >> btstack_config.h
echo "#define ENABLE_BLE" >> btstack_config.h
# echo "#define ENABLE_LE_PERIPHERAL" >> btstack_config.h
echo "#define ENABLE_LE_CENTRAL" >> btstack_config.h
echo "#define ENABLE_LE_SECURE_CONNECTIONS" >> btstack_config.h
echo "#define ENABLE_GATT_CLIENT_PAIRING" >> btstack_config.h
echo "#define ENABLE_CLASSIC" >> btstack_config.h
echo "#define ENABLE_LOG_ERROR" >> btstack_config.h
echo "#define ENABLE_LOG_INFO " >> btstack_config.h
echo "#define ENABLE_RFCOMM" >> btstack_config.h
echo "#define ENABLE_SDP" >> btstack_config.h
echo "#define ENABLE_SDP_DES_DUMP" >> btstack_config.h
echo >> btstack_config.h
# echo "#define ENABLE_LE_PERIPHERAL" >> btstack_config.h
echo "// BTstack features that can be enabled" >> btstack_config.h
echo "#define ENABLE_BLE" >> btstack_config.h
echo "#define ENABLE_LE_CENTRAL" >> btstack_config.h
echo "#define ENABLE_LE_SECURE_CONNECTIONS" >> btstack_config.h
echo "#define ENABLE_GATT_CLIENT_PAIRING" >> btstack_config.h
echo "#define ENABLE_CLASSIC" >> btstack_config.h
echo "#define ENABLE_LOG_ERROR" >> btstack_config.h
echo "#define ENABLE_LOG_INFO " >> btstack_config.h
echo "#define ENABLE_RFCOMM" >> btstack_config.h
echo "#define ENABLE_SDP" >> btstack_config.h
echo "#define ENABLE_SDP_DES_DUMP" >> btstack_config.h
echo "#define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS" >> btstack_config.h
echo >> btstack_config.h
echo "// BTstack configuration. buffers, sizes, .." >> btstack_config.h
echo "#define HCI_ACL_PAYLOAD_SIZE 1021" >> btstack_config.h
echo "#define NVM_NUM_DEVICE_DB_ENTRIES 20" >> btstack_config.h
echo >> btstack_config.h
echo "// BTstack configuration. buffers, sizes, .." >> btstack_config.h
echo "#define HCI_ACL_PAYLOAD_SIZE 1021" >> btstack_config.h
echo "#define NVM_NUM_DEVICE_DB_ENTRIES 20" >> btstack_config.h
echo >> btstack_config.h
echo "// Daemon configuration" >> btstack_config.h
if test "x$HCI_TRANSPORT" = xUSB; then

4
port/daemon/src/Makefile.in
View File

@ -5,6 +5,8 @@ prefix = @prefix@
CC = @CC@
LDFLAGS = @LDFLAGS@
CFLAGS = @CFLAGS@ \
-I ${BTSTACK_ROOT}/3rd-party/micro-ecc \
-I $(BTSTACK_ROOT)/platform/daemon/src \
-I $(BTSTACK_ROOT)/platform/daemon/src \
-I $(BTSTACK_ROOT)/platform/posix \
-I $(BTSTACK_ROOT)/platform/windows \
@ -15,6 +17,7 @@ BTSTACK_LIB_EXTENSION = @BTSTACK_LIB_EXTENSION@
USB_CFLAGS = @USB_CFLAGS@
USB_LDFLAGS = @USB_LDFLAGS@
VPATH += ${BTSTACK_ROOT}/3rd-party/micro-ecc
VPATH += ${BTSTACK_ROOT}/platform/daemon/src
VPATH += ${BTSTACK_ROOT}/platform/corefoundation
VPATH += ${BTSTACK_ROOT}/platform/libusb
@ -71,6 +74,7 @@ BTdaemon_SOURCES = \
sdp_client_rfcomm.o \
sdp_server.o \
sm.o \
uECC.o \
# use $(CC) for Objective-C files
.m.o: