From a9f461d30ef4b017c7f466c66b93229718518fd4 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Tue, 13 Feb 2024 20:34:28 +0100 Subject: [PATCH 1/4] Remove check on ip address --- IRCDDB/IRCDDBMultiClient.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/IRCDDB/IRCDDBMultiClient.h b/IRCDDB/IRCDDBMultiClient.h index 2b47a5f..448f72c 100644 --- a/IRCDDB/IRCDDBMultiClient.h +++ b/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()); } From 0097517bbd7ab13b8c4c5de3191c502d1eee2818 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sun, 18 Feb 2024 07:46:49 +0100 Subject: [PATCH 2/4] Update reeadme #42 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8719780..ca70c52 100644 --- a/README.md +++ b/README.md @@ -147,6 +147,7 @@ The testing framwework used is Google Test. # 5. Version History ## 5.1. Version 1.0 - [**Improvement**] Improve CI to include all variants of build configurations ([#40](https://github.com/F4FXL/DStarGateway/issues/40)) +- [**Bugfix**] Fix #42 Cache not updated when answering ircddb gateway is only conected to one network ([#42](https://github.com/F4FXL/DStarGateway/issues/42)) - [**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)) From 8ed74ea32aba40792e1e93684bc2eda197f5d65d Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 28 Feb 2024 18:07:58 +0100 Subject: [PATCH 3/4] type in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ca70c52..b0470af 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,7 @@ The testing framwework used is Google Test. # 5. Version History ## 5.1. Version 1.0 - [**Improvement**] Improve CI to include all variants of build configurations ([#40](https://github.com/F4FXL/DStarGateway/issues/40)) -- [**Bugfix**] Fix #42 Cache not updated when answering ircddb gateway is only conected to one network ([#42](https://github.com/F4FXL/DStarGateway/issues/42)) +- [**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)) From 0e8b2b54c26977bfa6ddfcf2d2821b7f088fbc0e Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 28 Feb 2024 22:23:26 +0100 Subject: [PATCH 4/4] include deps #45 --- APRS/Makefile | 1 + BaseCommon/Makefile | 1 + Common/Makefile | 1 + DGWRemoteControl/Makefile | 1 + DGWTextTransmit/Makefile | 1 + DGWTimeServer/Makefile | 1 + DGWVoiceTransmit/Makefile | 1 + DStarBase/Makefile | 1 + DStarGateway/Makefile | 1 + IRCDDB/Makefile | 1 + VersionInfo/Makefile | 2 ++ 11 files changed, 12 insertions(+) diff --git a/APRS/Makefile b/APRS/Makefile index d72b824..6b19ae7 100644 --- a/APRS/Makefile +++ b/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 \ No newline at end of file diff --git a/BaseCommon/Makefile b/BaseCommon/Makefile index dc769f0..af2f48b 100644 --- a/BaseCommon/Makefile +++ b/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 \ No newline at end of file diff --git a/Common/Makefile b/Common/Makefile index f04541f..117dd3f 100644 --- a/Common/Makefile +++ b/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: diff --git a/DGWRemoteControl/Makefile b/DGWRemoteControl/Makefile index cb7396a..f5646b4 100644 --- a/DGWRemoteControl/Makefile +++ b/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: diff --git a/DGWTextTransmit/Makefile b/DGWTextTransmit/Makefile index d209f9e..5fb8f18 100644 --- a/DGWTextTransmit/Makefile +++ b/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: diff --git a/DGWTimeServer/Makefile b/DGWTimeServer/Makefile index 87b80ab..066de4b 100644 --- a/DGWTimeServer/Makefile +++ b/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: diff --git a/DGWVoiceTransmit/Makefile b/DGWVoiceTransmit/Makefile index d214adb..5953191 100644 --- a/DGWVoiceTransmit/Makefile +++ b/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: diff --git a/DStarBase/Makefile b/DStarBase/Makefile index c6e019d..3ae60f3 100644 --- a/DStarBase/Makefile +++ b/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 diff --git a/DStarGateway/Makefile b/DStarGateway/Makefile index 03b2ea3..3487334 100644 --- a/DStarGateway/Makefile +++ b/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: diff --git a/IRCDDB/Makefile b/IRCDDB/Makefile index d84f384..f498694 100644 --- a/IRCDDB/Makefile +++ b/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: diff --git a/VersionInfo/Makefile b/VersionInfo/Makefile index 0753691..c6c5eed 100644 --- a/VersionInfo/Makefile +++ b/VersionInfo/Makefile @@ -20,4 +20,6 @@ endif clean: $(RM) *.o *.d GitVersion.h +.PHONY: FORCE FORCE: + @true