Index: uspace/lib/c/include/inet/inetping.h =================================================================== --- uspace/lib/c/include/inet/inetping.h (revision b243da3434115a8101e3ebac364a0a3b75aaf102) +++ uspace/lib/c/include/inet/inetping.h (revision 13be2583f424e363415cb6d5be27d6fb883f8353) @@ -38,12 +38,5 @@ #include #include - -typedef struct { - uint32_t src; - uint32_t dest; - uint16_t seq_no; - void *data; - size_t size; -} inetping_sdu_t; +#include typedef struct inetping_ev_ops { Index: uspace/lib/c/include/inet/inetping6.h =================================================================== --- uspace/lib/c/include/inet/inetping6.h (revision b243da3434115a8101e3ebac364a0a3b75aaf102) +++ uspace/lib/c/include/inet/inetping6.h (revision 13be2583f424e363415cb6d5be27d6fb883f8353) @@ -38,12 +38,5 @@ #include #include - -typedef struct { - addr128_t src; - addr128_t dest; - uint16_t seq_no; - void *data; - size_t size; -} inetping6_sdu_t; +#include typedef struct inetping6_ev_ops { Index: uspace/lib/c/include/types/inetping.h =================================================================== --- uspace/lib/c/include/types/inetping.h (revision 13be2583f424e363415cb6d5be27d6fb883f8353) +++ uspace/lib/c/include/types/inetping.h (revision 13be2583f424e363415cb6d5be27d6fb883f8353) @@ -0,0 +1,53 @@ +/* + * 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 + +typedef struct { + uint32_t src; + uint32_t dest; + uint16_t seq_no; + void *data; + size_t size; +} inetping_sdu_t; + +#endif + +/** @} + */ Index: uspace/lib/c/include/types/inetping6.h =================================================================== --- uspace/lib/c/include/types/inetping6.h (revision 13be2583f424e363415cb6d5be27d6fb883f8353) +++ uspace/lib/c/include/types/inetping6.h (revision 13be2583f424e363415cb6d5be27d6fb883f8353) @@ -0,0 +1,54 @@ +/* + * 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_INETPING6_H_ +#define LIBC_TYPES_INETPING6_H_ + +#include +#include + +typedef struct { + addr128_t src; + addr128_t dest; + uint16_t seq_no; + void *data; + size_t size; +} inetping6_sdu_t; + +#endif + +/** @} + */ Index: uspace/srv/net/inetsrv/icmp.c =================================================================== --- uspace/srv/net/inetsrv/icmp.c (revision b243da3434115a8101e3ebac364a0a3b75aaf102) +++ uspace/srv/net/inetsrv/icmp.c (revision 13be2583f424e363415cb6d5be27d6fb883f8353) @@ -40,4 +40,5 @@ #include #include +#include #include #include "icmp.h" Index: uspace/srv/net/inetsrv/icmp.h =================================================================== --- uspace/srv/net/inetsrv/icmp.h (revision b243da3434115a8101e3ebac364a0a3b75aaf102) +++ uspace/srv/net/inetsrv/icmp.h (revision 13be2583f424e363415cb6d5be27d6fb883f8353) @@ -38,4 +38,5 @@ #define ICMP_H_ +#include #include "inetsrv.h" Index: uspace/srv/net/inetsrv/icmpv6.c =================================================================== --- uspace/srv/net/inetsrv/icmpv6.c (revision b243da3434115a8101e3ebac364a0a3b75aaf102) +++ uspace/srv/net/inetsrv/icmpv6.c (revision 13be2583f424e363415cb6d5be27d6fb883f8353) @@ -41,4 +41,5 @@ #include #include +#include #include "icmpv6.h" #include "icmpv6_std.h" Index: uspace/srv/net/inetsrv/icmpv6.h =================================================================== --- uspace/srv/net/inetsrv/icmpv6.h (revision b243da3434115a8101e3ebac364a0a3b75aaf102) +++ uspace/srv/net/inetsrv/icmpv6.h (revision 13be2583f424e363415cb6d5be27d6fb883f8353) @@ -38,4 +38,5 @@ #define ICMPV6_H_ +#include #include "inetsrv.h" Index: uspace/srv/net/inetsrv/inetping.c =================================================================== --- uspace/srv/net/inetsrv/inetping.c (revision b243da3434115a8101e3ebac364a0a3b75aaf102) +++ uspace/srv/net/inetsrv/inetping.c (revision 13be2583f424e363415cb6d5be27d6fb883f8353) @@ -43,4 +43,5 @@ #include #include +#include #include #include "icmp.h" Index: uspace/srv/net/inetsrv/inetping.h =================================================================== --- uspace/srv/net/inetsrv/inetping.h (revision b243da3434115a8101e3ebac364a0a3b75aaf102) +++ uspace/srv/net/inetsrv/inetping.h (revision 13be2583f424e363415cb6d5be27d6fb883f8353) @@ -38,4 +38,5 @@ #define INETPING_H_ +#include #include "inetsrv.h" Index: uspace/srv/net/inetsrv/inetping6.c =================================================================== --- uspace/srv/net/inetsrv/inetping6.c (revision b243da3434115a8101e3ebac364a0a3b75aaf102) +++ uspace/srv/net/inetsrv/inetping6.c (revision 13be2583f424e363415cb6d5be27d6fb883f8353) @@ -43,4 +43,5 @@ #include #include +#include #include #include "icmpv6.h" Index: uspace/srv/net/inetsrv/inetping6.h =================================================================== --- uspace/srv/net/inetsrv/inetping6.h (revision b243da3434115a8101e3ebac364a0a3b75aaf102) +++ uspace/srv/net/inetsrv/inetping6.h (revision 13be2583f424e363415cb6d5be27d6fb883f8353) @@ -38,4 +38,5 @@ #define INETPING6_H_ +#include #include "inetsrv.h" Index: uspace/srv/net/inetsrv/inetsrv.h =================================================================== --- uspace/srv/net/inetsrv/inetsrv.h (revision b243da3434115a8101e3ebac364a0a3b75aaf102) +++ uspace/srv/net/inetsrv/inetsrv.h (revision 13be2583f424e363415cb6d5be27d6fb883f8353) @@ -148,20 +148,4 @@ } inet_dir_t; -typedef struct { - uint32_t src; - uint32_t dest; - uint16_t seq_no; - void *data; - size_t size; -} inetping_sdu_t; - -typedef struct { - addr128_t src; - addr128_t dest; - uint16_t seq_no; - void *data; - size_t size; -} inetping6_sdu_t; - extern int inet_ev_recv(inet_client_t *, inet_dgram_t *); extern int inet_recv_packet(inet_packet_t *);