Skip to content

Commit 89021dd

Browse files
wb2oszwb2osz
committed
Cleanups
1 parent dcabb8f commit 89021dd

14 files changed

+173
-48
lines changed

‎src/config.c

+31-7
Original file line numberDiff line numberDiff line change
@@ -4896,19 +4896,19 @@ void config_init (char *fname, struct audio_s *p_audio_config,
48964896
for ( ; *t != '\0' ; t++ ) {
48974897
switch (toupper(*t)) {
48984898
case 'N':
4899-
p_misc_config->waypoint_formats |= WPT_FORMAT_NMEA_GENERIC;
4899+
p_misc_config->waypoint_formats |= WPL_FORMAT_NMEA_GENERIC;
49004900
break;
49014901
case 'G':
4902-
p_misc_config->waypoint_formats |= WPT_FORMAT_GARMIN;
4902+
p_misc_config->waypoint_formats |= WPL_FORMAT_GARMIN;
49034903
break;
49044904
case 'M':
4905-
p_misc_config->waypoint_formats |= WPT_FORMAT_MAGELLAN;
4905+
p_misc_config->waypoint_formats |= WPL_FORMAT_MAGELLAN;
49064906
break;
49074907
case 'K':
4908-
p_misc_config->waypoint_formats |= WPT_FORMAT_KENWOOD;
4908+
p_misc_config->waypoint_formats |= WPL_FORMAT_KENWOOD;
49094909
break;
49104910
case 'A':
4911-
p_misc_config->waypoint_formats |= WPT_FORMAT_AIS;
4911+
p_misc_config->waypoint_formats |= WPL_FORMAT_AIS;
49124912
break;
49134913
case ' ':
49144914
case ',':
@@ -5470,6 +5470,10 @@ void config_init (char *fname, struct audio_s *p_audio_config,
54705470
* Returns 1 for success, 0 for serious error.
54715471
*/
54725472

5473+
// FIXME: provide error messages when non applicable option is used for particular beacon type.
5474+
// e.g. IBEACON DELAY=1 EVERY=1 SENDTO=IG OVERLAY=R SYMBOL="igate" LAT=37^44.46N LONG=122^27.19W COMMENT="N1KOL-1 IGATE"
5475+
// Just ignores overlay, symbol, lat, long, and comment.
5476+
54735477
static int beacon_options(char *cmd, struct beacon_s *b, int line, struct audio_s *p_audio_config)
54745478
{
54755479
char *t;
@@ -5643,8 +5647,28 @@ static int beacon_options(char *cmd, struct beacon_s *b, int line, struct audio_
56435647
}
56445648
else if (strcasecmp(keyword, "ALT") == 0 || strcasecmp(keyword, "ALTITUDE") == 0) {
56455649

5646-
// TODO: allow units.
5647-
b->alt_m = atof(value);
5650+
char *unit = strpbrk(value, "abcedfghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
5651+
if (unit != NULL) {
5652+
float meters = 0;
5653+
for (int j=0; j<NUM_UNITS && meters == 0; j++) {
5654+
if (strcasecmp(units[j].name, unit) == 0) {
5655+
meters = units[j].meters;
5656+
}
5657+
}
5658+
if (meters == 0) {
5659+
text_color_set(DW_COLOR_ERROR);
5660+
dw_printf ("Line %d: Unrecognized unit '%s' for altitude. Using meter.\n", line, unit);
5661+
dw_printf ("Try using singular form. e.g. ft or foot rather than feet.\n");
5662+
b->alt_m = atof(value);
5663+
}
5664+
else {
5665+
// valid unit
5666+
b->alt_m = atof(value) * meters;
5667+
}
5668+
} else {
5669+
// no unit specified
5670+
b->alt_m = atof(value);
5671+
}
56485672
}
56495673
else if (strcasecmp(keyword, "ZONE") == 0) {
56505674
strlcpy(zone, value, sizeof(zone));

‎src/config.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ struct misc_config_s {
9898

9999
int waypoint_formats; /* Which sentence formats should be generated? */
100100

101-
#define WPT_FORMAT_NMEA_GENERIC 0x01 /* N $GPWPT */
102-
#define WPT_FORMAT_GARMIN 0x02 /* G $PGRMW */
103-
#define WPT_FORMAT_MAGELLAN 0x04 /* M $PMGNWPL */
104-
#define WPT_FORMAT_KENWOOD 0x08 /* K $PKWDWPL */
105-
#define WPT_FORMAT_AIS 0x10 /* A !AIVDM */
101+
#define WPL_FORMAT_NMEA_GENERIC 0x01 /* N $GPWPL */
102+
#define WPL_FORMAT_GARMIN 0x02 /* G $PGRMW */
103+
#define WPL_FORMAT_MAGELLAN 0x04 /* M $PMGNWPL */
104+
#define WPL_FORMAT_KENWOOD 0x08 /* K $PKWDWPL */
105+
#define WPL_FORMAT_AIS 0x10 /* A !AIVDM */
106106

107107

108108
int log_daily_names; /* True to generate new log file each day. */

‎src/digipeater.h

+6
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ struct digi_config_s {
3838

3939
enum preempt_e { PREEMPT_OFF, PREEMPT_DROP, PREEMPT_MARK, PREEMPT_TRACE } preempt[MAX_CHANS][MAX_CHANS];
4040

41+
// NOID is an ugly hack for the specific need of ATGP which needs more that 8 digipeaters.
42+
// The via path starts out as HOP7-7,HOP7-7 and we do not want tracing so it does not fill up.
43+
// DO NOT put this in the User Guide. On a need to know basis.
44+
45+
char noid[MAX_CHANS][MAX_CHANS][AX25_MAX_ADDR_LEN];
46+
4147
char *filter_str[MAX_CHANS+1][MAX_CHANS+1];
4248
// NULL or optional Packet Filter strings such as "t/m".
4349
// Notice the size of arrays is one larger than normal.

‎src/direwolf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ int main (int argc, char *argv[])
299299
text_color_init(t_opt);
300300
text_color_set(DW_COLOR_INFO);
301301
//dw_printf ("Dire Wolf version %d.%d (%s) Beta Test 4\n", MAJOR_VERSION, MINOR_VERSION, __DATE__);
302-
dw_printf ("Dire Wolf DEVELOPMENT version %d.%d %s (%s)\n", MAJOR_VERSION, MINOR_VERSION, "C", __DATE__);
302+
dw_printf ("Dire Wolf DEVELOPMENT version %d.%d %s (%s)\n", MAJOR_VERSION, MINOR_VERSION, "D", __DATE__);
303303
//dw_printf ("Dire Wolf version %d.%d\n", MAJOR_VERSION, MINOR_VERSION);
304304

305305

‎src/dlq.c

+62-1
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,18 @@ void dlq_init (void)
130130
#else
131131
int err;
132132
err = pthread_mutex_init (&wake_up_mutex, NULL);
133+
if (err != 0) {
134+
text_color_set(DW_COLOR_ERROR);
135+
dw_printf ("dlq_init: pthread_mutex_init err=%d", err);
136+
perror ("");
137+
exit (EXIT_FAILURE);
138+
}
133139
err = pthread_mutex_init (&dlq_mutex, NULL);
134140
if (err != 0) {
135141
text_color_set(DW_COLOR_ERROR);
136142
dw_printf ("dlq_init: pthread_mutex_init err=%d", err);
137143
perror ("");
138-
exit (1);
144+
exit (EXIT_FAILURE);
139145
}
140146
#endif
141147

@@ -253,6 +259,11 @@ void dlq_rec_frame (int chan, int subchan, int slice, packet_t pp, alevel_t alev
253259
/* Allocate a new queue item. */
254260

255261
pnew = (struct dlq_item_s *) calloc (sizeof(struct dlq_item_s), 1);
262+
if (pnew == NULL) {
263+
text_color_set(DW_COLOR_ERROR);
264+
dw_printf ("FATAL ERROR: Out of memory.\n");
265+
exit (EXIT_FAILURE);
266+
}
256267
s_new_count++;
257268

258269
if (s_new_count > s_delete_count + 50) {
@@ -492,6 +503,11 @@ void dlq_connect_request (char addrs[AX25_MAX_ADDRS][AX25_MAX_ADDR_LEN], int num
492503
/* Allocate a new queue item. */
493504

494505
pnew = (struct dlq_item_s *) calloc (sizeof(struct dlq_item_s), 1);
506+
if (pnew == NULL) {
507+
text_color_set(DW_COLOR_ERROR);
508+
dw_printf ("FATAL ERROR: Out of memory.\n");
509+
exit (EXIT_FAILURE);
510+
}
495511
s_new_count++;
496512

497513
pnew->type = DLQ_CONNECT_REQUEST;
@@ -545,6 +561,11 @@ void dlq_disconnect_request (char addrs[AX25_MAX_ADDRS][AX25_MAX_ADDR_LEN], int
545561
/* Allocate a new queue item. */
546562

547563
pnew = (struct dlq_item_s *) calloc (sizeof(struct dlq_item_s), 1);
564+
if (pnew == NULL) {
565+
text_color_set(DW_COLOR_ERROR);
566+
dw_printf ("FATAL ERROR: Out of memory.\n");
567+
exit (EXIT_FAILURE);
568+
}
548569
s_new_count++;
549570

550571
pnew->type = DLQ_DISCONNECT_REQUEST;
@@ -603,6 +624,11 @@ void dlq_outstanding_frames_request (char addrs[AX25_MAX_ADDRS][AX25_MAX_ADDR_LE
603624
/* Allocate a new queue item. */
604625

605626
pnew = (struct dlq_item_s *) calloc (sizeof(struct dlq_item_s), 1);
627+
if (pnew == NULL) {
628+
text_color_set(DW_COLOR_ERROR);
629+
dw_printf ("FATAL ERROR: Out of memory.\n");
630+
exit (EXIT_FAILURE);
631+
}
606632
s_new_count++;
607633

608634
pnew->type = DLQ_OUTSTANDING_FRAMES_REQUEST;
@@ -670,6 +696,11 @@ void dlq_xmit_data_request (char addrs[AX25_MAX_ADDRS][AX25_MAX_ADDR_LEN], int n
670696
/* Allocate a new queue item. */
671697

672698
pnew = (struct dlq_item_s *) calloc (sizeof(struct dlq_item_s), 1);
699+
if (pnew == NULL) {
700+
text_color_set(DW_COLOR_ERROR);
701+
dw_printf ("FATAL ERROR: Out of memory.\n");
702+
exit (EXIT_FAILURE);
703+
}
673704
s_new_count++;
674705

675706
pnew->type = DLQ_XMIT_DATA_REQUEST;
@@ -733,6 +764,11 @@ void dlq_register_callsign (char addr[AX25_MAX_ADDR_LEN], int chan, int client)
733764
/* Allocate a new queue item. */
734765

735766
pnew = (struct dlq_item_s *) calloc (sizeof(struct dlq_item_s), 1);
767+
if (pnew == NULL) {
768+
text_color_set(DW_COLOR_ERROR);
769+
dw_printf ("FATAL ERROR: Out of memory.\n");
770+
exit (EXIT_FAILURE);
771+
}
736772
s_new_count++;
737773

738774
pnew->type = DLQ_REGISTER_CALLSIGN;
@@ -763,6 +799,11 @@ void dlq_unregister_callsign (char addr[AX25_MAX_ADDR_LEN], int chan, int client
763799
/* Allocate a new queue item. */
764800

765801
pnew = (struct dlq_item_s *) calloc (sizeof(struct dlq_item_s), 1);
802+
if (pnew == NULL) {
803+
text_color_set(DW_COLOR_ERROR);
804+
dw_printf ("FATAL ERROR: Out of memory.\n");
805+
exit (EXIT_FAILURE);
806+
}
766807
s_new_count++;
767808

768809
pnew->type = DLQ_UNREGISTER_CALLSIGN;
@@ -817,6 +858,11 @@ void dlq_channel_busy (int chan, int activity, int status)
817858
/* Allocate a new queue item. */
818859

819860
pnew = (struct dlq_item_s *) calloc (sizeof(struct dlq_item_s), 1);
861+
if (pnew == NULL) {
862+
text_color_set(DW_COLOR_ERROR);
863+
dw_printf ("FATAL ERROR: Out of memory.\n");
864+
exit (EXIT_FAILURE);
865+
}
820866
s_new_count++;
821867

822868
pnew->type = DLQ_CHANNEL_BUSY;
@@ -865,6 +911,11 @@ void dlq_seize_confirm (int chan)
865911
/* Allocate a new queue item. */
866912

867913
pnew = (struct dlq_item_s *) calloc (sizeof(struct dlq_item_s), 1);
914+
if (pnew == NULL) {
915+
text_color_set(DW_COLOR_ERROR);
916+
dw_printf ("FATAL ERROR: Out of memory.\n");
917+
exit (EXIT_FAILURE);
918+
}
868919
s_new_count++;
869920

870921
pnew->type = DLQ_SEIZE_CONFIRM;
@@ -910,6 +961,11 @@ void dlq_client_cleanup (int client)
910961
/* Allocate a new queue item. */
911962

912963
pnew = (struct dlq_item_s *) calloc (sizeof(struct dlq_item_s), 1);
964+
if (pnew == NULL) {
965+
text_color_set(DW_COLOR_ERROR);
966+
dw_printf ("FATAL ERROR: Out of memory.\n");
967+
exit (EXIT_FAILURE);
968+
}
913969
s_new_count++;
914970

915971
// All we care about is the client number.
@@ -1192,6 +1248,11 @@ cdata_t *cdata_new (int pid, char *data, int len)
11921248
size = ( len + 127 ) & ~0x7f;
11931249

11941250
cdata = malloc ( sizeof(cdata_t) + size );
1251+
if (cdata == NULL) {
1252+
text_color_set(DW_COLOR_ERROR);
1253+
dw_printf ("FATAL ERROR: Out of memory.\n");
1254+
exit (EXIT_FAILURE);
1255+
}
11951256

11961257
cdata->magic = TXDATA_MAGIC;
11971258
cdata->next = NULL;

‎src/kissnet.c

+5
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,11 @@ void kissnet_init (struct misc_config_s *mc)
263263
for (int i = 0; i < MAX_KISS_TCP_PORTS; i++) {
264264
if (mc->kiss_port[i] != 0) {
265265
struct kissport_status_s *kps = calloc(sizeof(struct kissport_status_s), 1);
266+
if (kps == NULL) {
267+
text_color_set(DW_COLOR_ERROR);
268+
dw_printf ("FATAL ERROR: Out of memory.\n");
269+
exit (EXIT_FAILURE);
270+
}
266271

267272
kps->tcp_port = mc->kiss_port[i];
268273
kps->chan = mc->kiss_chan[i];

‎src/log2gpx.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,6 @@ static void read_csv(FILE *fp)
258258
float speed = UNKNOWN_VALUE;
259259
float course = UNKNOWN_VALUE;
260260
float alt = UNKNOWN_VALUE;
261-
double freq = UNKNOWN_VALUE;
262-
int offset = UNKNOWN_VALUE;
263261
char stemp[16], desc[32], comment[256];
264262

265263
if (pspeed != NULL && strlen(pspeed) > 0) {
@@ -275,15 +273,15 @@ static void read_csv(FILE *fp)
275273
/* combine freq/offset/tone into one description string. */
276274

277275
if (pfreq != NULL && strlen(pfreq) > 0) {
278-
freq = atof(pfreq);
276+
double freq = atof(pfreq);
279277
snprintf (desc, sizeof(desc), "%.3f MHz", freq);
280278
}
281279
else {
282280
strlcpy (desc, "", sizeof(desc));
283281
}
284282

285283
if (poffset != NULL && strlen(poffset) > 0) {
286-
offset = atoi(poffset);
284+
int offset = atoi(poffset);
287285
if (offset != 0 && offset % 1000 == 0) {
288286
snprintf (stemp, sizeof(stemp), "%+dM", offset / 1000);
289287
}

‎src/mheard.c

+10
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,11 @@ void mheard_save_rf (int chan, decode_aprs_t *A, packet_t pp, alevel_t alevel, r
350350
}
351351

352352
mptr = calloc(sizeof(mheard_t),1);
353+
if (mptr == NULL) {
354+
text_color_set(DW_COLOR_ERROR);
355+
dw_printf ("FATAL ERROR: Out of memory.\n");
356+
exit (EXIT_FAILURE);
357+
}
353358
strlcpy (mptr->callsign, source, sizeof(mptr->callsign));
354359
mptr->count = 1;
355360
mptr->chan = chan;
@@ -485,6 +490,11 @@ void mheard_save_is (char *ptext)
485490
}
486491

487492
mptr = calloc(sizeof(mheard_t),1);
493+
if (mptr == NULL) {
494+
text_color_set(DW_COLOR_ERROR);
495+
dw_printf ("FATAL ERROR: Out of memory.\n");
496+
exit (EXIT_FAILURE);
497+
}
488498
strlcpy (mptr->callsign, source, sizeof(mptr->callsign));
489499
mptr->count = 1;
490500
mptr->last_heard_is = now;

‎src/rrbb.c

+5-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,11 @@ rrbb_t rrbb_new (int chan, int subchan, int slice, int is_scrambled, int descram
8888
assert (slice >= 0 && slice < MAX_SLICERS);
8989

9090
result = malloc(sizeof(struct rrbb_s));
91-
91+
if (result == NULL) {
92+
text_color_set(DW_COLOR_ERROR);
93+
dw_printf ("FATAL ERROR: Out of memory.\n");
94+
exit (EXIT_FAILURE);
95+
}
9296
result->magic1 = MAGIC1;
9397
result->chan = chan;
9498
result->subchan = subchan;

‎src/symbols.c

+25-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// This file is part of Dire Wolf, an amateur radio packet TNC.
33
//
4-
// Copyright (C) 2011, 2012, 2013, 2014, 2015 John Langner, WB2OSZ
4+
// Copyright (C) 2011, 2012, 2013, 2014, 2015, 2022 John Langner, WB2OSZ
55
//
66
// This program is free software: you can redistribute it and/or modify
77
// it under the terms of the GNU General Public License as published by
@@ -556,6 +556,7 @@ static const char ssid_to_sym[16] = {
556556
'v' /* 15 - Van */
557557
};
558558

559+
559560
void symbols_from_dest_or_src (char dti, char *src, char *dest, char *symtab, char *symbol)
560561
{
561562
char *p;
@@ -663,16 +664,30 @@ void symbols_from_dest_or_src (char dti, char *src, char *dest, char *symtab, ch
663664
* Chapter 20, "Symbol in the Source Address SSID"
664665
*/
665666

666-
p = strchr (src, '-');
667-
if (p != NULL)
668-
{
669-
int ssid;
667+
// January 2022 - Every time this shows up, it confuses people terribly.
668+
// e.g. An APRS "message" shows up with Bus or Motorcycle in the description.
670669

671-
ssid = atoi(p+1);
672-
if (ssid >= 1 && ssid <= 15) {
673-
*symtab = '/'; /* All in Primary table. */
674-
*symbol = ssid_to_sym[ssid];
675-
return;
670+
// The position and object formats all contain a proper symbol and table.
671+
// There doesn't seem to be much reason to have a symbol for something without
672+
// a postion because it would not show up on a map.
673+
// This just seems to be a remnant of something used long ago and no longer needed.
674+
// The protocol spec mentions a "MIM tracker" but I can't find any references to it.
675+
676+
// If this was completely removed, no one would probably ever notice.
677+
// The only possible useful case I can think of would be someone sending a
678+
// NMEA string directly from a GPS receiver and wanting to keep the destination field
679+
// for the system type.
680+
681+
if (dti == '$') {
682+
683+
p = strchr (src, '-');
684+
if (p != NULL) {
685+
int ssid = atoi(p+1);
686+
if (ssid >= 1 && ssid <= 15) {
687+
*symtab = '/'; /* All in Primary table. */
688+
*symbol = ssid_to_sym[ssid];
689+
return;
690+
}
676691
}
677692
}
678693

0 commit comments

Comments
 (0)