network: obtain address instance from fd, bind-to-zero in ListenSocke… #645
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
…tImpl. Refactor 33ece57 to assist with zero binding from integration tests.
htuch
force-pushed
the
refactor-addr-from-fd
branch
from
7eb448a
to
46be529
Compare
| socklen_t ss_len = sizeof ss; | ||
| const int rc = ::getsockname(fd, reinterpret_cast<sockaddr*>(&ss), &ss_len); | ||
| if (rc != 0) { | ||
| const int err = errno; |
| } | ||
| default: | ||
| throw EnvoyException(fmt::format("Unexpected family in getsockname result: {}", ss.ss_family)); | ||
| return nullptr; |
There was a problem hiding this comment.
nit: line can't be reached.
| const struct sockaddr_in* sin = reinterpret_cast<const struct sockaddr_in*>(&ss); | ||
| ASSERT(AF_INET == sin->sin_family); | ||
| return InstanceConstSharedPtr(new Address::Ipv4Instance(sin)); | ||
| break; |
There was a problem hiding this comment.
nit: line can't be reached.
| const struct sockaddr_in6* sin6 = reinterpret_cast<const struct sockaddr_in6*>(&ss); | ||
| ASSERT(AF_INET6 == sin6->sin6_family); | ||
| return InstanceConstSharedPtr(new Address::Ipv6Instance(*sin6)); | ||
| break; |
There was a problem hiding this comment.
nit: line can't be reached.
| throw EnvoyException(fmt::format("Unexpected family in getsockname result: {}", ss.ss_family)); | ||
| return nullptr; | ||
| } | ||
| return nullptr; |
There was a problem hiding this comment.
nit: Would just do NOT_REACHED here if compiler complains
| @@ -15,6 +15,11 @@ void ListenSocketImpl::doBind() { | |||
| throw EnvoyException( | |||
| fmt::format("cannot bind '{}': {}", local_address_->asString(), strerror(errno))); | |||
| } | |||
| if (local_address_->ip()->port() == 0) { | |||
There was a problem hiding this comment.
doBind() is also called in UdsListenSocket case so I think this line will crash without checking if ip() is not null or type is IP
There was a problem hiding this comment.
Yeah, didn't run the full tests before pushing, will fix.
|
Fixed, tests pass (this is what happens when you write code while in the middle of a meting ;) ) |
| @@ -15,6 +15,12 @@ void ListenSocketImpl::doBind() { | |||
| throw EnvoyException( | |||
| fmt::format("cannot bind '{}': {}", local_address_->asString(), strerror(errno))); | |||
| } | |||
| if (local_address_->type() == Address::Type::Ip && local_address_->ip() != nullptr && | |||
There was a problem hiding this comment.
nit: local_address_->ip() != nullptr is guaranteed if local_address_->type() == Address::Type::Ip
mattklein123
approved these changes
Mar 28, 2017
jpsim
pushed a commit
that referenced
this pull request
Nov 28, 2022
Description: update the envoy ref. This bump includes #9767 which will enable us to turn on process logs for Android devices in a subsequent PR. Risk Level: med, as always with a ref update. Testing: CI Signed-off-by: Jose Nino <[email protected]> Signed-off-by: JP Simard <[email protected]>
jpsim
pushed a commit
that referenced
this pull request
Nov 29, 2022
Description: update the envoy ref. This bump includes #9767 which will enable us to turn on process logs for Android devices in a subsequent PR. Risk Level: med, as always with a ref update. Testing: CI Signed-off-by: Jose Nino <[email protected]> Signed-off-by: JP Simard <[email protected]>
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.
…tImpl.
Refactor 33ece57 to assist with zero binding from integration tests.