Add inet_pton()
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4367 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
parent
703de27257
commit
4dbdc235fb
|
|
@ -2445,4 +2445,5 @@
|
|||
* lib/string/lib_strcasestr.c: Add strcasestr().
|
||||
* lib/stdio/lib_avsprintf.c: Add avsprintf().
|
||||
* lib/net/lib_inetntop.c: Add inet_ntop().
|
||||
* lib/net/lib_inetpton.c: Add inet_pton().
|
||||
|
||||
|
|
|
|||
|
|
@ -125,8 +125,8 @@ EXTERN in_addr_t _inet_netof(in_addr_t in);
|
|||
#endif
|
||||
EXTERN struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host);
|
||||
|
||||
EXTERN int inet_pton(int af, FAR const char *cp, FAR void *buf);
|
||||
EXTERN const char *inet_ntop(int af, FAR const void *cp, FAR char *buf, socklen_t len);
|
||||
EXTERN int inet_pton(int af, FAR const char *src, FAR void *dst);
|
||||
EXTERN const char *inet_ntop(int af, FAR const void *src, FAR char *dst, socklen_t size);
|
||||
|
||||
#undef EXTERN
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
|
|
@ -33,4 +33,5 @@
|
|||
#
|
||||
############################################################################
|
||||
|
||||
NET_SRCS = lib_htons.c lib_htonl.c lib_inetntoa.c lib_inetntop.c lib_etherntoa.c lib_inetaddr.c
|
||||
NET_SRCS = lib_etherntoa.c lib_htons.c lib_htonl.c lib_inetaddr.c
|
||||
NET_SRCS += lib_inetntoa.c lib_inetntop.c lib_inetpton.c
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@
|
|||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
*
|
||||
* Includes some logic extracted from hwport_ftpd, written by Jaehyuk Cho
|
||||
* <minzkn@minzkn.com> which has a BSD license (but no file headers).
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
|
|
@ -48,7 +51,7 @@
|
|||
#include <arpa/inet.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Global Functions
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
|
|
@ -111,6 +114,8 @@ FAR const char *inet_ntop(int af, FAR const void *src, FAR char *dst, socklen_t
|
|||
int maxentry;
|
||||
int maxcount;
|
||||
|
||||
DEBUGASSERT(src && dst);
|
||||
|
||||
if (af != AF_INET6)
|
||||
{
|
||||
errval = EAFNOSUPPORT;
|
||||
|
|
@ -165,20 +170,21 @@ FAR const char *inet_ntop(int af, FAR const void *src, FAR char *dst, socklen_t
|
|||
{
|
||||
if (offset == maxentry)
|
||||
{
|
||||
size -= (socklen_t)snprintf((char *)(&dst[strlen(dst)]), (size_t)size, ":");
|
||||
size -= snprintf(&dst[strlen(dst)], size, ":");
|
||||
offset += maxcount;
|
||||
if (offset >= 8)
|
||||
{
|
||||
size -= (socklen_t)snprintf((char *)(&dst[strlen(dst)]), (size_t)size, ":");
|
||||
size -= snprintf(&dst[strlen(dst)], size, ":");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (offset > 0)
|
||||
{
|
||||
size -= (socklen_t)snprintf((char *)(&dst[strlen(dst)]), (size_t)size, ":");
|
||||
size -= snprintf(&dst[strlen(dst)], size, ":");
|
||||
}
|
||||
size -= (socklen_t)snprintf((char *)(&dst[strlen(dst)]), (size_t)size, "%x", (unsigned int)warray[offset]);
|
||||
|
||||
size -= snprintf(&dst[strlen(dst)], size, "%x", warray[offset]);
|
||||
offset++;
|
||||
}
|
||||
}
|
||||
|
|
@ -191,4 +197,3 @@ errout:
|
|||
memset(dst, 0, size);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,329 @@
|
|||
/****************************************************************************
|
||||
* lib/net/lib_inetpton.c
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
*
|
||||
* Includes some logic extracted from hwport_ftpd, written by Jaehyuk Cho
|
||||
* <minzkn@minzkn.com> which has a BSD license (but no file headers).
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <arpa/inet.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: inet_pton
|
||||
*
|
||||
* Description:
|
||||
* The inet_pton() function converts an address in its standard text
|
||||
* presentation form into its numeric binary form.
|
||||
*
|
||||
* If the af argument of inet_pton() is AF_INET, the src string will be
|
||||
* in the standard IPv4 dotted-decimal form:
|
||||
*
|
||||
* ddd.ddd.ddd.ddd
|
||||
*
|
||||
* where "ddd" is a one to three digit decimal number between 0 and 255.
|
||||
*
|
||||
* If the af argument of inet_pton() is AF_INET6, the src string will be in
|
||||
* one of the following standard IPv6 text forms:
|
||||
*
|
||||
* 1. The preferred form is "x:x:x:x:x:x:x:x", where the 'x' s are the
|
||||
* hexadecimal values of the eight 16-bit pieces of the address. Leading
|
||||
* zeros in individual fields can be omitted, but there must be at least
|
||||
* one numeral in every field.
|
||||
*
|
||||
* 2. A string of contiguous zero fields in the preferred form can be shown
|
||||
* as "::". The "::" can only appear once in an address. Unspecified
|
||||
* addresses ( "0:0:0:0:0:0:0:0" ) may be represented simply as "::".
|
||||
*
|
||||
* 3. A third form that is sometimes more convenient when dealing with a
|
||||
* mixed environment of IPv4 and IPv6 nodes is "x:x:x:x:x:x:d.d.d.d",
|
||||
* where the 'x' s are the hexadecimal values of the six high-order
|
||||
* 16-bit pieces of the address, and the 'd' s are the decimal values
|
||||
* of the four low-order 8-bit pieces of the address (standard IPv4
|
||||
* representation).
|
||||
*
|
||||
* Input Parameters:
|
||||
* af - The af argument specifies the family of the address. This can be
|
||||
* AF_INET or AF_INET6.
|
||||
* src - The src argument points to the string being passed in.
|
||||
* dst - The dst argument points to a numstr into which the function stores
|
||||
* the numeric address; this must be large enough to hold the numeric
|
||||
* address (32 bits for AF_INET, 128 bits for AF_INET6).
|
||||
*
|
||||
* Returned Value:
|
||||
* The inet_pton() function returns 1 if the conversion succeeds, with the
|
||||
* address pointed to by dst in network byte order. It will return 0 if the
|
||||
* input is not a valid IPv4 dotted-decimal string or a valid IPv6 address
|
||||
* string, or -1 with errno set to EAFNOSUPPOR] if the af argument is unknown.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
int inet_pton(int af, FAR const char *src, FAR void *dst)
|
||||
{
|
||||
#ifndef CONFIG_NET_IPv6
|
||||
size_t srcoffset;
|
||||
size_t numoffset;
|
||||
int value;
|
||||
int ndots;
|
||||
uint8_t ch;
|
||||
char numstr[4];
|
||||
uint8_t *ip;
|
||||
|
||||
DEBUGASSERT(src && dst);
|
||||
|
||||
if (af != AF_INET)
|
||||
{
|
||||
set_errno(EAFNOSUPPORT);
|
||||
return -1;
|
||||
}
|
||||
|
||||
ip = (uint8_t *)dst;
|
||||
srcoffset = 0;
|
||||
numoffset = 0;
|
||||
ndots = 0;
|
||||
|
||||
for(;;)
|
||||
{
|
||||
ch = (uint8_t)src[srcoffset++];
|
||||
|
||||
if (ch == '.' || ch == '\0')
|
||||
{
|
||||
if (ch == '.' && ndots >= 4)
|
||||
{
|
||||
/* Too many dots */
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
if (numoffset <= 0)
|
||||
{
|
||||
/* Empty numeric string */
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
numstr[numoffset] = '\0';
|
||||
numoffset = 0;
|
||||
|
||||
value = atoi(numstr);
|
||||
if (value < 0 || value > 255)
|
||||
{
|
||||
/* Out of range value */
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
ip[ndots] = (uint8_t)value;
|
||||
|
||||
if (ch == '\0')
|
||||
{
|
||||
if (ndots != 3)
|
||||
{
|
||||
/* Not enough dots */
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
/* Return 1 if the conversion succeeds */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
ndots++;
|
||||
}
|
||||
else if (ch >= '0' && ch <= '9')
|
||||
{
|
||||
numstr[numoffset++] = ch;
|
||||
if (numoffset >= 4)
|
||||
{
|
||||
/* Number is too long */
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Illegal character */
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Return zero if there is any problem parsing the input */
|
||||
|
||||
return 0;
|
||||
#else
|
||||
DEBUGASSERT(src && dst);
|
||||
|
||||
if (af != AF_INET6)
|
||||
{
|
||||
set_errno(EAFNOSUPPORT);
|
||||
return -1;
|
||||
}
|
||||
|
||||
size_t srcoffset;
|
||||
size_t numoffset;
|
||||
long value;
|
||||
int nsep;
|
||||
int nrsep;
|
||||
uint8_t ch;
|
||||
char numstr[5];
|
||||
uint8_t ip[sizeof(in_addr)];
|
||||
uint8_t rip[sizeof(in_addr)];
|
||||
bool rtime;
|
||||
|
||||
(void)memset(dst, 0, sizeof(in_addr));
|
||||
srcoffset = 0;
|
||||
numoffset = 0;
|
||||
nsep = 0;
|
||||
nrsep = 0;
|
||||
rtime = false;
|
||||
|
||||
for(;;)
|
||||
{
|
||||
ch = (uint8_t)src[srcoffset++];
|
||||
|
||||
if (ch == ':' || ch == '\0' /* || ch == '/' */ )
|
||||
{
|
||||
if (ch == ':' && (nsep + nrsep) >= 8)
|
||||
{
|
||||
/* Too many separators */
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
if (ch != '\0' && numoffset <= 0)
|
||||
{
|
||||
/* Empty numeric string */
|
||||
|
||||
if (rtime != 0 && nrsep > 1)
|
||||
{
|
||||
/* dup simple */
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
numoffset = 0;
|
||||
rtime = true;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
numstr[numoffset] = '\0';
|
||||
numoffset = 0;
|
||||
|
||||
value = strtol(numstr, NULL, 16);
|
||||
if (value < 0 || value > 0xffff)
|
||||
{
|
||||
/* Out of range value */
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
if (!rtime)
|
||||
{
|
||||
ip[(nsep << 1) + 0] = (uint8_t)(value >> 8)) & 0xff;
|
||||
ip[(nsep << 1) + 1] = (uint8_t)(value >> 0)) & 0xff;
|
||||
nsep++;
|
||||
}
|
||||
else
|
||||
{
|
||||
rip[(nrsep << 1) + 0] = (uint8_t)(value >> 8)) & 0xff;
|
||||
rip[(nrsep << 1) + 1] = (uint8_t)(value >> 0)) & 0xff;
|
||||
nrsep++;
|
||||
}
|
||||
|
||||
if (ch == '\0' /* || ch == '/' */)
|
||||
{
|
||||
if ((nsep <= 1 && nrsep <= 0) || (nsep + nrsep) < 1 || (nsep + nrsep) > 8)
|
||||
{
|
||||
/* Separator count problem */
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
if (nsep > 0)
|
||||
{
|
||||
memcpy(dst, &ip[0], nsep << 1);
|
||||
}
|
||||
|
||||
if (nrsep > 0)
|
||||
{
|
||||
memcpy(dst + (16 - (nrsep << 1)), &rip[0], nrsep << 1);
|
||||
}
|
||||
|
||||
/* Return 1 if the conversion succeeds */
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
else if ((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F'))
|
||||
{
|
||||
numstr[numoffset++] = ch;
|
||||
if (numoffset >= 5)
|
||||
{
|
||||
/* Numeric string is too long */
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Illegal character */
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Return zero if there is any problem parsing the input */
|
||||
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
Loading…
Reference in New Issue