From 0682f01e9da4a6e1ffca4aaff90287b60660c3b8 Mon Sep 17 00:00:00 2001 From: Tom Early Date: Thu, 12 Mar 2020 13:17:11 -0700 Subject: [PATCH] installdash does a apt update and ii->find will go in state 6 --- Makefile | 3 ++- QnetGateway.cpp | 2 +- aprs.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3cb74dc..03b362d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2018-2019 by Thomas A. Early N7TAE +# Copyright (c) 2018-2020 by Thomas A. 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 @@ -171,6 +171,7 @@ installdtmf : qndtmf systemctl start qndtmf.service installdash : index.php + /usr/bin/apt update /usr/bin/apt install -y php-common php-fpm sqlite3 php-sqlite3 mkdir -p $(WWWDIR) /bin/ln -f -s $(shell pwd)/index.php $(WWWDIR) diff --git a/QnetGateway.cpp b/QnetGateway.cpp index 8a7c734..c4c56a3 100644 --- a/QnetGateway.cpp +++ b/QnetGateway.cpp @@ -554,7 +554,7 @@ int CQnetGateway::get_yrcall_rptr(const std::string &call, std::string &rptr, st return 0; /* at this point, the data is not in cache */ - if (7 == ii[i]->getConnectionState()) { + if (ii[i]->getConnectionState() > 5) { /* request data from irc server */ if (RoU == 'U') { printf("User [%s] not in local cache, try again\n", call.c_str()); diff --git a/aprs.cpp b/aprs.cpp index cd93e4e..c4638bc 100644 --- a/aprs.cpp +++ b/aprs.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 by Thomas A. Early N7TAE + * Copyright (C) 2016-2020 by Thomas A. 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 @@ -246,7 +246,7 @@ void CAPRS::Open(const std::string OWNER) /* login to aprs */ //sprintf(snd_buf, "user %s pass %d vers QnetGateway 9 UDP 5 ", OWNER.c_str(), m_rptr->aprs_hash); - sprintf(snd_buf, "user %s pass %d vers QnetGateway 9 ", OWNER.c_str(), m_rptr->aprs_hash); + sprintf(snd_buf, "user %s pass %d vers QnetGateway-9 ", OWNER.c_str(), m_rptr->aprs_hash); /* add the user's filter */ if (m_rptr->aprs_filter.length()) {