@@ -4,6 +4,7 @@
#include <linux/in.h>
#include <linux/in6.h>
#include <linux/socket.h>
+#include <linux/inet.h>
#include <net/addrconf.h>
union inet_addr {
@@ -59,4 +60,6 @@ static inline bool inet_addr_multicast(const union inet_addr *ipa)
}
#endif
+extern int simple_inet_pton(const char *str, union inet_addr *addr);
+
#endif
@@ -908,30 +908,10 @@ void netpoll_print_options(struct netpoll *np)
}
EXPORT_SYMBOL(netpoll_print_options);
-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->sin6.sin6_addr.s6_addr, -1, &end) > 0) {
-#if IS_ENABLED(CONFIG_IPV6)
- if (!*end)
- return 1;
-#else
- return -1;
-#endif
- }
- return -1;
-}
-
int netpoll_parse_options(struct netpoll *np, char *opt)
{
char *cur=opt, *delim;
- int ipv6;
+ int ret;
if (*cur != '@') {
if ((delim = strchr(cur, '@')) == NULL)
@@ -947,11 +927,11 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
if ((delim = strchr(cur, '/')) == NULL)
goto parse_failed;
*delim = 0;
- ipv6 = netpoll_parse_ip_addr(cur, &np->local_ip);
- if (ipv6 < 0)
+ ret = simple_inet_pton(cur, &np->local_ip);
+ if (ret < 0)
goto parse_failed;
else
- np->ipv6 = (bool)ipv6;
+ np->ipv6 = np->local_ip.sa.sa_family == AF_INET6;
cur = delim;
}
cur++;
@@ -983,13 +963,13 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
if ((delim = strchr(cur, '/')) == NULL)
goto parse_failed;
*delim = 0;
- ipv6 = netpoll_parse_ip_addr(cur, &np->remote_ip);
- if (ipv6 < 0)
+ ret = simple_inet_pton(cur, &np->remote_ip);
+ if (ret < 0)
goto parse_failed;
- else if (np->ipv6 != (bool)ipv6)
+ else if (np->ipv6 != (np->local_ip.sa.sa_family == AF_INET6))
goto parse_failed;
else
- np->ipv6 = (bool)ipv6;
+ np->ipv6 = np->local_ip.sa.sa_family == AF_INET6;
cur = delim + 1;
if (*cur != 0) {
@@ -29,6 +29,7 @@
#include <net/sock.h>
#include <net/net_ratelimit.h>
+#include <net/inet_addr.h>
#include <asm/byteorder.h>
#include <asm/uaccess.h>
@@ -338,3 +339,38 @@ void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb,
csum_unfold(*sum)));
}
EXPORT_SYMBOL(inet_proto_csum_replace16);
+
+/**
+ * simple_inet_pton - a simple implementation of inet_pton()
+ * @str: the start of the IPv4 or IPv6 address string
+ * @addr: a pointer to union inet_addr
+ *
+ * Return zero on success, callers should check addr->sa.sa_family
+ * to know if the address is IPv4 or IPv6; return negative when
+ * any error occurs.
+ *
+ */
+int simple_inet_pton(const char *str, union inet_addr *addr)
+{
+ const char *end;
+
+ if (!strchr(str, ':') &&
+ in4_pton(str, -1, (void *)addr, -1, &end) > 0) {
+ if (!*end) {
+ addr->sa.sa_family = AF_INET;
+ return 0;
+ }
+ }
+ if (in6_pton(str, -1, addr->sin6.sin6_addr.s6_addr, -1, &end) > 0) {
+#if IS_ENABLED(CONFIG_IPV6)
+ if (!*end) {
+ addr->sa.sa_family = AF_INET6;
+ return 0;
+ }
+#else
+ return -EAFNOSUPPORT;
+#endif
+ }
+ return -EINVAL;
+}
+EXPORT_SYMBOL(simple_inet_pton);