Implement rfc6587 auto detection #154
Open
+627
−73
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
alltilla
reviewed
Jun 12, 2024
Comment on lines
+115
to
+109
| self->proto_impl = _construct_detected_proto(self, detect_buffer, rc); | ||
| if (self->proto_impl) | ||
| { | ||
| /* transport is handed over to the new proto */ | ||
| self->super.transport = NULL; | ||
| return LPS_SUCCESS; | ||
| } |
There was a problem hiding this comment.
Shouldn't we do a handshake after we autodetected the proto?
There was a problem hiding this comment.
I think we are doing just that. This part is actually the handshake for LogProtoAutoServer and once we finish our own handshake we delegate that logic back to the proto implementation.
+ /* allow the impl to do its handshake */
+ if (self->proto_impl)
+ return log_proto_server_handshake(self->proto_impl, handshake_finished);
| octet-count based framing to avoid confusion that stems from the sender | ||
| using a different protocol to the server. This is automatically enabled for | ||
| both the `transport(tcp)` and the `transport(tls)` settings. You can disable | ||
| auto-detection by using `transport(text)` or `transport(framed)`. |
There was a problem hiding this comment.
We disable auto detection with transport(force-framed), right?
There was a problem hiding this comment.
- syslog() style sources default to "framed" that enables auto detection
- network() style sources default to "text" which does no auto detection and assumes there's no framing
- syslog(transport(text)) disables auto detection and disables framing
- syslog(transport(force-framed)) disables auto detection and requires framing
So the defaults are sane, network/tcp/udp would remain as is. syslog() would accept both with or without framing, thereby allowing the use of the syslog source driver for all cases.
bazsi
force-pushed
the
implement-rfc6587-auto-detection
branch
from
98435b3
to
c728d0a
Compare
bazsi
force-pushed
the
implement-rfc6587-auto-detection
branch
from
c728d0a
to
902b563
Compare
Instead of having to call an extra virtual method for each I/O event, bundle this information into the handshake call itself and track whether handshake is in progress in the caller. Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
…e is 0 Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
…lected Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
bazsi
force-pushed
the
implement-rfc6587-auto-detection
branch
from
902b563
to
6c992ba
Compare
|
This should wait until #156 is merged. |
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.
This is a pretty common misconfiguration that should be handled automatically.
Open questions were resolved this way: