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

C-Netz: Fix scheduling of frames when there is nothing to send

Browse Source
This commit is contained in:
Andreas Eversberg
2020-12-20 19:21:52 +01:00
parent 09f8473c3b
commit 118b0260bc
3 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cnetz/cnetz.c
View File

@@ -1300,9 +1300,10 @@ const telegramm_t *cnetz_transmit_telegramm_spk_k(cnetz_t *cnetz)
transaction_t *trans = cnetz->trans_list;
cnetz_t *ogk;
memset(&telegramm, 0, sizeof(telegramm));
if (!trans)
return &telegramm;
return NULL;
memset(&telegramm, 0, sizeof(telegramm));
telegramm.max_sendeleistung = cnetz_power2bits(cnetz->ms_power);
telegramm.sendeleistungsanpassung = (cnetz->ms_power < 8) ? 1 : 0;
@@ -1623,9 +1624,10 @@ const telegramm_t *cnetz_transmit_telegramm_spk_v(cnetz_t *cnetz)
transaction_t *trans = cnetz->trans_list;
int meter = 0;
memset(&telegramm, 0, sizeof(telegramm));
if (!trans)
return &telegramm;
return NULL;
memset(&telegramm, 0, sizeof(telegramm));
if (cnetz->metering) {
double now = get_time();