MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 15:09:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update the M17 callsign parsing rules.

Browse Source
This commit is contained in:
Jonathan Naylor
2024-09-23 17:04:18 +01:00
parent 001dfd6db6
commit ace21b744f
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
M17Utils.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2020,2021 by Jonathan Naylor G4KLX * Copyright (C) 2020,2021,2024 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -43,26 +43,30 @@ void CM17Utils::encodeCallsign(const std::string& callsign, unsigned char* encod
return; return;
} }
unsigned int len = callsign.size(); unsigned int len = (unsigned int)callsign.size();
if (len > 9U) if (len > 9U)
len = 9U; len = 9U;
uint64_t enc = 0ULL; uint64_t enc = 0ULL;
for (int i = len - 1; i >= 0; i--) { for (int i = len - 1; i >= 0; i--) {
size_t pos = M17_CHARS.find(callsign[i]); if ((i == 0) && (callsign[i] == '#')) {
if (pos == std::string::npos) enc += 262144000000000ULL;
pos = 0ULL; } else {
size_t pos = M17_CHARS.find(callsign[i]);
if (pos == std::string::npos)
pos = 0ULL;
enc *= 40ULL; enc *= 40ULL;
enc += pos; enc += pos;
}
} }
encoded[0U] = (enc >> 40) & 0xFFU; encoded[0U] = (enc >> 40) & 0xFFU;
encoded[1U] = (enc >> 32) & 0xFFU; encoded[1U] = (enc >> 32) & 0xFFU;
encoded[2U] = (enc >> 24) & 0xFFU; encoded[2U] = (enc >> 24) & 0xFFU;
encoded[3U] = (enc >> 16) & 0xFFU; encoded[3U] = (enc >> 16) & 0xFFU;
encoded[4U] = (enc >> 8) & 0xFFU; encoded[4U] = (enc >> 8) & 0xFFU;
encoded[5U] = (enc >> 0) & 0xFFU; encoded[5U] = (enc >> 0) & 0xFFU;
} }
void CM17Utils::decodeCallsign(const unsigned char* encoded, std::string& callsign) void CM17Utils::decodeCallsign(const unsigned char* encoded, std::string& callsign)
@@ -71,22 +75,27 @@ void CM17Utils::decodeCallsign(const unsigned char* encoded, std::string& callsi
callsign.clear(); callsign.clear();
if (encoded[0U] == 0xFFU && encoded[1U] == 0xFFU && encoded[2U] == 0xFFU && uint64_t enc = (uint64_t(encoded[0U]) << 40) +
encoded[3U] == 0xFFU && encoded[4U] == 0xFFU && encoded[5U] == 0xFFU) { (uint64_t(encoded[1U]) << 32) +
(uint64_t(encoded[2U]) << 24) +
(uint64_t(encoded[3U]) << 16) +
(uint64_t(encoded[4U]) << 8) +
(uint64_t(encoded[5U]) << 0);
if (enc == 281474976710655ULL) {
callsign = "ALL"; callsign = "ALL";
return; return;
} }
uint64_t enc = if (enc >= 268697600000000ULL) {
(uint64_t(encoded[0U]) << 40) + callsign = "Invalid";
(uint64_t(encoded[1U]) << 32) +
(uint64_t(encoded[2U]) << 24) +
(uint64_t(encoded[3U]) << 16) +
(uint64_t(encoded[4U]) << 8) +
(uint64_t(encoded[5U]) << 0);
if (enc >= 262144000000000ULL) // 40^9
return; return;
}
if (enc >= 262144000000000ULL) {
callsign = "#";
enc -= 262144000000000ULL;
}
while (enc > 0ULL) { while (enc > 0ULL) {
callsign += " ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-/."[enc % 40ULL]; callsign += " ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-/."[enc % 40ULL];

2
Version.h
View File

@@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20240831"; const char* VERSION = "20240923";
#endif #endif