v1.31 Backports 2025-01-28 #1152
Merged
+396
−262
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
[ upstream commit f352503 ] The logic that sets the proxylib l7 proto as requested application protocol on the network socket has been extracted from the function `extractSocketMetadata`. But, the test bpfmetadata config still contains this functionality. Therefore, this commit removes setting the requested application protocol on the network socket in the test bpfmetadata config. Tests that rely on this functionality should do this in the setup explicitly. Signed-off-by: Marco Hofstetter <[email protected]>
[ upstream commit 5276498 ] Currently, `extractSocketMetadata` also restores the local address for the use by the `OriginalDestCluster`. To keep the function free of side-effects, the logic that restores the local address gets extracted into a function within the `SocketMetadata` that gets called from the BPF metadata listener after extracting the BPF metadata from the socket. Signed-off-by: Marco Hofstetter <[email protected]>
[ upstream commit 7717128 ] According to the Envoy sourcecode, restoration of the local address should only be performed if it changes from the current local address. ``` ... This should only be called when restoring the original destination address of a connection redirected by iptables REDIRECT. The caller is responsible for making sure the new address is actually different. ``` Therefore, this commit introduces a check before restoring the local address. Signed-off-by: Marco Hofstetter <[email protected]>
[ upstream commit 011a335 ] This commit adds the socket filedescriptor to the logmessage when entering the `onAccept` method on the BPFMetadata listener filter. Signed-off-by: Marco Hofstetter <[email protected]>
[ upstream commit fcca05e ] This commit changes some usages of `ENVOY_LOG` to `ENVOY_CONN_LOG` to improve correlation of application logs entries with a connection id. Signed-off-by: Marco Hofstetter <[email protected]>
[ upstream commit 9ca66e4 ] This commit aligns the logging for restoration of the local address for downstream & upstream socket by always logging the socket and the old & new local address. Signed-off-by: Marco Hofstetter <[email protected]>
[ upstream commit 48b547d ] Currently, the socket options are completely defined in C++ header files. As a result, the bazel BUILD file misses some dependencies that also result to clangd not working properly for these files. This commit prepares the split into C & Header files by introducing the "empty" *.cc files and fixing the dependencies in the BUILD file. In the next commit, the logic will be moved. Signed-off-by: Marco Hofstetter <[email protected]>
[ upstream commit 3720cb0 ] This commit moves the implementation of the socket options into the *.cc files. Signed-off-by: Marco Hofstetter <[email protected]>
…ption [ upstream commit 090af04 ] PR #1115 unintentionally changed that the keep alive socket options are no longer applied on the accepted downstream socket, instead (due to the usage of Envoy SocketOption) they are now applied on the corresponding upstream socket. This commit is reverting this change and adds some helping comments to the code. Signed-off-by: Marco Hofstetter <[email protected]>
jrajahalme
approved these changes
Jan 28, 2025
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.
Once this PR is merged, a GitHub action will update the labels of these PRs: