diff options
| author | Sylvain Fonteneau <sylvain.fonteneau@trusted-logic.com> | 2010-11-26 10:38:22 +0100 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-12-05 13:15:05 -0800 |
| commit | 1c75e8952d88d81c5f04826f69ca22d14bb5683b (patch) | |
| tree | 5bbd1ffc62f248e24c9a5410eb4ffda710547325 /src/phFriNfc_LlcpTransport_Connectionless.c | |
| parent | e57ef4170474a0929b25bbdc8eb75f316ebffd56 (diff) | |
| download | external_libnfc-nxp-1c75e8952d88d81c5f04826f69ca22d14bb5683b.zip external_libnfc-nxp-1c75e8952d88d81c5f04826f69ca22d14bb5683b.tar.gz external_libnfc-nxp-1c75e8952d88d81c5f04826f69ca22d14bb5683b.tar.bz2 | |
Call the callback of any pending action in case of LLCP socket closure.
This ensure the lib client not to be stuck waiting for a callback when
the socket has been closed meanwhile.
Change-Id: I9cdfa3c2cc75ee9451c3ad5b92eb338b5e68f53a
Diffstat (limited to 'src/phFriNfc_LlcpTransport_Connectionless.c')
| -rw-r--r-- | src/phFriNfc_LlcpTransport_Connectionless.c | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/src/phFriNfc_LlcpTransport_Connectionless.c b/src/phFriNfc_LlcpTransport_Connectionless.c index 72397ad..5648c11 100644 --- a/src/phFriNfc_LlcpTransport_Connectionless.c +++ b/src/phFriNfc_LlcpTransport_Connectionless.c @@ -72,6 +72,31 @@ static void phFriNfc_LlcpTransport_Connectionless_SendTo_CB(void* pContex } +static void phFriNfc_LlcpTransport_Connectionless_Abort(phFriNfc_LlcpTransport_Socket_t* pLlcpSocket) +{ + if (pLlcpSocket->pfSocketSend_Cb != NULL) + { + pLlcpSocket->pfSocketSend_Cb(pLlcpSocket->pSendContext, NFCSTATUS_ABORTED); + pLlcpSocket->pSendContext = NULL; + pLlcpSocket->pfSocketSend_Cb = NULL; + } + if (pLlcpSocket->pfSocketRecvFrom_Cb != NULL) + { + pLlcpSocket->pfSocketRecvFrom_Cb(pLlcpSocket->pRecvContext, 0, NFCSTATUS_ABORTED); + pLlcpSocket->pRecvContext = NULL; + pLlcpSocket->pfSocketRecvFrom_Cb = NULL; + pLlcpSocket->pfSocketRecv_Cb = NULL; + } + pLlcpSocket->pAcceptContext = NULL; + pLlcpSocket->pfSocketAccept_Cb = NULL; + pLlcpSocket->pListenContext = NULL; + pLlcpSocket->pfSocketListen_Cb = NULL; + pLlcpSocket->pConnectContext = NULL; + pLlcpSocket->pfSocketConnect_Cb = NULL; + pLlcpSocket->pDisonnectContext = NULL; + pLlcpSocket->pfSocketDisconnect_Cb = NULL; +} + /** * \ingroup grp_fri_nfc * \brief <b>Close a socket on a LLCP-connectionless device</b>. @@ -100,16 +125,13 @@ NFCSTATUS phFriNfc_LlcpTransport_Connectionless_Close(phFriNfc_LlcpTransport_Soc pLlcpSocket->bSocketDiscPending = FALSE; pLlcpSocket->RemoteBusyConditionInfo = FALSE; pLlcpSocket->ReceiverBusyCondition = FALSE; - pLlcpSocket->pfSocketSend_Cb = NULL; - pLlcpSocket->pfSocketRecv_Cb = NULL; - pLlcpSocket->pfSocketListen_Cb = NULL; - pLlcpSocket->pfSocketConnect_Cb = NULL; - pLlcpSocket->pfSocketDisconnect_Cb = NULL; pLlcpSocket->socket_VS = 0; pLlcpSocket->socket_VSA = 0; pLlcpSocket->socket_VR = 0; pLlcpSocket->socket_VRA = 0; + phFriNfc_LlcpTransport_Connectionless_Abort(pLlcpSocket); + memset(&pLlcpSocket->sSocketOption, 0x00, sizeof(phFriNfc_LlcpTransport_sSocketOptions_t)); if (pLlcpSocket->sServiceName.buffer != NULL) { |