Skip to content

Ocean: fix auto port #2995

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

Merged
Jouzo merged 1 commit into from
Aug 13, 2024
Merged

Ocean: fix auto port #2995

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
12 changes: 6 additions & 6 deletions src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1670,15 +1670,15 @@ static void SetupRPCPorts(std::vector<std::string>& ethEndpoints, std::vector<st
}

// Determine which addresses to bind to ocean server
int ocean_port = gArgs.GetArg("-oceanarchiveport", BaseParams().WSPort());
int ocean_port = gArgs.GetArg("-oceanarchiveport", DEFAULT_OCEAN_ARCHIVE_PORT);
if (ocean_port == -1) {
LogPrintf("Websocket server disabled.\n");
LogPrintf("Ocean server disabled.\n");
} else {
if (setAutoPort) {
ocean_port = 0;
}
if (!(gArgs.IsArgSet("-rpcallowip") && gArgs.IsArgSet("-oceanarchivebind"))) { // Default to loopback if not allowing external IPs
auto endpoint = default_address + ":" + std::to_string(ws_port);
auto endpoint = default_address + ":" + std::to_string(ocean_port);
oceanEndpoints.push_back(endpoint);
if (gArgs.IsArgSet("-rpcallowip")) {
LogPrintf("WARNING: option -rpcallowip was specified without -oceanarchivebind; this doesn't usually make sense\n");
Expand All @@ -1687,10 +1687,10 @@ static void SetupRPCPorts(std::vector<std::string>& ethEndpoints, std::vector<st
LogPrintf("WARNING: option -oceanarchivebind was ignored because -rpcallowip was not specified, refusing to allow everyone to connect\n");
}
} else if (gArgs.IsArgSet("-oceanarchivebind")) { // Specific bind address
for (const std::string& strWSBind : gArgs.GetArgs("-oceanarchivebind")) {
int port = ws_port;
for (const std::string& strOCEANBind : gArgs.GetArgs("-oceanarchivebind")) {
int port = ocean_port;
std::string host;
SplitHostPort(strWSBind, port, host);
SplitHostPort(strOCEANBind, port, host);
auto endpoint = host + ":" + std::to_string(port);
oceanEndpoints.push_back(endpoint);
}
Expand Down
⚡