tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better handle transmit errors 

Return 0 receive bytes when socket is closed


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12099 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lpleahy 2011-08-08 18:19:45 +00:00
parent 42372879b5
commit 1c34b250f6
2 changed files with 250 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

462
StdLib/EfiSocketLib/Socket.c
View File

@ -2525,91 +2525,18 @@ EslSocketReceive (
pSocket = SOCKET_FROM_PROTOCOL ( pSocketProtocol );
//
// Verify the socket state
// Return the transmit error if necessary
//
if ( !pSocket->bConfigured ) {
//
// Synchronize with the socket layer
//
RAISE_TPL ( TplPrevious, TPL_SOCKETS );
//
// Validate the local address
//
switch ( pSocket->Domain ) {
default:
DEBUG (( DEBUG_RX,
"ERROR - Invalid socket address family: %d\r\n",
pSocket->Domain ));
Status = EFI_INVALID_PARAMETER;
pSocket->errno = EADDRNOTAVAIL;
break;
case AF_INET:
//
// Determine the connection point within the network stack
//
switch ( pSocket->Type ) {
default:
DEBUG (( DEBUG_RX,
"ERROR - Invalid socket type: %d\r\n",
pSocket->Type));
Status = EFI_INVALID_PARAMETER;
break;
case SOCK_STREAM:
case SOCK_SEQPACKET:
//
// Verify the port state
//
Status = EslTcpSocketIsConfigured4 ( pSocket );
break;
case SOCK_DGRAM:
//
// Verify the port state
//
Status = EslUdpSocketIsConfigured4 ( pSocket );
break;
}
break;
}
//
// Release the socket layer synchronization
//
RESTORE_TPL ( TplPrevious );
//
// Set errno if a failure occurs
//
if ( EFI_ERROR ( Status )) {
pSocket->errno = EADDRNOTAVAIL;
}
if ( EFI_SUCCESS != pSocket->TxError ) {
pSocket->errno = EIO;
Status = pSocket->TxError;
pSocket->TxError = EFI_SUCCESS;
}
if ( !EFI_ERROR ( Status )) {
else {
//
// Validate the buffer length
// Verify the socket state
//
if (( NULL == pDataLength )
&& ( 0 > pDataLength )
&& ( NULL == pBuffer )) {
if ( NULL == pDataLength ) {
DEBUG (( DEBUG_RX,
"ERROR - pDataLength is NULL!\r\n" ));
}
else if ( NULL == pBuffer ) {
DEBUG (( DEBUG_RX,
"ERROR - pBuffer is NULL!\r\n" ));
}
else {
DEBUG (( DEBUG_RX,
"ERROR - Data length < 0!\r\n" ));
}
Status = EFI_INVALID_PARAMETER;
pSocket->errno = EFAULT;
}
else{
if ( !pSocket->bConfigured ) {
//
// Synchronize with the socket layer
//
@ -2637,28 +2564,21 @@ EslSocketReceive (
"ERROR - Invalid socket type: %d\r\n",
pSocket->Type));
Status = EFI_INVALID_PARAMETER;
pSocket->errno = EADDRNOTAVAIL;
break;
case SOCK_STREAM:
case SOCK_SEQPACKET:
Status = EslTcpReceive4 ( pSocket,
Flags,
BufferLength,
pBuffer,
pDataLength,
pAddress,
pAddressLength );
//
// Verify the port state
//
Status = EslTcpSocketIsConfigured4 ( pSocket );
break;
case SOCK_DGRAM:
Status = EslUdpReceive4 ( pSocket,
Flags,
BufferLength,
pBuffer,
pDataLength,
pAddress,
pAddressLength);
//
// Verify the port state
//
Status = EslUdpSocketIsConfigured4 ( pSocket );
break;
}
break;
@ -2668,6 +2588,96 @@ EslSocketReceive (
// Release the socket layer synchronization
//
RESTORE_TPL ( TplPrevious );
//
// Set errno if a failure occurs
//
if ( EFI_ERROR ( Status )) {
pSocket->errno = EADDRNOTAVAIL;
}
}
if ( !EFI_ERROR ( Status )) {
//
// Validate the buffer length
//
if (( NULL == pDataLength )
&& ( 0 > pDataLength )
&& ( NULL == pBuffer )) {
if ( NULL == pDataLength ) {
DEBUG (( DEBUG_RX,
"ERROR - pDataLength is NULL!\r\n" ));
}
else if ( NULL == pBuffer ) {
DEBUG (( DEBUG_RX,
"ERROR - pBuffer is NULL!\r\n" ));
}
else {
DEBUG (( DEBUG_RX,
"ERROR - Data length < 0!\r\n" ));
}
Status = EFI_INVALID_PARAMETER;
pSocket->errno = EFAULT;
}
else{
//
// Synchronize with the socket layer
//
RAISE_TPL ( TplPrevious, TPL_SOCKETS );
//
// Validate the local address
//
switch ( pSocket->Domain ) {
default:
DEBUG (( DEBUG_RX,
"ERROR - Invalid socket address family: %d\r\n",
pSocket->Domain ));
Status = EFI_INVALID_PARAMETER;
pSocket->errno = EADDRNOTAVAIL;
break;
case AF_INET:
//
// Determine the connection point within the network stack
//
switch ( pSocket->Type ) {
default:
DEBUG (( DEBUG_RX,
"ERROR - Invalid socket type: %d\r\n",
pSocket->Type));
Status = EFI_INVALID_PARAMETER;
pSocket->errno = EADDRNOTAVAIL;
break;
case SOCK_STREAM:
case SOCK_SEQPACKET:
Status = EslTcpReceive4 ( pSocket,
Flags,
BufferLength,
pBuffer,
pDataLength,
pAddress,
pAddressLength );
break;
case SOCK_DGRAM:
Status = EslUdpReceive4 ( pSocket,
Flags,
BufferLength,
pBuffer,
pDataLength,
pAddress,
pAddressLength);
break;
}
break;
}
//
// Release the socket layer synchronization
//
RESTORE_TPL ( TplPrevious );
}
}
}
}
@ -2895,171 +2905,181 @@ EslSocketTransmit (
pSocket = SOCKET_FROM_PROTOCOL ( pSocketProtocol );
//
// Verify the socket state
// Return the transmit error if necessary
//
if ( !pSocket->bConfigured ) {
if ( EFI_SUCCESS != pSocket->TxError ) {
pSocket->errno = EIO;
Status = pSocket->TxError;
pSocket->TxError = EFI_SUCCESS;
}
else {
//
// Synchronize with the socket layer
// Verify the socket state
//
RAISE_TPL ( TplPrevious, TPL_SOCKETS );
//
// Validate the local address
//
switch ( pSocket->Domain ) {
default:
DEBUG (( DEBUG_RX,
"ERROR - Invalid socket address family: %d\r\n",
pSocket->Domain ));
Status = EFI_INVALID_PARAMETER;
pSocket->errno = EADDRNOTAVAIL;
break;
case AF_INET:
if ( !pSocket->bConfigured ) {
//
// Determine the connection point within the network stack
// Synchronize with the socket layer
//
switch ( pSocket->Type ) {
RAISE_TPL ( TplPrevious, TPL_SOCKETS );
//
// Validate the local address
//
switch ( pSocket->Domain ) {
default:
DEBUG (( DEBUG_RX,
"ERROR - Invalid socket type: %d\r\n",
pSocket->Type));
"ERROR - Invalid socket address family: %d\r\n",
pSocket->Domain ));
Status = EFI_INVALID_PARAMETER;
pSocket->errno = EADDRNOTAVAIL;
break;
case SOCK_STREAM:
case SOCK_SEQPACKET:
case AF_INET:
//
// Verify the port state
// Determine the connection point within the network stack
//
Status = EslTcpSocketIsConfigured4 ( pSocket );
break;
case SOCK_DGRAM:
//
// Verify the port state
//
Status = EslUdpSocketIsConfigured4 ( pSocket );
switch ( pSocket->Type ) {
default:
DEBUG (( DEBUG_RX,
"ERROR - Invalid socket type: %d\r\n",
pSocket->Type));
Status = EFI_INVALID_PARAMETER;
break;
case SOCK_STREAM:
case SOCK_SEQPACKET:
//
// Verify the port state
//
Status = EslTcpSocketIsConfigured4 ( pSocket );
break;
case SOCK_DGRAM:
//
// Verify the port state
//
Status = EslUdpSocketIsConfigured4 ( pSocket );
break;
}
break;
}
break;
}
//
// Release the socket layer synchronization
//
RESTORE_TPL ( TplPrevious );
//
// Set errno if a failure occurs
//
if ( EFI_ERROR ( Status )) {
pSocket->errno = EADDRNOTAVAIL;
}
}
if ( !EFI_ERROR ( Status )) {
//
// Verify that transmit is still allowed
//
if ( !pSocket->bTxDisable ) {
//
// Validate the buffer length
// Release the socket layer synchronization
//
if (( NULL == pDataLength )
&& ( 0 > pDataLength )
&& ( NULL == pBuffer )) {
if ( NULL == pDataLength ) {
DEBUG (( DEBUG_RX,
"ERROR - pDataLength is NULL!\r\n" ));
}
else if ( NULL == pBuffer ) {
DEBUG (( DEBUG_RX,
"ERROR - pBuffer is NULL!\r\n" ));
}
else {
DEBUG (( DEBUG_RX,
"ERROR - Data length < 0!\r\n" ));
}
Status = EFI_INVALID_PARAMETER;
pSocket->errno = EFAULT;
RESTORE_TPL ( TplPrevious );
//
// Set errno if a failure occurs
//
if ( EFI_ERROR ( Status )) {
pSocket->errno = EADDRNOTAVAIL;
}
else {
}
if ( !EFI_ERROR ( Status )) {
//
// Verify that transmit is still allowed
//
if ( !pSocket->bTxDisable ) {
//
// Validate the remote network address
// Validate the buffer length
//
if (( NULL != pAddress )
&& ( AddressLength < pAddress->sa_len )) {
DEBUG (( DEBUG_TX,
"ERROR - Invalid sin_len field in address\r\n" ));
if (( NULL == pDataLength )
&& ( 0 > pDataLength )
&& ( NULL == pBuffer )) {
if ( NULL == pDataLength ) {
DEBUG (( DEBUG_RX,
"ERROR - pDataLength is NULL!\r\n" ));
}
else if ( NULL == pBuffer ) {
DEBUG (( DEBUG_RX,
"ERROR - pBuffer is NULL!\r\n" ));
}
else {
DEBUG (( DEBUG_RX,
"ERROR - Data length < 0!\r\n" ));
}
Status = EFI_INVALID_PARAMETER;
pSocket->errno = EFAULT;
}
else {
//
// Synchronize with the socket layer
// Validate the remote network address
//
RAISE_TPL ( TplPrevious, TPL_SOCKETS );
//
// Validate the local address
//
switch ( pSocket->Domain ) {
default:
DEBUG (( DEBUG_RX,
"ERROR - Invalid socket address family: %d\r\n",
pSocket->Domain ));
if (( NULL != pAddress )
&& ( AddressLength < pAddress->sa_len )) {
DEBUG (( DEBUG_TX,
"ERROR - Invalid sin_len field in address\r\n" ));
Status = EFI_INVALID_PARAMETER;
pSocket->errno = EADDRNOTAVAIL;
break;
pSocket->errno = EFAULT;
}
else {
//
// Synchronize with the socket layer
//
RAISE_TPL ( TplPrevious, TPL_SOCKETS );
case AF_INET:
//
// Determine the connection point within the network stack
// Validate the local address
//
switch ( pSocket->Type ) {
switch ( pSocket->Domain ) {
default:
DEBUG (( DEBUG_RX,
"ERROR - Invalid socket type: %d\r\n",
pSocket->Type));
"ERROR - Invalid socket address family: %d\r\n",
pSocket->Domain ));
Status = EFI_INVALID_PARAMETER;
pSocket->errno = EADDRNOTAVAIL;
break;
case SOCK_STREAM:
case SOCK_SEQPACKET:
Status = EslTcpTxBuffer4 ( pSocket,
Flags,
BufferLength,
pBuffer,
pDataLength );
break;
case AF_INET:
//
// Determine the connection point within the network stack
//
switch ( pSocket->Type ) {
default:
DEBUG (( DEBUG_RX,
"ERROR - Invalid socket type: %d\r\n",
pSocket->Type));
Status = EFI_INVALID_PARAMETER;
pSocket->errno = EADDRNOTAVAIL;
break;
case SOCK_DGRAM:
Status = EslUdpTxBuffer4 ( pSocket,
Flags,
BufferLength,
pBuffer,
pDataLength,
pAddress,
AddressLength );
case SOCK_STREAM:
case SOCK_SEQPACKET:
Status = EslTcpTxBuffer4 ( pSocket,
Flags,
BufferLength,
pBuffer,
pDataLength );
break;
case SOCK_DGRAM:
Status = EslUdpTxBuffer4 ( pSocket,
Flags,
BufferLength,
pBuffer,
pDataLength,
pAddress,
AddressLength );
break;
}
break;
}
break;
}
//
// Release the socket layer synchronization
//
RESTORE_TPL ( TplPrevious );
//
// Release the socket layer synchronization
//
RESTORE_TPL ( TplPrevious );
}
}
}
}
else {
//
// The transmitter was shutdown
//
pSocket->errno = EPIPE;
Status = EFI_NOT_STARTED;
else {
//
// The transmitter was shutdown
//
pSocket->errno = EPIPE;
Status = EFI_NOT_STARTED;
}
}
}
}

11
StdLib/EfiSocketLib/Tcp4.c
View File

@ -2448,13 +2448,21 @@ EslTcpReceive4 (
&& ( NULL == pSocket->pRxPacketListHead )
&& ( NULL == pSocket->pRxOobPacketListHead )) {
Status = pSocket->RxError;
pSocket->RxError = EFI_SUCCESS;
switch ( Status ) {
default:
pSocket->errno = EIO;
break;
case EFI_CONNECTION_FIN:
pSocket->errno = ESHUTDOWN;
//
// Continue to return zero bytes received when the
// peer has successfully closed the connection
//
pSocket->RxError = EFI_CONNECTION_FIN;
*pDataLength = 0;
pSocket->errno = 0;
Status = EFI_SUCCESS;
break;
case EFI_CONNECTION_REFUSED:
@ -2481,7 +2489,6 @@ EslTcpReceive4 (
pSocket->errno = ENOPROTOOPT;
break;
}
pSocket->RxError = EFI_SUCCESS;
}
else {
Status = EFI_NOT_READY;