diff --git a/libuavcan/include/uavcan/node/generic_publisher.hpp b/libuavcan/include/uavcan/node/generic_publisher.hpp index 9b2f97bc90..7dde549c00 100644 --- a/libuavcan/include/uavcan/node/generic_publisher.hpp +++ b/libuavcan/include/uavcan/node/generic_publisher.hpp @@ -62,11 +62,11 @@ public: /** * By default, attempt to send a transfer from passive mode will result in an error @ref ErrPassive. - * This option allows to enable sending rogue transfers from passive mode. + * This option allows to enable sending anonymous transfers from passive mode. */ - void allowRogueTransfers() + void allowAnonymousTransfers() { - sender_->allowRogueTransfers(); + sender_->allowAnonymousTransfers(); } INode& getNode() const { return node_; } diff --git a/libuavcan/include/uavcan/node/generic_subscriber.hpp b/libuavcan/include/uavcan/node/generic_subscriber.hpp index dde139fe64..545e2a7489 100644 --- a/libuavcan/include/uavcan/node/generic_subscriber.hpp +++ b/libuavcan/include/uavcan/node/generic_subscriber.hpp @@ -67,7 +67,7 @@ public: TransferID getTransferID() const { return safeget(); } NodeID getSrcNodeID() const { return safeget(); } uint8_t getIfaceIndex() const { return safeget(); } - bool isRogueTransfer() const { return safeget(); } + bool isAnonymousTransfer() const { return safeget(); } }; /** @@ -198,12 +198,12 @@ protected: } /** - * By default, rogue transfers will be ignored. - * This option allows to enable reception of rogue transfers. + * By default, anonymous transfers will be ignored. + * This option allows to enable reception of anonymous transfers. */ - void allowRogueTransfers() + void allowAnonymousTransfers() { - forwarder_->allowRogueTransfers(); + forwarder_->allowAnonymousTransfers(); } /** diff --git a/libuavcan/include/uavcan/node/publisher.hpp b/libuavcan/include/uavcan/node/publisher.hpp index 9c684b29fc..2b720f7ee1 100644 --- a/libuavcan/include/uavcan/node/publisher.hpp +++ b/libuavcan/include/uavcan/node/publisher.hpp @@ -87,7 +87,7 @@ public: */ using BaseType::init; - using BaseType::allowRogueTransfers; + using BaseType::allowAnonymousTransfers; using BaseType::getTransferSender; using BaseType::getMinTxTimeout; using BaseType::getMaxTxTimeout; diff --git a/libuavcan/include/uavcan/node/subscriber.hpp b/libuavcan/include/uavcan/node/subscriber.hpp index 1bb8b2c934..f5c19f4c78 100644 --- a/libuavcan/include/uavcan/node/subscriber.hpp +++ b/libuavcan/include/uavcan/node/subscriber.hpp @@ -111,7 +111,7 @@ public: return BaseType::startAsMessageListener(); } - using BaseType::allowRogueTransfers; + using BaseType::allowAnonymousTransfers; using BaseType::stop; using BaseType::getFailureCount; }; diff --git a/libuavcan/include/uavcan/transport/transfer_listener.hpp b/libuavcan/include/uavcan/transport/transfer_listener.hpp index 99f4efd11e..73491be3b1 100644 --- a/libuavcan/include/uavcan/transport/transfer_listener.hpp +++ b/libuavcan/include/uavcan/transport/transfer_listener.hpp @@ -51,9 +51,9 @@ public: virtual void release() { } /** - * Whether this is a rogue transfer + * Whether this is a anonymous transfer */ - virtual bool isRogueTransfer() const { return false; } + virtual bool isAnonymousTransfer() const { return false; } MonotonicTime getMonotonicTimestamp() const { return ts_mono_; } UtcTime getUtcTimestamp() const { return ts_utc_; } @@ -73,7 +73,7 @@ class UAVCAN_EXPORT SingleFrameIncomingTransfer : public IncomingTransfer public: explicit SingleFrameIncomingTransfer(const RxFrame& frm); virtual int read(unsigned offset, uint8_t* data, unsigned len) const; - virtual bool isRogueTransfer() const; + virtual bool isAnonymousTransfer() const; }; /** @@ -99,7 +99,7 @@ class UAVCAN_EXPORT TransferListenerBase : public LinkedListNode& receivers_; ITransferBufferManager& bufmgr_; TransferPerfCounter& perf_; - bool allow_rogue_transfers_; + bool allow_anonymous_transfers_; class TimedOutReceiverPredicate { @@ -126,13 +126,13 @@ protected: , receivers_(receivers) , bufmgr_(bufmgr) , perf_(perf) - , allow_rogue_transfers_(false) + , allow_anonymous_transfers_(false) { } virtual ~TransferListenerBase() { } void handleReception(TransferReceiver& receiver, const RxFrame& frame, TransferBufferAccessor& tba); - void handleRogueTransferReception(const RxFrame& frame); + void handleAnonymousTransferReception(const RxFrame& frame); virtual void handleIncomingTransfer(IncomingTransfer& transfer) = 0; @@ -140,10 +140,10 @@ public: const DataTypeDescriptor& getDataTypeDescriptor() const { return data_type_; } /** - * By default, rogue transfers will be ignored. - * This option allows to enable reception of rogue transfers. + * By default, anonymous transfers will be ignored. + * This option allows to enable reception of anonymous transfers. */ - void allowRogueTransfers() { allow_rogue_transfers_ = true; } + void allowAnonymousTransfers() { allow_anonymous_transfers_ = true; } void cleanup(MonotonicTime ts); diff --git a/libuavcan/include/uavcan/transport/transfer_sender.hpp b/libuavcan/include/uavcan/transport/transfer_sender.hpp index 0b23b8b405..b67edf23a7 100644 --- a/libuavcan/include/uavcan/transport/transfer_sender.hpp +++ b/libuavcan/include/uavcan/transport/transfer_sender.hpp @@ -25,7 +25,7 @@ class UAVCAN_EXPORT TransferSender const TransferCRC crc_base_; CanIOFlags flags_; uint8_t iface_mask_; - bool allow_rogue_transfers_; + bool allow_anonymous_transfers_; Dispatcher& dispatcher_; @@ -47,7 +47,7 @@ public: , crc_base_(data_type.getSignature().toTransferCRC()) , flags_(CanIOFlags(0)) , iface_mask_(AllIfacesMask) - , allow_rogue_transfers_(false) + , allow_anonymous_transfers_(false) , dispatcher_(dispatcher) { } @@ -62,13 +62,13 @@ public: } /** - * Rogue transfers (i.e. transfers that don't carry a valid Source Node ID) can be sent if + * Anonymous transfers (i.e. transfers that don't carry a valid Source Node ID) can be sent if * the local node is configured in passive mode (i.e. the node doesn't have a valid Node ID). * By default, this class will return an error if it is asked to send a transfer while the * node is configured in passive mode. However, if this option is enabled, it will be possible - * to send rogue transfers from passive mode. + * to send anonymous transfers from passive mode. */ - void allowRogueTransfers() { allow_rogue_transfers_ = true; } + void allowAnonymousTransfers() { allow_anonymous_transfers_ = true; } /** * Send with explicit Transfer ID. diff --git a/libuavcan/src/protocol/uc_dynamic_node_id_allocation_client.cpp b/libuavcan/src/protocol/uc_dynamic_node_id_allocation_client.cpp index 7a989c13a8..f948d7b42e 100644 --- a/libuavcan/src/protocol/uc_dynamic_node_id_allocation_client.cpp +++ b/libuavcan/src/protocol/uc_dynamic_node_id_allocation_client.cpp @@ -31,7 +31,7 @@ void DynamicNodeIDAllocationClient::handleTimerEvent(const TimerEvent&) void DynamicNodeIDAllocationClient::handleDynamicNodeIDAllocation( const ReceivedDataStructure& msg) { - if ((msg.short_unique_id != short_unique_id_) || msg.isRogueTransfer()) + if ((msg.short_unique_id != short_unique_id_) || msg.isAnonymousTransfer()) { return; // Not ours } @@ -83,7 +83,7 @@ int DynamicNodeIDAllocationClient::startImpl() { return res; } - dnida_pub_.allowRogueTransfers(); + dnida_pub_.allowAnonymousTransfers(); res = dnida_sub_.start( DynamicNodeIDAllocationCallback(this, &DynamicNodeIDAllocationClient::handleDynamicNodeIDAllocation)); @@ -91,7 +91,7 @@ int DynamicNodeIDAllocationClient::startImpl() { return res; } - dnida_sub_.allowRogueTransfers(); + dnida_sub_.allowAnonymousTransfers(); startPeriodic( MonotonicDuration::fromMSec(protocol::DynamicNodeIDAllocation::ALLOCATEE_MIN_BROADCAST_INTERVAL_SEC * 1000)); diff --git a/libuavcan/src/transport/uc_transfer_listener.cpp b/libuavcan/src/transport/uc_transfer_listener.cpp index 8cba8d6226..6a5d38fbec 100644 --- a/libuavcan/src/transport/uc_transfer_listener.cpp +++ b/libuavcan/src/transport/uc_transfer_listener.cpp @@ -50,7 +50,7 @@ int SingleFrameIncomingTransfer::read(unsigned offset, uint8_t* data, unsigned l return int(len); } -bool SingleFrameIncomingTransfer::isRogueTransfer() const +bool SingleFrameIncomingTransfer::isAnonymousTransfer() const { return (getTransferType() == TransferTypeMessageBroadcast) && getSrcNodeID().isBroadcast(); } @@ -177,9 +177,9 @@ void TransferListenerBase::handleReception(TransferReceiver& receiver, const RxF } } -void TransferListenerBase::handleRogueTransferReception(const RxFrame& frame) +void TransferListenerBase::handleAnonymousTransferReception(const RxFrame& frame) { - if (allow_rogue_transfers_) + if (allow_anonymous_transfers_) { perf_.addRxTransfer(); SingleFrameIncomingTransfer it(frame); @@ -221,9 +221,9 @@ void TransferListenerBase::handleFrame(const RxFrame& frame) else if (frame.getSrcNodeID().isBroadcast() && frame.isFirst() && frame.isLast() && - frame.getDstNodeID().isBroadcast()) // Rogue transfer + frame.getDstNodeID().isBroadcast()) // Anonymous transfer { - handleRogueTransferReception(frame); + handleAnonymousTransferReception(frame); } else { diff --git a/libuavcan/src/transport/uc_transfer_sender.cpp b/libuavcan/src/transport/uc_transfer_sender.cpp index bd024a8ff7..0e603a4b54 100644 --- a/libuavcan/src/transport/uc_transfer_sender.cpp +++ b/libuavcan/src/transport/uc_transfer_sender.cpp @@ -30,11 +30,11 @@ int TransferSender::send(const uint8_t* payload, unsigned payload_len, Monotonic /* * Checking if we're allowed to send. - * In passive mode we can send only rogue transfers, if they are enabled. + * In passive mode we can send only anonymous transfers, if they are enabled. */ if (dispatcher_.isPassiveMode()) { - const bool allow = allow_rogue_transfers_ && + const bool allow = allow_anonymous_transfers_ && (transfer_type == TransferTypeMessageBroadcast) && (int(payload_len) <= frame.getMaxPayloadLen()); if (!allow) diff --git a/libuavcan/test/protocol/dynamic_node_id_allocation_client.cpp b/libuavcan/test/protocol/dynamic_node_id_allocation_client.cpp index 0e86d84e54..5806008291 100644 --- a/libuavcan/test/protocol/dynamic_node_id_allocation_client.cpp +++ b/libuavcan/test/protocol/dynamic_node_id_allocation_client.cpp @@ -54,11 +54,11 @@ TEST(DynamicNodeIDAllocationClient, Basic) /* * Initializing subscriber - * Rogue transfers must be enabled + * Anonymous transfers must be enabled */ SubscriberWithCollector dynid_sub(nodes.a); ASSERT_LE(0, dynid_sub.start()); - dynid_sub.subscriber.allowRogueTransfers(); + dynid_sub.subscriber.allowAnonymousTransfers(); /* * Monitoring requests at 1Hz @@ -86,7 +86,7 @@ TEST(DynamicNodeIDAllocationClient, Basic) /* * Sending a bunch of responses - * Note that response transfers are NOT rogue + * Note that response transfers are NOT anonymous */ uavcan::Publisher dynid_pub(nodes.a); ASSERT_LE(0, dynid_pub.init()); diff --git a/libuavcan/test/transport/transfer_listener.cpp b/libuavcan/test/transport/transfer_listener.cpp index 33ebf82770..fd42c1f118 100644 --- a/libuavcan/test/transport/transfer_listener.cpp +++ b/libuavcan/test/transport/transfer_listener.cpp @@ -245,7 +245,7 @@ TEST(TransferListener, MaximumTransferLength) } -TEST(TransferListener, RogueTransfers) +TEST(TransferListener, AnonymousTransfers) { const uavcan::DataTypeDescriptor type(uavcan::DataTypeKindMessage, 123, uavcan::DataTypeSignature(123456789), "A"); @@ -264,15 +264,15 @@ TEST(TransferListener, RogueTransfers) emulator.send(transfers); - // Nothing will be received, because rogue transfers are disabled by default + // Nothing will be received, because anonymous transfers are disabled by default ASSERT_TRUE(subscriber.isEmpty()); - subscriber.allowRogueTransfers(); + subscriber.allowAnonymousTransfers(); // Re-send everything again emulator.send(transfers); - // Now the rogue transfers are enabled + // Now the anonymous transfers are enabled ASSERT_TRUE(subscriber.matchAndPop(transfers[1])); // Only SFT broadcast will be accepted ASSERT_TRUE(subscriber.matchAndPop(transfers[3])); diff --git a/libuavcan/test/transport/transfer_sender.cpp b/libuavcan/test/transport/transfer_sender.cpp index baa4929f38..1fe2e22dbc 100644 --- a/libuavcan/test/transport/transfer_sender.cpp +++ b/libuavcan/test/transport/transfer_sender.cpp @@ -241,7 +241,7 @@ TEST(TransferSender, PassiveMode) uavcan::TransferTypeMessageBroadcast, uavcan::NodeID::Broadcast)); // Overriding the default - sender.allowRogueTransfers(); + sender.allowAnonymousTransfers(); // OK, now we can broadcast in any mode ASSERT_LE(0, sender.send(Payload, sizeof(Payload), tsMono(1000), uavcan::MonotonicTime(), diff --git a/libuavcan/test/transport/transfer_test_helpers.hpp b/libuavcan/test/transport/transfer_test_helpers.hpp index bbb25c4362..f27a603c49 100644 --- a/libuavcan/test/transport/transfer_test_helpers.hpp +++ b/libuavcan/test/transport/transfer_test_helpers.hpp @@ -132,11 +132,11 @@ public: const bool single_frame = dynamic_cast(&transfer) != NULL; - const bool rogue = single_frame && - transfer.getSrcNodeID().isBroadcast() && - (transfer.getTransferType() == uavcan::TransferTypeMessageBroadcast); + const bool anonymous = single_frame && + transfer.getSrcNodeID().isBroadcast() && + (transfer.getTransferType() == uavcan::TransferTypeMessageBroadcast); - ASSERT_EQ(rogue, transfer.isRogueTransfer()); + ASSERT_EQ(anonymous, transfer.isAnonymousTransfer()); } bool matchAndPop(const Transfer& reference)