mikisama/FreeRTOS-Kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update FreeRTOS_FD_SET() to check there is enough space in the queue before adding the socket to the socket set.

Browse Source
This commit is contained in:
Richard Barry
2013-10-07 20:13:02 +00:00
parent 10fa546e60
commit 0c849fa597
5 changed files with 59 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_Sockets.c
View File

@ -186,21 +186,39 @@ xFreeRTOS_Socket_t *pxSocket;
portBASE_TYPE FreeRTOS_FD_SET( xSocket_t xSocket, xSocketSet_t xSocketSet )
{
xFreeRTOS_Socket_t *pxSocket = ( xFreeRTOS_Socket_t * ) xSocket;
portBASE_TYPE xReturn;
portBASE_TYPE xReturn = pdFALSE;
unsigned portBASE_TYPE uxMessagesWaiting;
configASSERT( xSocket );
/* Is the socket already a member of a select group? */
if( pxSocket->xSelectQueue == NULL )
{
/* Store a pointer to the select group in the socket for future
reference. */
pxSocket->xSelectQueue = ( xQueueHandle ) xSocketSet;
xReturn = pdPASS;
}
else
{
/* The socket is already a member of a select group so cannot be added
to another. */
xReturn = pdFAIL;
taskENTER_CRITICAL();
{
/* Are there packets queued on the socket already? */
uxMessagesWaiting = uxQueueMessagesWaiting( pxSocket->xWaitingPacketSemaphore );
/* Are there enough notification spaces in the select queue for the
number of packets already queued on the socket? */
if( uxQueueSpacesAvailable( ( xQueueHandle ) xSocketSet ) >= uxMessagesWaiting )
{
/* Store a pointer to the select group in the socket for
future reference. */
pxSocket->xSelectQueue = ( xQueueHandle ) xSocketSet;
while( uxMessagesWaiting > 0 )
{
/* Add notifications of the number of packets that are
already queued on the socket to the select queue. */
xQueueSendFromISR( pxSocket->xSelectQueue, &pxSocket, NULL );
uxMessagesWaiting--;
}
xReturn = pdPASS;
}
}
taskEXIT_CRITICAL();
}
return xReturn;

4
FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOSIPConfigDefaults.h
View File

@ -147,4 +147,8 @@ from the FreeRTOSIPConfig.h configuration header file. */
#define ipconfigNABTO_TASK_PRIORITY ( ipconfigUDP_TASK_PRIORITY + 1 )
#endif
#ifndef ipconfigSUPPORT_SELECT_FUNCTION
#define ipconfigSUPPORT_SELECT_FUNCTION 0
#endif
#endif /* FREERTOS_DEFAULT_IP_CONFIG_H */