diff --git a/src/fne/network/FNENetwork.h b/src/fne/network/FNENetwork.h index 58980841..4d59d438 100644 --- a/src/fne/network/FNENetwork.h +++ b/src/fne/network/FNENetwork.h @@ -55,6 +55,12 @@ namespace network STATE_NXDN = 3U, }; + #define INFLUXDB_ERRSTR_DISABLED_SRC_RID "disabled source RID" + #define INFLUXDB_ERRSTR_DISABLED_DST_RID "disabled destination RID" + #define INFLUXDB_ERRSTR_INV_TALKGROUP "illegal/invalid talkgroup" + #define INFLUXDB_ERRSTR_DISABLED_TALKGROUP "disabled talkgroup" + #define INFLUXDB_ERRSTR_INV_SLOT "invalid slot for talkgroup" + // --------------------------------------------------------------------------- // Class Prototypes // --------------------------------------------------------------------------- diff --git a/src/fne/network/fne/TagDMRData.cpp b/src/fne/network/fne/TagDMRData.cpp index 92099be2..7b77d99e 100644 --- a/src/fne/network/fne/TagDMRData.cpp +++ b/src/fne/network/fne/TagDMRData.cpp @@ -575,7 +575,7 @@ bool TagDMRData::validate(uint32_t peerId, data::Data& data, uint32_t streamId) .tag("streamId", std::to_string(streamId)) .tag("srcId", std::to_string(data.getSrcId())) .tag("dstId", std::to_string(data.getDstId())) - .field("message", "disabled source RID") + .field("message", INFLUXDB_ERRSTR_DISABLED_SRC_RID) .field("slot", data.getSlotNo()) .timestamp(std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()) .request(m_network->m_influxServer); @@ -603,7 +603,7 @@ bool TagDMRData::validate(uint32_t peerId, data::Data& data, uint32_t streamId) .tag("streamId", std::to_string(streamId)) .tag("srcId", std::to_string(data.getSrcId())) .tag("dstId", std::to_string(data.getDstId())) - .field("message", "disabled destination RID") + .field("message", INFLUXDB_ERRSTR_DISABLED_DST_RID) .field("slot", data.getSlotNo()) .timestamp(std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()) .request(m_network->m_influxServer); @@ -626,7 +626,7 @@ bool TagDMRData::validate(uint32_t peerId, data::Data& data, uint32_t streamId) .tag("streamId", std::to_string(streamId)) .tag("srcId", std::to_string(data.getSrcId())) .tag("dstId", std::to_string(data.getDstId())) - .field("message", "illegal/invalid talkgroup") + .field("message", INFLUXDB_ERRSTR_INV_TALKGROUP) .field("slot", data.getSlotNo()) .timestamp(std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()) .request(m_network->m_influxServer); @@ -645,7 +645,7 @@ bool TagDMRData::validate(uint32_t peerId, data::Data& data, uint32_t streamId) .tag("streamId", std::to_string(streamId)) .tag("srcId", std::to_string(data.getSrcId())) .tag("dstId", std::to_string(data.getDstId())) - .field("message", "invalid slot for talkgroup") + .field("message", INFLUXDB_ERRSTR_INV_SLOT) .field("slot", data.getSlotNo()) .timestamp(std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()) .request(m_network->m_influxServer); @@ -663,7 +663,7 @@ bool TagDMRData::validate(uint32_t peerId, data::Data& data, uint32_t streamId) .tag("streamId", std::to_string(streamId)) .tag("srcId", std::to_string(data.getSrcId())) .tag("dstId", std::to_string(data.getDstId())) - .field("message", "disabled talkgroup") + .field("message", INFLUXDB_ERRSTR_DISABLED_TALKGROUP) .field("slot", data.getSlotNo()) .timestamp(std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()) .request(m_network->m_influxServer); diff --git a/src/fne/network/fne/TagNXDNData.cpp b/src/fne/network/fne/TagNXDNData.cpp index 01365516..2fafdb5b 100644 --- a/src/fne/network/fne/TagNXDNData.cpp +++ b/src/fne/network/fne/TagNXDNData.cpp @@ -457,7 +457,7 @@ bool TagNXDNData::validate(uint32_t peerId, lc::RTCH& lc, uint8_t messageType, u .tag("streamId", std::to_string(streamId)) .tag("srcId", std::to_string(lc.getSrcId())) .tag("dstId", std::to_string(lc.getDstId())) - .field("message", "disabled source RID") + .field("message", INFLUXDB_ERRSTR_DISABLED_SRC_RID) .timestamp(std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()) .request(m_network->m_influxServer); } @@ -484,7 +484,7 @@ bool TagNXDNData::validate(uint32_t peerId, lc::RTCH& lc, uint8_t messageType, u .tag("streamId", std::to_string(streamId)) .tag("srcId", std::to_string(lc.getSrcId())) .tag("dstId", std::to_string(lc.getDstId())) - .field("message", "disabled destination RID") + .field("message", INFLUXDB_ERRSTR_DISABLED_DST_RID) .timestamp(std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()) .request(m_network->m_influxServer); } @@ -508,7 +508,7 @@ bool TagNXDNData::validate(uint32_t peerId, lc::RTCH& lc, uint8_t messageType, u .tag("streamId", std::to_string(streamId)) .tag("srcId", std::to_string(lc.getSrcId())) .tag("dstId", std::to_string(lc.getDstId())) - .field("message", "illegal/invalid talkgroup") + .field("message", INFLUXDB_ERRSTR_INV_TALKGROUP) .timestamp(std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()) .request(m_network->m_influxServer); } @@ -525,7 +525,7 @@ bool TagNXDNData::validate(uint32_t peerId, lc::RTCH& lc, uint8_t messageType, u .tag("streamId", std::to_string(streamId)) .tag("srcId", std::to_string(lc.getSrcId())) .tag("dstId", std::to_string(lc.getDstId())) - .field("message", "disabled talkgroup") + .field("message", INFLUXDB_ERRSTR_DISABLED_TALKGROUP) .timestamp(std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()) .request(m_network->m_influxServer); } diff --git a/src/fne/network/fne/TagP25Data.cpp b/src/fne/network/fne/TagP25Data.cpp index aa2120b6..52af13e2 100644 --- a/src/fne/network/fne/TagP25Data.cpp +++ b/src/fne/network/fne/TagP25Data.cpp @@ -786,7 +786,7 @@ bool TagP25Data::validate(uint32_t peerId, lc::LC& control, uint8_t duid, const .tag("streamId", std::to_string(streamId)) .tag("srcId", std::to_string(control.getSrcId())) .tag("dstId", std::to_string(control.getDstId())) - .field("message", "disabled source RID") + .field("message", INFLUXDB_ERRSTR_DISABLED_SRC_RID) .timestamp(std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()) .request(m_network->m_influxServer); } @@ -817,7 +817,7 @@ bool TagP25Data::validate(uint32_t peerId, lc::LC& control, uint8_t duid, const .tag("streamId", std::to_string(streamId)) .tag("srcId", std::to_string(control.getSrcId())) .tag("dstId", std::to_string(control.getDstId())) - .field("message", "disabled destination RID") + .field("message", INFLUXDB_ERRSTR_DISABLED_DST_RID) .timestamp(std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()) .request(m_network->m_influxServer); } @@ -865,7 +865,7 @@ bool TagP25Data::validate(uint32_t peerId, lc::LC& control, uint8_t duid, const .tag("streamId", std::to_string(streamId)) .tag("srcId", std::to_string(control.getSrcId())) .tag("dstId", std::to_string(control.getDstId())) - .field("message", "illegal/invalid talkgroup") + .field("message", INFLUXDB_ERRSTR_INV_TALKGROUP) .timestamp(std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()) .request(m_network->m_influxServer); } @@ -882,7 +882,7 @@ bool TagP25Data::validate(uint32_t peerId, lc::LC& control, uint8_t duid, const .tag("streamId", std::to_string(streamId)) .tag("srcId", std::to_string(control.getSrcId())) .tag("dstId", std::to_string(control.getDstId())) - .field("message", "disabled talkgroup") + .field("message", INFLUXDB_ERRSTR_DISABLED_TALKGROUP) .timestamp(std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()) .request(m_network->m_influxServer); }