diff options
| author | Arnaud Ferir <arnaud.ferir@trusted-logic.com> | 2011-01-07 16:36:54 +0100 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-01-18 15:29:35 -0800 |
| commit | f546a14a4509e1814bfd94fc76cdfa2252dc455c (patch) | |
| tree | 92e89adffe7521f7b76ea88ac807edd9354cb372 | |
| parent | 44835562edd67f15196a47631a384afb1d8b8068 (diff) | |
| download | libnfc-nxp-f546a14a4509e1814bfd94fc76cdfa2252dc455c.tar.gz | |
Do not call LLCP socket listen callback on abort.
The listen callback is a notification callback, not an
end-of-operation callback so, when the socket is closed,
it should not be triggered since there is no connection
event.
Change-Id: I6e6994f6bcb09f9fadda04800d22528d76aff121
| -rw-r--r-- | src/phFriNfc_LlcpTransport_Connection.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/phFriNfc_LlcpTransport_Connection.c b/src/phFriNfc_LlcpTransport_Connection.c index 18e2600..63a8f51 100644 --- a/src/phFriNfc_LlcpTransport_Connection.c +++ b/src/phFriNfc_LlcpTransport_Connection.c @@ -347,12 +347,6 @@ static void phFriNfc_LlcpTransport_ConnectionOriented_Abort(phFriNfc_LlcpTranspo pLlcpSocket->pfSocketRecv_Cb = NULL; } pLlcpSocket->pRecvContext = NULL; - if (pLlcpSocket->pfSocketListen_Cb != NULL) - { - pLlcpSocket->pfSocketListen_Cb(pLlcpSocket->pListenContext, NULL); - pLlcpSocket->pfSocketListen_Cb = NULL; - } - pLlcpSocket->pListenContext = NULL; if (pLlcpSocket->pfSocketAccept_Cb != NULL) { pLlcpSocket->pfSocketAccept_Cb(pLlcpSocket->pAcceptContext, NFCSTATUS_ABORTED); @@ -373,6 +367,8 @@ static void phFriNfc_LlcpTransport_ConnectionOriented_Abort(phFriNfc_LlcpTranspo pLlcpSocket->pDisonnectContext = NULL; pLlcpSocket->pfSocketRecvFrom_Cb = NULL; + pLlcpSocket->pfSocketListen_Cb = NULL; + pLlcpSocket->pListenContext = NULL; } static NFCSTATUS phFriNfc_Llcp_Send_DisconnectMode_Frame(phFriNfc_LlcpTransport_t* psTransport, |