Index: uspace/lib/c/include/inet/addr.h =================================================================== --- uspace/lib/c/include/inet/addr.h (revision 53e3950b8dbd2e01cd0a036711fe2760544ae3bf) +++ uspace/lib/c/include/inet/addr.h (revision 6a75c1348f4cecc4045deb137aaa5b67b4adf133) @@ -111,6 +111,6 @@ extern int inet_naddr_compare_mask(const inet_naddr_t *, const inet_addr_t *); -extern int inet_addr_parse(const char *, inet_addr_t *); -extern int inet_naddr_parse(const char *, inet_naddr_t *); +extern int inet_addr_parse(const char *, inet_addr_t *, char **); +extern int inet_naddr_parse(const char *, inet_naddr_t *, char **); extern int inet_addr_format(const inet_addr_t *, char **); Index: uspace/lib/c/include/inet/dnsr.h =================================================================== --- uspace/lib/c/include/inet/dnsr.h (revision 53e3950b8dbd2e01cd0a036711fe2760544ae3bf) +++ uspace/lib/c/include/inet/dnsr.h (revision 6a75c1348f4cecc4045deb137aaa5b67b4adf133) @@ -33,6 +33,6 @@ */ -#ifndef LIBC_INET_DNSRES_H_ -#define LIBC_INET_DNSRES_H_ +#ifndef LIBC_INET_DNSR_H_ +#define LIBC_INET_DNSR_H_ #include Index: uspace/lib/c/include/inet/endpoint.h =================================================================== --- uspace/lib/c/include/inet/endpoint.h (revision 53e3950b8dbd2e01cd0a036711fe2760544ae3bf) +++ uspace/lib/c/include/inet/endpoint.h (revision 6a75c1348f4cecc4045deb137aaa5b67b4adf133) @@ -33,6 +33,6 @@ */ -#ifndef LIBC_INET_ASSOC_H_ -#define LIBC_INET_ASSOC_H_ +#ifndef LIBC_INET_ENDPOINT_H_ +#define LIBC_INET_ENDPOINT_H_ #include Index: uspace/lib/c/include/inet/host.h =================================================================== --- uspace/lib/c/include/inet/host.h (revision 6a75c1348f4cecc4045deb137aaa5b67b4adf133) +++ uspace/lib/c/include/inet/host.h (revision 6a75c1348f4cecc4045deb137aaa5b67b4adf133) @@ -0,0 +1,52 @@ +/* + * 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 int inet_host_parse(const char *, inet_host_t **, char **); +extern int inet_host_format(inet_host_t *, char **); +extern void inet_host_destroy(inet_host_t *); +extern int inet_host_lookup_one(inet_host_t *, ip_ver_t, inet_addr_t *); +extern int 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 6a75c1348f4cecc4045deb137aaa5b67b4adf133) +++ uspace/lib/c/include/inet/hostname.h (revision 6a75c1348f4cecc4045deb137aaa5b67b4adf133) @@ -0,0 +1,43 @@ +/* + * 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 int inet_hostname_parse(const char *, char **, char **); + +#endif + +/** @} + */ Index: uspace/lib/c/include/inet/hostport.h =================================================================== --- uspace/lib/c/include/inet/hostport.h (revision 6a75c1348f4cecc4045deb137aaa5b67b4adf133) +++ uspace/lib/c/include/inet/hostport.h (revision 6a75c1348f4cecc4045deb137aaa5b67b4adf133) @@ -0,0 +1,52 @@ +/* + * 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 int inet_hostport_parse(const char *, inet_hostport_t **, char **); +extern int inet_hostport_format(inet_hostport_t *, char **); +extern void inet_hostport_destroy(inet_hostport_t *); +extern int inet_hostport_lookup_one(inet_hostport_t *, ip_ver_t, inet_ep_t *); +extern int inet_hostport_plookup_one(const char *, ip_ver_t, inet_ep_t *, + char **, const char **); + +#endif + +/** @} + */ Index: uspace/lib/c/include/types/inet/host.h =================================================================== --- uspace/lib/c/include/types/inet/host.h (revision 6a75c1348f4cecc4045deb137aaa5b67b4adf133) +++ uspace/lib/c/include/types/inet/host.h (revision 6a75c1348f4cecc4045deb137aaa5b67b4adf133) @@ -0,0 +1,67 @@ +/* + * 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 6a75c1348f4cecc4045deb137aaa5b67b4adf133) +++ uspace/lib/c/include/types/inet/hostport.h (revision 6a75c1348f4cecc4045deb137aaa5b67b4adf133) @@ -0,0 +1,65 @@ +/* + * 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 + +/** @} + */