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

Also update input URIs that target host 0.0.0.0 #75

Merged
merged 2 commits into from
Mar 4, 2024
Merged

Also update input URIs that target host 0.0.0.0 #75

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ade2c61
Also update input URIs that target host 0.0.0.0
eflumerf Mar 1, 2024
2017ca6
Add more checks for 0.0.0.0 ips and add TRACE message
eflumerf Mar 1, 2024
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
16 changes: 10 additions & 6 deletions src/network/NetworkManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ NetworkManager::create_receiver(std::vector<ConnectionInfo> connections, Connect
std::vector<std::string> uris;
for (auto& conn : connections) {
// Check for case where both ends are in app and ConnectivityService hasn't received other end yet
if (conn.uri.find("*") != std::string::npos) {
if (conn.uri.find("*") != std::string::npos || conn.uri.find("0.0.0.0") != std::string::npos) {
continue;
}
uris.push_back(conn.uri);
Expand All @@ -286,16 +286,18 @@ NetworkManager::create_receiver(std::vector<ConnectionInfo> connections, Connect
TLOG_DEBUG(12) << "Receiver reports connected to URI " << newCs;

// Replace with resolved if there are wildcards (host and/or port)
if (connections[0].uri.find("*") != std::string::npos) {
if (connections[0].uri.find("*") != std::string::npos || connections[0].uri.find("0.0.0.0") != std::string::npos) {
TLOG_DEBUG(14) << "Wildcard found in connection URI " << connections[0].uri << ", adjusting before publish";
auto newUri = utilities::parse_connection_string(newCs);
auto oldUri = utilities::parse_connection_string(connections[0].uri);

if (oldUri.port == "*")
oldUri.port = newUri.port;
if (oldUri.host == "*")
if (oldUri.host == "*" || oldUri.host == "0.0.0.0")
oldUri.host = newUri.host;

connections[0].uri = oldUri.to_string();
TLOG_DEBUG(14) << "Connection URI is now " << connections[0].uri;
}

if (is_pubsub) {
Expand Down Expand Up @@ -326,7 +328,7 @@ NetworkManager::create_sender(ConnectionInfo connection)
ipm::get_recommended_plugin_name(is_pubsub ? ipm::IpmPluginType::Publisher : ipm::IpmPluginType::Sender);

// Check for case where both ends are in app and ConnectivityService hasn't received other end yet
if (!is_pubsub && connection.uri.find("*") != std::string::npos) {
if (!is_pubsub && (connection.uri.find("*") != std::string::npos || connection.uri.find("0.0.0.0") != std::string::npos)) {
return nullptr;
}

Expand All @@ -337,16 +339,18 @@ NetworkManager::create_sender(ConnectionInfo connection)
TLOG_DEBUG(11) << "Sender Plugin connected, reports URI " << newCs;

// Replace with resolved if there are wildcards (host and/or port)
if (connection.uri.find("*") != std::string::npos) {
if (connection.uri.find("*") != std::string::npos || connection.uri.find("0.0.0.0") != std::string::npos) {
TLOG_DEBUG(13) << "Wildcard found in connection URI " << connection.uri << ", adjusting before publish";
auto newUri = utilities::parse_connection_string(newCs);
auto oldUri = utilities::parse_connection_string(connection.uri);

if (oldUri.port == "*")
oldUri.port = newUri.port;
if (oldUri.host == "*")
if (oldUri.host == "*" || oldUri.host == "0.0.0.0")
oldUri.host = newUri.host;

connection.uri = oldUri.to_string();
TLOG_DEBUG(13) << "Connection URI is now " << connection.uri;
}

if (m_config_client != nullptr && is_pubsub) {
Expand Down
Loading