Skip to content

Commit 8683ddc

Browse files
wb2oszwb2osz
committed
Allow multiple TCP KISS ports and option for single radio channel.
1 parent 81447ed commit 8683ddc

13 files changed

+582
-272
lines changed

‎src/config.c

+77-8
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, 2017, 2018 John Langner, WB2OSZ
4+
// Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2021 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
@@ -852,7 +852,14 @@ void config_init (char *fname, struct audio_s *p_audio_config,
852852

853853
memset (p_misc_config, 0, sizeof(struct misc_config_s));
854854
p_misc_config->agwpe_port = DEFAULT_AGWPE_PORT;
855-
p_misc_config->kiss_port = DEFAULT_KISS_PORT;
855+
856+
for (int i=0; i<MAX_KISS_TCP_PORTS; i++) {
857+
p_misc_config->kiss_port[i] = 0; // entry not used.
858+
p_misc_config->kiss_chan[i] = -1;
859+
}
860+
p_misc_config->kiss_port[0] = DEFAULT_KISS_PORT;
861+
p_misc_config->kiss_chan[0] = -1; // all channels.
862+
856863
p_misc_config->enable_kiss_pt = 0; /* -p option */
857864
p_misc_config->kiss_copy = 0;
858865

@@ -4477,27 +4484,89 @@ void config_init (char *fname, struct audio_s *p_audio_config,
44774484
}
44784485

44794486
/*
4480-
* KISSPORT - Port number for KISS over IP.
4487+
* KISSPORT port [ chan ] - Port number for KISS over IP.
44814488
*/
44824489

4490+
// Previously we allowed only a single TCP port for KISS.
4491+
// An increasing number of people want to run multiple radios.
4492+
// Unfortunately, most applications don't know how to deal with multi-radio TNCs.
4493+
// They ignore the channel on receive and always transmit to channel 0.
4494+
// Running multiple instances of direwolf is a work-around but this leads to
4495+
// more complex configuration and we lose the cross-channel digipeating capability.
4496+
// In release 1.7 we add a new feature to assign a single radio channel to a TCP port.
4497+
// e.g.
4498+
// KISSPORT 8001 # default, all channels. Radio channel = KISS channel.
4499+
//
4500+
// KISSPORT 7000 0 # Only radio channel 0 for receive.
4501+
// # Transmit to radio channel 0, ignoring KISS channel.
4502+
//
4503+
// KISSPORT 7001 1 # Only radio channel 1 for receive. KISS channel set to 0.
4504+
// # Transmit to radio channel 1, ignoring KISS channel.
4505+
4506+
// FIXME
44834507
else if (strcasecmp(t, "KISSPORT") == 0) {
44844508
int n;
4509+
int tcp_port = 0;
4510+
int chan = -1; // optional. default to all if not specified.
44854511
t = split(NULL,0);
44864512
if (t == NULL) {
44874513
text_color_set(DW_COLOR_ERROR);
4488-
dw_printf ("Line %d: Missing port number for KISSPORT command.\n", line);
4514+
dw_printf ("Line %d: Missing TCP port number for KISSPORT command.\n", line);
44894515
continue;
44904516
}
44914517
n = atoi(t);
44924518
if ((n >= MIN_IP_PORT_NUMBER && n <= MAX_IP_PORT_NUMBER) || n == 0) {
4493-
p_misc_config->kiss_port = n;
4519+
tcp_port = n;
44944520
}
44954521
else {
4496-
p_misc_config->kiss_port = DEFAULT_KISS_PORT;
44974522
text_color_set(DW_COLOR_ERROR);
4498-
dw_printf ("Line %d: Invalid port number for KISS TCPIP Socket Interface. Using %d.\n",
4499-
line, p_misc_config->kiss_port);
4523+
dw_printf ("Line %d: Invalid TCP port number for KISS TCPIP Socket Interface.\n", line);
4524+
dw_printf ("Use something in the range of %d to %d.\n", MIN_IP_PORT_NUMBER, MAX_IP_PORT_NUMBER);
4525+
continue;
45004526
}
4527+
4528+
t = split(NULL,0);
4529+
if (t != NULL) {
4530+
chan = atoi(t);
4531+
if (chan < 0 || chan >= MAX_CHANS) {
4532+
text_color_set(DW_COLOR_ERROR);
4533+
dw_printf ("Line %d: Invalid channel %d for KISSPORT command. Must be in range 0 thru %d.\n", line, chan, MAX_CHANS-1);
4534+
continue;
4535+
}
4536+
}
4537+
4538+
// "KISSPORT 0" is used to remove the default entry.
4539+
4540+
if (tcp_port == 0) {
4541+
p_misc_config->kiss_port[0] = 0; // Should all be wiped out?
4542+
}
4543+
else {
4544+
4545+
// Try to find an empty slot.
4546+
// A duplicate TCP port number will overwrite the previous value.
4547+
4548+
int slot = -1;
4549+
for (int i = 0; i < MAX_KISS_TCP_PORTS && slot == -1; i++) {
4550+
if (p_misc_config->kiss_port[i] == tcp_port) {
4551+
slot = i;
4552+
if ( ! (slot == 0 && tcp_port == DEFAULT_KISS_PORT)) {
4553+
text_color_set(DW_COLOR_ERROR);
4554+
dw_printf ("Line %d: Warning: Duplicate TCP port %d will overwrite previous value.\n", line, tcp_port);
4555+
}
4556+
}
4557+
else if (p_misc_config->kiss_port[i] == 0) {
4558+
slot = i;
4559+
}
4560+
}
4561+
if (slot >= 0) {
4562+
p_misc_config->kiss_port[slot] = tcp_port;
4563+
p_misc_config->kiss_chan[slot] = chan;
4564+
}
4565+
else {
4566+
text_color_set(DW_COLOR_ERROR);
4567+
dw_printf ("Line %d: Too many KISSPORT commands.\n", line);
4568+
}
4569+
}
45014570
}
45024571

45034572
/*

‎src/config.h

+22-2
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,31 @@ enum sendto_type_e { SENDTO_XMIT, SENDTO_IGATE, SENDTO_RECV };
3030

3131

3232
#define MAX_BEACONS 30
33+
#define MAX_KISS_TCP_PORTS (MAX_CHANS+1)
3334

3435
struct misc_config_s {
3536

36-
int agwpe_port; /* Port number for the "AGW TCPIP Socket Interface" */
37-
int kiss_port; /* Port number for the "TCP KISS" protocol. */
37+
int agwpe_port; /* TCP Port number for the "AGW TCPIP Socket Interface" */
38+
39+
// Previously we allowed only a single TCP port for KISS.
40+
// An increasing number of people want to run multiple radios.
41+
// Unfortunately, most applications don't know how to deal with multi-radio TNCs.
42+
// They ignore the channel on receive and always transmit to channel 0.
43+
// Running multiple instances of direwolf is a work-around but this leads to
44+
// more complex configuration and we lose the cross-channel digipeating capability.
45+
// In release 1.7 we add a new feature to assign a single radio channel to a TCP port.
46+
// e.g.
47+
// KISSPORT 8001 # default, all channels. Radio channel = KISS channel.
48+
//
49+
// KISSPORT 7000 0 # Only radio channel 0 for receive.
50+
// # Transmit to radio channel 0, ignoring KISS channel.
51+
//
52+
// KISSPORT 7001 1 # Only radio channel 1 for receive. KISS channel set to 0.
53+
// # Transmit to radio channel 1, ignoring KISS channel.
54+
55+
int kiss_port[MAX_KISS_TCP_PORTS]; /* TCP Port number for the "TCP KISS" protocol. */
56+
int kiss_chan[MAX_KISS_TCP_PORTS]; /* Radio Channel number for this port or -1 for all. */
57+
3858
int kiss_copy; /* Data from network KISS client is copied to all others. */
3959
int enable_kiss_pt; /* Enable pseudo terminal for KISS. */
4060
/* Want this to be off by default because it hangs */

‎src/direwolf.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -1419,10 +1419,10 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev
14191419

14201420
flen = ax25_pack(pp, fbuf);
14211421

1422-
server_send_rec_packet (chan, pp, fbuf, flen); // AGW net protocol
1423-
kissnet_send_rec_packet (chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1); // KISS TCP
1424-
kissserial_send_rec_packet (chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1); // KISS serial port
1425-
kisspt_send_rec_packet (chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1); // KISS pseudo terminal
1422+
server_send_rec_packet (chan, pp, fbuf, flen); // AGW net protocol
1423+
kissnet_send_rec_packet (chan, KISS_CMD_DATA_FRAME, fbuf, flen, NULL, -1); // KISS TCP
1424+
kissserial_send_rec_packet (chan, KISS_CMD_DATA_FRAME, fbuf, flen, NULL, -1); // KISS serial port
1425+
kisspt_send_rec_packet (chan, KISS_CMD_DATA_FRAME, fbuf, flen, NULL, -1); // KISS pseudo terminal
14261426

14271427
if (A_opt_ais_to_obj && strlen(ais_obj_packet) != 0) {
14281428
packet_t ao_pp = ax25_from_text (ais_obj_packet, 1);
@@ -1431,9 +1431,9 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev
14311431
int ao_flen = ax25_pack(ao_pp, ao_fbuf);
14321432

14331433
server_send_rec_packet (chan, ao_pp, ao_fbuf, ao_flen);
1434-
kissnet_send_rec_packet (chan, KISS_CMD_DATA_FRAME, ao_fbuf, ao_flen, -1);
1435-
kissserial_send_rec_packet (chan, KISS_CMD_DATA_FRAME, ao_fbuf, ao_flen, -1);
1436-
kisspt_send_rec_packet (chan, KISS_CMD_DATA_FRAME, ao_fbuf, ao_flen, -1);
1434+
kissnet_send_rec_packet (chan, KISS_CMD_DATA_FRAME, ao_fbuf, ao_flen, NULL, -1);
1435+
kissserial_send_rec_packet (chan, KISS_CMD_DATA_FRAME, ao_fbuf, ao_flen, NULL, -1);
1436+
kisspt_send_rec_packet (chan, KISS_CMD_DATA_FRAME, ao_fbuf, ao_flen, NULL, -1);
14371437
ax25_delete (ao_pp);
14381438
}
14391439
}

‎src/kiss.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ void kisspt_set_debug (int n)
9494
return;
9595
}
9696

97-
void kisspt_send_rec_packet (int chan, int kiss_cmd, unsigned char *fbuf, int flen, int client)
97+
void kisspt_send_rec_packet (int chan, int kiss_cmd, unsigned char *fbuf, int flen, struct kissport_status_s *kps, int client)
9898
{
9999
return;
100100
}
@@ -374,7 +374,7 @@ static int kisspt_open_pt (void)
374374
* flen - Length of raw received frame not including the FCS
375375
* or -1 for a text string.
376376
*
377-
* client - Not used for pseudo terminal.
377+
* kps, client - Not used for pseudo terminal.
378378
* Here so that 3 related functions all have
379379
* the same parameter list.
380380
*
@@ -385,7 +385,7 @@ static int kisspt_open_pt (void)
385385
*--------------------------------------------------------------------*/
386386

387387

388-
void kisspt_send_rec_packet (int chan, int kiss_cmd, unsigned char *fbuf, int flen, int client)
388+
void kisspt_send_rec_packet (int chan, int kiss_cmd, unsigned char *fbuf, int flen, struct kissport_status_s *kps, int client)
389389
{
390390
unsigned char kiss_buff[2 * AX25_MAX_PACKET_LEN + 2];
391391
int kiss_len;
@@ -591,7 +591,7 @@ static void * kisspt_listen_thread (void *arg)
591591

592592
while (1) {
593593
ch = kisspt_get();
594-
kiss_rec_byte (&kf, ch, kisspt_debug, -1, kisspt_send_rec_packet);
594+
kiss_rec_byte (&kf, ch, kisspt_debug, NULL, -1, kisspt_send_rec_packet);
595595
}
596596

597597
return (void *) 0; /* Unreachable but avoids compiler warning. */

‎src/kiss.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010

1111
#include "config.h"
1212

13-
13+
#include "kiss_frame.h" // for struct kissport_status_s
1414

1515

1616
void kisspt_init (struct misc_config_s *misc_config);
1717

18-
void kisspt_send_rec_packet (int chan, int kiss_cmd, unsigned char *fbuf, int flen, int client);
18+
void kisspt_send_rec_packet (int chan, int kiss_cmd, unsigned char *fbuf, int flen,
19+
struct kissport_status_s *notused1, int notused2);
1920

2021
void kisspt_set_debug (int n);
2122

0 commit comments

Comments
 (0)