PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More error checking.

This commit is contained in:
wb2osz 2019-04-21 19:13:18 -04:00
parent 8a2138e16b
commit 792569b991
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
beacon.c
View File

@ -172,6 +172,12 @@ void beacon_init (struct audio_s *pmodem, struct misc_config_s *pconfig, struct
* If a serious error is found, set type to BEACON_IGNORE and that * If a serious error is found, set type to BEACON_IGNORE and that
* table entry should be ignored later on. * table entry should be ignored later on.
*/ */
// TODO: Better checking.
// We should really have a table for which keywords are are required,
// optional, or not allowed for each beacon type. Options which
// are not applicable are often silently ignored, causing confusion.
for (j=0; j<g_misc_config_p->num_beacons; j++) { for (j=0; j<g_misc_config_p->num_beacons; j++) {
int chan = g_misc_config_p->beacon[j].sendto_chan; int chan = g_misc_config_p->beacon[j].sendto_chan;
@ -207,6 +213,18 @@ void beacon_init (struct audio_s *pmodem, struct misc_config_s *pconfig, struct
g_misc_config_p->beacon[j].btype = BEACON_IGNORE; g_misc_config_p->beacon[j].btype = BEACON_IGNORE;
continue; continue;
} }
/* INFO and INFOCMD are only for Custom Beacon. */
if (g_misc_config_p->beacon[j].custom_info != NULL || g_misc_config_p->beacon[j].custom_infocmd != NULL) {
text_color_set(DW_COLOR_ERROR);
dw_printf ("Config file, line %d: INFO or INFOCMD are allowed only for custom beacon.\n", g_misc_config_p->beacon[j].lineno);
dw_printf ("INFO and INFOCMD allow you to specify contents of the Information field so it\n");
dw_printf ("so it would not make sense to use these with other beacon types which construct\n");
dw_printf ("the Information field. Perhaps you want to use COMMENT or COMMENTCMD option.\n");
//g_misc_config_p->beacon[j].btype = BEACON_IGNORE;
continue;
}
break; break;
case BEACON_TRACKER: case BEACON_TRACKER:
@ -232,6 +250,18 @@ void beacon_init (struct audio_s *pmodem, struct misc_config_s *pconfig, struct
} }
} }
/* INFO and INFOCMD are only for Custom Beacon. */
if (g_misc_config_p->beacon[j].custom_info != NULL || g_misc_config_p->beacon[j].custom_infocmd != NULL) {
text_color_set(DW_COLOR_ERROR);
dw_printf ("Config file, line %d: INFO or INFOCMD are allowed only for custom beacon.\n", g_misc_config_p->beacon[j].lineno);
dw_printf ("INFO and INFOCMD allow you to specify contents of the Information field so it\n");
dw_printf ("so it would not make sense to use these with other beacon types which construct\n");
dw_printf ("the Information field. Perhaps you want to use COMMENT or COMMENTCMD option.\n");
//g_misc_config_p->beacon[j].btype = BEACON_IGNORE;
continue;
}
break; break;
case BEACON_CUSTOM: case BEACON_CUSTOM: