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

fix issue wehre message field was being incorrectly stored and could be pushed as an incorrect type (i.e. non-string) [NOTE: this could *break* collected Influx data];

Browse Source
pull/85/head
Bryan Biedenkapp 10 months ago
parent 26aafbe1dd
commit 68829b17f2
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File

30
src/fne/network/callhandler/TagDMRData.cpp
Unescape View File

@ -763,8 +763,8 @@ bool TagDMRData::validate(uint32_t peerId, data::NetData& data, uint32_t streamI
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(data.getSrcId())) .tag("srcId", std::to_string(data.getSrcId()))
.tag("dstId", std::to_string(data.getDstId())) .tag("dstId", std::to_string(data.getDstId()))
.field("message", INFLUXDB_ERRSTR_DISABLED_SRC_RID) .field("message", std::string(INFLUXDB_ERRSTR_DISABLED_SRC_RID))
.field("slot", data.getSlotNo()) .field("slot", std::to_string(data.getSlotNo()))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -800,8 +800,8 @@ bool TagDMRData::validate(uint32_t peerId, data::NetData& data, uint32_t streamI
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(data.getSrcId())) .tag("srcId", std::to_string(data.getSrcId()))
.tag("dstId", std::to_string(data.getDstId())) .tag("dstId", std::to_string(data.getDstId()))
.field("message", INFLUXDB_ERRSTR_DISABLED_DST_RID) .field("message", std::string(INFLUXDB_ERRSTR_DISABLED_DST_RID))
.field("slot", data.getSlotNo()) .field("slot", std::to_string(data.getSlotNo()))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -821,8 +821,8 @@ bool TagDMRData::validate(uint32_t peerId, data::NetData& data, uint32_t streamI
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(data.getSrcId())) .tag("srcId", std::to_string(data.getSrcId()))
.tag("dstId", std::to_string(data.getDstId())) .tag("dstId", std::to_string(data.getDstId()))
.field("message", INFLUXDB_ERRSTR_DISABLED_SRC_RID) .field("message", std::string(INFLUXDB_ERRSTR_DISABLED_SRC_RID))
.field("slot", data.getSlotNo()) .field("slot", std::to_string(data.getSlotNo()))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -848,8 +848,8 @@ bool TagDMRData::validate(uint32_t peerId, data::NetData& data, uint32_t streamI
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(data.getSrcId())) .tag("srcId", std::to_string(data.getSrcId()))
.tag("dstId", std::to_string(data.getDstId())) .tag("dstId", std::to_string(data.getDstId()))
.field("message", INFLUXDB_ERRSTR_INV_TALKGROUP) .field("message", std::string(INFLUXDB_ERRSTR_INV_TALKGROUP))
.field("slot", data.getSlotNo()) .field("slot", std::to_string(data.getSlotNo()))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -880,8 +880,8 @@ bool TagDMRData::validate(uint32_t peerId, data::NetData& data, uint32_t streamI
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(data.getSrcId())) .tag("srcId", std::to_string(data.getSrcId()))
.tag("dstId", std::to_string(data.getDstId())) .tag("dstId", std::to_string(data.getDstId()))
.field("message", INFLUXDB_ERRSTR_DISABLED_SRC_RID) .field("message", std::string(INFLUXDB_ERRSTR_DISABLED_SRC_RID))
.field("slot", data.getSlotNo()) .field("slot", std::to_string(data.getSlotNo()))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -903,8 +903,8 @@ bool TagDMRData::validate(uint32_t peerId, data::NetData& data, uint32_t streamI
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(data.getSrcId())) .tag("srcId", std::to_string(data.getSrcId()))
.tag("dstId", std::to_string(data.getDstId())) .tag("dstId", std::to_string(data.getDstId()))
.field("message", INFLUXDB_ERRSTR_INV_SLOT) .field("message", std::string(INFLUXDB_ERRSTR_INV_SLOT))
.field("slot", data.getSlotNo()) .field("slot", std::to_string(data.getSlotNo()))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -924,8 +924,8 @@ bool TagDMRData::validate(uint32_t peerId, data::NetData& data, uint32_t streamI
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(data.getSrcId())) .tag("srcId", std::to_string(data.getSrcId()))
.tag("dstId", std::to_string(data.getDstId())) .tag("dstId", std::to_string(data.getDstId()))
.field("message", INFLUXDB_ERRSTR_DISABLED_TALKGROUP) .field("message", std::string(INFLUXDB_ERRSTR_DISABLED_TALKGROUP))
.field("slot", data.getSlotNo()) .field("slot", std::to_string(data.getSlotNo()))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -950,7 +950,7 @@ bool TagDMRData::validate(uint32_t peerId, data::NetData& data, uint32_t streamI
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(data.getSrcId())) .tag("srcId", std::to_string(data.getSrcId()))
.tag("dstId", std::to_string(data.getDstId())) .tag("dstId", std::to_string(data.getDstId()))
.field("message", INFLUXDB_ERRSTR_RID_NOT_PERMITTED) .field("message", std::string(INFLUXDB_ERRSTR_RID_NOT_PERMITTED))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }

12
src/fne/network/callhandler/TagNXDNData.cpp
Unescape View File

@ -570,7 +570,7 @@ bool TagNXDNData::validate(uint32_t peerId, lc::RTCH& lc, uint8_t messageType, u
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(lc.getSrcId())) .tag("srcId", std::to_string(lc.getSrcId()))
.tag("dstId", std::to_string(lc.getDstId())) .tag("dstId", std::to_string(lc.getDstId()))
.field("message", INFLUXDB_ERRSTR_DISABLED_SRC_RID) .field("message", std::string(INFLUXDB_ERRSTR_DISABLED_SRC_RID))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -606,7 +606,7 @@ bool TagNXDNData::validate(uint32_t peerId, lc::RTCH& lc, uint8_t messageType, u
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(lc.getSrcId())) .tag("srcId", std::to_string(lc.getSrcId()))
.tag("dstId", std::to_string(lc.getDstId())) .tag("dstId", std::to_string(lc.getDstId()))
.field("message", INFLUXDB_ERRSTR_DISABLED_DST_RID) .field("message", std::string(INFLUXDB_ERRSTR_DISABLED_DST_RID))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -628,7 +628,7 @@ bool TagNXDNData::validate(uint32_t peerId, lc::RTCH& lc, uint8_t messageType, u
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(lc.getSrcId())) .tag("srcId", std::to_string(lc.getSrcId()))
.tag("dstId", std::to_string(lc.getDstId())) .tag("dstId", std::to_string(lc.getDstId()))
.field("message", INFLUXDB_ERRSTR_DISABLED_SRC_RID) .field("message", std::string(INFLUXDB_ERRSTR_DISABLED_SRC_RID))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -656,7 +656,7 @@ bool TagNXDNData::validate(uint32_t peerId, lc::RTCH& lc, uint8_t messageType, u
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(lc.getSrcId())) .tag("srcId", std::to_string(lc.getSrcId()))
.tag("dstId", std::to_string(lc.getDstId())) .tag("dstId", std::to_string(lc.getDstId()))
.field("message", INFLUXDB_ERRSTR_INV_TALKGROUP) .field("message", std::string(INFLUXDB_ERRSTR_INV_TALKGROUP))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -687,7 +687,7 @@ bool TagNXDNData::validate(uint32_t peerId, lc::RTCH& lc, uint8_t messageType, u
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(lc.getSrcId())) .tag("srcId", std::to_string(lc.getSrcId()))
.tag("dstId", std::to_string(lc.getDstId())) .tag("dstId", std::to_string(lc.getDstId()))
.field("message", INFLUXDB_ERRSTR_DISABLED_SRC_RID) .field("message", std::string(INFLUXDB_ERRSTR_DISABLED_SRC_RID))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -734,7 +734,7 @@ bool TagNXDNData::validate(uint32_t peerId, lc::RTCH& lc, uint8_t messageType, u
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(lc.getSrcId())) .tag("srcId", std::to_string(lc.getSrcId()))
.tag("dstId", std::to_string(lc.getDstId())) .tag("dstId", std::to_string(lc.getDstId()))
.field("message", INFLUXDB_ERRSTR_RID_NOT_PERMITTED) .field("message", std::string(INFLUXDB_ERRSTR_RID_NOT_PERMITTED))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }

14
src/fne/network/callhandler/TagP25Data.cpp
Unescape View File

@ -1088,7 +1088,7 @@ bool TagP25Data::validate(uint32_t peerId, lc::LC& control, DUID::E duid, const
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(control.getSrcId())) .tag("srcId", std::to_string(control.getSrcId()))
.tag("dstId", std::to_string(control.getDstId())) .tag("dstId", std::to_string(control.getDstId()))
.field("message", INFLUXDB_ERRSTR_DISABLED_SRC_RID) .field("message", std::string(INFLUXDB_ERRSTR_DISABLED_SRC_RID))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -1156,7 +1156,7 @@ bool TagP25Data::validate(uint32_t peerId, lc::LC& control, DUID::E duid, const
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(control.getSrcId())) .tag("srcId", std::to_string(control.getSrcId()))
.tag("dstId", std::to_string(control.getDstId())) .tag("dstId", std::to_string(control.getDstId()))
.field("message", INFLUXDB_ERRSTR_DISABLED_DST_RID) .field("message", std::string(INFLUXDB_ERRSTR_DISABLED_DST_RID))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -1178,7 +1178,7 @@ bool TagP25Data::validate(uint32_t peerId, lc::LC& control, DUID::E duid, const
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(control.getSrcId())) .tag("srcId", std::to_string(control.getSrcId()))
.tag("dstId", std::to_string(control.getDstId())) .tag("dstId", std::to_string(control.getDstId()))
.field("message", INFLUXDB_ERRSTR_DISABLED_SRC_RID) .field("message", std::string(INFLUXDB_ERRSTR_DISABLED_SRC_RID))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -1254,7 +1254,7 @@ bool TagP25Data::validate(uint32_t peerId, lc::LC& control, DUID::E duid, const
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(control.getSrcId())) .tag("srcId", std::to_string(control.getSrcId()))
.tag("dstId", std::to_string(control.getDstId())) .tag("dstId", std::to_string(control.getDstId()))
.field("message", INFLUXDB_ERRSTR_INV_TALKGROUP) .field("message", std::string(INFLUXDB_ERRSTR_INV_TALKGROUP))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -1285,7 +1285,7 @@ bool TagP25Data::validate(uint32_t peerId, lc::LC& control, DUID::E duid, const
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(control.getSrcId())) .tag("srcId", std::to_string(control.getSrcId()))
.tag("dstId", std::to_string(control.getDstId())) .tag("dstId", std::to_string(control.getDstId()))
.field("message", INFLUXDB_ERRSTR_DISABLED_SRC_RID) .field("message", std::string(INFLUXDB_ERRSTR_DISABLED_SRC_RID))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -1307,7 +1307,7 @@ bool TagP25Data::validate(uint32_t peerId, lc::LC& control, DUID::E duid, const
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(control.getSrcId())) .tag("srcId", std::to_string(control.getSrcId()))
.tag("dstId", std::to_string(control.getDstId())) .tag("dstId", std::to_string(control.getDstId()))
.field("message", INFLUXDB_ERRSTR_DISABLED_TALKGROUP) .field("message", std::string(INFLUXDB_ERRSTR_DISABLED_TALKGROUP))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }
@ -1332,7 +1332,7 @@ bool TagP25Data::validate(uint32_t peerId, lc::LC& control, DUID::E duid, const
.tag("streamId", std::to_string(streamId)) .tag("streamId", std::to_string(streamId))
.tag("srcId", std::to_string(control.getSrcId())) .tag("srcId", std::to_string(control.getSrcId()))
.tag("dstId", std::to_string(control.getDstId())) .tag("dstId", std::to_string(control.getDstId()))
.field("message", INFLUXDB_ERRSTR_RID_NOT_PERMITTED) .field("message", std::string(INFLUXDB_ERRSTR_RID_NOT_PERMITTED))
.timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count()) .timestamp(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
.requestAsync(m_network->m_influxServer); .requestAsync(m_network->m_influxServer);
} }

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.