mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-05 00:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow to receive packets with size == 0

Browse Source
This commit is contained in:
matthias.ringwald 2010-11-19 21:20:26 +00:00
parent 53443e19d1
commit fd39030d0f
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/socket_connection.c
View File

@ -106,8 +106,7 @@ static int socket_connection_dummy_handler(connection_t *connection, uint16_t pa
} }
int socket_connection_set_non_blocking(int fd) int socket_connection_set_non_blocking(int fd) {
{
int err; int err;
int flags; int flags;
// According to the man page, F_GETFL can't error! // According to the man page, F_GETFL can't error!
@ -177,8 +176,6 @@ int socket_connection_hci_process(struct data_source *ds) {
int bytes_read = read(ds->fd, &conn->buffer[conn->bytes_read], conn->bytes_to_read); int bytes_read = read(ds->fd, &conn->buffer[conn->bytes_read], conn->bytes_to_read);
if (bytes_read <= 0){ if (bytes_read <= 0){
fprintf(stderr, "socket_connection_hci_process read bytes %d\n", bytes_read);
// connection broken (no particular channel, no date yet) // connection broken (no particular channel, no date yet)
uint8_t event[1]; uint8_t event[1];
event[0] = DAEMON_EVENT_CONNECTION_CLOSED; event[0] = DAEMON_EVENT_CONNECTION_CLOSED;
@ -192,32 +189,41 @@ int socket_connection_hci_process(struct data_source *ds) {
} }
conn->bytes_read += bytes_read; conn->bytes_read += bytes_read;
conn->bytes_to_read -= bytes_read; conn->bytes_to_read -= bytes_read;
// hexdump( conn->buffer, conn->bytes_read);
if (conn->bytes_to_read > 0) { if (conn->bytes_to_read > 0) {
return 0; return 0;
} }
int dispatch_err; int dispatch = 0;
switch (conn->state){ switch (conn->state){
case SOCKET_W4_HEADER: case SOCKET_W4_HEADER:
conn->state = SOCKET_W4_DATA; conn->state = SOCKET_W4_DATA;
conn->bytes_to_read = READ_BT_16( conn->buffer, 4); conn->bytes_to_read = READ_BT_16( conn->buffer, 4);
break; if (conn->bytes_to_read == 0){
case SOCKET_W4_DATA: dispatch = 1;
// dispatch packet !!! connection, type, channel, data, size
dispatch_err = (*socket_connection_packet_callback)(conn, READ_BT_16( conn->buffer, 0), READ_BT_16( conn->buffer, 2),
&conn->buffer[sizeof(packet_header_t)], READ_BT_16( conn->buffer, 4));
// reset state machine
socket_connection_init_statemachine(conn);
// "park" if dispatch failed
if (dispatch_err) {
log_dbg("socket_connection_hci_process dispatch failed -> park connection\n");
run_loop_remove_data_source(ds);
linked_list_add_tail(&parked, (linked_item_t *) ds);
} }
break; break;
case SOCKET_W4_DATA:
dispatch = 1;
break;
default:
break;
}
if (dispatch){
// dispatch packet !!! connection, type, channel, data, size
int dispatch_err = (*socket_connection_packet_callback)(conn, READ_BT_16( conn->buffer, 0), READ_BT_16( conn->buffer, 2),
&conn->buffer[sizeof(packet_header_t)], READ_BT_16( conn->buffer, 4));
// reset state machine
socket_connection_init_statemachine(conn);
// "park" if dispatch failed
if (dispatch_err) {
log_dbg("socket_connection_hci_process dispatch failed -> park connection\n");
run_loop_remove_data_source(ds);
linked_list_add_tail(&parked, (linked_item_t *) ds);
}
} }
return 0; return 0;
} }
@ -261,7 +267,7 @@ static int socket_connection_accept(struct data_source *socket_ds) {
} }
// non-blocking ? // non-blocking ?
// socket_connection_set_non_blocking(ds->fd); // socket_connection_set_non_blocking(ds->fd);
// no sigpipe // no sigpipe
socket_connection_set_no_sigpipe(fd); socket_connection_set_no_sigpipe(fd);