Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-03 23:04:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add ability via compile-time flag to connect via rfcom rather than

Browse source 
l2cap.  Works with two caveats: assumes l2cap-style complete packets
(no framing), and has problems with linux sdp system's tendency to
retain records long after sessions are closed.
This commit is contained in:
ehouse 2007-11-13 15:20:33 +00:00
parent 938a90634f
commit 5d3e641082
2 changed files with 114 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
linux/Makefile
View file

@ -64,7 +64,8 @@ DEFINES += -DFEATURE_TRAY_EDIT
#DEFINES += -DDRAW_WITH_PRIMITIVES #DEFINES += -DDRAW_WITH_PRIMITIVES
# Bluetooth support # Bluetooth support
BLUETOOTH = -DXWFEATURE_BLUETOOTH #BLUETOOTH = -DXWFEATURE_BLUETOOTH -DBT_USE_L2CAP
BLUETOOTH = -DXWFEATURE_BLUETOOTH -DBT_USE_RFCOMM
# DEFINES += -DXWFEATURE_IR # DEFINES += -DXWFEATURE_IR
DEFINES += ${BLUETOOTH} DEFINES += ${BLUETOOTH}
DEFINES += -DXWFEATURE_RELAY DEFINES += -DXWFEATURE_RELAY

145
linux/linuxbt.c
View file

@ -21,8 +21,8 @@
#ifdef XWFEATURE_BLUETOOTH #ifdef XWFEATURE_BLUETOOTH
/* /*
http://www.btessentials.com/examples/ is good for some of this stuff. http://www.btessentials.com/examples/examples.html is good for some of this
Copyright allows free use. stuff. Copyright allows free use.
*/ */
#include <stdio.h> #include <stdio.h>
@ -30,7 +30,11 @@
#include <errno.h> #include <errno.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <bluetooth/bluetooth.h> #include <bluetooth/bluetooth.h>
#include <bluetooth/l2cap.h> #if defined BT_USE_L2CAP
# include <bluetooth/l2cap.h>
#elif defined BT_USE_RFCOMM
# include <bluetooth/rfcomm.h>
#endif
#include <bluetooth/sdp.h> #include <bluetooth/sdp.h>
#include <bluetooth/sdp_lib.h> #include <bluetooth/sdp_lib.h>
@ -39,6 +43,13 @@
#define MAX_CLIENTS 3 #define MAX_CLIENTS 3
#if defined BT_USE_L2CAP
# define L2_RF_ADDR struct sockaddr_l2
#elif defined BT_USE_RFCOMM
# define L2_RF_ADDR struct sockaddr_rc
#endif
typedef struct BtaddrSockMap { typedef struct BtaddrSockMap {
bdaddr_t btaddr; bdaddr_t btaddr;
int sock; int sock;
@ -117,11 +128,11 @@ lbt_make( MPFORMAL XP_Bool amMaster )
return btStuff; return btStuff;
} /* lbt_make */ } /* lbt_make */
static struct sockaddr_l2* static L2_RF_ADDR*
getL2Addr( const CommsAddrRec const* addrP, struct sockaddr_l2* const saddr ) getL2Addr( const CommsAddrRec const* addrP, L2_RF_ADDR* const saddr )
{ {
LOG_FUNC(); LOG_FUNC();
struct sockaddr_l2* result = NULL; L2_RF_ADDR* result = NULL;
uint8_t svc_uuid_int[] = XW_BT_UUID; uint8_t svc_uuid_int[] = XW_BT_UUID;
@ -152,21 +163,35 @@ getL2Addr( const CommsAddrRec const* addrP, struct sockaddr_l2* const saddr )
sdp_list_t *r; sdp_list_t *r;
// go through each of the service records // go through each of the service records
for ( r = response_list; r; r = r->next ) { for ( r = response_list; r && !result; r = r->next ) {
sdp_list_t *proto_list = NULL; sdp_list_t *proto_list = NULL;
sdp_record_t *rec = (sdp_record_t*) r->data; sdp_record_t *rec = (sdp_record_t*) r->data;
// get a list of the protocol sequences // get a list of the protocol sequences
if( sdp_get_access_protos( rec, &proto_list ) == 0 ) { if( sdp_get_access_protos( rec, &proto_list ) == 0 ) {
#if defined BT_USE_L2CAP
unsigned short psm = sdp_get_proto_port( proto_list, unsigned short psm = sdp_get_proto_port( proto_list,
L2CAP_UUID ); L2CAP_UUID );
sdp_list_free( proto_list, 0 ); if ( psm > 0 ) {
sdp_list_free( proto_list, 0 );
saddr->l2_family = AF_BLUETOOTH; saddr->l2_family = AF_BLUETOOTH;
saddr->l2_psm = htobs( psm ); saddr->l2_psm = htobs( psm );
XP_MEMCPY( &saddr->l2_bdaddr, &addrP->u.bt.btAddr, XP_MEMCPY( &saddr->l2_bdaddr, &addrP->u.bt.btAddr,
sizeof(saddr->l2_bdaddr) ); sizeof(saddr->l2_bdaddr) );
result = saddr; result = saddr;
}
#elif defined BT_USE_RFCOMM
int channel = sdp_get_proto_port( proto_list,
RFCOMM_UUID );
if ( channel > 0 ) {
XP_LOGF( "got channel: %d", channel );
saddr->rc_channel = (uint8_t)channel;
saddr->rc_family = AF_BLUETOOTH;
XP_MEMCPY( &saddr->rc_bdaddr, &addrP->u.bt.btAddr,
sizeof(saddr->rc_bdaddr) );
result = saddr;
}
#endif
} }
sdp_record_free( rec ); sdp_record_free( rec );
} }
@ -186,16 +211,21 @@ lbt_connectSocket( LinBtStuff* btStuff, const CommsAddrRec* addrP )
int sock; int sock;
// allocate a socket // allocate a socket
sock = socket( AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP ); sock = socket( AF_BLUETOOTH,
#if defined BT_USE_L2CAP
SOCK_SEQPACKET, BTPROTO_L2CAP
#elif defined BT_USE_RFCOMM
SOCK_STREAM, BTPROTO_RFCOMM
#endif
);
if ( sock < 0 ) { if ( sock < 0 ) {
XP_LOGF( "%s: socket->%s", __FUNCTION__, strerror(errno) ); XP_LOGF( "%s: socket->%s", __FUNCTION__, strerror(errno) );
} else { } else {
struct sockaddr_l2 saddr; L2_RF_ADDR saddr;
XP_MEMSET( &saddr, 0, sizeof(saddr) ); XP_MEMSET( &saddr, 0, sizeof(saddr) );
if ( (NULL != getL2Addr( addrP, &saddr ) ) if ( (NULL != getL2Addr( addrP, &saddr ) )
// set the connection parameters (who to connect to) // set the connection parameters (who to connect to)
// connect to server // connect to server
&& (0 == connect( sock, (struct sockaddr *)&saddr, sizeof(saddr) )) ) { && (0 == connect( sock, (struct sockaddr *)&saddr, sizeof(saddr) )) ) {
CommonGlobals* globals = btStuff->globals; CommonGlobals* globals = btStuff->globals;
(*globals->socketChanged)( globals->socketChangedClosure, (*globals->socketChanged)( globals->socketChangedClosure,
@ -213,7 +243,7 @@ lbt_accept( int listener, void* ctxt )
CommonGlobals* globals = (CommonGlobals*)ctxt; CommonGlobals* globals = (CommonGlobals*)ctxt;
LinBtStuff* btStuff = globals->btStuff; LinBtStuff* btStuff = globals->btStuff;
int sock = -1; int sock = -1;
struct sockaddr_l2 inaddr; L2_RF_ADDR inaddr;
socklen_t slen; socklen_t slen;
XP_Bool success; XP_Bool success;
@ -227,7 +257,11 @@ lbt_accept( int listener, void* ctxt )
success = sock >= 0; success = sock >= 0;
if ( success ) { if ( success ) {
#if defined BT_USE_L2CAP
lbt_addSock( btStuff, &inaddr.l2_bdaddr, sock ); lbt_addSock( btStuff, &inaddr.l2_bdaddr, sock );
#elif defined BT_USE_RFCOMM
lbt_addSock( btStuff, &inaddr.rc_bdaddr, sock );
#endif
(*globals->socketChanged)( globals->socketChangedClosure, (*globals->socketChanged)( globals->socketChangedClosure,
-1, sock ); -1, sock );
} else { } else {
@ -237,39 +271,58 @@ lbt_accept( int listener, void* ctxt )
} /* lbt_accept */ } /* lbt_accept */
static void static void
lbt_register( LinBtStuff* btStuff, const struct sockaddr_l2* const saddr ) lbt_register( LinBtStuff* btStuff, unsigned short l2_psm, uint8_t rc_channel )
{ {
LOG_FUNC(); LOG_FUNC();
if ( NULL == btStuff->u.master.session ) { if ( NULL == btStuff->u.master.session ) {
uint8_t svc_uuid_int[] = XW_BT_UUID; uint8_t svc_uuid_int[] = XW_BT_UUID;
const char *service_name = XW_BT_NAME; const char *service_name = XW_BT_NAME;
const char *svc_dsc = "An experimental plumbing router"; const char *svc_dsc = "An open source word game";
const char *service_prov = "Roto-Rooter"; const char *service_prov = "xwords.sf.net";
uuid_t l2cap_uuid, svc_uuid; uuid_t svc_uuid;
sdp_list_t *l2cap_list = 0, sdp_list_t
*root_list = 0, *root_list = 0,
*proto_list = 0, *proto_list = 0,
*access_proto_list = 0, *access_proto_list = 0,
*svc_class_list = 0, *svc_class_list = 0,
*profile_list = 0; *profile_list = 0;
sdp_data_t *psm = 0;
sdp_record_t record = { 0 }; sdp_record_t record = { 0 };
sdp_session_t *session = NULL; sdp_session_t *session = NULL;
sdp_list_t *l2cap_list = 0;
sdp_data_t *psm = 0;
#if defined BT_USE_L2CAP
#elif defined BT_USE_RFCOMM
sdp_list_t *rfcomm_list = 0;
sdp_data_t *channel = 0;
#endif
// set the general service ID // set the general service ID
sdp_uuid128_create( &svc_uuid, &svc_uuid_int ); sdp_uuid128_create( &svc_uuid, &svc_uuid_int );
sdp_set_service_id( &record, svc_uuid ); sdp_set_service_id( &record, svc_uuid );
// set l2cap information // set l2cap information
uuid_t l2cap_uuid;
sdp_uuid16_create( &l2cap_uuid, L2CAP_UUID ); sdp_uuid16_create( &l2cap_uuid, L2CAP_UUID );
l2cap_list = sdp_list_append( 0, &l2cap_uuid ); l2cap_list = sdp_list_append( 0, &l2cap_uuid );
/* from pybluez source */ /* from pybluez source */
unsigned short l2cap_psm = saddr->l2_psm; unsigned short l2cap_psm = l2_psm;
psm = sdp_data_alloc( SDP_UINT16, &l2cap_psm ); psm = sdp_data_alloc( SDP_UINT16, &l2cap_psm );
sdp_list_append( l2cap_list, psm ); sdp_list_append( l2cap_list, psm );
proto_list = sdp_list_append( 0, l2cap_list ); proto_list = sdp_list_append( 0, l2cap_list );
#if defined BT_USE_RFCOMM
uuid_t rfcomm_uuid;
uint8_t rfcomm_channel = rc_channel;
sdp_uuid16_create( &rfcomm_uuid, RFCOMM_UUID );
channel = sdp_data_alloc( SDP_UINT8, &rfcomm_channel );
rfcomm_list = sdp_list_append( 0, &rfcomm_uuid );
sdp_list_append( rfcomm_list, channel );
sdp_list_append( proto_list, rfcomm_list );
#endif
access_proto_list = sdp_list_append( 0, proto_list ); access_proto_list = sdp_list_append( 0, proto_list );
sdp_set_access_protos( &record, access_proto_list ); sdp_set_access_protos( &record, access_proto_list );
@ -287,11 +340,16 @@ lbt_register( LinBtStuff* btStuff, const struct sockaddr_l2* const saddr )
// cleanup // cleanup
sdp_data_free( psm ); sdp_data_free( psm );
sdp_list_free( l2cap_list, 0 );
sdp_list_free( root_list, 0 ); sdp_list_free( root_list, 0 );
sdp_list_free( access_proto_list, 0 ); sdp_list_free( access_proto_list, 0 );
sdp_list_free( svc_class_list, 0 ); sdp_list_free( svc_class_list, 0 );
sdp_list_free( profile_list, 0 ); sdp_list_free( profile_list, 0 );
#if defined BT_USE_L2CAP
sdp_list_free( l2cap_list, 0 );
#elif defined BT_USE_RFCOMM
sdp_list_free( rfcomm_list, 0 );
sdp_data_free( channel );
#endif
btStuff->u.master.session = session; btStuff->u.master.session = session;
} }
@ -301,21 +359,42 @@ static void
lbt_listenerSetup( CommonGlobals* globals ) lbt_listenerSetup( CommonGlobals* globals )
{ {
LinBtStuff* btStuff = globals->btStuff; LinBtStuff* btStuff = globals->btStuff;
struct sockaddr_l2 saddr; L2_RF_ADDR saddr;
int listener; int listener;
uint8_t rc_channel = 0;
listener = socket( AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP ); listener = socket( AF_BLUETOOTH,
#if defined BT_USE_L2CAP
SOCK_SEQPACKET, BTPROTO_L2CAP
#elif defined BT_USE_RFCOMM
SOCK_STREAM, BTPROTO_RFCOMM
#endif
);
btStuff->u.master.listener = listener; btStuff->u.master.listener = listener;
XP_MEMSET( &saddr, 0, sizeof(saddr) ); XP_MEMSET( &saddr, 0, sizeof(saddr) );
#if defined BT_USE_L2CAP
saddr.l2_family = AF_BLUETOOTH; saddr.l2_family = AF_BLUETOOTH;
saddr.l2_bdaddr = *BDADDR_ANY; saddr.l2_bdaddr = *BDADDR_ANY;
saddr.l2_psm = htobs( XW_PSM ); /* need to associate uuid with this before opening? */ saddr.l2_psm = htobs( XW_PSM ); /* need to associate uuid with this before opening? */
bind( listener, (struct sockaddr *)&saddr, sizeof(saddr) ); if ( 0 != bind( listener, (struct sockaddr *)&saddr, sizeof(saddr) ) ) {
XP_LOGF( "%s: bind->%s", __FUNCTION__, strerror(errno) );
}
#elif defined BT_USE_RFCOMM
saddr.rc_family = AF_BLUETOOTH;
saddr.rc_bdaddr = *BDADDR_ANY;
for ( rc_channel = 1; rc_channel < 30; ++rc_channel ) {
saddr.rc_channel = rc_channel;
XP_LOGF( "setting channel: %d", saddr.rc_channel );
if ( 0 == bind( listener, (struct sockaddr *)&saddr, sizeof(saddr) ) ) {
break;
}
}
#endif
listen( listener, MAX_CLIENTS ); listen( listener, MAX_CLIENTS );
lbt_register( btStuff, &saddr ); lbt_register( btStuff, htobs( XW_PSM ), rc_channel );
(*globals->addAcceptor)( listener, lbt_accept, globals ); (*globals->addAcceptor)( listener, lbt_accept, globals );
} /* lbt_listenerSetup */ } /* lbt_listenerSetup */