Skip to content

Commit 30c5286

Browse files
committed
New "kissutil" application.
1 parent 00cdf7b commit 30c5286

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

direwolf.c

+5-4
Original file line numberDiff line numberDiff line change
@@ -1117,16 +1117,17 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev
11171117

11181118
/* Send to another application if connected. */
11191119
// TODO: Put a wrapper around this so we only call one function to send by all methods.
1120+
// We see the same sequence in tt_user.c.
11201121

11211122
int flen;
11221123
unsigned char fbuf[AX25_MAX_PACKET_LEN];
11231124

11241125
flen = ax25_pack(pp, fbuf);
11251126

1126-
server_send_rec_packet (chan, pp, fbuf, flen); // AGW net protocol
1127-
kissnet_send_rec_packet (chan, fbuf, flen, -1); // KISS TCP
1128-
kissserial_send_rec_packet (chan, fbuf, flen, -1); // KISS serial port
1129-
kisspt_send_rec_packet (chan, fbuf, flen, -1); // KISS pseudo terminal
1127+
server_send_rec_packet (chan, pp, fbuf, flen); // AGW net protocol
1128+
kissnet_send_rec_packet (chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1); // KISS TCP
1129+
kissserial_send_rec_packet (chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1); // KISS serial port
1130+
kisspt_send_rec_packet (chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1); // KISS pseudo terminal
11301131

11311132
/*
11321133
* If it came from DTMF decoder, send it to APRStt gateway.

tt_user.c

+5-4
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
#include "kiss.h"
6161
#include "kissserial.h"
6262
#include "kissnet.h"
63-
63+
#include "kiss_frame.h"
6464

6565
/*
6666
* Information kept about local APRStt users.
@@ -892,13 +892,14 @@ static void xmit_object_report (int i, int first_time)
892892
int flen;
893893

894894
// TODO1.3: Put a wrapper around this so we only call one function to send by all methods.
895+
// We see the same sequence in direwolf.c.
895896

896897
flen = ax25_pack(pp, fbuf);
897898

898899
server_send_rec_packet (save_tt_config_p->obj_recv_chan, pp, fbuf, flen);
899-
kissnet_send_rec_packet (save_tt_config_p->obj_recv_chan, fbuf, flen, -1);
900-
kissserial_send_rec_packet (save_tt_config_p->obj_recv_chan, fbuf, flen, -1);
901-
kisspt_send_rec_packet (save_tt_config_p->obj_recv_chan, fbuf, flen, -1);
900+
kissnet_send_rec_packet (save_tt_config_p->obj_recv_chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1);
901+
kissserial_send_rec_packet (save_tt_config_p->obj_recv_chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1);
902+
kisspt_send_rec_packet (save_tt_config_p->obj_recv_chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1);
902903
}
903904

904905
if (first_time && save_tt_config_p->obj_send_to_ig) {

0 commit comments

Comments
 (0)