From 63bb9bf64a225cbdf3758d525ddfa90f2a87adcd Mon Sep 17 00:00:00 2001 From: Emil Ivov Date: Mon, 26 May 2014 21:00:58 +0200 Subject: [PATCH] Fixes an issue with non-responses to INVITEs arriving within a TERMINATED dialog by responding with a 481 Call/Transaction Does Not Exist. --- .../OperationSetBasicTelephonySipImpl.java | 60 ++++++++++++++++++- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java index 858af4168..10b368aea 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java @@ -313,8 +313,17 @@ public boolean processRequest(RequestEvent requestEvent) } else { - logger.error("reINVITEs while the dialog is not " - + "confirmed are not currently supported."); + if (dialogState.equals(DialogState.TERMINATED)) + { + processStrayInvite(serverTransaction); + } + else + { + logger.error("reINVITEs while the dialog is not " + + "confirmed are not currently supported."); + } + + processed = true; } } // ACK @@ -1166,6 +1175,53 @@ private void processBye(ServerTransaction serverTransaction, callPeer.processBye(serverTransaction); } + /** + * Processes stray INVITE requests that arrive for a dialog which has been + * already terminated. This method simply responds with a + * 481 Call/Transaction Does Not exist. + * + * @param serverTransaction the ServerTransaction the INVITE request + * arrived in. + */ + private void processStrayInvite(ServerTransaction serverTransaction) + { + Request inviteRequest = serverTransaction.getRequest(); + + // Send 481 Call/Transaction Does Not exist + Response noSuchCall = null; + try + { + noSuchCall = messageFactory.createResponse( + Response.CALL_OR_TRANSACTION_DOES_NOT_EXIST, inviteRequest); + } + catch (ParseException ex) + { + logger + .error("Error while trying to send a response to an INVITE", ex); + /* + * No need to let the user know about the error since it doesn't + * affect them. + */ + } + + if (noSuchCall != null) + { + try + { + serverTransaction.sendResponse(noSuchCall); + if (logger.isDebugEnabled()) + logger.debug("sent response " + noSuchCall); + } + catch (Exception ex) + { + logger.error("Failed to reject a stray INVITE with a 481, " + + "exception was:\n", ex); + } + } + + //there's really nothing else for us to do here. + } + /** * Sets the state of the specifies call peer as DISCONNECTED. *