williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pocsag: Allow dialing function digit A..D (numeric, tone 1, tone 2, alpha)

Browse Source
This commit is contained in:
Andreas Eversberg
2024-04-01 21:52:36 +02:00
parent b8b250bd0a
commit a2ea0339e5
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocsag/main.c
View File

@@ -244,7 +244,7 @@ int msg_receive(const char *text)
static const struct number_lengths number_lengths[] = { static const struct number_lengths number_lengths[] = {
{ 7, "RIC with default function" }, { 7, "RIC with default function" },
{ 8, "RIC with function (append 0..3)" }, { 8, "RIC with function (append 0..3 or A..D)" },
{ 0, NULL } { 0, NULL }
}; };
@@ -262,7 +262,7 @@ int main(int argc, char *argv[])
init_besetzton(); init_besetzton();
/* init mobile interface */ /* init mobile interface */
main_mobile_init("0123456789", number_lengths, NULL, pocsag_number_valid); main_mobile_init("0123456789ABCD", number_lengths, NULL, pocsag_number_valid);
/* handle options / config file */ /* handle options / config file */
add_options(); add_options();

17
src/pocsag/pocsag.c
View File

@@ -144,16 +144,19 @@ const char *pocsag_number_valid(const char *number)
/* assume that the number has valid length(s) and digits */ /* assume that the number has valid length(s) and digits */
for (i = 0; i < 7; i++) for (i = 0; i < 7; i++) {
if (number[i] < '0' || number[i] > '9')
return "Illegal RIC digit (Use 0..9 only)";
ric = ric * 10 + number[i] - '0'; ric = ric * 10 + number[i] - '0';
}
if (ric > 2097151) if (ric > 2097151)
return "Maximum allowed RIC is (2^21)-1. (2097151)"; return "Maximum allowed RIC is (2^21)-1. (2097151)";
if ((ric & 0xfffffff8) == 2007664) if ((ric & 0xfffffff8) == 2007664)
return "Illegal RIC. (Used for idle codeword)"; return "Illegal RIC. (Used for idle codeword)";
if (number[7] && (number[7] < '0' || number[7] > '3')) if (number[7] && !(number[7] >= '0' && number[7] <= '3') && !(number[7] >= 'A' && number[7] <= 'D'))
return "Illegal function digit #8 (Use 0..3 only)"; return "Illegal function digit #8 (Use 0..3 only)";
return NULL; return NULL;
} }
@@ -516,6 +519,10 @@ int call_down_setup(int callref, const char *caller_id, enum number_type __attri
ric = ric * 10 + dialing[i] - '0'; ric = ric * 10 + dialing[i] - '0';
if (dialing[7] >= '0' && dialing[7] <= '3') if (dialing[7] >= '0' && dialing[7] <= '3')
function = dialing[7]- '0'; function = dialing[7]- '0';
else if (dialing[7] >= 'a' && dialing[7] <= 'd')
function = dialing[7]- 'A';
else if (dialing[7] >= 'A' && dialing[7] <= 'D')
function = dialing[7]- 'A';
else else
function = pocsag->default_function; function = pocsag->default_function;