From 30c52862a96fc8198527b1264b47a8acffe85d17 Mon Sep 17 00:00:00 2001 From: wb2osz Date: Mon, 11 Sep 2017 22:35:44 -0400 Subject: [PATCH] New "kissutil" application. --- direwolf.c | 9 +++++---- tt_user.c | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/direwolf.c b/direwolf.c index 4447cb3..835c757 100644 --- a/direwolf.c +++ b/direwolf.c @@ -1117,16 +1117,17 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev /* Send to another application if connected. */ // TODO: Put a wrapper around this so we only call one function to send by all methods. +// We see the same sequence in tt_user.c. int flen; unsigned char fbuf[AX25_MAX_PACKET_LEN]; flen = ax25_pack(pp, fbuf); - server_send_rec_packet (chan, pp, fbuf, flen); // AGW net protocol - kissnet_send_rec_packet (chan, fbuf, flen, -1); // KISS TCP - kissserial_send_rec_packet (chan, fbuf, flen, -1); // KISS serial port - kisspt_send_rec_packet (chan, fbuf, flen, -1); // KISS pseudo terminal + server_send_rec_packet (chan, pp, fbuf, flen); // AGW net protocol + kissnet_send_rec_packet (chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1); // KISS TCP + kissserial_send_rec_packet (chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1); // KISS serial port + kisspt_send_rec_packet (chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1); // KISS pseudo terminal /* * If it came from DTMF decoder, send it to APRStt gateway. diff --git a/tt_user.c b/tt_user.c index deb1042..c071326 100644 --- a/tt_user.c +++ b/tt_user.c @@ -60,7 +60,7 @@ #include "kiss.h" #include "kissserial.h" #include "kissnet.h" - +#include "kiss_frame.h" /* * Information kept about local APRStt users. @@ -892,13 +892,14 @@ static void xmit_object_report (int i, int first_time) int flen; // TODO1.3: Put a wrapper around this so we only call one function to send by all methods. + // We see the same sequence in direwolf.c. flen = ax25_pack(pp, fbuf); server_send_rec_packet (save_tt_config_p->obj_recv_chan, pp, fbuf, flen); - kissnet_send_rec_packet (save_tt_config_p->obj_recv_chan, fbuf, flen, -1); - kissserial_send_rec_packet (save_tt_config_p->obj_recv_chan, fbuf, flen, -1); - kisspt_send_rec_packet (save_tt_config_p->obj_recv_chan, fbuf, flen, -1); + kissnet_send_rec_packet (save_tt_config_p->obj_recv_chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1); + kissserial_send_rec_packet (save_tt_config_p->obj_recv_chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1); + kisspt_send_rec_packet (save_tt_config_p->obj_recv_chan, KISS_CMD_DATA_FRAME, fbuf, flen, -1); } if (first_time && save_tt_config_p->obj_send_to_ig) {