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.

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

9 ➡️ 10 #259

Merged
merged 9 commits into from
Sep 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
id: ci
uses: ignition-tooling/action-ignition-ci@bionic
with:
codecov-token: ${{ secrets.CODECOV_TOKEN }}
codecov-enabled: true
focal-ci:
runs-on: ubuntu-latest
name: Ubuntu Focal CI
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ project(ignition-transport10 VERSION 10.0.0)
# Find ignition-cmake
#============================================================================
# If you get an error at this line, you need to install ignition-cmake
find_package(ignition-cmake2 2.3 REQUIRED)
find_package(ignition-cmake2 2.8.0 REQUIRED)
set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})

#============================================================================
Expand Down
20 changes: 20 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,26 @@

### Ignition Transport 9.X.X

### Ignition Transport 9.1.1 (2021-01-05)

1. Add errno output for discovery.
* [Github pull request 254](https://github.com/ignitionrobotics/ign-transport/pull/254)

1. Consider all network interfaces when checking HOST option.
* [Github pull request 245](https://github.com/ignitionrobotics/ign-transport/pull/245)

1. Remove tools/code_check and update codecov.
* [Github pull request 246](https://github.com/ignitionrobotics/ign-transport/pull/246)

1. Remove deprecated test.
* [Github pull request 239](https://github.com/ignitionrobotics/ign-transport/pull/239)

1. Master branch updates.
* [Github pull request 224](https://github.com/ignitionrobotics/ign-transport/pull/224)

1. Add windows installation.
* [Github pull request 214](https://github.com/ignitionrobotics/ign-transport/pull/214)

### Ignition Transport 9.1.0 (2021-01-05)

1. All changes up to version 8.2.0.
Expand Down
15 changes: 11 additions & 4 deletions include/ignition/transport/Discovery.hh
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,10 @@ namespace ignition
this->SendUnicast(msg);
}

bool isSenderLocal = (std::find(this->hostInterfaces.begin(),
this->hostInterfaces.end(), _fromIp) != this->hostInterfaces.end()) ||
(_fromIp.find("127.") == 0);

// Update timestamp and cache the callbacks.
DiscoveryCallback<Pub> connectCb;
DiscoveryCallback<Pub> disconnectCb;
Expand All @@ -926,7 +930,7 @@ namespace ignition
// Check scope of the topic.
if ((publisher.Options().Scope() == Scope_t::PROCESS) ||
(publisher.Options().Scope() == Scope_t::HOST &&
_fromIp != this->hostAddr))
!isSenderLocal))
{
return;
}
Expand Down Expand Up @@ -979,7 +983,7 @@ namespace ignition
// Check scope of the topic.
if ((nodeInfo.Options().Scope() == Scope_t::PROCESS) ||
(nodeInfo.Options().Scope() == Scope_t::HOST &&
_fromIp != this->hostAddr))
!isSenderLocal))
{
continue;
}
Expand Down Expand Up @@ -1051,7 +1055,7 @@ namespace ignition
// Check scope of the topic.
if ((publisher.Options().Scope() == Scope_t::PROCESS) ||
(publisher.Options().Scope() == Scope_t::HOST &&
_fromIp != this->hostAddr))
!isSenderLocal))
{
return;
}
Expand Down Expand Up @@ -1169,6 +1173,7 @@ namespace ignition
// Send the discovery message to the unicast relays.
for (const auto &sockAddr : this->relayAddrs)
{
errno = 0;
auto sent = sendto(this->sockets.at(0),
reinterpret_cast<const raw_type *>(
reinterpret_cast<const unsigned char*>(buffer)),
Expand All @@ -1178,7 +1183,9 @@ namespace ignition

if (sent != totalSize)
{
std::cerr << "Exception sending a unicast message" << std::endl;
std::cerr << "Exception sending a unicast message:" << std::endl;
std::cerr << " Return value: " << sent << std::endl;
std::cerr << " Error code: " << strerror(errno) << std::endl;
break;
}
}
Expand Down
10 changes: 0 additions & 10 deletions test/regression/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,3 @@ ign_get_sources(tests)

ign_build_tests(TYPE REGRESSION SOURCES ${tests}
LIB_DEPS ${EXTRA_TEST_LIB_DEPS})

if(TARGET REGRESSION_deprecated)
# Turn off deprecation warnings specifically for the test of deprecated
# functions.
if(UNIX)
target_compile_options(REGRESSION_deprecated PRIVATE -Wno-deprecated-declarations)
elseif(MSVC)
target_compile_options(REGRESSION_deprecated PRIVATE /wd4996)
endif()
endif()
41 changes: 0 additions & 41 deletions test/regression/deprecated.cc

This file was deleted.

81 changes: 0 additions & 81 deletions tools/check_test_ran.py

This file was deleted.

Loading