From 82f5a61cb2a2ceed6dffa2a7676f2eae0938d293 Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Fri, 30 Jul 2021 09:26:21 -0400 Subject: [PATCH] assign initial UACN throughout the stack --- acn/appliance.cpp | 2 ++ acn/appliance.h | 16 ++++++---------- acn/component.h | 6 +++++- sacn/node.cpp | 2 +- sacn/receiver.cpp | 2 ++ sacn/source.cpp | 2 +- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/acn/appliance.cpp b/acn/appliance.cpp index b260cb1..85d5a14 100644 --- a/acn/appliance.cpp +++ b/acn/appliance.cpp @@ -39,6 +39,8 @@ namespace ACN { Appliance::Appliance(UUID::uuid cid) : Component(cid) { + assignUserName("libESTA ACN Appliance"); + RlpRegisterVectorHandler(SDT::SDT_PROTOCOL_ID, std::bind(&Appliance::SdtReceiver, this, std::placeholders::_1)); diff --git a/acn/appliance.h b/acn/appliance.h index 34c16dd..21d54c9 100644 --- a/acn/appliance.h +++ b/acn/appliance.h @@ -32,16 +32,6 @@ #include #include -// appliance: In DDL an appliance is a piece of equipment described by a root -// device and all its children and descendents. In DMP systems an appliance -// corresponds to a component that exposes one or more devices (since the -// rules require that all devices are descendants of a single root device). -// See also root device. - -// component: The process, program or application corresponding to a single ACN -// endpoint. All messages in ACN are sent and received by a component. See -// [Arch] for a more complete definition. - // root device: An instance of a device described in DDL that has no parent // device. See also appliance. @@ -50,6 +40,12 @@ namespace ACN { /** * @brief The Appliance class + * In DDL an appliance is a piece of equipment described by a root device and + * all its children and descendents. In DMP systems an appliance corresponds + * to a component that exposes one or more devices (since the rules require + * that all devices are descendants of a single root device). + * + * See also root device. */ class Appliance : public Component diff --git a/acn/component.h b/acn/component.h index 102992a..09d8d99 100644 --- a/acn/component.h +++ b/acn/component.h @@ -29,7 +29,11 @@ namespace ACN { /** - * @brief 2.1. ACN Components and Component Identifiers (CIDs) + * @brief The Component class + * The process, program or application corresponding to a single ACN endpoint. + * All messages in ACN are sent and received by a component. + * + * See [Arch] for a more complete definition. */ class Component { public: diff --git a/sacn/node.cpp b/sacn/node.cpp index 3e7d670..f73325d 100644 --- a/sacn/node.cpp +++ b/sacn/node.cpp @@ -5,7 +5,7 @@ namespace SACN { Node::Node(UUID::uuid cid) : Appliance(cid) { - + assignUserName("libESTA sACN Node"); } } // SACN diff --git a/sacn/receiver.cpp b/sacn/receiver.cpp index 3e22875..85885a4 100644 --- a/sacn/receiver.cpp +++ b/sacn/receiver.cpp @@ -35,6 +35,8 @@ namespace SACN { Receiver::Receiver(UUID::uuid cid) : Appliance(cid) { + assignUserName("libESTA sACN Receiver"); + RlpRegisterVectorHandler(VECTOR_ROOT_E131_DATA, std::bind(&Receiver::dataReceiver, this, std::placeholders::_1)); RlpRegisterVectorHandler(VECTOR_ROOT_E131_EXTENDED, diff --git a/sacn/source.cpp b/sacn/source.cpp index abf2fff..d723a3c 100644 --- a/sacn/source.cpp +++ b/sacn/source.cpp @@ -32,7 +32,7 @@ namespace SACN { Source::Source(UUID::uuid cid) : Appliance(cid) { - + assignUserName("libESTA sACN Source"); }