From: Cong Wang <amwang@redhat.com>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Cong Wang <amwang@redhat.com>,
Ben Hutchings <bhutchings@solarflare.com>,
Stephen Hemminger <stephen@networkplumber.org>
Subject: [Patch net-next 2/7] net: introduce generic simple_inet_pton()
Date: Mon, 22 Jul 2013 15:05:08 +0800 [thread overview]
Message-ID: <1374476713-8838-3-git-send-email-amwang@redhat.com> (raw)
In-Reply-To: <1374476713-8838-1-git-send-email-amwang@redhat.com>
From: Cong Wang <amwang@redhat.com>
simple_inet_pton() is a simple implementation of inet_pton()
in kernel, the original code is already in netpoll, so just move
it to global.
Cc: Ben Hutchings <bhutchings@solarflare.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
include/net/inet_addr.h | 3 +++
net/core/netpoll.c | 36 ++++++++----------------------------
net/core/utils.c | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 47 insertions(+), 28 deletions(-)
diff --git a/include/net/inet_addr.h b/include/net/inet_addr.h
index 66a16fe..3416f65 100644
--- a/include/net/inet_addr.h
+++ b/include/net/inet_addr.h
@@ -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
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index e7d4388..67174c4 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -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) {
diff --git a/net/core/utils.c b/net/core/utils.c
index aa88e23..22dd621 100644
--- a/net/core/utils.c
+++ b/net/core/utils.c
@@ -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);
--
1.7.7.6
next prev parent reply other threads:[~2013-07-22 7:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-22 7:05 [Patch net-next 0/7] net: introduce generic type and helpers for IP address Cong Wang
2013-07-22 7:05 ` [Patch net-next 1/7] net: introduce generic union inet_addr Cong Wang
2013-07-22 7:05 ` Cong Wang [this message]
2013-07-22 7:05 ` [Patch net-next 3/7] inetpeer: use " Cong Wang
2013-07-22 15:18 ` Eric Dumazet
2013-07-23 2:05 ` Cong Wang
2013-07-23 2:26 ` Eric Dumazet
2013-07-23 3:38 ` Cong Wang
2013-07-22 7:05 ` [Patch net-next 4/7] sunrpc: " Cong Wang
[not found] ` <1374476713-8838-5-git-send-email-amwang-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-07-23 16:40 ` J. Bruce Fields
[not found] ` <20130723164051.GE12569-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2013-07-25 12:34 ` Cong Wang
2013-07-25 12:54 ` J. Bruce Fields
2013-07-22 7:05 ` [Patch net-next 5/7] fs: use generic union inet_addr and help functions Cong Wang
2013-07-22 7:05 ` [Patch net-next 6/7] sctp: use generic union inet_addr Cong Wang
2013-07-22 7:05 ` [Patch net-next 7/7] selinux: " Cong Wang
2013-07-22 20:36 ` Paul Moore
2013-07-23 2:07 ` Cong Wang
2013-07-22 20:44 ` [Patch net-next 0/7] net: introduce generic type and helpers for IP address Joe Perches
2013-07-23 2:00 ` Cong Wang
2013-07-23 2:16 ` Joe Perches
2013-07-23 2:26 ` Cong Wang
2013-07-24 21:28 ` David Miller
2013-07-25 12:30 ` Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1374476713-8838-3-git-send-email-amwang@redhat.com \
--to=amwang@redhat.com \
--cc=bhutchings@solarflare.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).