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

NMT-900: Handle channels >= 1025 correctly

Browse Source
This commit is contained in:
Andreas Eversberg
2017-10-08 17:10:03 +02:00
parent 3218d1a8e0
commit f7476bce41
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nmt/nmt.c
View File

@@ -490,10 +490,16 @@ static void nmt_page(transaction_t *trans, int try)
static int match_channel(nmt_t *nmt, frame_t *frame)
{
int channel, power;
int rc;
/* check channel match */
nmt_decode_channel(nmt->sysinfo.system, frame->channel_no, &channel, &power);
if ((channel & 0x3ff) != (nmt->sender.kanal & 0x3ff)) {
rc = nmt_decode_channel(nmt->sysinfo.system, frame->channel_no, &channel, &power);
if (rc < 0) {
PDEBUG_CHAN(DNMT, DEBUG_NOTICE, "Frame with illegal encoded channel received, ignoring.\n");
return 0;
}
/* in case of interleaved channel, ignore the missing upper bit */
if ((channel % 1024) != (nmt->sender.kanal % 1024)) {
PDEBUG_CHAN(DNMT, DEBUG_NOTICE, "Frame for different channel %d received, ignoring.\n", channel);
return 0;
}