Index: uspace/lib/packet/include/net_byteorder.h =================================================================== --- uspace/lib/packet/include/net_byteorder.h (revision 23882034cfd4477b9f4fc0091927fb70107cde4e) +++ uspace/lib/packet/include/net_byteorder.h (revision 23882034cfd4477b9f4fc0091927fb70107cde4e) @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/** @addtogroup net + * @{ + */ + +/** @file + * Host - network byte order manipulation functions. + */ + +#ifndef __NET_BYTEORDER_H__ +#define __NET_BYTEORDER_H__ + +#include +#include + + +/** Converts the given short number (16 bit) from the host byte order to the network byte order (big endian). + * @param[in] number The number in the host byte order to be converted. + * @returns The number in the network byte order. + */ +#define htons(number) host2uint16_t_be(number) + +/** Converts the given long number (32 bit) from the host byte order to the network byte order (big endian). + * @param[in] number The number in the host byte order to be converted. + * @returns The number in the network byte order. + */ +#define htonl(number) host2uint32_t_be(number) + +/** Converts the given short number (16 bit) from the network byte order (big endian) to the host byte order. + * @param[in] number The number in the network byte order to be converted. + * @returns The number in the host byte order. + */ +#define ntohs(number) uint16_t_be2host(number) + +/** Converts the given long number (32 bit) from the network byte order (big endian) to the host byte order. + * @param[in] number The number in the network byte order to be converted. + * @returns The number in the host byte order. + */ +#define ntohl(number) uint32_t_be2host(number) + +#endif + +/** @} + */ Index: uspace/lib/packet/include/net_err.h =================================================================== --- uspace/lib/packet/include/net_err.h (revision 23882034cfd4477b9f4fc0091927fb70107cde4e) +++ uspace/lib/packet/include/net_err.h (revision 23882034cfd4477b9f4fc0091927fb70107cde4e) @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/** @addtogroup net + * @{ + */ + +/** @file + * Common error processing codes and routines. + */ + +#ifndef __NET_ERR_H__ +#define __NET_ERR_H__ + +#include + +#ifdef CONFIG_DEBUG + #include + #include +#endif + +/** An actual stored error code. + * + */ +#define ERROR_CODE error_check_return_value + +/** An error processing routines declaration. + * + * This has to be declared in the block where the error processing + * is desired. + * + */ +#define ERROR_DECLARE int ERROR_CODE + +/** Store the value as an error code and checks if an error occurred. + * + * @param[in] value The value to be checked. May be a function call. + * @return False if the value indicates success (EOK). + * @return True otherwise. + * + */ +#ifdef CONFIG_DEBUG + +#define ERROR_OCCURRED(value) \ + (((ERROR_CODE = (value)) != EOK) \ + && ({ \ + fprintf(stderr, "libsocket error at %s:%d (%s)\n", \ + __FILE__, __LINE__, str_error(ERROR_CODE)); \ + 1; \ + })) + +#else + +#define ERROR_OCCURRED(value) ((ERROR_CODE = (value)) != EOK) + +#endif + +/** Error propagation + * + * Check if an error occurred and immediately exit the actual + * function returning the error code. + * + * @param[in] value The value to be checked. May be a function call. + * + */ + +#define ERROR_PROPAGATE(value) \ + if (ERROR_OCCURRED(value)) \ + return ERROR_CODE + +#endif + +/** @} + */ Index: uspace/lib/packet/include/socket_errno.h =================================================================== --- uspace/lib/packet/include/socket_errno.h (revision 23882034cfd4477b9f4fc0091927fb70107cde4e) +++ uspace/lib/packet/include/socket_errno.h (revision 23882034cfd4477b9f4fc0091927fb70107cde4e) @@ -0,0 +1,136 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/** @addtogroup net + * @{ + */ + +/** @file + * Socket error codes. + * Based on BSD. + */ + +#ifndef __NET_SOCKET_ERR_H__ +#define __NET_SOCKET_ERR_H__ + +#include + +/** @name Socket error codes definitions + */ +/*@{*/ + +////#define EINTR (-10004) +////#define EBADF (-10009) +//#define EACCES (-10013) +//#define EFAULT (-10014) +////#define EINVAL (-10022) +////#define EMFILE (-10024) +//#define EWOULDBLOCK (-10035) + +/** An API function is called while another blocking function is in progress. + */ +#define EINPROGRESS (-10036) + +//#define EALREADY (-10037) + +/** The socket identifier is not valid. + */ +#define ENOTSOCK (-10038) + +/** The destination address required. + */ +#define EDESTADDRREQ (-10039) + +//#define EMSGSIZE (-10040) +//#define EPROTOTYPE (-10041) +//#define ENOPROTOOPT (-10042) + +/** Protocol is not supported. + */ +#define EPROTONOSUPPORT (-10043) + +/** Socket type is not supported. + */ +#define ESOCKTNOSUPPORT (-10044) + +//#define EOPNOTSUPP (-10045) + +/** Protocol family is not supported. + */ +#define EPFNOSUPPORT (-10046) + +/** Address family is not supported. + */ +#define EAFNOSUPPORT (-10047) + +/** Address is already in use. + */ +#define EADDRINUSE (-10048) + +//#define EADDRNOTAVAIL (-10049) +/* May be reported at any time if the implementation detects an underlying failure. + */ +//#define ENETDOWN (-10050) +//#define ENETUNREACH (-10051) +//#define ENETRESET (-10052) +//#define ECONNABORTED (-10053) +//#define ECONNRESET (-10054) +//#define ENOBUFS (-10055) +//#define EISCONN (-10056) + +/** The socket is not connected or bound. + */ +#define ENOTCONN (-10057) + +//#define ESHUTDOWN (-10058) +//#define ETOOMANYREFS (-10059) +//#define ETIMEDOUT (-10060) +//#define ECONNREFUSED (-10061) +//#define ELOOP (-10062) +////#define ENAMETOOLONG (-10063) +//#define EHOSTDOWN (-10064) +//#define EHOSTUNREACH (-10065) +//#define HOST_NOT_FOUND (-11001) + +/** The requested operation was not performed. + * Try again later. + */ +#define TRY_AGAIN (-11002) + +//#define NO_RECOVERY (-11003) + +/** No data. + */ +#define NO_DATA (-11004) + +/*@}*/ + +#endif + +/** @} + */