Unixsock v2.2 #3196
Closed
Unixsock v2.2 #3196
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This patch updates the unix socket protocol. Messages send from the server and the client have now a '\n' at the end. This allows both sides to detect easily the end of a command. As a side effect, this fixes the problem of long answer in suricatasc. There is now a limit at the arbitrary value of 65536. Backward compatility is preserved as a client with the older version of the protocol can still connect to a Suricata with version 2 of the protocol.
Implement a basic autoreconnect support. It tries to reconnect once when connection has been lost. If it fails, it discards the command and try again to connect at next command.
+ PYTHONPATH=scripts/suricatasc/src
+ python3 scripts/suricatasc/suricatasc -v -c 'register-tenant 1 /home/victor/sync/qa/tests/multi-tenant/tenant-1.yaml' /home/buildbot/tmp/suriqa.8ifETH1/custom.socket
Traceback (most recent call last):
File "scripts/suricatasc/suricatasc", line 21, in
from suricatasc import *
File "/home/buildbot/qa/buildbot/donkey/bugs/Private/scripts/suricatasc/src/suricatasc.py", line 380
except IOError, err:
^
SyntaxError: invalid syntax
|
dbcfd
reviewed
Jan 29, 2018
| @@ -414,9 +426,16 @@ static int UnixCommandAccept(UnixCommand *this) | |||
|
|
|||
| json_decref(server_msg); | |||
|
|
|||
| if (client_version > UNIX_PROTO_V1) { | |||
| if (send(client, "\n", 1, MSG_NOSIGNAL) == -1) { | |||
There was a problem hiding this comment.
Is it possible to just oversize the buffer on UNIX_PROTO_V2 or higher, and after write set the write length + 1 to the return, rather than sending the return as an additional send?
There was a problem hiding this comment.
Yes, make sense indeed, as pointed by @inliniac this code is quite old and was done before the code was switched to use a memory buffer. Gonna fix that.
|
Fixing these problems. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
2 unix socket related patches. First one introduce a new version of the protocol to fix issue with long answer. Second one propose a simple implementation of automatic reconnect for suricatasc.
Link to redmine ticket:
PRScript output: