mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-22 06:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed multicast filtering

Browse Source 
Replace filters instead of adding new to the list
This commit is contained in:
ole.reinhardt@googlemail.com 2015-01-04 00:19:28 +00:00
parent 1ffd7400f6
commit 70539b1863
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bnep.c
View File

@ -401,8 +401,10 @@ static int bnep_filter_protocol(bnep_channel_t *channel, uint16_t network_protoc
int i; int i;
if (channel->net_filter_count == 0) { if (channel->net_filter_count == 0) {
/* No filter set */
return 1; return 1;
} }
for (i = 0; i < channel->net_filter_count; i ++) { for (i = 0; i < channel->net_filter_count; i ++) {
if ((network_protocol_type >= channel->net_filter[i].range_start) && if ((network_protocol_type >= channel->net_filter[i].range_start) &&
(network_protocol_type <= channel->net_filter[i].range_end)) { (network_protocol_type <= channel->net_filter[i].range_end)) {
@ -418,11 +420,16 @@ static int bnep_filter_multicast(bnep_channel_t *channel, bd_addr_t addr_dest)
int i; int i;
/* Check if the multicast flag is set int the destination address */ /* Check if the multicast flag is set int the destination address */
if (!addr_dest[0] & 0x01) { if ((addr_dest[0] & 0x01) == 0x00) {
/* Not a multicast frame, do not apply filtering and send it in any case */ /* Not a multicast frame, do not apply filtering and send it in any case */
return 1; return 1;
} }
if (channel->multicast_filter_count == 0) {
/* No filter set */
return 1;
}
for (i = 0; i < channel->multicast_filter_count; i ++) { for (i = 0; i < channel->multicast_filter_count; i ++) {
if ((memcmp(addr_dest, channel->multicast_filter[i].addr_start, sizeof(bd_addr_t)) >= 0) && if ((memcmp(addr_dest, channel->multicast_filter[i].addr_start, sizeof(bd_addr_t)) >= 0) &&
(memcmp(addr_dest, channel->multicast_filter[i].addr_end, sizeof(bd_addr_t)) <= 0)) { (memcmp(addr_dest, channel->multicast_filter[i].addr_end, sizeof(bd_addr_t)) <= 0)) {
@ -488,7 +495,7 @@ int bnep_send(uint16_t bnep_cid, uint8_t *packet, uint16_t len)
/* Check network protocol and multicast filters before sending */ /* Check network protocol and multicast filters before sending */
if (!bnep_filter_protocol(channel, network_protocol_type) || if (!bnep_filter_protocol(channel, network_protocol_type) ||
!bnep_filter_multicast(channel, addr_dest)) { !bnep_filter_multicast(channel, addr_dest)) {
/* Packet did not pass filter... omit it */ /* Packet did not pass filter... */
if ((network_protocol_type == ETHERTYPE_VLAN) && if ((network_protocol_type == ETHERTYPE_VLAN) &&
(payload_len >= 4)) { (payload_len >= 4)) {
/* The packet has been tagged as a with IEE 802.1Q tag and has been filtered out. /* The packet has been tagged as a with IEE 802.1Q tag and has been filtered out.
@ -901,11 +908,12 @@ static int bnep_handle_filter_net_type_set(bnep_channel_t *channel, uint8_t *pac
} }
/* Check if we have enough space for more filters */ /* Check if we have enough space for more filters */
if ((list_length / (2*2)) + channel->net_filter_count > MAX_BNEP_NETFILTER) { if ((list_length / (2*2)) > MAX_BNEP_NETFILTER) {
log_info("BNEP_FILTER_NET_TYPE_SET: Too many filter"); log_info("BNEP_FILTER_NET_TYPE_SET: Too many filter");
response_code = BNEP_RESP_FILTER_ERR_TOO_MANY_FILTERS; response_code = BNEP_RESP_FILTER_ERR_TOO_MANY_FILTERS;
} else { } else {
int i; int i;
channel->net_filter_count = 0;
/* There is still enough space, copy the filters to our filter list */ /* There is still enough space, copy the filters to our filter list */
for (i = 0; i < list_length / (2 * 2); i ++) { for (i = 0; i < list_length / (2 * 2); i ++) {
channel->net_filter[channel->net_filter_count].range_start = READ_NET_16(packet, 1 + 2 + i * 4); channel->net_filter[channel->net_filter_count].range_start = READ_NET_16(packet, 1 + 2 + i * 4);
@ -984,12 +992,13 @@ static int bnep_handle_multi_addr_set(bnep_channel_t *channel, uint8_t *packet,
} }
/* Check if we have enough space for more filters */ /* Check if we have enough space for more filters */
if ((list_length / (2 * ETHER_ADDR_LEN)) + channel->multicast_filter_count > MAX_BNEP_MULTICAST_FILTER) { if ((list_length / (2 * ETHER_ADDR_LEN)) > MAX_BNEP_MULTICAST_FILTER) {
log_info("BNEP_MULTI_ADDR_SET: Too many filter"); log_info("BNEP_MULTI_ADDR_SET: Too many filter");
response_code = BNEP_RESP_FILTER_ERR_TOO_MANY_FILTERS; response_code = BNEP_RESP_FILTER_ERR_TOO_MANY_FILTERS;
} else { } else {
unsigned int i; unsigned int i;
/* There is still enough space, copy the filters to our filter list */ channel->multicast_filter_count = 0;
/* There is enough space, copy the filters to our filter list */
for (i = 0; i < list_length / (2 * ETHER_ADDR_LEN); i ++) { for (i = 0; i < list_length / (2 * ETHER_ADDR_LEN); i ++) {
BD_ADDR_COPY(channel->multicast_filter[channel->multicast_filter_count].addr_start, packet + 1 + 2 + i * ETHER_ADDR_LEN * 2); BD_ADDR_COPY(channel->multicast_filter[channel->multicast_filter_count].addr_start, packet + 1 + 2 + i * ETHER_ADDR_LEN * 2);
BD_ADDR_COPY(channel->multicast_filter[channel->multicast_filter_count].addr_end, packet + 1 + 2 + i * ETHER_ADDR_LEN * 2 + ETHER_ADDR_LEN); BD_ADDR_COPY(channel->multicast_filter[channel->multicast_filter_count].addr_end, packet + 1 + 2 + i * ETHER_ADDR_LEN * 2 + ETHER_ADDR_LEN);