Skip to content

Commit bef8a97

Browse files
wb2oszwb2osz
committed
KISS TNC enhancements: Multiple TCP clients, serial port for Linux, polling for Bluetooth device.
1 parent 15b0f59 commit bef8a97

18 files changed

+609
-726
lines changed

‎CHANGES.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22
# Revision History #
33

44

5+
## Version 1.5 -- Development snapshot A -- May 2017 ##
6+
7+
This is a snapshot of ongoing development towards version of 1.5. Some features might be incomplete or broken or not documented properly.
8+
9+
### New Features: ###
10+
11+
- TCP KISS can now handle multiple concurrent applications.
12+
13+
- Linux can use serial port for KISS in addition to a pseudo terminal.
14+
15+
- New document ***Bluetooth-KISS-TNC.pdf*** explaining how to use KISS over Bluetooth.
16+
17+
### Bugs Fixed: ###
18+
19+
- Little spelling errors in messages ????
20+
21+
----------
22+
523
## Version 1.4 -- April 2017 ##
624

725

‎Makefile.linux

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ z := $(notdir ${CURDIR})
292292
direwolf : direwolf.o config.o recv.o demod.o dsp.o demod_afsk.o demod_psk.o demod_9600.o hdlc_rec.o \
293293
hdlc_rec2.o multi_modem.o rdq.o rrbb.o dlq.o \
294294
fcs_calc.o ax25_pad.o ax25_pad2.o xid.o \
295-
decode_aprs.o symbols.o server.o kiss.o kissnet.o kiss_frame.o hdlc_send.o fcs_calc.o \
295+
decode_aprs.o symbols.o server.o kiss.o kissserial.o kissnet.o kiss_frame.o hdlc_send.o fcs_calc.o \
296296
gen_tone.o audio.o audio_stats.o digipeater.o cdigipeater.o pfilter.o dedupe.o tq.o xmit.o morse.o \
297297
ptt.o beacon.o encode_aprs.o latlong.o encode_aprs.o latlong.o textcolor.o \
298298
dtmf.o aprs_tt.o tt_user.o tt_text.o igate.o waypoint.o serial_port.o log.o telemetry.o \
@@ -570,15 +570,22 @@ install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon
570570
# doc/README.md contains an overview of the PDF file contents and is more useful here.
571571
#
572572
$(INSTALL) -D --mode=644 doc/README.md $(INSTALLDIR)/share/doc/direwolf/README.md
573-
$(INSTALL) -D --mode=644 doc/User-Guide.pdf $(INSTALLDIR)/share/doc/direwolf/User-Guide.pdf
573+
$(INSTALL) -D --mode=644 doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf $(INSTALLDIR)/share/doc/direwolf/2400-4800-PSK-for-APRS-Packet-Radio.pdf
574+
$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
575+
$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
576+
$(INSTALL) -D --mode=644 doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf $(INSTALLDIR)/share/doc/direwolf/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf
577+
$(INSTALL) -D --mode=644 doc/APRS-Telemetry-Toolkit.pdf $(INSTALLDIR)/share/doc/direwolf/APRS-Telemetry-Toolkit.pdf
578+
$(INSTALL) -D --mode=644 doc/APRStt-Implementation-Notes.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
579+
$(INSTALL) -D --mode=644 doc/APRStt-interface-for-SARTrack.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-interface-for-SARTrack.pdf
580+
$(INSTALL) -D --mode=644 doc/APRStt-Listening-Example.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-Listening-Example.pdf
581+
$(INSTALL) -D --mode=644 doc/Bluetooth-KISS-TNC.pdf $(INSTALLDIR)/share/doc/direwolf/Bluetooth-KISS-TNC.pdf
582+
$(INSTALL) -D --mode=644 doc/Going-beyond-9600-baud.pdf $(INSTALLDIR)/share/doc/direwolf/Going-beyond-9600-baud.pdf
574583
$(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS.pdf
575584
$(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS-Tracker.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
576585
$(INSTALL) -D --mode=644 doc/Raspberry-Pi-SDR-IGate.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-SDR-IGate.pdf
577-
$(INSTALL) -D --mode=644 doc/APRStt-Implementation-Notes.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
578-
$(INSTALL) -D --mode=644 doc/APRStt-interface-for-SARTrack.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-interface-for-SARTrack.pdf
579-
$(INSTALL) -D --mode=644 doc/APRS-Telemetry-Toolkit.pdf $(INSTALLDIR)/share/doc/direwolf/APRS-Telemetry-Toolkit.pdf
580-
$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
581-
$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
586+
$(INSTALL) -D --mode=644 doc/Successful-APRS-IGate-Operation.pdf $(INSTALLDIR)/share/doc/direwolf/Successful-APRS-IGate-Operation.pdf
587+
$(INSTALL) -D --mode=644 doc/User-Guide.pdf $(INSTALLDIR)/share/doc/direwolf/User-Guide.pdf
588+
$(INSTALL) -D --mode=644 doc/WA8LMF-TNC-Test-CD-Results.pdf $(INSTALLDIR)/share/doc/direwolf/WA8LMF-TNC-Test-CD-Results.pdf
582589
#
583590
# Various sample config and other files go into examples under the doc directory.
584591
# When building from source, these can be put in home directory with "make install-conf".

‎Makefile.macosx

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ direwolf : direwolf.o aprs_tt.o audio_portaudio.o audio_stats.o ax25_link.o ax25
237237
demod.o digipeater.o cdigipeater.o dlq.o dsp.o dtime_now.o dtmf.o dwgps.o \
238238
encode_aprs.o encode_aprs.o fcs_calc.o fcs_calc.o gen_tone.o \
239239
geotranz.a hdlc_rec.o hdlc_rec2.o hdlc_send.o igate.o kiss_frame.o \
240-
kiss.o kissnet.o latlong.o latlong.o log.o morse.o multi_modem.o \
240+
kiss.o kissserial.o kissnet.o latlong.o latlong.o log.o morse.o multi_modem.o \
241241
waypoint.o serial_port.o pfilter.o ptt.o rdq.o recv.o rrbb.o server.o \
242242
symbols.o telemetry.o textcolor.o tq.o tt_text.o tt_user.o xid.o xmit.o \
243243
dwgps.o dwgpsnmea.o mheard.o
@@ -359,15 +359,26 @@ install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon
359359
$(INSTALL) -D --mode=644 LICENSE-dire-wolf.txt $(INSTALLDIR)/share/doc/direwolf/LICENSE-dire-wolf.txt
360360
$(INSTALL) -D --mode=644 LICENSE-other.txt $(INSTALLDIR)/share/doc/direwolf/LICENSE-other.txt
361361
#
362-
$(INSTALL) -D --mode=644 doc/User-Guide.pdf $(INSTALLDIR)/share/doc/direwolf/User-Guide.pdf
362+
# ./README.md is an overview for the project main page.
363+
# doc/README.md contains an overview of the PDF file contents and is more useful here.
364+
#
365+
$(INSTALL) -D --mode=644 doc/README.md $(INSTALLDIR)/share/doc/direwolf/README.md
366+
$(INSTALL) -D --mode=644 doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf $(INSTALLDIR)/share/doc/direwolf/2400-4800-PSK-for-APRS-Packet-Radio.pdf
367+
$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
368+
$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
369+
$(INSTALL) -D --mode=644 doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf $(INSTALLDIR)/share/doc/direwolf/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf
370+
$(INSTALL) -D --mode=644 doc/APRS-Telemetry-Toolkit.pdf $(INSTALLDIR)/share/doc/direwolf/APRS-Telemetry-Toolkit.pdf
371+
$(INSTALL) -D --mode=644 doc/APRStt-Implementation-Notes.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
372+
$(INSTALL) -D --mode=644 doc/APRStt-interface-for-SARTrack.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-interface-for-SARTrack.pdf
373+
$(INSTALL) -D --mode=644 doc/APRStt-Listening-Example.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-Listening-Example.pdf
374+
$(INSTALL) -D --mode=644 doc/Bluetooth-KISS-TNC.pdf $(INSTALLDIR)/share/doc/direwolf/Bluetooth-KISS-TNC.pdf
375+
$(INSTALL) -D --mode=644 doc/Going-beyond-9600-baud.pdf $(INSTALLDIR)/share/doc/direwolf/Going-beyond-9600-baud.pdf
363376
$(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS.pdf
364377
$(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS-Tracker.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
365378
$(INSTALL) -D --mode=644 doc/Raspberry-Pi-SDR-IGate.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-SDR-IGate.pdf
366-
$(INSTALL) -D --mode=644 doc/APRStt-Implementation-Notes.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
367-
$(INSTALL) -D --mode=644 doc/APRStt-interface-for-SARTrack.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-interface-for-SARTrack.pdf
368-
$(INSTALL) -D --mode=644 doc/APRS-Telemetry-Toolkit.pdf $(INSTALLDIR)/share/doc/direwolf/APRS-Telemetry-Toolkit.pdf
369-
$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
370-
$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
379+
$(INSTALL) -D --mode=644 doc/Successful-APRS-IGate-Operation.pdf $(INSTALLDIR)/share/doc/direwolf/Successful-APRS-IGate-Operation.pdf
380+
$(INSTALL) -D --mode=644 doc/User-Guide.pdf $(INSTALLDIR)/share/doc/direwolf/User-Guide.pdf
381+
$(INSTALL) -D --mode=644 doc/WA8LMF-TNC-Test-CD-Results.pdf $(INSTALLDIR)/share/doc/direwolf/WA8LMF-TNC-Test-CD-Results.pdf
371382
#
372383
# Sample config files also go into the doc directory.
373384
# When building from source, these can be put in home directory with "make install-conf".

‎Makefile.win

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ demod_psk.o : fsk_demod_state.h
9898
direwolf : direwolf.o config.o recv.o demod.o dsp.o demod_afsk.o demod_psk.o demod_9600.o hdlc_rec.o \
9999
hdlc_rec2.o multi_modem.o rdq.o rrbb.o dlq.o \
100100
fcs_calc.o ax25_pad.o ax25_pad2.o xid.o \
101-
decode_aprs.o symbols.o server.o kiss.o kissnet.o kiss_frame.o hdlc_send.o fcs_calc.o \
101+
decode_aprs.o symbols.o server.o kiss.o kissserial.o kissnet.o kiss_frame.o hdlc_send.o fcs_calc.o \
102102
gen_tone.o morse.o audio_win.o audio_stats.o digipeater.o cdigipeater.o pfilter.o dedupe.o tq.o xmit.o \
103103
ptt.o beacon.o dwgps.o encode_aprs.o latlong.o textcolor.o \
104104
dtmf.o aprs_tt.o tt_user.o tt_text.o igate.o waypoint.o serial_port.o log.o telemetry.o \
@@ -193,6 +193,12 @@ gen_packets : gen_packets.o ax25_pad.o hdlc_send.o fcs_calc.o gen_tone.o morse.
193193
$(CC) $(CFLAGS) -o $@ $^
194194

195195

196+
# Connected mode packet application server.
197+
198+
appserver : appserver.o textcolor.o ax25_pad.o fcs_calc.o misc.a
199+
$(CC) $(CFLAGS) -o $@ $^ -lwinmm -lws2_32
200+
201+
196202

197203
# ------------------------------------------- Libraries --------------------------------------------
198204

@@ -600,20 +606,25 @@ dist-win : direwolf.exe decode_aprs.exe text2tt.exe tt2text.exe ll2utm.exe utm2l
600606
rm -f ../$z-win.zip
601607
egrep '^C|^W' generic.conf | cut -c2-999 > direwolf.conf
602608
unix2dos direwolf.conf
609+
cp doc/README.md README-doc.md
603610
zip --junk-paths ../$z-win.zip \
604611
README.md \
605612
CHANGES.md \
606-
doc/User-Guide.pdf \
607-
doc/Raspberry-Pi-APRS.pdf \
613+
README-doc.md \
614+
doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf \
608615
doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf \
609616
doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf \
617+
doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf \
610618
doc/APRS-Telemetry-Toolkit.pdf \
611619
doc/APRStt-Implementation-Notes.pdf \
612620
doc/APRStt-interface-for-SARTrack.pdf \
613621
doc/APRStt-Listening-Example.pdf \
622+
doc/Bluetooth-KISS-TNC.pdf \
623+
doc/Going-beyond-9600-baud.pdf \
614624
doc/Raspberry-Pi-APRS.pdf \
615625
doc/Raspberry-Pi-APRS-Tracker.pdf \
616626
doc/Raspberry-Pi-SDR-IGate.pdf \
627+
doc/Successful-APRS-IGate-Operation.pdf \
617628
doc/User-Guide.pdf \
618629
doc/WA8LMF-TNC-Test-CD-Results.pdf \
619630
LICENSE* \
@@ -630,6 +641,7 @@ dist-win : direwolf.exe decode_aprs.exe text2tt.exe tt2text.exe ll2utm.exe utm2l
630641
ttcalc.exe \
631642
dwespeak.bat \
632643
telemetry-toolkit/*
644+
rm README-doc.md
633645

634646

635647
# Reminders if pdf files are not up to date.
@@ -668,3 +680,4 @@ backup :
668680
#
669681
# DO NOT DELETE
670682

683+

‎config.c

Lines changed: 49 additions & 7 deletions
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, 2016 John Langner, WB2OSZ
4+
// Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017 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
@@ -870,8 +870,9 @@ void config_init (char *fname, struct audio_s *p_audio_config,
870870
/* Ideally we'd like to figure out if com0com is installed */
871871
/* and automatically enable this. */
872872

873-
//strlcpy (p_misc_config->nullmodem, DEFAULT_NULLMODEM, sizeof(p_misc_config->nullmodem));
874-
strlcpy (p_misc_config->nullmodem, "", sizeof(p_misc_config->nullmodem));
873+
strlcpy (p_misc_config->kiss_serial_port, "", sizeof(p_misc_config->kiss_serial_port));
874+
p_misc_config->kiss_serial_speed = 0;
875+
p_misc_config->kiss_serial_poll = 0;
875876

876877
strlcpy (p_misc_config->gpsnmea_port, "", sizeof(p_misc_config->gpsnmea_port));
877878
strlcpy (p_misc_config->waypoint_port, "", sizeof(p_misc_config->waypoint_port));
@@ -4102,17 +4103,58 @@ void config_init (char *fname, struct audio_s *p_audio_config,
41024103
}
41034104

41044105
/*
4105-
* NULLMODEM - Device name for our end of the virtual "null modem"
4106+
* NULLMODEM name [ speed ] - Device name for serial port or our end of the virtual "null modem"
4107+
* SERIALKISS name [ speed ]
4108+
*
4109+
* Version 1.5: Added SERIALKISS which is equivalent to NULLMODEM.
4110+
* The original name sort of made sense when it was used only for one end of a virtual
4111+
* null modem cable on Windows only. Now it is also available for Linux.
4112+
* TODO1.5: In retrospect, this doesn't seem like such a good name.
4113+
*/
4114+
4115+
else if (strcasecmp(t, "NULLMODEM") == 0 || strcasecmp(t, "SERIALKISS") == 0) {
4116+
t = split(NULL,0);
4117+
if (t == NULL) {
4118+
text_color_set(DW_COLOR_ERROR);
4119+
dw_printf ("Config file: Missing serial port name on line %d.\n", line);
4120+
continue;
4121+
}
4122+
else {
4123+
if (strlen(p_misc_config->kiss_serial_port) > 0) {
4124+
text_color_set(DW_COLOR_ERROR);
4125+
dw_printf ("Config file: Warning serial port name on line %d replaces earlier value.\n", line);
4126+
}
4127+
strlcpy (p_misc_config->kiss_serial_port, t, sizeof(p_misc_config->kiss_serial_port));
4128+
p_misc_config->kiss_serial_speed = 0;
4129+
p_misc_config->kiss_serial_poll = 0;
4130+
}
4131+
4132+
t = split(NULL,0);
4133+
if (t != NULL) {
4134+
p_misc_config->kiss_serial_speed = atoi(t);
4135+
}
4136+
}
4137+
4138+
/*
4139+
* SERIALKISSPOLL name - Poll for serial port name that might come and go.
4140+
* e.g. /dev/rfcomm0 for bluetooth.
41064141
*/
4107-
else if (strcasecmp(t, "nullmodem") == 0) {
4142+
4143+
else if (strcasecmp(t, "SERIALKISSPOLL") == 0) {
41084144
t = split(NULL,0);
41094145
if (t == NULL) {
41104146
text_color_set(DW_COLOR_ERROR);
4111-
dw_printf ("Config file: Missing device name for my end of the 'null modem' on line %d.\n", line);
4147+
dw_printf ("Config file: Missing serial port name on line %d.\n", line);
41124148
continue;
41134149
}
41144150
else {
4115-
strlcpy (p_misc_config->nullmodem, t, sizeof(p_misc_config->nullmodem));
4151+
if (strlen(p_misc_config->kiss_serial_port) > 0) {
4152+
text_color_set(DW_COLOR_ERROR);
4153+
dw_printf ("Config file: Warning serial port name on line %d replaces earlier value.\n", line);
4154+
}
4155+
strlcpy (p_misc_config->kiss_serial_port, t, sizeof(p_misc_config->kiss_serial_port));
4156+
p_misc_config->kiss_serial_speed = 0;
4157+
p_misc_config->kiss_serial_poll = 1; // set polling.
41164158
}
41174159
}
41184160

‎config.h

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,24 @@ enum sendto_type_e { SENDTO_XMIT, SENDTO_IGATE, SENDTO_RECV };
3434
struct misc_config_s {
3535

3636
int agwpe_port; /* Port number for the "AGW TCPIP Socket Interface" */
37-
int kiss_port; /* Port number for the "KISS" protocol. */
37+
int kiss_port; /* Port number for the "TCP KISS" protocol. */
3838
int enable_kiss_pt; /* Enable pseudo terminal for KISS. */
3939
/* Want this to be off by default because it hangs */
4040
/* after a while if nothing is reading from other end. */
4141

42-
char nullmodem[20]; /* Serial port name for our end of the */
42+
char kiss_serial_port[20];
43+
/* Serial port name for our end of the */
4344
/* virtual null modem for native Windows apps. */
45+
/* Version 1.5 add same capability for Linux. */
46+
47+
int kiss_serial_speed; /* Speed, in bps, for the KISS serial port. */
48+
/* If 0, just leave what was already there. */
49+
50+
int kiss_serial_poll; /* When using Bluetooth KISS, the /dev/rfcomm0 device */
51+
/* will appear and disappear as the remote application */
52+
/* opens and closes the virtual COM port. */
53+
/* When this is non-zero, we will check periodically to */
54+
/* see if the device has appeared and we will open it. */
4455

4556
char gpsnmea_port[20]; /* Serial port name for reading NMEA sentences from GPS. */
4657
/* e.g. COM22, /dev/ttyACM0 */

‎direwolf.c

Lines changed: 12 additions & 9 deletions
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, 2016 John Langner, WB2OSZ
4+
// Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017 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
@@ -94,6 +94,7 @@
9494
#include "server.h"
9595
#include "kiss.h"
9696
#include "kissnet.h"
97+
#include "kissserial.h"
9798
#include "kiss_frame.h"
9899
#include "waypoint.h"
99100
#include "gen_tone.h"
@@ -260,8 +261,8 @@ int main (int argc, char *argv[])
260261
text_color_init(t_opt);
261262
text_color_set(DW_COLOR_INFO);
262263
//dw_printf ("Dire Wolf version %d.%d (%s) Beta Test\n", MAJOR_VERSION, MINOR_VERSION, __DATE__);
263-
//dw_printf ("Dire Wolf DEVELOPMENT version %d.%d %s (%s)\n", MAJOR_VERSION, MINOR_VERSION, "H", __DATE__);
264-
dw_printf ("Dire Wolf version %d.%d\n", MAJOR_VERSION, MINOR_VERSION);
264+
dw_printf ("Dire Wolf DEVELOPMENT version %d.%d %s (%s)\n", MAJOR_VERSION, MINOR_VERSION, "A", __DATE__);
265+
//dw_printf ("Dire Wolf version %d.%d\n", MAJOR_VERSION, MINOR_VERSION);
265266

266267
#if defined(ENABLE_GPSD) || defined(USE_HAMLIB)
267268
dw_printf ("Includes optional support for: ");
@@ -466,7 +467,7 @@ int main (int argc, char *argv[])
466467

467468
case 'a': server_set_debug(1); break;
468469

469-
case 'k': d_k_opt++; kiss_serial_set_debug (d_k_opt); break;
470+
case 'k': d_k_opt++; kissserial_set_debug (d_k_opt); kisspt_set_debug (d_k_opt); break;
470471
case 'n': d_n_opt++; kiss_net_set_debug (d_n_opt); break;
471472

472473
case 'u': d_u_opt = 1; break;
@@ -766,7 +767,8 @@ int main (int argc, char *argv[])
766767
/*
767768
* Create a pseudo terminal and KISS TNC emulator.
768769
*/
769-
kiss_init (&misc_config);
770+
kisspt_init (&misc_config);
771+
kissserial_init (&misc_config);
770772
kiss_frame_init (&audio_config);
771773

772774
/*
@@ -1084,9 +1086,10 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev
10841086

10851087
flen = ax25_pack(pp, fbuf);
10861088

1087-
server_send_rec_packet (chan, pp, fbuf, flen);
1088-
kissnet_send_rec_packet (chan, fbuf, flen);
1089-
kiss_send_rec_packet (chan, fbuf, flen);
1089+
server_send_rec_packet (chan, pp, fbuf, flen); // AGW net protocol
1090+
kissnet_send_rec_packet (chan, fbuf, flen, -1); // KISS TCP
1091+
kissserial_send_rec_packet (chan, fbuf, flen, -1); // KISS serial port
1092+
kisspt_send_rec_packet (chan, fbuf, flen, -1); // KISS pseudo terminal
10901093

10911094
/*
10921095
* If it came from DTMF decoder, send it to APRStt gateway.
@@ -1204,7 +1207,7 @@ static void usage (char **argv)
12041207
dw_printf (" -D n Divide audio sample rate by n for channel 0.\n");
12051208
dw_printf (" -d Debug options:\n");
12061209
dw_printf (" a a = AGWPE network protocol client.\n");
1207-
dw_printf (" k k = KISS serial port client.\n");
1210+
dw_printf (" k k = KISS serial port or pseudo terminal client.\n");
12081211
dw_printf (" n n = KISS network client.\n");
12091212
dw_printf (" u u = Display non-ASCII text in hexadecimal.\n");
12101213
dw_printf (" p p = dump Packets in hexadecimal.\n");

‎fcs_calc.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,22 @@ unsigned short fcs_calc (unsigned char *data, int len)
8787
}
8888

8989

90+
/*
91+
* CRC is also used for duplicate checking for the digipeater and IGate.
92+
* A packet is considered a duplicate if the source, destination, and
93+
* information parts match. In other words, we ignore the via path
94+
* which changes along the way.
95+
* Rather than keeping a variable length string we just keep a 16 bit
96+
* CRC which takes less memory and processing to compare.
97+
*
98+
* This can result in occasional false matches. If we had a random
99+
* 16 bit number, there is a 1/65536 ( = 0.0015 % ) chance that it will
100+
* match and we will drop something that should be passed along.
101+
*
102+
* Looking at it another way, there is a 0.9999847412109375 (out of 1)
103+
* probability of doing the right thing.
104+
*/
105+
90106
/*
91107
* This can be used when we want to calculate a single CRC over disjoint data.
92108
*

0 commit comments

Comments
 (0)