Merge branch 'develop' into feature/aprs_#42

APRS/Makefile

@@ -7,6 +7,7 @@ APRS.a: $(OBJS)
 
 %.o : %.cpp
 	$(CC) -I../BaseCommon $(CPPFLAGS) -MMD -MD -c $< -o $@
+-include $(DEPS)
 
 clean:
 	$(RM) *.o *.d APRS.a

BaseCommon/Makefile

@@ -7,6 +7,7 @@ BaseCommon.a: $(OBJS)
 
 %.o : %.cpp
 	$(CC) $(CPPFLAGS) -MMD -MD -c $< -o $@
+-include $(DEPS)
 
 clean:
 	$(RM) *.o *.d BaseCommon.a

Common/Makefile

@@ -7,6 +7,7 @@ Common.a: $(OBJS) ../APRS/APRS.a ../BaseCommon/BaseCommon.a ../DStarBase/DStarBa
 
 %.o : %.cpp
 	$(CC) -I../APRS -I../BaseCommon -I../DStarBase -I../IRCDDB -I../VersionInfo $(CPPFLAGS) -MMD -MD -c $< -o $@
+-include $(DEPS)
 
 .PHONY clean:
 clean:

DGWRemoteControl/Makefile

@@ -7,6 +7,7 @@ dgwremotecontrol: ../VersionInfo/GitVersion.h $(OBJS) ../DStarBase/DStarBase.a .
 
 %.o : %.cpp
 	$(CC) -I../Common -I../BaseCommon  -I../DStarBase -I../VersionInfo -DCFG_DIR='"$(CFG_DIR)"' $(CPPFLAGS) -MMD -MD -c $< -o $@
+-include $(DEPS)
 
 .PHONY clean:
 clean:

DGWTextTransmit/Makefile

@@ -7,6 +7,7 @@ dgwtexttransmit: ../VersionInfo/GitVersion.h $(OBJS) ../DStarBase/DStarBase.a ..
 
 %.o : %.cpp
 	$(CC) -I../BaseCommon -I../DStarBase -I../VersionInfo -DCFG_DIR='"$(CFG_DIR)"' $(CPPFLAGS) -MMD -MD -c $< -o $@
+-include $(DEPS)
 
 .PHONY clean:
 clean:

DGWTimeServer/Makefile

@@ -7,6 +7,7 @@ dgwtimeserver: ../VersionInfo/GitVersion.h $(OBJS) ../DStarBase/DStarBase.a ../B
 
 %.o : %.cpp
 	$(CC) -I../BaseCommon -I../DStarBase -I../VersionInfo $(CPPFLAGS) -MMD -MD -c $< -o $@
+-include $(DEPS)
 
 .PHONY clean:
 clean:

DGWVoiceTransmit/Makefile

@@ -7,6 +7,7 @@ dgwvoicetransmit: ../VersionInfo/GitVersion.h $(OBJS) ../DStarBase/DStarBase.a .
 
 %.o : %.cpp
 	$(CC) -I../BaseCommon -I../APRS -I../DStarBase -I../VersionInfo -DCFG_DIR='"$(CFG_DIR)"' $(CPPFLAGS) -MMD -MD -c $< -o $@
+-include $(DEPS)
 
 .PHONY clean:
 clean:

DStarBase/Makefile

@@ -7,6 +7,7 @@ DStarBase.a: $(OBJS)
 
 %.o : %.cpp
 	$(CC) -I../BaseCommon $(CPPFLAGS) -MMD -MD -c $< -o $@
+-include $(DEPS)
 
 clean:
 	$(RM) *.o *.d DStarBase.a

DStarGateway/Makefile

@@ -7,6 +7,7 @@ dstargateway: ../VersionInfo/GitVersion.h $(OBJS) ../APRS/APRS.a ../IRCDDB/IRCDD
 
 %.o : %.cpp
 	$(CC) -I../APRS -I../Common -I../BaseCommon -I../DStarBase -I../IRCDDB -I../VersionInfo $(CPPFLAGS) -MMD -MD -c $< -o $@
+-include $(DEPS)
 
 .PHONY clean:
 clean:

IRCDDB/IRCDDBMultiClient.h

@@ -97,7 +97,7 @@ public:
 	}
 
 	/*
-		Updates the entry, but only if the timestamp is newer. if an address was already specified it is kept.
+		Updates the entry, but only if the timestamp is newer. 
 	*/
 	void Update(const std::string& user, const std::string& repeater, const std::string& gateway, const std::string& address, const std::string& timestamp, const std::string& remotePort)
 	{
@@ -108,9 +108,7 @@ public:
 			m_gateway = gateway;
 			m_timestamp = timestamp;
 			m_remotePort = remotePort;
-
-			if(m_address.empty() && !address.empty())
-				m_address = address;
+			m_address = address;
 		}
 		//wxLogMessage("After : %s"), toString());
 	}

IRCDDB/Makefile

@@ -7,6 +7,7 @@ IRCDDB.a: $(OBJS) ../VersionInfo/GitVersion.h ../BaseCommon/BaseCommon.a
 
 %.o : %.cpp
 	$(CC) -I../BaseCommon -I../VersionInfo $(CPPFLAGS) -MMD -MD -c $< -o $@
+-include $(DEPS)
 
 .PHONY clean:
 clean:

README.md

@@ -148,6 +148,7 @@ The testing framwework used is Google Test.
 ## 5.1. Version 1.0
 - [**Improvement**] APRS Improvements: Diplay 220MHz in APRS Posits, add different ToCalls depending on gateway type ([#42](https://github.com/F4FXL/DStarGateway/issues/42))
 - [**Improvement**] Improve CI to include all variants of build configurations ([#40](https://github.com/F4FXL/DStarGateway/issues/40))
+- [**Bugfix**] Fix #43 Cache not updated when answering ircddb gateway is only conected to one network ([#43](https://github.com/F4FXL/DStarGateway/issues/43))
 - [**Bugfix**] Fix #37 Unable to transmit multiple files (DGWVoiceTransmit) ([#37](https://github.com/F4FXL/DStarGateway/issues/37))
 - [**Bugfix**] Fix #36 Error1 Build fails in some environment ([#36](https://github.com/F4FXL/DStarGateway/issues/36))
 - [**Bugfix**] Fix #38 g++ 13 build ([#38](https://github.com/F4FXL/DStarGateway/issues/38))

VersionInfo/Makefile

@@ -20,4 +20,6 @@ endif
 clean:
 	$(RM) *.o *.d GitVersion.h
 
+.PHONY: FORCE
 FORCE:
+	@true