Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement nut-scanner -m auto* modes on WIN32 #2521

Merged
merged 10 commits into from
Jul 10, 2024
Merged

Implement nut-scanner -m auto* modes on WIN32 #2521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b5ee6aa
m4/nut_check_headers_windows.m4: introduce NUT_CHECK_HEADER_IPHLPAPI …
jimklimov Jul 9, 2024
1ff7c52
configure.ac: avoid checking "${PWD}" as a tool name (is a shell buil…
jimklimov Jul 9, 2024
4004eed
configure.ac: clarify why we call "cygpath" or "pwd -W", constrain th…
jimklimov Jul 9, 2024
4184fd6
configure.ac, tools/nut-scanner/Makefile.am: detect WIN32 support of …
jimklimov Jul 9, 2024
3710a76
configure.ac: fix location of NUT_CHECK_HEADER_IPHLPAPI call [#2516]
jimklimov Jul 9, 2024
2df35f8
common/common.c: revise debug-tracing of get_libname*() methods
jimklimov Jul 9, 2024
eb84deb
tools/nut-scanner/*: move WIN32 WSAStartup() rituals to nutscan_init(…
jimklimov Jul 9, 2024
14bb3c9
NEWS.adoc: update `nut-scanner -m auto` note - WIN32 is now supported…
jimklimov Jul 9, 2024
a4734f0
tools/nut-scanner/nut-scanner.c: implement "-m auto" for two WIN32 AP…
jimklimov Jul 9, 2024
fd4106a
tools/nut-scanner/nut-scanner.c: add a warning comment about bit-coun…
jimklimov Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NEWS.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ installed.
* newly added support to scan several IP addresses (single or ranges)
with the same call, by repeating command-line options; also `-m auto{,4,6}`
can be specified (once) to select IP (all, IPv4, IPv6) address ranges of
configured local network interfaces (currently not implemented for WIN32).
configured local network interfaces.
An `/ADDRLEN` suffix can be added to the option, to filter out discovered
subnets with too many bits available for the host address part (avoiding
millions of scans in the extreme cases).
Expand Down
82 changes: 64 additions & 18 deletions common/common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3193,32 +3193,42 @@ static char * get_libname_in_dir(const char* base_libname, size_t base_libname_l
char *libname_path = NULL, *libname_alias = NULL;
char current_test_path[LARGEBUF];

upsdebugx(3, "%s('%s', %" PRIuSIZE ", '%s', %i): Entering method...",
__func__, base_libname, base_libname_length, dirname, index);

memset(current_test_path, 0, LARGEBUF);

if ((dp = opendir(dirname)) == NULL) {
if (index >= 0) {
upsdebugx(5,"NOT looking for lib %s in unreachable directory #%d : %s",
base_libname, index, dirname);
upsdebugx(5, "%s: NOT looking for lib %s in "
"unreachable directory #%d : %s",
__func__, base_libname, index, dirname);
} else {
upsdebugx(5,"NOT looking for lib %s in unreachable directory : %s",
base_libname, dirname);
upsdebugx(5, "%s: NOT looking for lib %s in "
"unreachable directory : %s",
__func__, base_libname, dirname);
}
return NULL;
}

if (index >= 0) {
upsdebugx(2,"Looking for lib %s in directory #%d : %s", base_libname, index, dirname);
upsdebugx(4, "%s: Looking for lib %s in directory #%d : %s",
__func__, base_libname, index, dirname);
} else {
upsdebugx(2,"Looking for lib %s in directory : %s", base_libname, dirname);
upsdebugx(4, "%s: Looking for lib %s in directory : %s",
__func__, base_libname, dirname);
}

/* TODO: Try a quick stat() first? */
while ((dirp = readdir(dp)) != NULL)
{
#if !HAVE_DECL_REALPATH
struct stat st;
#endif
int compres;

upsdebugx(5,"Comparing lib %s with dirpath entry %s", base_libname, dirp->d_name);
upsdebugx(5, "%s: Comparing lib %s with dirpath entry %s",
__func__, base_libname, dirp->d_name);
compres = strncmp(dirp->d_name, base_libname, base_libname_length);
if (compres == 0) {
/* avoid "*.dll.a", ".so.1.2.3" etc. */
Expand Down Expand Up @@ -3247,7 +3257,8 @@ static char * get_libname_in_dir(const char* base_libname, size_t base_libname_l
for (p = current_test_path; *p != '\0' && (p - current_test_path) < LARGEBUF; p++) {
if (*p == '/') *p = '\\';
}
upsdebugx(3, "%s: WIN32: re-checking with %s", __func__, current_test_path);
upsdebugx(4, "%s: WIN32: re-checking with %s",
__func__, current_test_path);
if (stat(current_test_path, &st) == 0) {
if (st.st_size > 0) {
libname_path = xstrdup(current_test_path);
Expand All @@ -3260,7 +3271,8 @@ static char * get_libname_in_dir(const char* base_libname, size_t base_libname_l
* original dir, and no threading at this moment, to be safe!)
* https://stackoverflow.com/a/66096983/4715872
*/
upsdebugx(3, "%s: WIN32: re-checking with %s", __func__, current_test_path + 2);
upsdebugx(4, "%s: WIN32: re-checking with %s",
__func__, current_test_path + 2);
if (stat(current_test_path + 2, &st) == 0) {
if (st.st_size > 0) {
libname_path = xstrdup(current_test_path + 2);
Expand All @@ -3270,9 +3282,9 @@ static char * get_libname_in_dir(const char* base_libname, size_t base_libname_l
# endif /* WIN32 */
#endif /* HAVE_DECL_REALPATH */

upsdebugx(2,"Candidate path for lib %s is %s (realpath %s)",
upsdebugx(2, "Candidate path for lib %s is %s (realpath %s)",
base_libname, current_test_path,
(libname_path!=NULL)?libname_path:"NULL");
NUT_STRARG(libname_path));
if (libname_path != NULL)
break;
}
Expand Down Expand Up @@ -3304,11 +3316,18 @@ static char * get_libname_in_pathset(const char* base_libname, size_t base_libna
char *onedir = NULL;
char* pathset_tmp;

upsdebugx(3, "%s('%s', %" PRIuSIZE ", '%s', %i): Entering method...",
__func__, base_libname, base_libname_length,
NUT_STRARG(pathset),
counter ? *counter : -1);

if (!pathset || *pathset == '\0')
return NULL;

/* First call to tokenization passes the string, others pass NULL */
pathset_tmp = xstrdup(pathset);
upsdebugx(4, "%s: Looking for lib %s in a colon-separated path set",
__func__, base_libname);
while (NULL != (onedir = strtok( (onedir ? NULL : pathset_tmp), ":" ))) {
libname_path = get_libname_in_dir(base_libname, base_libname_length, onedir, (*counter)++);
if (libname_path != NULL)
Expand All @@ -3321,6 +3340,8 @@ static char * get_libname_in_pathset(const char* base_libname, size_t base_libna
pathset_tmp = xstrdup(pathset);
if (!libname_path) {
onedir = NULL; /* probably is NULL already, but better ensure this */
upsdebugx(4, "%s: WIN32: Looking for lib %s in a semicolon-separated path set",
__func__, base_libname);
while (NULL != (onedir = strtok( (onedir ? NULL : pathset_tmp), ";" ))) {
libname_path = get_libname_in_dir(base_libname, base_libname_length, onedir, (*counter)++);
if (libname_path != NULL)
Expand All @@ -3342,16 +3363,21 @@ char * get_libname(const char* base_libname)
size_t base_libname_length = strlen(base_libname);
struct stat st;

upsdebugx(3, "%s('%s'): Entering method...", __func__, base_libname);

/* First, check for an exact hit by absolute/relative path
* if `base_libname` includes path separator character(s) */
if (xbasename(base_libname) != base_libname) {
upsdebugx(4, "%s: Looking for lib %s by exact hit...",
__func__, base_libname);
#if HAVE_DECL_REALPATH
/* allocates the buffer we free() later */
libname_path = realpath(base_libname, NULL);
if (libname_path != NULL) {
if (stat(libname_path, &st) == 0) {
if (st.st_size > 0) {
upsdebugx(2, "Looking for lib %s, found by exact hit", base_libname);
upsdebugx(2, "Looking for lib %s, found by exact hit",
base_libname);
goto found;
}
}
Expand All @@ -3366,7 +3392,8 @@ char * get_libname(const char* base_libname)
if (stat(base_libname, &st) == 0) {
if (st.st_size > 0) {
libname_path = xstrdup(base_libname);
upsdebugx(2, "Looking for lib %s, found by exact hit", base_libname);
upsdebugx(2, "Looking for lib %s, found by exact hit",
base_libname);
goto found;
}
}
Expand All @@ -3375,25 +3402,36 @@ char * get_libname(const char* base_libname)
/* Normally these envvars should not be set, but if the user insists,
* we should prefer the override... */
#ifdef BUILD_64
upsdebugx(4, "%s: Looking for lib %s by path-set LD_LIBRARY_PATH_64...",
__func__, base_libname);
libname_path = get_libname_in_pathset(base_libname, base_libname_length, getenv("LD_LIBRARY_PATH_64"), &counter);
if (libname_path != NULL) {
upsdebugx(2, "Looking for lib %s, found in LD_LIBRARY_PATH_64", base_libname);
upsdebugx(2, "Looking for lib %s, found in LD_LIBRARY_PATH_64",
base_libname);
goto found;
}
#else
upsdebugx(4, "%s: Looking for lib %s by path-set LD_LIBRARY_PATH_32...",
__func__, base_libname);
libname_path = get_libname_in_pathset(base_libname, base_libname_length, getenv("LD_LIBRARY_PATH_32"), &counter);
if (libname_path != NULL) {
upsdebugx(2, "Looking for lib %s, found in LD_LIBRARY_PATH_32", base_libname);
upsdebugx(2, "Looking for lib %s, found in LD_LIBRARY_PATH_32",
base_libname);
goto found;
}
#endif

upsdebugx(4, "%s: Looking for lib %s by path-set LD_LIBRARY_PATH...",
__func__, base_libname);
libname_path = get_libname_in_pathset(base_libname, base_libname_length, getenv("LD_LIBRARY_PATH"), &counter);
if (libname_path != NULL) {
upsdebugx(2, "Looking for lib %s, found in LD_LIBRARY_PATH", base_libname);
upsdebugx(2, "Looking for lib %s, found in LD_LIBRARY_PATH",
base_libname);
goto found;
}

upsdebugx(4, "%s: Looking for lib %s by search_paths[]...",
__func__, base_libname);
for (index = 0 ; (search_paths[index] != NULL) && (libname_path == NULL) ; index++)
{
libname_path = get_libname_in_dir(base_libname, base_libname_length, search_paths[index], counter++);
Expand All @@ -3408,17 +3446,23 @@ char * get_libname(const char* base_libname)
if (!libname_path) {
/* First check near the EXE (if executing it from another
* working directory) */
upsdebugx(4, "%s: WIN32: Looking for lib %s near EXE...",
__func__, base_libname);
libname_path = get_libname_in_dir(base_libname, base_libname_length, getfullpath(NULL), counter++);
}

# ifdef PATH_LIB
if (!libname_path) {
upsdebugx(4, "%s: WIN32: Looking for lib %s via PATH_LIB...",
__func__, base_libname);
libname_path = get_libname_in_dir(base_libname, base_libname_length, getfullpath(PATH_LIB), counter++);
}
# endif

if (!libname_path) {
/* Resolve "lib" dir near the one with current executable ("bin" or "sbin") */
upsdebugx(4, "%s: WIN32: Looking for lib %s in a 'lib' dir near EXE...",
__func__, base_libname);
libname_path = get_libname_in_dir(base_libname, base_libname_length, getfullpath("/../lib"), counter++);
}
#endif /* WIN32 so far */
Expand All @@ -3427,13 +3471,15 @@ char * get_libname(const char* base_libname)
/* Windows-specific: DLLs can be provided by common "PATH" envvar,
* at lowest search priority though (after EXE dir, system, etc.) */
if (!libname_path) {
upsdebugx(2, "Looking for lib %s in PATH", base_libname);
upsdebugx(4, "%s: WIN32: Looking for lib %s in PATH",
__func__, base_libname);
libname_path = get_libname_in_pathset(base_libname, base_libname_length, getenv("PATH"), &counter);
}
#endif /* WIN32 */

found:
upsdebugx(1,"Looking for lib %s, found %s", base_libname, (libname_path!=NULL)?libname_path:"NULL");
upsdebugx(1, "Looking for lib %s, found %s",
base_libname, NUT_STRARG(libname_path));
return libname_path;
}

Expand Down
Loading
Loading