removed versions.h

QnetDVAP.cpp

@@ -37,7 +37,6 @@
 #include <sys/ioctl.h>
 #include <termios.h>
 #include <sys/file.h>
-#include "versions.h"
 
 #include <atomic>
 #include <future>
@@ -52,7 +51,8 @@
 #include "UnixDgramSocket.h"
 #include "QnetConfigure.h"
 
-#define VERSION DVAP_VERSION
+#define DVAP_VERSION "QnetDVAP-6.0.1"
+
 #define CALL_SIZE 8
 #define IP_SIZE 15
 
@@ -944,7 +944,7 @@ int main(int argc, const char **argv)
 	short cnt = 0;
 
 	setvbuf(stdout, NULL, _IOLBF, 0);
-	printf("dvap_rptr VERSION %s\n", VERSION);
+	printf("dvap_rptr VERSION %s\n", DVAP_VERSION);
 
 	if (argc != 2) {
 		fprintf(stderr, "Usage: %s dvap_rptr.cfg\n", argv[0]);

QnetDVRPTR.cpp

@@ -21,14 +21,14 @@
 #include <termios.h>
 #include <wchar.h>
 #include <sys/file.h>
-#include "versions.h"
 #include <string>
 
 #include "Random.h"
 #include "UnixDgramSocket.h"
 #include "QnetConfigure.h"
 
-#define VERSION DVRPTR_VERSION
+#define DVRPTR_VERSION "QnetDVRPTR-6.0.2"
+
 #define BAUD B115200
 #define CALL_SIZE 8
 #define IP_SIZE 15
@@ -2494,7 +2494,7 @@ int main(int argc, const char **argv)
 	char fw_string[10];
 
 	setvbuf(stdout, NULL, _IOLBF, 0);
-	printf("dvrptr VERSION %s\n", VERSION);
+	printf("dvrptr VERSION %s\n", DVRPTR_VERSION);
 
 	if (argc != 2) {
 		fprintf(stderr, "Usage: %s dvrptr.cfg\n", argv[0]);

QnetGateway.cpp

@@ -55,10 +55,11 @@
 
 #include "IRCDDB.h"
 #include "IRCutils.h"
-#include "versions.h"
 #include "QnetConfigure.h"
 #include "QnetGateway.h"
 
+#define IRCDDB_VERSION "QnetGateway-8.0.1"
+
 extern void dstar_dv_init();
 extern int dstar_dv_decode(const unsigned char *d, int data[3]);
 
@@ -206,13 +207,13 @@ bool CQnetGateway::read_config(char *cfgFile)
 		} else {
 			printf("Found Module: %s = '%s'\n", path.c_str(), type.c_str());
 			if (0 == type.compare("dvap")) {
-				rptr.mod[m].package_version = DVAP_VERSION;
+				rptr.mod[m].package_version = "QnetDVAP";
 			} else if (0 == type.compare("dvrptr")) {
-				rptr.mod[m].package_version = DVRPTR_VERSION;
+				rptr.mod[m].package_version = "QnetDVRPTR";
 			} else if (0 == type.compare("mmdvm")) {
-				rptr.mod[m].package_version = MMDVM_VERSION;
+				rptr.mod[m].package_version = "QnetRelay";
 			} else if (0 == type.compare("itap")) {
-				rptr.mod[m].package_version = ITAP_VERSION;
+				rptr.mod[m].package_version = "QnetITAP";
 			} else {
 				printf("module type '%s' is invalid\n", type.c_str());
 				return true;

QnetITAP.cpp

@@ -40,11 +40,12 @@
 #include <thread>
 #include <chrono>
 
-#include "versions.h"
 #include "QnetITAP.h"
 #include "QnetTypeDefs.h"
 #include "QnetConfigure.h"
 
+#define ITAP_VERSION "QnetITAP-1.0.2"
+
 std::atomic<bool> CQnetITAP::keep_running(true);
 
 CQnetITAP::CQnetITAP(int mod)

QnetLink.cpp

@@ -48,11 +48,12 @@
 #include <thread>
 #include <chrono>
 
-#include "versions.h"
 #include "DPlusAuthenticator.h"
 #include "QnetConfigure.h"
 #include "QnetLink.h"
 
+#define LINK_VERSION "QnetLink7.0.1"
+
 std::atomic<bool> CQnetLink::keep_running(true);
 
 CQnetLink::CQnetLink()
@@ -1976,7 +1977,7 @@ void CQnetLink::Process()
 					// printf("Remote station %s %s requested version\n", inbound_ptr->call, ip);
 
 					buf[0] = 9;
-					strncpy((char *)buf + 4, VERSION, 4);
+					strncpy((char *)buf + 4, LINK_VERSION, 4);
 					buf[8] = 0;
 
 					sendto(ref_g2_sock, buf, 9, 0, (struct sockaddr *)&fromDst4, sizeof(struct sockaddr_in));
@@ -3555,7 +3556,7 @@ int main(int argc, char **argv)
 	CQnetLink qnlink;
 	if (qnlink.Init(argv[1]))
 		return 1;
-	printf("g2_link %s initialized...entering processing loop\n", VERSION);
+	printf("g2_link %s initialized...entering processing loop\n", LINK_VERSION);
 	qnlink.Process();
 	printf("g2_link exiting\n");
 	qnlink.Shutdown();

QnetLink.h

@@ -25,14 +25,13 @@
 #include <set>
 #include <atomic>
 #include <netinet/in.h>
-#include "versions.h"
+
 #include "QnetTypeDefs.h"
 #include "SEcho.h"
 #include "Random.h"
 #include "UnixDgramSocket.h"
 
 /*** version number must be x.xx ***/
-#define VERSION LINK_VERSION
 #define CALL_SIZE 8
 #define IP_SIZE 15
 #define QUERY_SIZE 56

QnetRelay.cpp

@@ -32,11 +32,12 @@
 #include <arpa/inet.h>
 #include <errno.h>
 
-#include "versions.h"
 #include "QnetRelay.h"
 #include "QnetTypeDefs.h"
 #include "QnetConfigure.h"
 
+#define RELAY_VERSION "QnetRelay-1.0.2"
+
 std::atomic<bool> CQnetRelay::keep_running(true);
 
 CQnetRelay::CQnetRelay(int mod) :

versions.h

@@ -1,8 +0,0 @@
-// version strings must be 55 characters or less!
-#define IRCDDB_VERSION "QnetGateway-8.0.1"
-#define LINK_VERSION "QnetLink7.0.1"
-#define DVAP_VERSION "QnetDVAP-6.0.1"
-#define RELAY_VERSION "QnetRelay-1.0.2"
-#define ITAP_VERSION "QnetITAP-1.0.2"
-#define DVRPTR_VERSION "QnetDVRPTR-6.0.2"
-#define MMDVM_VERSION "QnetGateway-MMDVM-1.0.0"