mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-06 08:47:44 -04:00
netconsole: move netpoll_parse_ip_addr() earlier for reuse
Move netpoll_parse_ip_addr() earlier in the file to be reused in other functions, such as local_ip_store(). This avoids duplicate address parsing logic and centralizes validation for both IPv4 and IPv6 string input. No functional changes intended. Signed-off-by: Breno Leitao <leitao@debian.org> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20250811-netconsole_ref-v4-1-9c510d8713a2@debian.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
75f2625766
commit
fa38524ca5
@@ -300,6 +300,26 @@ static void netconsole_print_banner(struct netpoll *np)
|
||||
np_info(np, "remote ethernet address %pM\n", np->remote_mac);
|
||||
}
|
||||
|
||||
static int netpoll_parse_ip_addr(const char *str, union inet_addr *addr)
|
||||
{
|
||||
const char *end;
|
||||
|
||||
if (!strchr(str, ':') &&
|
||||
in4_pton(str, -1, (void *)addr, -1, &end) > 0) {
|
||||
if (!*end)
|
||||
return 0;
|
||||
}
|
||||
if (in6_pton(str, -1, addr->in6.s6_addr, -1, &end) > 0) {
|
||||
#if IS_ENABLED(CONFIG_IPV6)
|
||||
if (!*end)
|
||||
return 1;
|
||||
#else
|
||||
return -1;
|
||||
#endif
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NETCONSOLE_DYNAMIC
|
||||
|
||||
/*
|
||||
@@ -1742,26 +1762,6 @@ static void write_msg(struct console *con, const char *msg, unsigned int len)
|
||||
spin_unlock_irqrestore(&target_list_lock, flags);
|
||||
}
|
||||
|
||||
static int netpoll_parse_ip_addr(const char *str, union inet_addr *addr)
|
||||
{
|
||||
const char *end;
|
||||
|
||||
if (!strchr(str, ':') &&
|
||||
in4_pton(str, -1, (void *)addr, -1, &end) > 0) {
|
||||
if (!*end)
|
||||
return 0;
|
||||
}
|
||||
if (in6_pton(str, -1, addr->in6.s6_addr, -1, &end) > 0) {
|
||||
#if IS_ENABLED(CONFIG_IPV6)
|
||||
if (!*end)
|
||||
return 1;
|
||||
#else
|
||||
return -1;
|
||||
#endif
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int netconsole_parser_cmdline(struct netpoll *np, char *opt)
|
||||
{
|
||||
bool ipversion_set = false;
|
||||
|
||||
Reference in New Issue
Block a user