rename to ReflStateFile

.gitignore

@@ -6,9 +6,6 @@ reflector/urfd.whitelist
 reflector/urfd.interlink
 reflector/urfd.terminal
 configure.mk
-configure.h
-configure.sql
-reflector.cfg
 wiresx/configure.php
 urfd*
 inicheck

reflector/Configure.cpp

@@ -55,7 +55,6 @@
 #define JIPV4EXTERNAL            "IPv4External"
 #define JIPV6BINDING             "IPv6Binding"
 #define JIPV6EXTERNAL            "IPv6External"
-#define JJSONPATH                "JsonPath"
 #define JM17                     "M17"
 #define JMMDVM                   "MMDVM"
 #define JMODE                    "Mode"
@@ -72,6 +71,7 @@
 #define JREGISTRATIONID          "RegistrationID"
 #define JREGISTRATIONNAME        "RegistrationName"
 #define JSPONSOR                 "Sponsor"
+#define JREFLSTATEPATH           "ReflStatePath"
 #define JSYSOPEMAIL              "SysopEmail"
 #define JTRANSCODED              "Transcoded"
 #define JTRANSCODER              "Transcoder"
@@ -456,8 +456,8 @@ bool CConfigure::ReadData(const std::string &path)
 			case ESection::files:
 				if (0 == key.compare(JPIDPATH))
 					data[g_Keys.files.pid] = value;
-				else if (0 == key.compare(JJSONPATH))
+				else if (0 == key.compare(JREFLSTATEPATH))
-					data[g_Keys.files.json] = value;
+					data[g_Keys.files.state] = value;
 				else if (0 == key.compare(JWHITELISTPATH))
 					data[g_Keys.files.white] = value;
 				else if (0 == key.compare(JBLACKLISTPATH))
@@ -672,7 +672,7 @@ bool CConfigure::ReadData(const std::string &path)
 	}
 	// Other files
 	isDefined(ErrorLevel::fatal, JFILES, JPIDPATH,        g_Keys.files.pid,       rval);
-	isDefined(ErrorLevel::fatal, JFILES, JJSONPATH,       g_Keys.files.json,      rval);
+	isDefined(ErrorLevel::fatal, JFILES, JREFLSTATEPATH,  g_Keys.files.state,     rval);
 	isDefined(ErrorLevel::fatal, JFILES, JWHITELISTPATH,  g_Keys.files.white,     rval);
 	isDefined(ErrorLevel::fatal, JFILES, JBLACKLISTPATH,  g_Keys.files.black,     rval);
 	isDefined(ErrorLevel::fatal, JFILES, JINTERLINKPATH,  g_Keys.files.interlink, rval);

reflector/JsonKeys.h

@@ -52,6 +52,6 @@ struct SJsonKeys {
 	dmriddb   {  "dmrIdDbUrl",  "dmrIdDbMode",  "dmrIdDbRefresh",  "dmrIdDbFilePath" },
 	nxdniddb  { "nxdnIdDbUrl", "nxdnIdDbMode", "nxdnIdDbRefresh", "nxdnIdDbFilePath" },
 	ysftxrxdb {  "ysfIdDbUrl",  "ysfIdDbMode",  "ysfIdDbRefresh",  "ysfIdDbFilePath" };
-	struct FILES { const std::string pid, json, white, black, interlink, terminal; }
+	struct FILES { const std::string pid, state, white, black, interlink, terminal; }
-	files { "pidFilePath", "jsonFilePath", "whitelistFilePath", "blacklistFilePath", "interlinkFilePath", "g3TerminalFilePath" };
+	files { "pidFilePath", "stateFilePath", "whitelistFilePath", "blacklistFilePath", "interlinkFilePath", "g3TerminalFilePath" };
 };

reflector/Makefile

@@ -48,7 +48,7 @@ $(INICHECK) : Configure.cpp CurlGet.o
 	$(CXX) -DINICHECK $(CFLAGS) $< CurlGet.o -o $@ -lcurl
 
 $(DBUTIL) : Main.cpp $(DBUTILOBJS)
-	$(CXX) -DUTILITY $(CFLAGS) $< $(DBUTILOBJS) -o $@ -lcurl
+	$(CXX) -DUTILITY $(CFLAGS) $< $(DBUTILOBJS) -o $@ -pthread -lcurl
 
 %.o : %.cpp
 	$(CXX) $(CFLAGS) -c $< -o $@
@@ -59,23 +59,15 @@ clean :
 -include $(DEPS)
 
 install :
-	ln -f -s $(shell pwd)/$(EXE).blacklist $(CFGDIR)/$(EXE).blacklist
+	$(CP) ../$(EXE).service /etc/systemd/system/
-	ln -f -s $(shell pwd)/$(EXE).whitelist $(CFGDIR)/$(EXE).whitelist
+	$(CP) $(EXE) $(BINDIR)
-	ln -f -s $(shell pwd)/$(EXE).interlink $(CFGDIR)/$(EXE).interlink
-	ln -f -s $(shell pwd)/$(EXE).terminal  $(CFGDIR)/$(EXE).terminal
-	cp -f ../systemd/$(EXE).service /etc/systemd/system/
-	cp -f $(EXE) $(BINDIR)
 	systemctl enable $(EXE).service
 	systemctl daemon-reload
 	systemctl start $(EXE)
 
 uninstall :
-	rm -f $(CFGDIR)/$(EXE).blacklist
-	rm -f $(CFGDIR)/$(EXE).whitelist
-	rm -f $(CFGDIR)/$(EXE).interlink
-	rm -f $(CFGDIR)/$(EXE).terminal
 	systemctl stop $(EXE).service
-	rm -f $(CFGDIR)/dmrid.dat
 	systemctl disable $(EXE).service
-	rm -f /etc/systemd/system/$(EXE).service
+	$(RM) /etc/systemd/system/$(EXE).service
 	systemctl daemon-reload
+	$(RM) $(BINDIR)/$(EXE)

reflector/example.ini

@@ -113,7 +113,7 @@ RefreshMin = 191
 ######### Other File locations
 [Files]
 PidPath = /var/run/urfd.pid
-JsonPath = /var/log/urfd.json
+ReflStatePath = /var/log/urfd.xml
 WhitelistPath = /usr/local/etc/urfd.whitelist
 BlacklistPath = /usr/local/etc/urfd.blacklist
 InterlinkPath = /usr/local/etc/urfd.interlink