Index: uspace/lib/c/include/inet/addr.h =================================================================== --- uspace/lib/c/include/inet/addr.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,133 +1,0 @@ -/* - * Copyright (c) 2013 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_INET_ADDR_H_ -#define _LIBC_INET_ADDR_H_ - -#include -#include - -typedef uint32_t addr32_t; -typedef uint8_t addr48_t[6]; -typedef uint8_t addr128_t[16]; - -typedef enum { - /** Any IP protocol version */ - ip_any, - /** IPv4 */ - ip_v4, - /** IPv6 */ - ip_v6 -} ip_ver_t; - -/** Node address */ -typedef struct { - /** IP version */ - ip_ver_t version; - union { - addr32_t addr; - addr128_t addr6; - }; -} inet_addr_t; - -/** Network address */ -typedef struct { - /** IP version */ - ip_ver_t version; - - /** Address */ - union { - addr32_t addr; - addr128_t addr6; - }; - - /** Number of valid bits */ - uint8_t prefix; -} inet_naddr_t; - -extern const addr32_t addr32_broadcast_all_hosts; -extern const addr48_t addr48_broadcast; - -extern void addr48(const addr48_t, addr48_t); -extern void addr128(const addr128_t, addr128_t); - -extern int addr48_compare(const addr48_t, const addr48_t); -extern int addr128_compare(const addr128_t, const addr128_t); - -extern void addr48_solicited_node(const addr128_t, addr48_t); - -extern void host2addr128_t_be(const addr128_t, addr128_t); -extern void addr128_t_be2host(const addr128_t, addr128_t); - -extern void inet_addr(inet_addr_t *, uint8_t, uint8_t, uint8_t, uint8_t); -extern void inet_naddr(inet_naddr_t *, uint8_t, uint8_t, uint8_t, uint8_t, - uint8_t); - -extern void inet_addr6(inet_addr_t *, uint16_t, uint16_t, uint16_t, uint16_t, - uint16_t, uint16_t, uint16_t, uint16_t); -extern void inet_naddr6(inet_naddr_t *, uint16_t, uint16_t, uint16_t, uint16_t, - uint16_t, uint16_t, uint16_t, uint16_t, uint8_t); - -extern void inet_naddr_addr(const inet_naddr_t *, inet_addr_t *); -extern void inet_addr_naddr(const inet_addr_t *, uint8_t, inet_naddr_t *); - -extern void inet_addr_any(inet_addr_t *); -extern void inet_naddr_any(inet_naddr_t *); - -extern int inet_addr_compare(const inet_addr_t *, const inet_addr_t *); -extern int inet_addr_is_any(const inet_addr_t *); - -extern int inet_naddr_compare(const inet_naddr_t *, const inet_addr_t *); -extern int inet_naddr_compare_mask(const inet_naddr_t *, const inet_addr_t *); - -extern errno_t inet_addr_parse(const char *, inet_addr_t *, char **); -extern errno_t inet_naddr_parse(const char *, inet_naddr_t *, char **); - -extern errno_t inet_addr_format(const inet_addr_t *, char **); -extern errno_t inet_naddr_format(const inet_naddr_t *, char **); - -extern ip_ver_t inet_addr_get(const inet_addr_t *, addr32_t *, addr128_t *); -extern ip_ver_t inet_naddr_get(const inet_naddr_t *, addr32_t *, addr128_t *, - uint8_t *); - -extern void inet_addr_set(addr32_t, inet_addr_t *); -extern void inet_naddr_set(addr32_t, uint8_t, inet_naddr_t *); - -extern void inet_addr_set6(addr128_t, inet_addr_t *); -extern void inet_naddr_set6(addr128_t, uint8_t, inet_naddr_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/inet/dhcp.h =================================================================== --- uspace/lib/c/include/inet/dhcp.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (c) 2013 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_INET_DHCP_H_ -#define _LIBC_INET_DHCP_H_ - -#include - -extern errno_t dhcp_init(void); -extern errno_t dhcp_link_add(sysarg_t); -extern errno_t dhcp_link_remove(sysarg_t); -extern errno_t dhcp_discover(sysarg_t); - -#endif - -/** @} - */ Index: uspace/lib/c/include/inet/dnsr.h =================================================================== --- uspace/lib/c/include/inet/dnsr.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,61 +1,0 @@ -/* - * Copyright (c) 2013 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_INET_DNSR_H_ -#define _LIBC_INET_DNSR_H_ - -#include -#include - -enum { - DNSR_NAME_MAX_SIZE = 255 -}; - -typedef struct { - /** Host canonical name */ - char *cname; - /** Host address */ - inet_addr_t addr; -} dnsr_hostinfo_t; - -extern errno_t dnsr_init(void); -extern errno_t dnsr_name2host(const char *, dnsr_hostinfo_t **, ip_ver_t); -extern void dnsr_hostinfo_destroy(dnsr_hostinfo_t *); -extern errno_t dnsr_get_srvaddr(inet_addr_t *); -extern errno_t dnsr_set_srvaddr(inet_addr_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/inet/endpoint.h =================================================================== --- uspace/lib/c/include/inet/endpoint.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,86 +1,0 @@ -/* - * Copyright (c) 2015 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_INET_ENDPOINT_H_ -#define _LIBC_INET_ENDPOINT_H_ - -#include -#include -#include - -/** Internet port number ranges - * - * Port number ranges per RFC 6335 section 6 (Port Number Ranges. - * Technically port zero is a system port. But since it is reserved, - * we will use it as a special value denoting no port is specified - * and we will exclude it from the system port range to disallow - * ever assigning it. - */ -enum inet_port_ranges { - /** Special value meaning no specific port */ - inet_port_any = 0, - /** Lowest system port (a.k.a. well known port) */ - inet_port_sys_lo = 1, - /** Highest system port (a.k.a. well known port) */ - inet_port_sys_hi = 1023, - /** Lowest user port (a.k.a. registered port) */ - inet_port_user_lo = 1024, - /** Highest user port (a.k.a. registered port) */ - inet_port_user_hi = 49151, - /** Lowest dynamic port (a.k.a. private or ephemeral port) */ - inet_port_dyn_lo = 49152, - /** Highest dynamic port (a.k.a. private or ephemeral port) */ - inet_port_dyn_hi = 65535 -}; - -/** Internet endpoint (address-port pair), a.k.a. socket */ -typedef struct { - inet_addr_t addr; - uint16_t port; -} inet_ep_t; - -/** Internet endpoint pair */ -typedef struct { - service_id_t local_link; - inet_ep_t local; - inet_ep_t remote; -} inet_ep2_t; - -extern void inet_ep_init(inet_ep_t *); -extern void inet_ep2_init(inet_ep2_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/inet/host.h =================================================================== --- uspace/lib/c/include/inet/host.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,52 +1,0 @@ -/* - * Copyright (c) 2016 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_INET_HOST_H_ -#define _LIBC_INET_HOST_H_ - -#include -#include -#include - -extern errno_t inet_host_parse(const char *, inet_host_t **, char **); -extern errno_t inet_host_format(inet_host_t *, char **); -extern void inet_host_destroy(inet_host_t *); -extern errno_t inet_host_lookup_one(inet_host_t *, ip_ver_t, inet_addr_t *); -extern errno_t inet_host_plookup_one(const char *, ip_ver_t, inet_addr_t *, - char **, const char **); - -#endif - -/** @} - */ Index: uspace/lib/c/include/inet/hostname.h =================================================================== --- uspace/lib/c/include/inet/hostname.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,43 +1,0 @@ -/* - * Copyright (c) 2016 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_INET_HOSTNAME_H_ -#define _LIBC_INET_HOSTNAME_H_ - -extern errno_t inet_hostname_parse(const char *, char **, char **); - -#endif - -/** @} - */ Index: uspace/lib/c/include/inet/hostport.h =================================================================== --- uspace/lib/c/include/inet/hostport.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,52 +1,0 @@ -/* - * Copyright (c) 2016 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_INET_HOSTPORT_H_ -#define _LIBC_INET_HOSTPORT_H_ - -#include -#include -#include - -extern errno_t inet_hostport_parse(const char *, inet_hostport_t **, char **); -extern errno_t inet_hostport_format(inet_hostport_t *, char **); -extern void inet_hostport_destroy(inet_hostport_t *); -extern errno_t inet_hostport_lookup_one(inet_hostport_t *, ip_ver_t, inet_ep_t *); -extern errno_t inet_hostport_plookup_one(const char *, ip_ver_t, inet_ep_t *, - char **, const char **); - -#endif - -/** @} - */ Index: uspace/lib/c/include/inet/inet.h =================================================================== --- uspace/lib/c/include/inet/inet.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,50 +1,0 @@ -/* - * Copyright (c) 2012 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_INET_INET_H_ -#define _LIBC_INET_INET_H_ - -#include -#include -#include -#include - -extern errno_t inet_init(uint8_t, inet_ev_ops_t *); -extern errno_t inet_send(inet_dgram_t *, uint8_t, inet_df_t); -extern errno_t inet_get_srcaddr(inet_addr_t *, uint8_t, inet_addr_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/inet/inetcfg.h =================================================================== --- uspace/lib/c/include/inet/inetcfg.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,62 +1,0 @@ -/* - * Copyright (c) 2012 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_INET_INETCFG_H_ -#define _LIBC_INET_INETCFG_H_ - -#include -#include -#include - -extern errno_t inetcfg_init(void); -extern errno_t inetcfg_addr_create_static(const char *, inet_naddr_t *, sysarg_t, sysarg_t *); -extern errno_t inetcfg_addr_delete(sysarg_t); -extern errno_t inetcfg_addr_get(sysarg_t, inet_addr_info_t *); -extern errno_t inetcfg_addr_get_id(const char *, sysarg_t, sysarg_t *); -extern errno_t inetcfg_get_addr_list(sysarg_t **, size_t *); -extern errno_t inetcfg_get_link_list(sysarg_t **, size_t *); -extern errno_t inetcfg_get_sroute_list(sysarg_t **, size_t *); -extern errno_t inetcfg_link_add(sysarg_t); -extern errno_t inetcfg_link_get(sysarg_t, inet_link_info_t *); -extern errno_t inetcfg_link_remove(sysarg_t); -extern errno_t inetcfg_sroute_get(sysarg_t, inet_sroute_info_t *); -extern errno_t inetcfg_sroute_get_id(const char *, sysarg_t *); -extern errno_t inetcfg_sroute_create(const char *, inet_naddr_t *, inet_addr_t *, - sysarg_t *); -extern errno_t inetcfg_sroute_delete(sysarg_t); - -#endif - -/** @} - */ Index: uspace/lib/c/include/inet/inetping.h =================================================================== --- uspace/lib/c/include/inet/inetping.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,52 +1,0 @@ -/* - * Copyright (c) 2013 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_INET_INETPING_H_ -#define _LIBC_INET_INETPING_H_ - -#include -#include - -typedef struct inetping_ev_ops { - errno_t (*recv)(inetping_sdu_t *); -} inetping_ev_ops_t; - -extern errno_t inetping_init(inetping_ev_ops_t *); -extern errno_t inetping_send(inetping_sdu_t *); -extern errno_t inetping_get_srcaddr(const inet_addr_t *, inet_addr_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/inet/iplink.h =================================================================== --- uspace/lib/c/include/inet/iplink.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,98 +1,0 @@ -/* - * Copyright (c) 2012 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_INET_IPLINK_H_ -#define _LIBC_INET_IPLINK_H_ - -#include -#include - -struct iplink_ev_ops; - -typedef struct { - async_sess_t *sess; - struct iplink_ev_ops *ev_ops; - void *arg; -} iplink_t; - -/** IPv4 link Service Data Unit */ -typedef struct { - /** Local source address */ - addr32_t src; - /** Local destination address */ - addr32_t dest; - /** Serialized IP packet */ - void *data; - /** Size of @c data in bytes */ - size_t size; -} iplink_sdu_t; - -/** IPv6 link Service Data Unit */ -typedef struct { - /** Local MAC destination address */ - addr48_t dest; - /** Serialized IP packet */ - void *data; - /** Size of @c data in bytes */ - size_t size; -} iplink_sdu6_t; - -/** Internet link receive Service Data Unit */ -typedef struct { - /** Serialized datagram */ - void *data; - /** Size of @c data in bytes */ - size_t size; -} iplink_recv_sdu_t; - -typedef struct iplink_ev_ops { - errno_t (*recv)(iplink_t *, iplink_recv_sdu_t *, ip_ver_t); - errno_t (*change_addr)(iplink_t *, addr48_t); -} iplink_ev_ops_t; - -extern errno_t iplink_open(async_sess_t *, iplink_ev_ops_t *, void *, iplink_t **); -extern void iplink_close(iplink_t *); -extern errno_t iplink_send(iplink_t *, iplink_sdu_t *); -extern errno_t iplink_send6(iplink_t *, iplink_sdu6_t *); -extern errno_t iplink_addr_add(iplink_t *, inet_addr_t *); -extern errno_t iplink_addr_remove(iplink_t *, inet_addr_t *); -extern errno_t iplink_get_mtu(iplink_t *, size_t *); -extern errno_t iplink_get_mac48(iplink_t *, addr48_t *); -extern errno_t iplink_set_mac48(iplink_t *, addr48_t); -extern void *iplink_get_userptr(iplink_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/inet/iplink_srv.h =================================================================== --- uspace/lib/c/include/inet/iplink_srv.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,75 +1,0 @@ -/* - * Copyright (c) 2012 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_INET_IPLINK_SRV_H_ -#define _LIBC_INET_IPLINK_SRV_H_ - -#include -#include -#include -#include -#include - -struct iplink_ops; - -typedef struct { - fibril_mutex_t lock; - bool connected; - struct iplink_ops *ops; - void *arg; - async_sess_t *client_sess; -} iplink_srv_t; - -typedef struct iplink_ops { - errno_t (*open)(iplink_srv_t *); - errno_t (*close)(iplink_srv_t *); - errno_t (*send)(iplink_srv_t *, iplink_sdu_t *); - errno_t (*send6)(iplink_srv_t *, iplink_sdu6_t *); - errno_t (*get_mtu)(iplink_srv_t *, size_t *); - errno_t (*get_mac48)(iplink_srv_t *, addr48_t *); - errno_t (*set_mac48)(iplink_srv_t *, addr48_t *); - errno_t (*addr_add)(iplink_srv_t *, inet_addr_t *); - errno_t (*addr_remove)(iplink_srv_t *, inet_addr_t *); -} iplink_ops_t; - -extern void iplink_srv_init(iplink_srv_t *); - -extern errno_t iplink_conn(ipc_call_t *, void *); -extern errno_t iplink_ev_recv(iplink_srv_t *, iplink_recv_sdu_t *, ip_ver_t); -extern errno_t iplink_ev_change_addr(iplink_srv_t *, addr48_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/inet/tcp.h =================================================================== --- uspace/lib/c/include/inet/tcp.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,123 +1,0 @@ -/* - * Copyright (c) 2015 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_INET_TCP_H_ -#define _LIBC_INET_TCP_H_ - -#include -#include -#include -#include - -/** TCP connection */ -typedef struct { - fibril_mutex_t lock; - fibril_condvar_t cv; - struct tcp *tcp; - link_t ltcp; - sysarg_t id; - struct tcp_cb *cb; - void *cb_arg; - /** Some received data available in TCP server */ - bool data_avail; - bool connected; - bool conn_failed; - bool conn_reset; -} tcp_conn_t; - -/** TCP connection listener */ -typedef struct { - struct tcp *tcp; - link_t ltcp; - sysarg_t id; - struct tcp_listen_cb *lcb; - void *lcb_arg; - struct tcp_cb *cb; - void *cb_arg; -} tcp_listener_t; - -/** TCP connection callbacks */ -typedef struct tcp_cb { - void (*connected)(tcp_conn_t *); - void (*conn_failed)(tcp_conn_t *); - void (*conn_reset)(tcp_conn_t *); - void (*data_avail)(tcp_conn_t *); - void (*urg_data)(tcp_conn_t *); -} tcp_cb_t; - -/** TCP listener callbacks */ -typedef struct tcp_listen_cb { - void (*new_conn)(tcp_listener_t *, tcp_conn_t *); -} tcp_listen_cb_t; - -/** TCP service */ -typedef struct tcp { - /** TCP session */ - async_sess_t *sess; - /** List of connections */ - list_t conn; /* of tcp_conn_t */ - /** List of listeners */ - list_t listener; /* of tcp_listener_t */ - /** TCP service lock */ - fibril_mutex_t lock; - /** For waiting on cb_done */ - fibril_condvar_t cv; - /** Set to @a true when callback connection handler has terminated */ - bool cb_done; -} tcp_t; - -extern errno_t tcp_create(tcp_t **); -extern void tcp_destroy(tcp_t *); -extern errno_t tcp_conn_create(tcp_t *, inet_ep2_t *, tcp_cb_t *, void *, - tcp_conn_t **); -extern void tcp_conn_destroy(tcp_conn_t *); -extern void *tcp_conn_userptr(tcp_conn_t *); -extern errno_t tcp_listener_create(tcp_t *, inet_ep_t *, tcp_listen_cb_t *, void *, - tcp_cb_t *, void *, tcp_listener_t **); -extern void tcp_listener_destroy(tcp_listener_t *); -extern void *tcp_listener_userptr(tcp_listener_t *); - -extern errno_t tcp_conn_wait_connected(tcp_conn_t *); -extern errno_t tcp_conn_send(tcp_conn_t *, const void *, size_t); -extern errno_t tcp_conn_send_fin(tcp_conn_t *); -extern errno_t tcp_conn_push(tcp_conn_t *); -extern errno_t tcp_conn_reset(tcp_conn_t *); - -extern errno_t tcp_conn_recv(tcp_conn_t *, void *, size_t, size_t *); -extern errno_t tcp_conn_recv_wait(tcp_conn_t *, void *, size_t, size_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/inet/udp.h =================================================================== --- uspace/lib/c/include/inet/udp.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,110 +1,0 @@ -/* - * Copyright (c) 2015 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_INET_UDP_H_ -#define _LIBC_INET_UDP_H_ - -#include -#include -#include -#include -#include -#include - -/** UDP link state */ -typedef enum { - udp_ls_down, - udp_ls_up -} udp_link_state_t; - -/** UDP received message */ -typedef struct { - struct udp *udp; - sysarg_t assoc_id; - size_t size; - inet_ep_t remote_ep; -} udp_rmsg_t; - -/** UDP received error */ -typedef struct { -} udp_rerr_t; - -/** UDP association */ -typedef struct { - struct udp *udp; - link_t ludp; - sysarg_t id; - struct udp_cb *cb; - void *cb_arg; -} udp_assoc_t; - -/** UDP callbacks */ -typedef struct udp_cb { - void (*recv_msg)(udp_assoc_t *, udp_rmsg_t *); - void (*recv_err)(udp_assoc_t *, udp_rerr_t *); - void (*link_state)(udp_assoc_t *, udp_link_state_t); -} udp_cb_t; - -/** UDP service */ -typedef struct udp { - /** UDP session */ - async_sess_t *sess; - /** List of associations */ - list_t assoc; /* of udp_assoc_t */ - /** UDP service lock */ - fibril_mutex_t lock; - /** For waiting on cb_done */ - fibril_condvar_t cv; - /** Set to @a true when callback connection handler has terminated */ - bool cb_done; -} udp_t; - -extern errno_t udp_create(udp_t **); -extern void udp_destroy(udp_t *); -extern errno_t udp_assoc_create(udp_t *, inet_ep2_t *, udp_cb_t *, void *, - udp_assoc_t **); -extern errno_t udp_assoc_set_nolocal(udp_assoc_t *); -extern void udp_assoc_destroy(udp_assoc_t *); -extern errno_t udp_assoc_send_msg(udp_assoc_t *, inet_ep_t *, void *, size_t); -extern void *udp_assoc_userptr(udp_assoc_t *); -extern size_t udp_rmsg_size(udp_rmsg_t *); -extern errno_t udp_rmsg_read(udp_rmsg_t *, size_t, void *, size_t); -extern void udp_rmsg_remote_ep(udp_rmsg_t *, inet_ep_t *); -extern uint8_t udp_rerr_type(udp_rerr_t *); -extern uint8_t udp_rerr_code(udp_rerr_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/dhcp.h =================================================================== --- uspace/lib/c/include/ipc/dhcp.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * Copyright (c) 2013 Jiri Svoboda - * 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 libcipc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_IPC_DHCP_H_ -#define _LIBC_IPC_DHCP_H_ - -#include - -/** DHCP service requests */ -typedef enum { - DHCP_LINK_ADD = IPC_FIRST_USER_METHOD, - DHCP_LINK_REMOVE, - DHCP_DISCOVER -} dhcp_request_t; - -#endif - -/** - * @} - */ Index: uspace/lib/c/include/ipc/dnsr.h =================================================================== --- uspace/lib/c/include/ipc/dnsr.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2013 Jiri Svoboda - * 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 libcipc - * @{ - */ - -#ifndef _LIBC_IPC_DNSR_H_ -#define _LIBC_IPC_DNSR_H_ - -#include - -typedef enum { - DNSR_NAME2HOST = IPC_FIRST_USER_METHOD, - DNSR_GET_SRVADDR, - DNSR_SET_SRVADDR -} dnsr_request_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/inet.h =================================================================== --- uspace/lib/c/include/ipc/inet.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,86 +1,0 @@ -/* - * Copyright (c) 2012 Jiri Svoboda - * 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 libcipc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_IPC_INET_H_ -#define _LIBC_IPC_INET_H_ - -#include - -/** Requests on Inet default port */ -typedef enum { - INET_CALLBACK_CREATE = IPC_FIRST_USER_METHOD, - INET_GET_SRCADDR, - INET_SEND, - INET_SET_PROTO -} inet_request_t; - -/** Events on Inet default port */ -typedef enum { - INET_EV_RECV = IPC_FIRST_USER_METHOD -} inet_event_t; - -/** Requests on Inet configuration port */ -typedef enum { - INETCFG_ADDR_CREATE_STATIC = IPC_FIRST_USER_METHOD, - INETCFG_ADDR_DELETE, - INETCFG_ADDR_GET, - INETCFG_ADDR_GET_ID, - INETCFG_GET_ADDR_LIST, - INETCFG_GET_LINK_LIST, - INETCFG_GET_SROUTE_LIST, - INETCFG_LINK_ADD, - INETCFG_LINK_GET, - INETCFG_LINK_REMOVE, - INETCFG_SROUTE_CREATE, - INETCFG_SROUTE_DELETE, - INETCFG_SROUTE_GET, - INETCFG_SROUTE_GET_ID -} inetcfg_request_t; - -/** Events on Inet ping port */ -typedef enum { - INETPING_EV_RECV = IPC_FIRST_USER_METHOD -} inetping_event_t; - -/** Requests on Inet ping port */ -typedef enum { - INETPING_SEND = IPC_FIRST_USER_METHOD, - INETPING_GET_SRCADDR -} inetping_request_t; - -#endif - -/** - * @} - */ Index: uspace/lib/c/include/ipc/iplink.h =================================================================== --- uspace/lib/c/include/ipc/iplink.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,59 +1,0 @@ -/* - * Copyright (c) 2012 Jiri Svoboda - * 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 libcipc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_IPC_IPLINK_H_ -#define _LIBC_IPC_IPLINK_H_ - -#include - -typedef enum { - IPLINK_GET_MTU = IPC_FIRST_USER_METHOD, - IPLINK_GET_MAC48, - IPLINK_SET_MAC48, - IPLINK_SEND, - IPLINK_SEND6, - IPLINK_ADDR_ADD, - IPLINK_ADDR_REMOVE -} iplink_request_t; - -typedef enum { - IPLINK_EV_RECV = IPC_FIRST_USER_METHOD, - IPLINK_EV_CHANGE_ADDR, -} iplink_event_t; - -#endif - -/** - * @} - */ Index: uspace/lib/c/include/ipc/tcp.h =================================================================== --- uspace/lib/c/include/ipc/tcp.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,66 +1,0 @@ -/* - * Copyright (c) 2015 Jiri Svoboda - * 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 libcipc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_IPC_TCP_H_ -#define _LIBC_IPC_TCP_H_ - -#include - -typedef enum { - TCP_CALLBACK_CREATE = IPC_FIRST_USER_METHOD, - TCP_CONN_CREATE, - TCP_CONN_DESTROY, - TCP_LISTENER_CREATE, - TCP_LISTENER_DESTROY, - TCP_CONN_SEND, - TCP_CONN_SEND_FIN, - TCP_CONN_PUSH, - TCP_CONN_RESET, - TCP_CONN_RECV, - TCP_CONN_RECV_WAIT -} tcp_request_t; - -typedef enum { - TCP_EV_CONNECTED = IPC_FIRST_USER_METHOD, - TCP_EV_CONN_FAILED, - TCP_EV_CONN_RESET, - TCP_EV_DATA, - TCP_EV_URG_DATA, - TCP_EV_NEW_CONN -} tcp_event_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/udp.h =================================================================== --- uspace/lib/c/include/ipc/udp.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,58 +1,0 @@ -/* - * Copyright (c) 2015 Jiri Svoboda - * 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 libcipc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_IPC_UDP_H_ -#define _LIBC_IPC_UDP_H_ - -#include - -typedef enum { - UDP_CALLBACK_CREATE = IPC_FIRST_USER_METHOD, - UDP_ASSOC_CREATE, - UDP_ASSOC_DESTROY, - UDP_ASSOC_SET_NOLOCAL, - UDP_ASSOC_SEND_MSG, - UDP_RMSG_INFO, - UDP_RMSG_READ, - UDP_RMSG_DISCARD -} udp_request_t; - -typedef enum { - UDP_EV_DATA = IPC_FIRST_USER_METHOD -} udp_event_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/types/inet.h =================================================================== --- uspace/lib/c/include/types/inet.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,66 +1,0 @@ -/* - * Copyright (c) 2012 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_TYPES_INET_H_ -#define _LIBC_TYPES_INET_H_ - -#include -#include -#include -#include - -#define INET_TTL_MAX 255 - -typedef struct { - /** Local IP link service ID (optional) */ - service_id_t iplink; - inet_addr_t src; - inet_addr_t dest; - uint8_t tos; - void *data; - size_t size; -} inet_dgram_t; - -typedef struct { - errno_t (*recv)(inet_dgram_t *); -} inet_ev_ops_t; - -typedef enum { - INET_DF = 1 -} inet_df_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/types/inet/host.h =================================================================== --- uspace/lib/c/include/types/inet/host.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,67 +1,0 @@ -/* - * Copyright (c) 2016 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_TYPES_INET_HOST_H_ -#define _LIBC_TYPES_INET_HOST_H_ - -#include - -typedef enum { - /** Host name */ - inet_host_name, - /** Host address */ - inet_host_addr -} inet_host_form_t; - -/** Internet host:port specification - * - * As in RFC 1738 Uniform Resouce Locators (URL) and RFC 2732 Format for - * literal IPv6 Addresses in URLs - */ -typedef struct { - /** Host form */ - inet_host_form_t hform; - - union { - /** Host name */ - char *name; - /** Host address */ - inet_addr_t addr; - } host; -} inet_host_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/types/inet/hostport.h =================================================================== --- uspace/lib/c/include/types/inet/hostport.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,65 +1,0 @@ -/* - * Copyright (c) 2016 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_TYPES_INET_HOSTPORT_H_ -#define _LIBC_TYPES_INET_HOSTPORT_H_ - -#include -#include -#include - -/** Internet host:port specification - * - * As in RFC 1738 Uniform Resouce Locators (URL) and RFC 2732 Format for - * literal IPv6 Addresses in URLs - */ -typedef struct { - /** Host form */ - inet_host_form_t hform; - - union { - /** Host name */ - char *name; - /** Host address */ - inet_addr_t addr; - } host; - - /** Port number of 0 if omitted */ - uint16_t port; -} inet_hostport_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/types/inetcfg.h =================================================================== --- uspace/lib/c/include/types/inetcfg.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,74 +1,0 @@ -/* - * Copyright (c) 2013 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_TYPES_INETCFG_H_ -#define _LIBC_TYPES_INETCFG_H_ - -#include -#include - -/** Address object info */ -typedef struct { - /** Network address */ - inet_naddr_t naddr; - /** Link service ID */ - sysarg_t ilink; - /** Address object name */ - char *name; -} inet_addr_info_t; - -/** IP link info */ -typedef struct { - /** Link service name */ - char *name; - /** Default MTU */ - size_t def_mtu; - /** Link layer address */ - addr48_t mac_addr; -} inet_link_info_t; - -/** Static route info */ -typedef struct { - /** Destination network address */ - inet_naddr_t dest; - /** Router address */ - inet_addr_t router; - /** Static route name */ - char *name; -} inet_sroute_info_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/types/inetping.h =================================================================== --- uspace/lib/c/include/types/inetping.h (revision 7727cfdde03877ab663a1b6e9acbb07eff7a0de1) +++ (revision ) @@ -1,55 +1,0 @@ -/* - * Copyright (c) 2013 Jiri Svoboda - * 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 libc - * @{ - */ -/** - * @file - * @brief - */ - -#ifndef _LIBC_TYPES_INETPING_H_ -#define _LIBC_TYPES_INETPING_H_ - -#include -#include -#include - -typedef struct { - inet_addr_t src; - inet_addr_t dest; - uint16_t seq_no; - void *data; - size_t size; -} inetping_sdu_t; - -#endif - -/** @} - */