Skip to content
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.

Sign up for GitHub

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

Jump to bottom

socket options: add support for directly creating ipv4/ipv6 pairs #18769

Merged
merged 7 commits into from
Oct 28, 2021
Merged

socket options: add support for directly creating ipv4/ipv6 pairs #18769

merged 7 commits into from
Oct 28, 2021

Conversation

goaway
Copy link
Contributor

@goaway goaway commented Oct 26, 2021 •
edited
Loading

Commit Message: socket options: add support for directly creating ipv4/ipv6 pairs
Additional Description: Allows AddrFamilyAwareSocketOptionImpl to be constructed directly from Socket::Option pairs.

Needed for envoyproxy/envoy-mobile#1897
Risk Level: Low
Testing: Local & CI

Signed-off-by: Mike Schore [email protected]

@goaway goaway requested a review from snowp as a code owner October 26, 2021 12:46
@goaway goaway changed the title socket option: add support for directly creating ipv4/ipv6 pairs socket options: add support for directly creating ipv4/ipv6 pairs Oct 26, 2021
@goaway
fix format
b296c21 
Signed-off-by: Mike Schore <[email protected]>
@snowp snowp self-assigned this Oct 26, 2021
snowp
snowp suggested changes Oct 26, 2021
View reviewed changes
Copy link
Contributor

@snowp snowp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, just the few comments on isSupported

envoy/network/socket.h Outdated
@@ -299,8 +299,16 @@ class Socket {
virtual absl::optional<Details>
getOptionDetails(const Socket& socket,
envoy::config::core::v3::SocketOption::SocketState state) const PURE;

/**
* Implementations should typically return true. Unsupported or placeholder implementations
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe phrase this as Whether the socket option is supported or Whether the socket option can be applied?

I think I'd normally see the comment begin with describing what the function is supposed to do, then fill in with implementation guidelines if appropriate

envoy/network/socket.h
* may indicate such by returning false.
* @return Whether this is an actual socket option.
*/
virtual bool isSupported() const PURE;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What calls this at this layer? Is this something we'll be calling via EM?

Copy link
Contributor Author

@goaway goaway Oct 26, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's called by AddrFamilyAwareSocketOptionImpl. EM itself won't be calling it, but I needed to move it to the parent class (it was actually already replicated across a couple subclasses).

goaway added 3 commits October 27, 2021 17:15
@goaway
update comment
879582e 
Signed-off-by: Mike Schore <[email protected]>
@goaway
fix format
72213b1 
Signed-off-by: Mike Schore <[email protected]>
@goaway
Merge branch 'main' into ms/socket-option-cleanup
68b4ab8 
Signed-off-by: Mike Schore <[email protected]>
@goaway goaway requested a review from snowp October 27, 2021 09:20
@goaway
Copy link
Contributor Author

goaway commented Oct 27, 2021

Thanks for taking a look @snowp! Updated isSupported docstring.

@goaway goaway mentioned this pull request Oct 27, 2021
Merged
snowp
snowp reviewed Oct 27, 2021
View reviewed changes
Copy link
Contributor

@snowp snowp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool this LGTM, but seems like CI is red, can you take a look?

@goaway
Copy link
Contributor Author

goaway commented Oct 27, 2021

@snowp it seems spurious(?) - it looks like a bunch tasks timed out.

@goaway goaway requested a review from snowp October 27, 2021 17:49
goaway added 2 commits October 28, 2021 02:04
@goaway
try CI again
4606ede 
Signed-off-by: Mike Schore <[email protected]>
@goaway
fix mock
e3ef40f 
Signed-off-by: Mike Schore <[email protected]>
snowp
snowp approved these changes Oct 27, 2021
View reviewed changes
Copy link
Contributor

@snowp snowp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@snowp snowp enabled auto-merge (squash) October 27, 2021 19:57
@snowp
Copy link
Contributor

snowp commented Oct 28, 2021

/retest

@repokitteh-read-only
Copy link

Retrying Azure Pipelines:
Retried failed jobs in: envoy-presubmit

🐱

Caused by: a #18769 (comment) was created by @snowp.

see: more, trace.

@snowp snowp merged commit 365900f into envoyproxy:main Oct 28, 2021
@goaway
Copy link
Contributor Author

goaway commented Oct 28, 2021

Thanks @snowp!

mpuncel added a commit to mpuncel/envoy that referenced this pull request Oct 29, 2021
@mpuncel
Merge branch 'main' into mpuncel/hc-after-sds-init-manager
65ef40c 
* main: (221 commits)
  deps: Bump `protobuf` -> 3.19.0 (envoyproxy#18471)
  tooling: auto-assign dependency shephards (envoyproxy#18794)
  clang-tidy: Return from diff fun if empty diff (envoyproxy#18815)
  repokitteh: Block PRs pending deps approval (envoyproxy#18814)
  deps: Bump `org_llvm_llvm` -> 12.0.1, `com_github_wavm_wavm` -> 9ffd3e2 (envoyproxy#18747)
  dns resolvers: add All lookup mode (envoyproxy#18464)
  doc: fix link formatting for TLS session_timeout (envoyproxy#18790)
  ext_authz: Set response flag and code details to UAEX when denied (envoyproxy#18740)
  socket options: add support for directly creating ipv4/ipv6 pairs (envoyproxy#18769)
  ecds: make onConfigUpdate generic over filter type (envoyproxy#18061)
  bazel: update CMake instructions in EXTERNAL_DEPS.md (envoyproxy#18799)
  upstream: fix typo in comment (envoyproxy#18798)
  runtime: removing envoy.reloadable_features.grpc_json_transcoder_adhere_to_buffer_limits (envoyproxy#18696)
  bazel: Add CC=clang to clang configuration (envoyproxy#18732)
  fix error request id in the dubbbo local reply (envoyproxy#18741)
  event: assert the case of both read and closed event registered (envoyproxy#18265)
  tcp proxy connect tunneling: improved testing (envoyproxy#18784)
  deps: Bump `protoc-gen-validate` -> 0.6.2 (envoyproxy#18742)
  deps: Bump `rules_pkg` -> ad57589 (envoyproxy#18746)
  bazel: copy .bazelversion for envoy filter examples (envoyproxy#18730)
  ...

Signed-off-by: Michael Puncel <[email protected]>
@junr03 junr03 mentioned this pull request Jan 25, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@snowp snowp snowp approved these changes

Assignees

@snowp snowp

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@goaway @snowp