From 795f8ff4f8135c5daf68a52ebadcef61b63be04d Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 11 Dec 2007 14:23:58 +0000 Subject: Add ether_ntoa() and inet_ntoa() git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@440 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/lib/Makefile | 2 +- nuttx/lib/lib_etherntoa.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++ nuttx/lib/lib_inetntoa.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 nuttx/lib/lib_etherntoa.c create mode 100644 nuttx/lib/lib_inetntoa.c (limited to 'nuttx/lib') diff --git a/nuttx/lib/Makefile b/nuttx/lib/Makefile index 5e9db3e6a..1ea90971b 100644 --- a/nuttx/lib/Makefile +++ b/nuttx/lib/Makefile @@ -71,7 +71,7 @@ MATH_SRCS = lib_rint.c UNISTD_SRCS = lib_getopt.c -NET_SRCS = lib_htons.c lib_htonl.c +NET_SRCS = lib_htons.c lib_htonl.c lib_inetntoa.c lib_etherntoa.c LIBGEN_SRCS = lib_basename.c lib_dirname.c diff --git a/nuttx/lib/lib_etherntoa.c b/nuttx/lib/lib_etherntoa.c new file mode 100644 index 000000000..8be9d4f65 --- /dev/null +++ b/nuttx/lib/lib_etherntoa.c @@ -0,0 +1,69 @@ +/**************************************************************************** + * lib/lib_etherntoa.c + * + * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 Gregory Nutt 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 +#include + +#include +#include + +/**************************************************************************** + * Global Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: ether_ntoa + * + * Description: + * The ether_ntoa() function converts the Ethernet host address addr given + * in network byte order to a string in standard hex-digits-and-colons + * notation. The string is returned in a statically allocated buffer, which + * subsequent calls will overwrite. + * + ****************************************************************************/ + +char *ether_ntoa(const struct ether_addr *addr) +{ + static char buffer[20]; + sprintf(buffer, "%02x:%02x:%02x:%02x:%02x:%02x", + addr->ether_addr_octet[0], addr->ether_addr_octet[1], + addr->ether_addr_octet[2], addr->ether_addr_octet[3], + addr->ether_addr_octet[4], addr->ether_addr_octet[5]); + return buffer; +} diff --git a/nuttx/lib/lib_inetntoa.c b/nuttx/lib/lib_inetntoa.c new file mode 100644 index 000000000..4aea7826a --- /dev/null +++ b/nuttx/lib/lib_inetntoa.c @@ -0,0 +1,65 @@ +/**************************************************************************** + * lib/lib_inetntoa.c + * + * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 Gregory Nutt 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 +#include +#include + +/**************************************************************************** + * Global Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: inet_ntoa + * + * Description: + * The inet_ntoa() function converts the Internet host address in given in + * network byte order to a string in standard numbers-and-dots notation. + * The string is returned in a statically allocated buffer, which subsequent + * calls will overwrite. + * + ****************************************************************************/ + +char *inet_ntoa(struct in_addr in) +{ + static char buffer[18]; + char *ptr = (char*)&in.s_addr; + sprintf(buffer, "%d.%d.%d.%d", ptr[0], ptr[1], ptr[2], ptr[3]); + return buffer; +} -- cgit v1.2.3