From patchwork Mon Aug 19 10:14:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amerigo Wang X-Patchwork-Id: 268146 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 16E3E2C0124 for ; Mon, 19 Aug 2013 20:15:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751339Ab3HSKPK (ORCPT ); Mon, 19 Aug 2013 06:15:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57726 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751100Ab3HSKPF (ORCPT ); Mon, 19 Aug 2013 06:15:05 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7JAF04W006985 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 19 Aug 2013 06:15:00 -0400 Received: from cr0.redhat.com (vpn1-112-57.nay.redhat.com [10.66.112.57]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r7JAEfxS017200; Mon, 19 Aug 2013 06:14:55 -0400 From: Cong Wang To: netdev@vger.kernel.org Cc: "David S. Miller" , Ben Hutchings , Stephen Hemminger , Cong Wang Subject: [Patch net-next v3 3/9] net: introduce generic simple_inet_pton() Date: Mon, 19 Aug 2013 18:14:32 +0800 Message-Id: <1376907278-26377-4-git-send-email-amwang@redhat.com> In-Reply-To: <1376907278-26377-1-git-send-email-amwang@redhat.com> References: <1376907278-26377-1-git-send-email-amwang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Cong Wang 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 Cc: Stephen Hemminger Signed-off-by: Cong Wang --- 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..7289aed 100644 --- a/include/net/inet_addr.h +++ b/include/net/inet_addr.h @@ -4,6 +4,7 @@ #include #include #include +#include #include union inet_addr { @@ -59,4 +60,6 @@ static inline bool inet_addr_multicast(const union inet_addr *ipa) } #endif +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 9a45c54..5b1d0c8 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 #include +#include #include #include @@ -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);