Skip to content

always copy sock address #7089

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

Open
mikea wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −7
Open

always copy sock address #7089

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/workerd/server/server.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7090,17 +7090,16 @@ kj::Promise<void> Server::listenOnSockets(config::Config::Reader config,
// Start sockets
TRACE_EVENT("workerd", "listenOnSockets");
for (auto sock: config.getSockets()) {
kj::StringPtr name = sock.getName();
kj::StringPtr addrStr = nullptr;
kj::String ownAddrStr;
kj::String name = kj::str(sock.getName());
kj::String addrStr;
kj::Maybe<kj::Own<kj::ConnectionReceiver>> listenerOverride;

kj::Own<Service> service = lookupService(sock.getService(), kj::str("Socket \"", name, "\""));

KJ_IF_SOME(override, socketOverrides.findEntry(name)) {
KJ_SWITCH_ONEOF(override.value) {
KJ_CASE_ONEOF(str, kj::String) {
addrStr = ownAddrStr = kj::mv(str);
addrStr = kj::mv(str);
break;
}
KJ_CASE_ONEOF(l, kj::Own<kj::ConnectionReceiver>) {
Expand All @@ -7110,7 +7109,7 @@ kj::Promise<void> Server::listenOnSockets(config::Config::Reader config,
}
socketOverrides.erase(override);
} else if (sock.hasAddress()) {
addrStr = sock.getAddress();
addrStr = kj::str(sock.getAddress());
} else {
reportConfigError(kj::str("Socket \"", name,
"\" has no address in the config, so must be specified on the "
Expand Down Expand Up @@ -7147,8 +7146,8 @@ kj::Promise<void> Server::listenOnSockets(config::Config::Reader config,

auto handle = kj::coCapture(
[this, service = kj::mv(service), rewriter = kj::mv(rewriter),
physicalProtocol = socketConfig.physicalProtocol, name,
isHttp = sock.which() != config::Socket::TCP, addrStr](
physicalProtocol = socketConfig.physicalProtocol, name = kj::mv(name),
isHttp = sock.which() != config::Socket::TCP, addrStr = kj::mv(addrStr)](
kj::Promise<kj::Own<kj::ConnectionReceiver>> promise) mutable -> kj::Promise<void> {
if (isHttp) {
TRACE_EVENT("workerd", "setup listenHttp");
Expand Down
Loading