niklas/rmw_cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return error for invalid name nodes

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2019-08-16 15:08:49 +02:00 • committed by eboasson
parent b49dd0eb62
commit 0f25192bcb
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
rmw_cyclonedds_cpp/src/rmw_node.cpp
View file

@ -31,6 +31,7 @@
#include "rmw/get_service_names_and_types.h"
#include "rmw/get_topic_names_and_types.h"
#include "rmw/get_node_info_and_types.h"
#include "rmw/validate_node_name.h"
#include "rmw/rmw.h"
#include "rmw/sanity_checks.h"
@ -359,7 +360,12 @@ extern "C" rmw_node_t *rmw_create_node (rmw_context_t *context, const char *name
RET_NULL_X (namespace_, return nullptr);
(void) domain_id;
(void) security_options;
rmw_ret_t ret;
int dummy_validation_result;
size_t dummy_invalid_index;
if ((ret = rmw_validate_node_name (name, &dummy_validation_result, &dummy_invalid_index)) != RMW_RET_OK) {
return nullptr;
}
dds_qos_t *qos = dds_create_qos ();
std::string user_data = get_node_user_data (name, namespace_);
dds_qset_userdata (qos, user_data.c_str (), user_data.size ());
@ -1813,6 +1819,13 @@ static rmw_ret_t get_endpoint_names_and_types_by_node (const rmw_node_t *node, r
if (ret != RMW_RET_OK) {
return ret;
}
if (node_name) {
int dummy_validation_result;
size_t dummy_invalid_index;
if ((ret = rmw_validate_node_name (node_name, &dummy_validation_result, &dummy_invalid_index)) != RMW_RET_OK) {
return ret;
}
}
std::set<dds_builtintopic_guid_t> guids;
if (node_name != nullptr && (ret = get_node_guids (node_name, node_namespace, guids)) != RMW_RET_OK) {
return ret;
@ -1851,6 +1864,13 @@ static rmw_ret_t get_service_names_and_types_by_node (const rmw_node_t *node, rc
if (ret != RMW_RET_OK) {
return ret;
}
if (node_name) {
int dummy_validation_result;
size_t dummy_invalid_index;
if ((ret = rmw_validate_node_name (node_name, &dummy_validation_result, &dummy_invalid_index)) != RMW_RET_OK) {
return ret;
}
}
std::set<dds_builtintopic_guid_t> guids;
if (node_name != nullptr && (ret = get_node_guids (node_name, node_namespace, guids)) != RMW_RET_OK) {
return ret;