From 481280e346c01408272f9b8cc9f941df75e0c99c Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 16 Dec 2015 09:56:52 +0100 Subject: add ntohs, ntohl, ntohll, htons, htonl, and htonll MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- TODO | 2 - include/arpa/inet.h | 162 +++++++++++++++++++++++++++++++++++++++++++++++++ src/arpa/inet/htonl.c | 41 +++++++++++++ src/arpa/inet/htonll.c | 47 ++++++++++++++ src/arpa/inet/htons.c | 39 ++++++++++++ src/arpa/inet/ntohl.c | 42 +++++++++++++ src/arpa/inet/ntohll.c | 48 +++++++++++++++ src/arpa/inet/ntohs.c | 40 ++++++++++++ 8 files changed, 419 insertions(+), 2 deletions(-) create mode 100644 include/arpa/inet.h create mode 100644 src/arpa/inet/htonl.c create mode 100644 src/arpa/inet/htonll.c create mode 100644 src/arpa/inet/htons.c create mode 100644 src/arpa/inet/ntohl.c create mode 100644 src/arpa/inet/ntohll.c create mode 100644 src/arpa/inet/ntohs.c diff --git a/TODO b/TODO index 3cfbfe3..7754403 100644 --- a/TODO +++ b/TODO @@ -59,8 +59,6 @@ Extensions: base16 -d variable argument string concat string manipulation - htonll - ntohll POSIX specifies that *printf shall fail with EOVERFLOW is the length of the constructed string is greater than INT_MAX. diff --git a/include/arpa/inet.h b/include/arpa/inet.h new file mode 100644 index 0000000..8552838 --- /dev/null +++ b/include/arpa/inet.h @@ -0,0 +1,162 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#ifndef _ARAP_INET_H +#define _ARAP_INET_H +#include +#include + + + +#define __NEED_uint16_t +#define __NEED_uint32_t +#if defined(__SLIBC_SOURCE) +# define __NEED_uint64_t +#endif + +#include + + + +/* On some implementations, these functions are defined as macros. */ + +/** + * Convert a 16-bit quantity from network byte order + * little endian) to host byte order. + * + * @etymology (N)etwork byte order (to) (h)ost byte order, (s)hort. + * + * @param value A 16-bit quantity to convert. + * @return The value in host byte order. + * + * @since Always. + */ +uint16_t _ntohs(uint16_t) + __GCC_ONLY(__attribute__((__const__, __warn_unuses_result__))); +#if !defined(__PORTABLE) +# define ntohs _ntohs +#else +# define ntohs(value) (_ntohs(value)) +#endif + +/** + * Convert a 32-bit quantity from network byte order + * (little endian) to host byte order. + * + * @etymology (N)etwork byte order (to) (h)ost byte order, (l)ong. + * + * @param value A 32-bit quantity to convert. + * @return The value in host byte order. + * + * @since Always. + */ +uint32_t _ntohl(uint32_t) + __GCC_ONLY(__attribute__((__const__, __warn_unuses_result__))); +#if !defined(__PORTABLE) +# define ntohl _ntohl +#else +# define ntohl(value) (_ntohl(value)) +#endif + +#ifdef (__SLIBC_SOURCE) +/** + * Convert a 64-bit quantity from network byte order + * (little endian) to host byte order. + * + * This is a slibc extension. + * + * @etymology (N)etwork byte order (to) (h)ost byte order, (l)ong (l)ong. + * + * @param value A 64-bit quantity to convert. + * @return The value in host byte order. + * + * @since Always. + */ +uint64_t _ntohll(uint64_t) + __GCC_ONLY(__attribute__((__const__, __warn_unuses_result__))); +# if !defined(__PORTABLE) +# define ntohll _ntohll +# else +# define ntohll(value) (_ntohll(value)) +# endif +#endif + +/** + * Convert a 16-bit quantity from host byte order + * little endian) to network byte order. + * + * @etymology (H)ost byte order (to) (n)etwork byte order, (s)hort. + * + * @param value A 16-bit quantity to convert. + * @return The value in network byte order. + * + * @since Always. + */ +uint16_t _htons(uint16_t) + __GCC_ONLY(__attribute__((__const__, __warn_unuses_result__))); +#if !defined(__PORTABLE) +# define htons _htons +#else +# define htons(value) (_htons(value)) +#endif + +/** + * Convert a 32-bit quantity from host byte order + * (little endian) to network byte order. + * + * @etymology (H)ost byte order (to) (n)etwork byte order, (l)ong. + * + * @param value A 32-bit quantity to convert. + * @return The value in network byte order. + * + * @since Always. + */ +uint32_t _htonl(uint32_t) + __GCC_ONLY(__attribute__((__const__, __warn_unuses_result__))); +#if !defined(__PORTABLE) +# define htonl _htonl +#else +# define htonl(value) (_htonl(value)) +#endif + +#ifdef (__SLIBC_SOURCE) +/** + * Convert a 64-bit quantity from host byte order + * (little endian) to network byte order. + * + * This is a slibc extension. + * + * @etymology (H)ost byte order (to) (n)etwork byte order, (l)ong (l)ong. + * + * @param value A 64-bit quantity to convert. + * @return The value in network byte order. + * + * @since Always. + */ +uint64_t _htonll(uint64_t) + __GCC_ONLY(__attribute__((__const__, __warn_unuses_result__))); +# if !defined(__PORTABLE) +# define htonll _htonll +# else +# define htonll(value) (_htonll(value)) +# endif +#endif + + + +#endif + diff --git a/src/arpa/inet/htonl.c b/src/arpa/inet/htonl.c new file mode 100644 index 0000000..4a410b3 --- /dev/null +++ b/src/arpa/inet/htonl.c @@ -0,0 +1,41 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include + + +/** + * Convert a 32-bit quantity from host byte order + * (little endian) to network byte order. + * + * @etymology (H)ost byte order (to) (n)etwork byte order, (l)ong. + * + * @param value A 32-bit quantity to convert. + * @return The value in network byte order. + * + * @since Always. + */ +uint32_t _htonl(uint32_t value) +{ + char rc[4]; + rc[0] = (value >> 24) & 255; + rc[1] = (value >> 16) & 255; + rc[2] = (value >> 8) & 255; + rc[3] = (value >> 0) & 255; + return *(uint16_t*)rc; +} + diff --git a/src/arpa/inet/htonll.c b/src/arpa/inet/htonll.c new file mode 100644 index 0000000..fdd8b06 --- /dev/null +++ b/src/arpa/inet/htonll.c @@ -0,0 +1,47 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include + + +/** + * Convert a 64-bit quantity from host byte order + * (little endian) to network byte order. + * + * This is a slibc extension. + * + * @etymology (H)ost byte order (to) (n)etwork byte order, (l)ong (l)ong. + * + * @param value A 64-bit quantity to convert. + * @return The value in network byte order. + * + * @since Always. + */ +uint64_t _htonll(uint64_t value) +{ + char rc[8]; + rc[0] = (value >> 56) & 255; + rc[1] = (value >> 48) & 255; + rc[2] = (value >> 40) & 255; + rc[3] = (value >> 32) & 255; + rc[4] = (value >> 24) & 255; + rc[5] = (value >> 16) & 255; + rc[6] = (value >> 8) & 255; + rc[7] = (value >> 0) & 255; + return *(uint16_t*)rc; +} + diff --git a/src/arpa/inet/htons.c b/src/arpa/inet/htons.c new file mode 100644 index 0000000..78592e9 --- /dev/null +++ b/src/arpa/inet/htons.c @@ -0,0 +1,39 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include + + +/** + * Convert a 16-bit quantity from host byte order + * little endian) to network byte order. + * + * @etymology (H)ost byte order (to) (n)etwork byte order, (s)hort. + * + * @param value A 16-bit quantity to convert. + * @return The value in network byte order. + * + * @since Always. + */ +uint16_t _htons(uint16_t value) +{ + char rc[2]; + rc[0] = (value >> 8) & 255; + rc[1] = (value >> 0) & 255; + return *(uint16_t*)rc; +} + diff --git a/src/arpa/inet/ntohl.c b/src/arpa/inet/ntohl.c new file mode 100644 index 0000000..8eb5a3d --- /dev/null +++ b/src/arpa/inet/ntohl.c @@ -0,0 +1,42 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include + + +/** + * Convert a 32-bit quantity from network byte order + * (little endian) to host byte order. + * + * @etymology (N)etwork byte order (to) (h)ost byte order, (l)ong. + * + * @param value A 32-bit quantity to convert. + * @return The value in host byte order. + * + * @since Always. + */ +uint32_t _ntohl(uint32_t value) +{ + unsigned char* v = (unsigned char*)&value; + uint32_t rc = 0; + rc |= (uint32_t)(v[0]) << 24; + rc |= (uint32_t)(v[1]) << 16; + rc |= (uint32_t)(v[2]) << 8; + rc |= (uint32_t)(v[3]) << 0; + return rc; +} + diff --git a/src/arpa/inet/ntohll.c b/src/arpa/inet/ntohll.c new file mode 100644 index 0000000..f25d64c --- /dev/null +++ b/src/arpa/inet/ntohll.c @@ -0,0 +1,48 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include + + +/** + * Convert a 64-bit quantity from network byte order + * (little endian) to host byte order. + * + * This is a slibc extension. + * + * @etymology (N)etwork byte order (to) (h)ost byte order, (l)ong (l)ong. + * + * @param value A 64-bit quantity to convert. + * @return The value in host byte order. + * + * @since Always. + */ +uint64_t _ntohll(uint64_t value) +{ + unsigned char* v = (unsigned char*)&value; + uint64_t rc = 0; + rc |= (uint64_t)(v[0]) << 56; + rc |= (uint64_t)(v[1]) << 48; + rc |= (uint64_t)(v[2]) << 40; + rc |= (uint64_t)(v[3]) << 32; + rc |= (uint64_t)(v[4]) << 24; + rc |= (uint64_t)(v[5]) << 16; + rc |= (uint64_t)(v[6]) << 8; + rc |= (uint64_t)(v[7]) << 0; + return rc; +} + diff --git a/src/arpa/inet/ntohs.c b/src/arpa/inet/ntohs.c new file mode 100644 index 0000000..7aea8a0 --- /dev/null +++ b/src/arpa/inet/ntohs.c @@ -0,0 +1,40 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include + + +/** + * Convert a 16-bit quantity from network byte order + * little endian) to host byte order. + * + * @etymology (N)etwork byte order (to) (h)ost byte order, (s)hort. + * + * @param value A 16-bit quantity to convert. + * @return The value in host byte order. + * + * @since Always. + */ +uint16_t _ntohs(uint16_t value) +{ + unsigned char* v = (unsigned char*)&value; + uint16_t rc = 0; + rc |= (uint16_t)(v[0]) << 8; + rc |= (uint16_t)(v[1]) << 0; + return rc; +} + -- cgit v1.2.3-70-g09d2