Digital_Voice_Modem_Project
/
dvmhost
mirror of https://github.com/DVMProject/dvmhost.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make common strings #defines instead of copy and pasted static text;

Browse Source
pull/51/head
Bryan Biedenkapp 2 years ago
parent 1341690653
commit f603949879
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File

6
src/fne/network/FNENetwork.h
Unescape View File

@ -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
// ---------------------------------------------------------------------------

10
src/fne/network/fne/TagDMRData.cpp
Unescape View File

@ -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::nanoseconds>(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::nanoseconds>(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::nanoseconds>(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::nanoseconds>(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::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.request(m_network->m_influxServer);

8
src/fne/network/fne/TagNXDNData.cpp
Unescape View File

@ -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::nanoseconds>(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::nanoseconds>(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::nanoseconds>(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::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.request(m_network->m_influxServer);
}

8
src/fne/network/fne/TagP25Data.cpp
Unescape View File

@ -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::nanoseconds>(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::nanoseconds>(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::nanoseconds>(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::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.request(m_network->m_influxServer);
}

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.