From patchwork Thu Jun 27 06:43:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amerigo Wang X-Patchwork-Id: 254980 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 493432C0091 for ; Thu, 27 Jun 2013 16:46:26 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752246Ab3F0GoO (ORCPT ); Thu, 27 Jun 2013 02:44:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49339 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750810Ab3F0GoN (ORCPT ); Thu, 27 Jun 2013 02:44:13 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5R6i5fv011692 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 27 Jun 2013 02:44:05 -0400 Received: from localhost.localdomain (vpn1-112-131.nay.redhat.com [10.66.112.131]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r5R6hOdK016556; Thu, 27 Jun 2013 02:43:59 -0400 From: Cong Wang To: netdev@vger.kernel.org Cc: Daniel Borkmann , "David S. Miller" , Cong Wang , Neil Horman , Jiri Pirko , Eric Dumazet , linux-kernel@vger.kernel.org Subject: [RFC Patch net-next 2/5] net: introduce generic inet_pton() Date: Thu, 27 Jun 2013 14:43:15 +0800 Message-Id: <1372315398-19683-3-git-send-email-amwang@redhat.com> In-Reply-To: <1372315398-19683-1-git-send-email-amwang@redhat.com> References: <1372315398-19683-1-git-send-email-amwang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Cong Wang --- include/net/inet_addr.h | 20 ++++++++++++++++++++ net/core/netpoll.c | 24 ++---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/net/inet_addr.h b/include/net/inet_addr.h index 66a16fe..1379287 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,23 @@ static inline bool inet_addr_multicast(const union inet_addr *ipa) } #endif +static inline int 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) + 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; +} #endif diff --git a/net/core/netpoll.c b/net/core/netpoll.c index c300358..6631b5e 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -907,26 +907,6 @@ 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; @@ -946,7 +926,7 @@ 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); + ipv6 = inet_pton(cur, &np->local_ip); if (ipv6 < 0) goto parse_failed; else @@ -982,7 +962,7 @@ 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); + ipv6 = inet_pton(cur, &np->remote_ip); if (ipv6 < 0) goto parse_failed; else if (np->ipv6 != (bool)ipv6)