-
Notifications
You must be signed in to change notification settings - Fork 151
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Avoid sending double CRLF keep alive on TCP socket shutdown #172
base: master
Are you sure you want to change the base?
Conversation
@@ -602,7 +602,7 @@ public void run() { | |||
int nbytes = myClientInputStream.read(msg, 0, bufferSize); | |||
// no more bytes to read... | |||
if (nbytes == -1) { | |||
hispipe.write("\r\n\r\n".getBytes("UTF-8")); | |||
hispipe.write("\r\n".getBytes("UTF-8")); // send \r\n to allow the pipe to wake up |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how about wrapping this in a new method, e.g.
sendCrlfToWakeUpPipe(hispipe)
then we don't need comments!! ; ) \ o /
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Im not sure we can savely assume this branch is becuase of socket closed, certainly the inputstream has reached end. I can see the original author probably choosed doubleCRLF becuase is an small message,yet still valid under the heartbeat Spec. sending a single CRLF may cuase issues for some remote peers, who knows?
If the original concern of the PR is that " sometimes this will lead to the error message", why dont we try to review the log level of that message?. Jain-SIP stack is known to be quite verbose,and not using log level conventions properly. We have tried to alleviate this several times by reducing the log level, but there might be still some messages to tweak.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gsaslis: Yes, I think the only reason for sending a double CRLF was to wakeup the pipe. Therefore the new method would cover it.
@jaimecasero: when sending the double CRLF the to wake up the pipe the pipe will handle this double CRLF and tries to send a single CRLF. This does not make sense in the case of shutting down. Therefore I was wondering why to send just this double CRLF where there are other possibilities to wake up the queue.
Unfortunately it's not only one error message that comes up in the case where mySock is still there and not closed in sendSingleCRLF() and the sendMessage() is called (which causes the errors). This is a race condition. The error messages looks ugly when it happens:
2018-02-05 19:22:37,842 WARN nist.javax.sip.stack.IOHandler [] IOException occured retryCount 0
2018-02-05 19:22:37,842 ERROR nist.javax.sip.stack.IOHandler [] Problem sending: sendBytes TCP inAddr 12.23.165.59 port = 57550 remoteHost 12.23.165.59 remotePort 57550 peerPacketPort 57550 isClient false
2018-02-05 19:22:37,842 ERROR nist.javax.sip.stack.IOHandler [] {}
2018-02-05 19:22:37,842 ERROR nist.javax.sip.stack.IOHandler [] Could not connect to /12.23.165.59:57550
2018-02-05 19:22:37,842 WARN nist.javax.sip.stack.TCPMessageChannel [] Failed to connect /12.23.165.59:57550 but trying the advertised port=57550 if it's different than the port we just failed on
2018-02-05 19:22:37,842 WARN nist.javax.sip.stack.TCPMessageChannel [] Couldn't connect to peerAddress = /12.23.165.59 peerPort = 57550 key = tcp:12.23.165.59:57550 retrying on peerPortAdvertisedInHeaders 57550
@@ -45,7 +45,7 @@ | |||
*/ | |||
public void processMessage(SIPMessage msg) throws Exception; | |||
|
|||
public void sendSingleCLRF() throws Exception; | |||
public void sendSingleCRLF() throws Exception; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
even though this seems like a clear typo, i'm concerned this would break backwords compatibility... 🤔
Maybe a default implementation here for the new one invoking the old one would help us get the best of both worlds...
@jaimecasero thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this interface is not part of JAIN-SIP spec, and is not a boundary with the App. Is an internal API to allow IO layer to contact Parsing layer. If we change this interface, we will need to cover all the neccesary changes tin IO and parsing layer (XPipelineParsers,ConnOrientedMsgChannel,TCPMsgChannel,TLSMsgChannel...).
not sure is worth the change, but we could do it if the PR is comprehensive and tests results are ok
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would suggests to handle in different PRs, as the original concern about double CRLF on TCP closing seems valid. We could potentially merge this asap, and then think about the typo...
@fre42 Thanks for submitting the PR ❤️ - really appreciate you taking the time to contribute this!! Could you please take a look at our Open Source Playbook and then proceed with signing our CLA, so we can then move forward with properly reviewing this? Thanks in advance! |
I need to clarify with my company if I'm allowed to sign the CLA. Unfortunately this may take some time. |
@fre42 sure thing. Please take your time, so we can make sure we do this properly. |
Where can I find this CLA? I've found the link https://www.restcomm.com/contributor-license-agreement/#Contribute. The CLA is mentioned there but not linked. |
@fre42 sorry for the delay in getting back to you on this. The CLA is available on that page "inside" the form... you have to select "Individual" or "Corporate" on the form at the bottom of the page for the CLA text to come up. (I know it's not ideal, won't be long before we integrate CLA signing as part of the PR flow) |
@gsaslis Meanwhile I've got feedback from my company's legal department. They have concerns signing the CLA as it is:
, any of our patents that may be included in a contribution, i.e. not tied to the contribution. OSS licenses usually contain wording to limit such license to the use of the contribution within the license terms, see below example from the EPL 1.0 license.
They don’t think that this was the intention of Telestax, however, it is what the agreement says.
Would such an individual CLA be OK for you? |
@fre42 thanks for bringing that to my attention - will check internally and let you know asap. |
@fre42 sorry for the delay here - can you please drop me an email at yorgos.saslis |
The current implementation does send a duplicate CRLF in the case of a TCP/TLS connection shutdown (socket closed). This leads to the situation that the PipelinedMsgParser handles it as "RFC 5626 CRLF keepalive mechanism" and tries to send a single CRLF. This sending will of course fail because the socket is closed.
Due to a race condition when closing the socket, sometimes this will lead to the error message "A problem occured while trying to send a single CRLF in response to a double CRLF" which is no error.
By the way I've fixed a small typo: "CRLF" was sometimes "CLRF" in log messages an in the code.