Skip to content

nshlib/nsh_netcmds: set AI_CANONNAME and SOCK_STREAM hints in cmd_nslookup #3913

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

Merged
xiaoxiang781216 merged 1 commit into from
Oct 26, 2026
+11 −3
Merged

nshlib/nsh_netcmds: set AI_CANONNAME and SOCK_STREAM hints in cmd_nslookup #3913

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions nshlib/nsh_netcmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ static int wget_callback(FAR char **buffer, int offset, int datend,
{
ssize_t written = write((int)((intptr_t)arg), &((*buffer)[offset]),
datend - offset);

if (written == -1)
{
return -errno;
Expand Down Expand Up @@ -1177,6 +1178,7 @@ int cmd_vconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
#if defined(CONFIG_LIBC_NETDB) && !defined(CONFIG_NSH_DISABLE_NSLOOKUP)
int cmd_nslookup(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
{
struct addrinfo hints;
FAR struct addrinfo *info;
FAR struct addrinfo *next;
char buffer[48];
Expand All @@ -1188,7 +1190,11 @@ int cmd_nslookup(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)

/* Get the matching address + canonical name */

ret = getaddrinfo(argv[1], NULL, NULL, &info);
memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_CANONNAME;
hints.ai_socktype = SOCK_STREAM;

ret = getaddrinfo(argv[1], NULL, &hints, &info);
if (ret != OK)
{
nsh_error(vtbl, g_fmtcmdfailed,
Expand All @@ -1212,7 +1218,9 @@ int cmd_nslookup(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)

/* Print the host name / address mapping */

nsh_output(vtbl, "Host: %s Addr: %s\n", next->ai_canonname, buffer);
nsh_output(vtbl, "Host: %s Addr: %s\n",
info->ai_canonname != NULL ? info->ai_canonname : argv[1],
buffer);
}

freeaddrinfo(info);
Expand Down Expand Up @@ -1509,6 +1517,7 @@ int cmd_put(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
#ifndef CONFIG_NSH_DISABLE_WGET
int cmd_wget(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
{
struct webclient_context ctx;
FAR char *localfile = NULL;
FAR char *allocfile = NULL;
FAR char *buffer = NULL;
Expand Down Expand Up @@ -1608,7 +1617,6 @@ int cmd_wget(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)

/* And perform the wget */

struct webclient_context ctx;
webclient_set_defaults(&ctx);
ctx.method = "GET";
ctx.url = url;
Expand Down
Loading