diff --git a/QnetGateway.cpp b/QnetGateway.cpp index bd9e2cb..00fb04a 100644 --- a/QnetGateway.cpp +++ b/QnetGateway.cpp @@ -2844,7 +2844,7 @@ void CQnetGateway::gps_send(short int rptr_idx) printf("GPRMC=[%s]\n", band_txt[rptr_idx].gprmc); printf("GPS id=[%s]\n",band_txt[rptr_idx].gpid); - if (validate_csum(band_txt[rptr_idx], false) || validate_csum(band_txt[rptr_idx], true)) + if (validate_csum(band_txt[rptr_idx], false)) // || validate_csum(band_txt[rptr_idx], true)) return; /* now convert GPS into APRS and send it */ @@ -2899,7 +2899,7 @@ void CQnetGateway::build_aprs_from_gps_and_send(short int rptr_idx) printf("Invalid North or South indicator in latitude\n"); return; } - if (strlen(lat_str) != 9) { + if (strlen(lat_str) > 9) { printf("Invalid latitude\n"); return; } @@ -2922,7 +2922,7 @@ void CQnetGateway::build_aprs_from_gps_and_send(short int rptr_idx) printf("Invalid East or West indicator in longitude\n"); return; } - if (strlen(lon_str) != 10) { + if (strlen(lon_str) > 10) { printf("Invalid longitude\n"); return; } diff --git a/QnetGateway.h b/QnetGateway.h index a6a6bb1..b8212f0 100644 --- a/QnetGateway.h +++ b/QnetGateway.h @@ -18,6 +18,7 @@ #include #include "QnetTypeDefs.h" +#include "SEcho.h" #include "aprs.h" diff --git a/QnetLink.h b/QnetLink.h index 5155276..34c8b05 100644 --- a/QnetLink.h +++ b/QnetLink.h @@ -28,6 +28,7 @@ #include #include "versions.h" #include "QnetTypeDefs.h" +#include "SEcho.h" #include "Random.h" using namespace libconfig; diff --git a/QnetTypeDefs.h b/QnetTypeDefs.h index db175b5..41aac94 100644 --- a/QnetTypeDefs.h +++ b/QnetTypeDefs.h @@ -123,13 +123,3 @@ typedef struct dsrp_tag { // offset size }; } SDSRP; #pragma pack(pop) - -typedef struct echo_tag { - bool is_linked; - time_t last_time; - unsigned short streamid; - int fd; - char message[24]; - SDSVT header; - char file[FILENAME_MAX + 1]; -} SECHO; diff --git a/SEcho.h b/SEcho.h new file mode 100644 index 0000000..cb9fc5c --- /dev/null +++ b/SEcho.h @@ -0,0 +1,28 @@ +#pragma once +/* + * Copyright 2018 by Thomas Early, N7TAE + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +typedef struct echo_tag { + bool is_linked; + time_t last_time; + unsigned short streamid; + int fd; + char message[24]; + SDSVT header; + char file[FILENAME_MAX + 1]; +} SECHO; diff --git a/versions.h b/versions.h index 0280387..b7556b7 100644 --- a/versions.h +++ b/versions.h @@ -1,6 +1,6 @@ // version strings must be 55 characters or less! -#define IRCDDB_VERSION "QnetGateway-7.4.4" -#define LINK_VERSION "QnetLink-6.3.0" +#define IRCDDB_VERSION "QnetGateway-7.4.5" +#define LINK_VERSION "QnetLink-6.3.1" #define DVAP_VERSION "QnetDVAP-5.1.2" #define RELAY_VERSION "QnetRelay-0.2.3" #define ITAP_VERSION "QnetITAP-0.2.1"