Merge pull request #3240 from jimklimov/FTY-remerge-20251231

Merge remote-tracking branch 'upstream/master' into FTY as of 20251231

Author: jimklimov

Makefile.am

@@ -1623,29 +1623,34 @@ install-win-bundle-thirdparty:
 	 if test -n "$$ARCH" ; then export ARCH ; fi ; \
 	 DESTDIR='$(DESTDIR)' ; export DESTDIR ; \
 	 (  cd '$(DESTDIR)' || exit ; \
-	    GREP=$(GREP)' EGREP='$(EGREP)' \
+	    GREP='$(GREP)' EGREP='$(EGREP)' \
 	    DESTDIR="" '$(abs_top_srcdir)/scripts/Windows/dllldd.sh' dllldddir . \
 	    | while read D ; do \
+	        BD="`basename \"$$D\"`" ; \
+	        if test -e './$(bindir)/'"$$BD" && diff './$(bindir)/'"$$BD" "$$D" 2>/dev/null >/dev/null ; then \
+	            echo "   DLL->bin       $$D : skip (already installed there)" 2>&1 ; \
+	            continue ; \
+	        fi ; \
 	        echo "   DLL->bin       $$D" 2>&1 ; \
 	        cp -pf "$$D" './$(bindir)/' ; \
 	    done ; \
 	 ) || exit ; \
 	 (  if test x"$(bindir)" = x"$(sbindir)" ; then exit 0 ; fi ; \
 	    cd '$(DESTDIR)/$(sbindir)' || exit ; \
-	    GREP=$(GREP)' EGREP='$(EGREP)' \
+	    GREP='$(GREP)' EGREP='$(EGREP)' \
 	    '$(abs_top_srcdir)/scripts/Windows/dllldd.sh' dllldddir . \
 	    | while read D ; do \
-	        echo "   DLL->sbin      $$D" 2>&1 ; \
+	        echo "   DLL->sbin      $$D (symlink from bindir)" 2>&1 ; \
 	        ln -f '$(DESTDIR)/$(bindir)'/"`basename \"$$D\"`" ./ ; \
 	    done ; \
 	 ) || exit ; \
 	 (  if test x"$(driverexecdir)" = x"$(bindir)" ; then exit 0 ; fi ; \
 	    if test x"$(driverexecdir)" = x"$(sbindir)" ; then exit 0 ; fi ; \
 	    cd '$(DESTDIR)/$(driverexecdir)' || exit ; \
-	    GREP=$(GREP)' EGREP='$(EGREP)' \
+	    GREP='$(GREP)' EGREP='$(EGREP)' \
 	    '$(abs_top_srcdir)/scripts/Windows/dllldd.sh' dllldddir . \
 	    | while read D ; do \
-	        echo "   DLL->drv       $$D" 2>&1 ; \
+	        echo "   DLL->drv       $$D (symlink from bindir)" 2>&1 ; \
 	        ln -f '$(DESTDIR)/$(bindir)'/"`basename \"$$D\"`" ./ ; \
 	    done ; \
 	 ) || exit ; \
@@ -1654,10 +1659,10 @@ install-win-bundle-thirdparty:
 	    if test x"$(cgiexecdir)" = x"$(sbindir)" ; then exit 0 ; fi ; \
 	    if test x"$(driverexecdir)" = x"$(cgiexecdir)" ; then exit 0 ; fi ; \
 	    cd '$(DESTDIR)/$(cgiexecdir)' || exit ; \
-	    GREP=$(GREP)' EGREP='$(EGREP)' \
+	    GREP='$(GREP)' EGREP='$(EGREP)' \
 	    '$(abs_top_srcdir)/scripts/Windows/dllldd.sh' dllldddir . \
 	    | while read D ; do \
-	        echo "   DLL->cgi       $$D" 2>&1 ; \
+	        echo "   DLL->cgi       $$D (symlink from bindir)" 2>&1 ; \
 	        ln -f '$(DESTDIR)/$(bindir)'/"`basename \"$$D\"`" ./ ; \
 	    done ; \
 	 ) || exit ; \
@@ -1666,10 +1671,10 @@ install-win-bundle-thirdparty:
 	    if test x"$(libexecdir)" = x"$(driverexecdir)" ; then exit 0 ; fi ; \
 	    if test x"$(libexecdir)" = x"$(cgiexecdir)" ; then exit 0 ; fi ; \
 	    cd '$(DESTDIR)/$(libexecdir)' || exit ; \
-	    GREP=$(GREP)' EGREP='$(EGREP)' \
+	    GREP='$(GREP)' EGREP='$(EGREP)' \
 	    '$(abs_top_srcdir)/scripts/Windows/dllldd.sh' dllldddir . \
 	    | while read D ; do \
-	        echo "   DLL->libexec   $$D" 2>&1 ; \
+	        echo "   DLL->libexec   $$D (symlink from bindir)" 2>&1 ; \
 	        ln -f '$(DESTDIR)/$(bindir)'/"`basename \"$$D\"`" ./ ; \
 	    done ; \
 	 ) || exit

NEWS.adoc

@@ -83,6 +83,9 @@ https://github.com/networkupstools/nut/milestone/12
    * Revised detection of (relative) paths to program and configuration files
      near the currently running program in NUT for Windows builds. [issues #3207,
      #3063, #3065, #3219]
+   * Fixed thread-safety of IP address printout in `libupsclient` method
+    `upscli_tryconnect()` (practical bug seen in `nut-scanner` parallel scans).
+    [issue #3234]
 
  - `asem`, `bestfortress`, `bestuferrups`, `bicker_ser`, `everups`, `metasys`,
    `masterguard`, `mge-utalk`, `oneac`, `phoenixcontact_modbus`, `pijuice`,
@@ -98,6 +101,10 @@ https://github.com/networkupstools/nut/milestone/12
  - Introduced a new NUT driver named `meanwell_ntu` which provides support for
    the Mean Well NTU series hybrid inverter and UPS units. [PR #3206]
 
+ - Introduced a new NUT driver named `must_ep2000pro` which provides support
+   for the MUST EP2000Pro compatible, line-interactive UPS models which talk
+   serial-protocol modbus protocol. [PR #3228]
+
  - `nhs_ser` driver updates:
    * Driver source code includes a table to map baud rates (defined by the OS
      as C macros) to numbers and strings more useful to the driver program.
@@ -355,6 +362,21 @@ several `FSD` notifications into one executed action. [PR #3097]
    system conforming to FHS-3.0 standard where that location is absent or
    is a symlink, while `/run` exists and is a true directory. [#3099]
 
+ - Augmented `nut.exe` launcher with `status` and `restart` actions, and
+   general ability to debug-log the activities during service management
+   operations. (Re-)registration of the "Network UPS Tools" service should
+   now populate a nice description of it. The `-U` (uninstall) action should
+   now also try to stop the service first. [PR #3235]
+
+ - Fixed `LISTEN *` handling for `upsd.exe` in NUT for Windows builds. [PR #3237]
+
+ - Revised WIN32 `WSAStartup()` and registration of `atexit(WSACleanup)` to
+   only be done once per program (and cleanups to be always registered); this
+   impacts the C `libupsclient` and C++ `libnutclient` libraries (and so most
+   NUT clients and tools which use the former, and `nutconf` which uses the
+   latter), the `apcupsd` driver, `upsd` data server, and `nut-scanner` tool.
+   [PR #3237]
+
  - Revised CI and deliverable scripts, and Makefile recipes, to not use
    the verbatim `grep -E` (loudly preferred by newer systems, but may be
    absent on older ones) after all, nor use `egrep` (loudly disliked by

UPGRADING.adoc

@@ -63,6 +63,12 @@ Changes from 2.8.4 to 2.8.5
   usually override `--with-pidpath` anyway to provide a dedicated location
   for NUT `root`-owned daemon PID files. [#3099]
 
+- The autoconf managed macro for `--with-port` option was renamed from plain
+  `PORT` to less ambiguous `NUT_PORT` to avoid potential conflicts with any
+  third-party code.  If anyone did use this macro in their custom builds or
+  integrations, some renaming (or stubbed definitions to the effect of
+  `PORT=NUT_PORT`) may be needed. [#3238]
+
 - In drivers using the common `main.c` and `main.h` framework, introduced
   a `void upsdrv_tweak_prognames(void)` required method (may be no-op) to
   optionally tweak `prognames[]` entries now that there is certain support

clients/nutclient.cpp

@@ -285,8 +285,14 @@ void Socket::connect(const std::string& host, uint16_t port)
 	HANDLE event = NULL;
 	unsigned long argp;
 
-	WSADATA WSAdata;
-	WSAStartup(2,&WSAdata);
+	/* Required ritual before calling any socket functions */
+	static WSADATA	WSAdata;
+	static int	WSA_Started = 0;
+	if (!WSA_Started) {
+		WSAStartup(2, &WSAdata);
+		atexit((void(*)(void))WSACleanup);
+		WSA_Started = 1;
+	}
 #endif	/* WIN32 */
 
 	_sock = INVALID_SOCKET;
@@ -794,7 +800,7 @@ bool Client::hasFeature(const Feature& feature)
 TcpClient::TcpClient():
 Client(),
 _host("localhost"),
-_port(3493),
+_port(NUT_PORT),
 _timeout(0),
 _socket(new internal::Socket)
 {

clients/nutclient.h

@@ -33,7 +33,15 @@
 
 /* See include/common.h for details behind this */
 #ifndef NUT_UNUSED_VARIABLE
-#define NUT_UNUSED_VARIABLE(x) (void)(x)
+# define NUT_UNUSED_VARIABLE(x) (void)(x)
+#endif
+
+/* Should be defined via autoconf in include/config.h -
+ * if that is included earlier by the program code.
+ * If not - got a fallback here:
+ */
+#ifndef NUT_PORT
+# define NUT_PORT 3493
 #endif
 
 namespace nut
@@ -389,15 +397,15 @@ class TcpClient : public Client
 	 * \param host Server host name.
 	 * \param port Server port.
 	 */
-	TcpClient(const std::string& host, uint16_t port = 3493);
+	TcpClient(const std::string& host, uint16_t port = NUT_PORT);
 	~TcpClient() override;
 
 	/**
 	 * Connect it to the specified server.
 	 * \param host Server host name.
 	 * \param port Server port.
 	 */
-	void connect(const std::string& host, uint16_t port = 3493);
+	void connect(const std::string& host, uint16_t port = NUT_PORT);
 
 	/**
 	 * Connect to the server.

clients/upsclient.c

@@ -1019,9 +1019,16 @@ int upscli_tryconnect(UPSCONN_t *ups, const char *host, uint16_t port, int flags
 	HANDLE event = NULL;
 	unsigned long argp;
 
-	WSADATA WSAdata;
-	WSAStartup(2,&WSAdata);
+	/* Required ritual before calling any socket functions */
+	static WSADATA	WSAdata;
+	static int	WSA_Started = 0;
+	if (!WSA_Started) {
+		WSAStartup(2, &WSAdata);
+		atexit((void(*)(void))WSACleanup);
+		WSA_Started = 1;
+	}
 #endif	/* WIN32 */
+
 	if (!ups) {
 		return -1;
 	}
@@ -1164,9 +1171,11 @@ int upscli_tryconnect(UPSCONN_t *ups, const char *host, uint16_t port, int flags
 			    ups->upserror == UPSCLI_ERR_CONNFAILURE &&
 			    ups->syserrno == ETIMEDOUT
 			) {
-				const char	*addrstr = inet_ntopAI(ai);
+				const char	*addrstr = xinet_ntopAI(ai);
 				upslogx(LOG_WARNING, "%s: Connection to host timed out: '%s'",
 					__func__, (addrstr && *addrstr) ? addrstr : NUT_STRARG(host));
+				if (addrstr)
+					free((char*)addrstr);
 				break;
 			}
 			continue;
@@ -1694,7 +1703,7 @@ int upscli_splitname(const char *buf, char **upsname, char **hostname, uint16_t
 			return -1;
 		}
 
-		*port = PORT;
+		*port = NUT_PORT;
 		return 0;
 	}
 
@@ -1750,7 +1759,7 @@ int upscli_splitaddr(const char *buf, char **hostname, uint16_t *port)
 
 		/* no port specified, use default */
 		if (((s = strtok_r(NULL, "\0", &last)) == NULL) || (*s != ':')) {
-			*port = PORT;
+			*port = NUT_PORT;
 			return 0;
 		}
 	} else {
@@ -1763,7 +1772,7 @@ int upscli_splitaddr(const char *buf, char **hostname, uint16_t *port)
 
 		/* no port specified, use default */
 		if (s == NULL) {
-			*port = PORT;
+			*port = NUT_PORT;
 			return 0;
 		}
 	}