sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

socketcan/recv : fixed recv filter not work in special case

Browse Source 
can recv filter doesn't work when there is any CAN data already
buffered in a read-ahead buffer

Signed-off-by: xucheng5 <xucheng5@xiaomi.com>
This commit is contained in:
xucheng5 2023-09-01 15:02:49 +08:00 committed by Xiang Xiao
parent 08b151a681
commit 30bb3086be
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
net/can/can_recvmsg.c
View File

@ -72,6 +72,10 @@ struct can_recvfrom_s
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NET_CANPROTO_OPTIONS
static int can_recv_filter(struct can_conn_s *conn, canid_t id);
#endif
/**************************************************************************** /****************************************************************************
* Name: can_add_recvlen * Name: can_add_recvlen
* *
@ -234,6 +238,31 @@ static inline int can_readahead(struct can_recvfrom_s *pstate)
{ {
DEBUGASSERT(iob->io_pktlen > 0); DEBUGASSERT(iob->io_pktlen > 0);
#ifdef CONFIG_NET_CANPROTO_OPTIONS
/* Check receive filters */
canid_t can_id;
iob_copyout((uint8_t *)&can_id, iob, sizeof(canid_t), 0);
if (can_recv_filter(conn, can_id) == 0)
{
FAR struct iob_s *tmp;
/* Remove the I/O buffer chain from the head of the read-ahead
* buffer queue.
*/
tmp = iob_remove_queue(&conn->readahead);
DEBUGASSERT(tmp == iob);
UNUSED(tmp);
/* And free the I/O buffer chain */
iob_free_chain(iob);
return 0;
}
#endif
#ifdef CONFIG_NET_TIMESTAMP #ifdef CONFIG_NET_TIMESTAMP
if (conn->timestamp && pstate->pr_msglen == sizeof(struct timeval)) if (conn->timestamp && pstate->pr_msglen == sizeof(struct timeval))
{ {