diff --git a/Makefile.am b/Makefile.am index 3ad7467..0544306 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = avl httpp log net thread +SUBDIRS = avl httpp log thread lib_LTLIBRARIES = libigloo.la @@ -14,7 +14,6 @@ pkginclude_HEADERS = \ include/igloo/igloo.h \ include/igloo/log.h \ include/igloo/resolver.h \ - include/igloo/sock.h \ include/igloo/thread.h \ include/igloo/timing.h \ include/igloo/ro.h \ @@ -22,6 +21,8 @@ pkginclude_HEADERS = \ include/igloo/typedef.h \ include/igloo/interface.h \ include/igloo/io.h \ + include/igloo/socket.h \ + include/igloo/socketaddr.h \ include/igloo/stdio.h \ include/igloo/filter.h \ include/igloo/objecthandler.h \ @@ -38,6 +39,8 @@ libigloo_la_SOURCES = \ src/interface.c \ src/ro.c \ src/io.c \ + src/socket.c \ + src/socketaddr.c \ src/stdio.c \ src/filter.c \ src/objecthandler.c \ @@ -52,7 +55,6 @@ libigloo_la_LIBADD = \ avl/libiceavl.la \ httpp/libicehttpp.la \ log/libicelog.la \ - net/libicenet.la \ thread/libicethread.la pkgconfig_DATA = igloo.pc diff --git a/configure.ac b/configure.ac index 27ac403..af50705 100644 --- a/configure.ac +++ b/configure.ac @@ -169,7 +169,6 @@ AC_CONFIG_FILES([ httpp/Makefile thread/Makefile log/Makefile - net/Makefile igloo.pc ]) diff --git a/include/igloo/sock.h b/include/igloo/sock.h deleted file mode 100644 index c93a16e..0000000 --- a/include/igloo/sock.h +++ /dev/null @@ -1,119 +0,0 @@ -/* sock.h - * - General Socket Function Headers - * - * Copyright (C) 2014 Michael Smith , - * Brendan Cully , - * Karl Heyes , - * Jack Moffitt , - * Ed "oddsock" Zaleski , - * Copyright (C) 2012-2018 Philipp "ph3-der-loewe" Schafft - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - */ - -#ifndef _LIBIGLOO__SOCK_H_ -#define _LIBIGLOO__SOCK_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include - -#include - -#ifdef IGLOO_CTC_HAVE_WINSOCK2_H -#include -#endif - -#ifdef IGLOO_CTC_HAVE_UNISTD_H -#include -#elif _WIN32 -#include -#endif - -#ifdef IGLOO_CTC_HAVE_SYS_UIO_H -#include -#else -#ifndef _SYS_UIO_H -struct iovec -{ - void *iov_base; - size_t iov_len; -}; -#endif -#endif - -#if !defined(IGLOO_CTC_HAVE_INET_ATON) && defined(IGLOO_CTC_HAVE_INET_PTON) -#define inet_aton(a,b) inet_pton(AF_INET, (a), (b)) -#endif - -#ifdef INET6_ADDRSTRLEN -#define MAX_ADDR_LEN INET6_ADDRSTRLEN -#else -#define MAX_ADDR_LEN 46 -#endif - -#ifndef igloo_sock_t -#define igloo_sock_t int -#endif - -/* The following values are based on unix avoiding errno value clashes */ -#define igloo_SOCK_SUCCESS 0 -#define igloo_SOCK_ERROR (igloo_sock_t)-1 -#define igloo_SOCK_TIMEOUT -2 - -/* Misc socket functions */ -int igloo_sock_error(void); -int igloo_sock_active (igloo_sock_t sock); -int igloo_sock_set_blocking(igloo_sock_t sock, int block); -int igloo_sock_set_nodelay(igloo_sock_t sock); -void igloo_sock_set_send_buffer (igloo_sock_t sock, int win_size); -int igloo_sock_close(igloo_sock_t sock); - -/* Connection related socket functions */ -igloo_sock_t igloo_sock_connect_wto(const char *hostname, int port, int timeout); -igloo_sock_t igloo_sock_connect_wto_bind(const char *hostname, int port, const char *bnd, int timeout); -igloo_sock_t igloo_sock_connect_non_blocking(const char *host, unsigned port); -int igloo_sock_connected(igloo_sock_t sock, int timeout); - -/* Socket write functions */ -int igloo_sock_write_bytes(igloo_sock_t sock, const void *buff, size_t len); -int igloo_sock_write(igloo_sock_t sock, const char *fmt, ...); -int igloo_sock_write_fmt(igloo_sock_t sock, const char *fmt, va_list ap); - - -/* Socket read functions */ -int igloo_sock_read_bytes(igloo_sock_t sock, char *buff, size_t len); -int igloo_sock_read_line(igloo_sock_t sock, char *string, const int len); - -/* server socket functions */ -igloo_sock_t igloo_sock_get_server_socket(int port, const char *sinterface); -int igloo_sock_listen(igloo_sock_t serversock, int backlog); -igloo_sock_t igloo_sock_accept(igloo_sock_t serversock, char *ip, size_t len); - -int igloo_sock_recoverable(int error); - -#ifdef _WIN32 -int inet_aton(const char *s, struct in_addr *a); -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* __SOCK_H */ diff --git a/include/igloo/socket.h b/include/igloo/socket.h new file mode 100644 index 0000000..08b4e2d --- /dev/null +++ b/include/igloo/socket.h @@ -0,0 +1,320 @@ +/* Copyright (C) 2019 Philipp "ph3-der-loewe" Schafft + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef _LIBIGLOO__SOCKET_H_ +#define _LIBIGLOO__SOCKET_H_ +/** + * @file + * Put a good description of this file here + */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* Put stuff here */ + +#include + +#ifdef IGLOO_CTC_HAVE_SYS_SELECT_H +#include +#endif +#ifdef IGLOO_CTC_HAVE_POLL +#include +#endif + +#include "types.h" +#include "socketaddr.h" + +igloo_RO_FORWARD_TYPE(igloo_socket_t); + +/* Type used for socket shutdown. */ +typedef enum { + /* Do not shut down the socket. */ + igloo_SOCKET_SHUTDOWN_NONE = 0x0, + /* Shut the receiving end down. */ + igloo_SOCKET_SHUTDOWN_RECEIVE = 0x1, + /* Shut the sending end down. */ + igloo_SOCKET_SHUTDOWN_SEND = 0x2, + /* Shut down both ends. */ + igloo_SOCKET_SHUTDOWN_RECEIVESEND = igloo_SOCKET_SHUTDOWN_RECEIVE|igloo_SOCKET_SHUTDOWN_SEND +} igloo_socket_shutdown_t; + +/* Advanced control functions. + */ +typedef enum { + /* No operation. + * Parameters: None. + */ + igloo_SOCKET_CONTROL_NONE = 0, + /* Set no delay options. + * Parameters: None. + */ + igloo_SOCKET_CONTROL_SET_NODELAY, + /* Set send and receive buffers + * Parameters: (size_t)buffersize. + */ + igloo_SOCKET_CONTROL_SET_SEND_BUFFER, + igloo_SOCKET_CONTROL_SET_RECEIVE_BUFFER +} igloo_socket_control_t; + +/* Address operations. */ +typedef enum { + /* Clear the list of addresses for the given endpoint. */ + igloo_SOCKET_ADDRESSOP_CLEAR, + /* Add an address for the given endpoint. */ + igloo_SOCKET_ADDRESSOP_ADD, + /* Remove an address from the given endpoint. */ + igloo_SOCKET_ADDRESSOP_REMOVE, + /* Replace all addresses on an endpoint with the new address. */ + igloo_SOCKET_ADDRESSOP_REPLACE +} igloo_socket_addressop_t; + +/* Endpoints of the socket. + * + * Physical addresses are as seen by the process. + * Logical addresses are addresses as seen by the peer. + * + * E.g. when there is a port forwarding from A:a -> B:b + * the local address is A:a and the phyical address is B:b. + */ +typedef enum { + /* Local address. */ + igloo_SOCKET_ENDPOINT_LOCAL, + /* Local physical address. */ + igloo_SOCKET_ENDPOINT_LOCAL_PHYSICAL, + /* Local logical address. */ + igloo_SOCKET_ENDPOINT_LOCAL_LOGICAL, + /* Peer address. */ + igloo_SOCKET_ENDPOINT_PEER, + /* Peer's physical address. */ + igloo_SOCKET_ENDPOINT_PEER_PHYSICAL, + /* Peer's logical address. */ + igloo_SOCKET_ENDPOINT_PEER_LOGICAL +} igloo_socket_endpoint_t; + +/* Actions sockets can do. */ +typedef enum { + /* No action. */ + igloo_SOCKET_ACTION_NONE = 0, + /* Connecting to the peer. */ + igloo_SOCKET_ACTION_CONNECT, + /* Waiting and accepting new client connections. */ + igloo_SOCKET_ACTION_ACCEPT +} igloo_socket_action_t; + +/* Create a new socket. + * + * Parameters: + * domain, type, protocol + * Domain, Type, and Protocol for the new socket. + * name, associated, instance + * See igloo_ro_new(). + * error + * The error value if the socket can not be created. + */ +igloo_socket_t * igloo_socket_new(igloo_socketaddr_domain_t domain, igloo_socketaddr_type_t type, igloo_socketaddr_protocol_t protocol, const char *name, igloo_ro_t associated, igloo_ro_t instance, igloo_error_t *error); + +/* Create a new socket based on an address. + * + * Parameters: + * endpoint + * The endpoint to set the address for. + * This is normally igloo_SOCKET_ENDPOINT_LOCAL for listen sockets and + * igloo_SOCKET_ENDPOINT_PEER for connectig sockets. + * addr + * The address to be set for the endpoint. + * error + * The error value if the socket can not be created. + */ +igloo_socket_t * igloo_socket_new_simple(igloo_socket_endpoint_t endpoint, igloo_socketaddr_t *addr, igloo_error_t *error); + +/* Alter addresses for the socket. + * + * This can be used to set local and peer addresses for the socket. + * What addresses are supported depends on the domain of the socket. + * + * Parameters: + * sock + * The socket to operate on. + * op + * The operation to perform. See igloo_socket_addressop_t. + * endpoint + * The endpoint to operate on. See igloo_socket_endpoint_t. + * addr + * The address to use for the operation or NULL. + */ +igloo_error_t igloo_socket_alter_address(igloo_socket_t *sock, igloo_socket_addressop_t op, igloo_socket_endpoint_t endpoint, igloo_socketaddr_t *addr); + +/* Get the main address for an endpoint. + * + * This returns the main address for an endpoint. + * It depends on the socket Domain, Type, and Protocol to define what the main address is. + * + * Parameters: + * sock + * The socket to operate on. + * endpoint + * The endpoint to operate on. See igloo_socket_endpoint_t. + * error + * The error in case the address can not be returned. + */ +igloo_socketaddr_t * igloo_socket_get_main_address(igloo_socket_t *sock, igloo_socket_endpoint_t endpoint, igloo_error_t *error); + +/* Get the list of addresses for an endpoint. + * + * This returns the list of all known addresses for the given endpoint. + * + * Parameters: + * sock + * The socket to operate on. + * endpoint + * The endpoint to operate on. See igloo_socket_endpoint_t. + * error + * The error in case the address can not be returned. + */ +igloo_list_t * igloo_socket_get_address(igloo_socket_t *sock, igloo_socket_endpoint_t endpoint, igloo_error_t *error); + +/* Connect the socket. + * + * This lets the socket connect to the peer. The operation is blocking. + * If you want to connect non-blocking use igloo_socket_nonblocking() with igloo_SOCKET_ACTION_CONNECT. + * + * Parameters: + * sock + * The socket to operate on. + */ +igloo_error_t igloo_socket_connect(igloo_socket_t *sock); + +/* This sets the socket into the listening state. + * + * Parameters: + * sock + * The socket to operate on. + * backlog + * The backlog for the listen queue or -1 for default. + */ +igloo_error_t igloo_socket_listen(igloo_socket_t *sock, ssize_t backlog); + +/* Shuts the socket down. + * + * This allows shuting a socket down. This can be useful e.g. to signal EOF + * to the peer once all writing has been done. + * + * Parameters: + * sock + * The socket to operate on. + * how + * How the socket is shut down. See igloo_socket_shutdown_t. + */ +igloo_error_t igloo_socket_shutdown(igloo_socket_t *sock, igloo_socket_shutdown_t how); + +/* Accept a client on a listening socket. + * + * This accepts a client on a listening connection. + * This can be called on blocking sockets or after using igloo_socket_nonblocking() with + * igloo_SOCKET_ACTION_ACCEPT to fetch a client from the queue. + * + * Parameters: + * sock + * The socket to operate on. + * name, associated + * See igloo_ro_new(). + * error + * The error if no client can be accepted. + */ +igloo_socket_t * igloo_socket_accept(igloo_socket_t *sock, const char *name, igloo_ro_t associated, igloo_error_t *error); + +/* Advanced socket control. + * + * Parameters: + * sock + * The socket to operate on. + * control + * The control to use. See igloo_socket_control_t. + * ... + * The parameters for the specific control if any. + */ +igloo_error_t igloo_socket_control(igloo_socket_t *sock, igloo_socket_control_t control, ...); + +/* Request an socket action to be done in non-blocking mode. + * + * Parameters: + * sock + * The socket to operate on. + * action + * The action to be done. + * igloo_SOCKET_ACTION_NONE leaves the non-blocking mode. + * igloo_SOCKET_ACTION_CONNECT requests connect. + * igloo_socket_connect() must not be called. After this action the socket is set back into blocking mode. + * igloo_SOCKET_ACTION_ACCEPT requests accepts. + * igloo_socket_accept() must be called to fetch each client connection. + */ +igloo_error_t igloo_socket_nonblocking(igloo_socket_t *sock, igloo_socket_action_t action); +#ifdef IGLOO_CTC_HAVE_SYS_SELECT_H +/* Uses select() for non-blocking operations. + * + * This set of functions is used to fill sets for select(). + * + * The basic idea is: + * if ((error = igloo_socket_nonblocking_select_set(sock, &readfds, &writefds, &exceptfds, &maxfd)) != igloo_ERROR_NONE) + * return error; + * select(maxfd + 1, &readfds, &writefds, &exceptfds, &timeout); + * error = igloo_socket_nonblocking_select_result(sock, &readfds, &writefds, &exceptfds); + * if (error == igloo_ERROR_NONE) { + * success...; + * } else if (error == igloo_ERROR_AGAIN) { + * timeout...; + * } else { + * return error; + * } + * + * igloo_socket_nonblocking_select_clear() can be used to clear the socket from the sets in case the sets will be reused without the socket. + */ +igloo_error_t igloo_socket_nonblocking_select_set(igloo_socket_t *sock, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, int *maxfd); +igloo_error_t igloo_socket_nonblocking_select_clear(igloo_socket_t *sock, fd_set *readfds, fd_set *writefds, fd_set *exceptfds); +igloo_error_t igloo_socket_nonblocking_select_result(igloo_socket_t *sock, fd_set *readfds, fd_set *writefds, fd_set *exceptfds); +#endif +#ifdef IGLOO_CTC_HAVE_POLL +/* Uses poll() for non-blocking operations. + * + * This set is used to fill the structure for poll(). + * + * The basic idea is: + * struct pollfd fd[n]; + * if ((error = igloo_socket_nonblocking_poll_fill(sock, &(fd[m]))) != igloo_ERROR_NONE) + * return error; + * poll(fd, n, timeout); + * error = igloo_socket_nonblocking_poll_result(sock, &(fd[m])); + * if (error == igloo_ERROR_NONE) { + * success...; + * } else if (error == igloo_ERROR_AGAIN) { + * timeout...; + * } else { + * return error; + * } + */ +igloo_error_t igloo_socket_nonblocking_poll_fill(igloo_socket_t *sock, struct pollfd *fd); +igloo_error_t igloo_socket_nonblocking_poll_result(igloo_socket_t *sock, struct pollfd *fd); +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* ! _LIBIGLOO__SOCKET_H_ */ diff --git a/include/igloo/socketaddr.h b/include/igloo/socketaddr.h new file mode 100644 index 0000000..90a3edf --- /dev/null +++ b/include/igloo/socketaddr.h @@ -0,0 +1,188 @@ +/* Copyright (C) 2019 Philipp "ph3-der-loewe" Schafft + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef _LIBIGLOO__SOCKETADDR_H_ +#define _LIBIGLOO__SOCKETADDR_H_ +/** + * @file + * Put a good description of this file here + */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* Put stuff here */ + +/* About thread safety: + * This set of functions is not thread safe. + */ + +#include + +#include "types.h" + + +igloo_RO_FORWARD_TYPE(igloo_socketaddr_t); + +/* Domain of sockets */ +typedef enum { + /* Special value used for unspecified or not jet known domain. */ + igloo_SOCKETADDR_DOMAIN_UNSPEC = 0, + /* Unix Domain Sockets, AKA AF_UNIX */ + igloo_SOCKETADDR_DOMAIN_UNIX, + /* IPv4 Sockets, AKA AF_INET */ + igloo_SOCKETADDR_DOMAIN_INET4, + /* IPv6 Sockets, AKA AF_INET6 */ + igloo_SOCKETADDR_DOMAIN_INET6 +} igloo_socketaddr_domain_t; + +/* Socket type */ +typedef enum { + /* Special value used for unspecified or not jet known type. */ + igloo_SOCKETADDR_TYPE_UNSPEC = 0, + /* Stream sockets */ + igloo_SOCKETADDR_TYPE_STREAM, + /* Datagram sockets */ + igloo_SOCKETADDR_TYPE_DGRAM, + /* Sequenced and reliable datagram sockets */ + igloo_SOCKETADDR_TYPE_SEQPACK, + /* Reliable datagram sockets */ + igloo_SOCKETADDR_TYPE_RDM +} igloo_socketaddr_type_t; + +/* Specific socket protocol */ +typedef enum { + /* Special value used for unspecified or not jet known protocol. */ + igloo_SOCKETADDR_PROTOCOL_UNSPEC = 0, + /* Transmission Control Protocol */ + igloo_SOCKETADDR_PROTOCOL_TCP, + /* User Datagram Protocol */ + igloo_SOCKETADDR_PROTOCOL_UDP, + /* Datagram Congestion Control Protocol */ + igloo_SOCKETADDR_PROTOCOL_DCCP, + /* Stream Control Transmission Protocol */ + igloo_SOCKETADDR_PROTOCOL_SCTP, + /* Lightweight User Datagram Protocol */ + igloo_SOCKETADDR_PROTOCOL_UDPLITE +} igloo_socketaddr_protocol_t; + +/* This set of functions convert Domain, Type, and Protocol representations between enum and string values. + * + * Those functions are very helpful for parsing and writing config files, and for debug and log output. + */ +igloo_error_t igloo_socketaddr_domain2str(const char **str, igloo_socketaddr_domain_t domain); +igloo_error_t igloo_socketaddr_str2domain(igloo_socketaddr_domain_t *domain, const char *str); +igloo_error_t igloo_socketaddr_type2str(const char **str, igloo_socketaddr_type_t type); +igloo_error_t igloo_socketaddr_str2type(igloo_socketaddr_type_t *type, const char *str); +igloo_error_t igloo_socketaddr_protocol2str(const char **str, igloo_socketaddr_protocol_t protocol); +igloo_error_t igloo_socketaddr_str2protocol(igloo_socketaddr_protocol_t *protocol, const char *str); + +/* This creates a new address object. + * Parameters: + * name, associated, instance + * See igloo_ro_new(). + * domain, type, protocol + * Domain, Type, and Protocol for the new address. Can be igloo_SOCKETADDR_*_UNSPEC. + */ +igloo_socketaddr_t * igloo_socketaddr_new(igloo_socketaddr_domain_t domain, igloo_socketaddr_type_t type, igloo_socketaddr_protocol_t protocol, const char *name, igloo_ro_t associated, igloo_ro_t instance, igloo_error_t *error); + +/* Gets base information on the address. + * Parameters: + * addr + * The address to operate on. + * domain, type, protocol + * The address' Domain, Type, and Protocol. + */ +igloo_error_t igloo_socketaddr_get_base(igloo_socketaddr_t *addr, igloo_socketaddr_domain_t *domain, igloo_socketaddr_type_t *type, igloo_socketaddr_protocol_t *protocol); + +/* Get or set the address' node value. + * + * The Node is a protocol dependent representation of a node on the network. + * This might be a nodename or hostname, an IP address, a MAC address or anything else + * that identifies the node. + * + * Parameters: + * addr + * The address to operate on. + * node + * The node value to set or get. + */ + +igloo_error_t igloo_socketaddr_set_node(igloo_socketaddr_t *addr, const char *node); +igloo_error_t igloo_socketaddr_get_node(igloo_socketaddr_t *addr, const char **node); +/* Get the IP address of the address + * + * This gets the currently used IP address for the address if any. + * The IP address can not be set directly. Use igloo_socketaddr_set_node() to set the node. + * + * See also igloo_socketaddr_set_node(). + * + * addr + * The address to operate on. + * ip + * The ip address used in the address. + */ +igloo_error_t igloo_socketaddr_get_ip (igloo_socketaddr_t *addr, const char **ip); + +/* Get or set the addresse' port number. + * + * This sets or get the port number for addresses of domains that use ports. + * + * See also igloo_socketaddr_set_service(). + * + * Parameters: + * addr + * The address to operate on. + * port + * The port value to set or get. + */ +igloo_error_t igloo_socketaddr_set_port(igloo_socketaddr_t *addr, uint16_t port); +igloo_error_t igloo_socketaddr_get_port(igloo_socketaddr_t *addr, uint16_t *port); + +/* Set the service to use for the address. + * + * For port based domains this takes the port name or number as a string. + * This is very useful for parsing user input. + * + * Parameters: + * addr + * The address to operate on. + * service + * The service to set. + */ +igloo_error_t igloo_socketaddr_set_service(igloo_socketaddr_t *addr, const char *service); + +/* Get or set the addresse' path. + * + * This sets or get the path for addresses of domains that use paths. + * + * Parameters: + * addr + * The address to operate on. + * path + * The path value to set or get. + */ +igloo_error_t igloo_socketaddr_set_path(igloo_socketaddr_t *addr, const char *path); +igloo_error_t igloo_socketaddr_get_path(igloo_socketaddr_t *addr, const char **path); + +#ifdef __cplusplus +} +#endif + +#endif /* ! _LIBIGLOO__SOCKETADDR_H_ */ diff --git a/include/igloo/types.h b/include/igloo/types.h index 9ab0dc6..88675f6 100644 --- a/include/igloo/types.h +++ b/include/igloo/types.h @@ -40,6 +40,8 @@ extern "C" { #include "typedef.h" typedef struct igloo_io_tag igloo_io_t; +typedef struct igloo_socket_tag igloo_socket_t; +typedef struct igloo_socketaddr_tag igloo_socketaddr_t; typedef struct igloo_filter_tag igloo_filter_t; typedef struct igloo_objecthandler_tag igloo_objecthandler_t; typedef struct igloo_logmsg_tag igloo_logmsg_t; @@ -70,6 +72,8 @@ typedef union __attribute__ ((__transparent_union__)) { /* Those are libigloo's own types */ igloo_RO_TYPE(igloo_ro_base_t) igloo_RO_TYPE(igloo_io_t) + igloo_RO_TYPE(igloo_socket_t) + igloo_RO_TYPE(igloo_socketaddr_t) igloo_RO_TYPE(igloo_filter_t) igloo_RO_TYPE(igloo_objecthandler_t) igloo_RO_TYPE(igloo_logmsg_t) diff --git a/net/BUILDING b/net/BUILDING deleted file mode 100644 index b63563a..0000000 --- a/net/BUILDING +++ /dev/null @@ -1,3 +0,0 @@ -defines that affect compilation - -none currently diff --git a/net/COPYING b/net/COPYING deleted file mode 100644 index 92b8903..0000000 --- a/net/COPYING +++ /dev/null @@ -1,481 +0,0 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/net/Makefile.am b/net/Makefile.am deleted file mode 100644 index e39957d..0000000 --- a/net/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -## Process this with automake to create Makefile.in - -AUTOMAKE_OPTIONS = foreign - -EXTRA_DIST = BUILDING COPYING README TODO test_resolver.c - -noinst_LTLIBRARIES = libicenet.la - -libicenet_la_SOURCES = sock.c resolver.c - -AM_CFLAGS = -I$(top_srcdir)/include - -debug: - $(MAKE) all CFLAGS="@DEBUG@" - -profile: - $(MAKE) all CFLAGS="@PROFILE@ - diff --git a/net/README b/net/README deleted file mode 100644 index d0d2d00..0000000 --- a/net/README +++ /dev/null @@ -1,10 +0,0 @@ -This is a name resolving library that's threadsafe. - -Right now it only implements this with mutexes, but we should extend it to use gethostbyXXXX_r() -if it's available. - -It shoudl work on win32, but i'm probably forgetting a headerfile. - -API is basically not going to change. Please consult with the rest of the team before changing the interface. - -jack. \ No newline at end of file diff --git a/net/TODO b/net/TODO deleted file mode 100644 index 3357459..0000000 --- a/net/TODO +++ /dev/null @@ -1 +0,0 @@ -- add getXbyY_r function support diff --git a/net/resolver.c b/net/resolver.c deleted file mode 100644 index c0cd45f..0000000 --- a/net/resolver.c +++ /dev/null @@ -1,166 +0,0 @@ -/* - * resolver.c - name resolver library - * - * Copyright (C) 2014 Michael Smith , - * Brendan Cully , - * Karl Heyes , - * Jack Moffitt , - * Copyright (C) 2012-2018 Philipp "ph3-der-loewe" Schafft - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - */ -#ifdef HAVE_CONFIG_H - #include -#endif - -#include -#include -#include -#include - -#ifndef _WIN32 -#include -#include -#include -#include -#else -#include -#endif - -#include - -#include -#include - -/* internal function */ - -static int _isip(const char *what); - -/* internal data */ - -static igloo_mutex_t igloo__resolver_mutex; -static int igloo__initialized = 0; - -#ifdef HAVE_INET_PTON -static int _isip(const char *what) -{ - union { - struct in_addr v4addr; - struct in6_addr v6addr; - } addr_u; - - if (inet_pton(AF_INET, what, &addr_u.v4addr) <= 0) - return inet_pton(AF_INET6, what, &addr_u.v6addr) > 0 ? 1 : 0; - - return 1; -} - -#else -static int _isip(const char *what) -{ - struct in_addr inp; - - return inet_aton(what, &inp); -} -#endif - - -#if defined (HAVE_GETNAMEINFO) && defined (HAVE_GETADDRINFO) -char *igloo_resolver_getip(const char *name, char *buff, int len) -{ - struct addrinfo *head, hints; - char *ret = NULL; - - if (_isip(name)) { - strncpy(buff, name, len); - buff [len-1] = '\0'; - return buff; - } - - memset (&hints, 0, sizeof (hints)); - hints . ai_family = AF_UNSPEC; - hints . ai_socktype = SOCK_STREAM; - if (getaddrinfo (name, NULL, &hints, &head)) - return NULL; - - if (head) - { - if (getnameinfo(head->ai_addr, head->ai_addrlen, buff, len, NULL, - 0, NI_NUMERICHOST) == 0) - ret = buff; - freeaddrinfo (head); - } - - return ret; -} - -#else - -char *igloo_resolver_getip(const char *name, char *buff, int len) -{ - struct hostent *host; - char *ret = NULL; - - if (_isip(name)) - { - strncpy(buff, name, len); - buff [len-1] = '\0'; - return buff; - } - igloo_thread_mutex_lock(&igloo__resolver_mutex); - host = gethostbyname(name); - if (host) - { - char * temp = inet_ntoa(*(struct in_addr *)host->h_addr); - ret = strncpy(buff, temp, len); - buff [len-1] = '\0'; - } - igloo_thread_mutex_unlock(&igloo__resolver_mutex); - - return ret; -} -#endif - - -void igloo_resolver_initialize() -{ - /* initialize the lib if we havne't done so already */ - - if (!igloo__initialized) - { - igloo__initialized = 1; - igloo_thread_mutex_create (&igloo__resolver_mutex); - - /* keep dns connects (TCP) open */ -#ifdef HAVE_SETHOSTENT - sethostent(1); -#endif - } -} - -void igloo_resolver_shutdown(void) -{ - if (igloo__initialized) - { - igloo_thread_mutex_destroy(&igloo__resolver_mutex); - igloo__initialized = 0; -#ifdef HAVE_ENDHOSTENT - endhostent(); -#endif - } -} - diff --git a/net/sock.c b/net/sock.c deleted file mode 100644 index 164f283..0000000 --- a/net/sock.c +++ /dev/null @@ -1,870 +0,0 @@ -/* -*- c-basic-offset: 4; -*- */ -/* sock.c: General Socket Functions - * - * Copyright (C) 2014 Michael Smith , - * Brendan Cully , - * Karl Heyes , - * Jack Moffitt , - * Ed "oddsock" Zaleski , - * Copyright (C) 2012-2018 Philipp "ph3-der-loewe" Schafft - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - */ - -#ifdef HAVE_CONFIG_H - #include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef HAVE_POLL -#include -#endif -#ifdef HAVE_SYS_SELECT_H -#include -#endif - -#ifndef _WIN32 -#include -#include -#include -#include -#include -#include -#include -#else -#include -#endif - -#include -#include -#include "../src/private.h" - -/* for older C libraries */ -#ifndef AI_NUMERICSERV -# define AI_NUMERICSERV 0 -#endif -#ifndef AI_ADDRCONFIG -# define AI_ADDRCONFIG 0 -#endif - -/* igloo_sock_initialize -** -** initializes the socket library. you must call this -** before using the library! -*/ -void igloo_sock_initialize(void) -{ -#ifdef _WIN32 - WSADATA wsad; - WSAStartup(0x0101, &wsad); -#endif - - igloo_resolver_initialize(); -} - -/* igloo_sock_shutdown -** -** shutdown the socket library. remember to call this when you're -** through using the lib -*/ -void igloo_sock_shutdown(void) -{ -#ifdef _WIN32 - WSACleanup(); -#endif - - igloo_resolver_shutdown(); -} - -/* igloo_sock_error -** -** returns the last socket error -*/ -int igloo_sock_error(void) -{ -#ifdef _WIN32 - return WSAGetLastError(); -#else - return errno; -#endif -} - -static void igloo_sock_set_error(int val) -{ -#ifdef _WIN32 - WSASetLastError (val); -#else - errno = val; -#endif -} - -/* igloo_sock_recoverable -** -** determines if the socket error is recoverable -** in terms of non blocking sockets -*/ -int igloo_sock_recoverable(int error) -{ - switch (error) - { - case 0: - case EAGAIN: - case EINTR: - case EINPROGRESS: -#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN - case EWOULDBLOCK: -#endif -#if defined (WSAEWOULDBLOCK) && WSAEWOULDBLOCK != EWOULDBLOCK - case WSAEWOULDBLOCK: -#endif -#if defined (WSAEINPROGRESS) && WSAEINPROGRESS != EINPROGRESS - case WSAEINPROGRESS: -#endif -#ifdef ERESTART - case ERESTART: -#endif - return 1; - default: - return 0; - } -} - - -static int sock_connect_pending (int error) -{ - return error == EINPROGRESS || error == EALREADY; -} - -/* igloo_sock_valid_socket -** -** determines if a igloo_sock_t represents a valid socket -*/ -static int igloo_sock_valid_socket(igloo_sock_t sock) -{ - int ret; - int optval; - socklen_t optlen; - - optlen = sizeof(int); - /* apparently on windows getsockopt.optval is a char * */ - ret = getsockopt(sock, SOL_SOCKET, SO_TYPE, (void*) &optval, &optlen); - - return (ret == 0); -} - - -/* determines if the passed socket is still connected */ -int igloo_sock_active (igloo_sock_t sock) -{ - char c; - int l; - - l = recv (sock, &c, 1, MSG_PEEK); - if (l == 0) - return 0; - if (l == igloo_SOCK_ERROR && igloo_sock_recoverable (igloo_sock_error())) - return 1; - return 0; -} - -/* inet_aton -** -** turns an ascii ip address into a binary representation -*/ -#ifdef _WIN32 -int inet_aton(const char *s, struct in_addr *a) -{ - int lsb, b2, b3, msb; - - if (sscanf(s, "%d.%d.%d.%d", &lsb, &b2, &b3, &msb) < 4) { - return 0; - } - - a->s_addr = inet_addr(s); - - return (a->s_addr != INADDR_NONE); -} -#endif /* _WIN32 */ - -/* igloo_sock_set_blocking - * - * set the sock blocking or nonblocking - * 1 for blocking - * 0 for nonblocking - */ -int igloo_sock_set_blocking(igloo_sock_t sock, int block) -{ -#ifdef _WIN32 -#ifdef __MINGW32__ - u_long varblock = 1; -#else - int varblock = 1; -#endif -#endif - - if ((!igloo_sock_valid_socket(sock)) || (block < 0) || (block > 1)) - return igloo_SOCK_ERROR; - -#ifdef _WIN32 - if (block) varblock = 0; - return ioctlsocket(sock, FIONBIO, &varblock); -#else - return fcntl(sock, F_SETFL, (block) ? 0 : O_NONBLOCK); -#endif -} - -static int igloo_sock_set_nolinger(igloo_sock_t sock) -{ - struct linger lin = { 0, 0 }; - return setsockopt(sock, SOL_SOCKET, SO_LINGER, (void *)&lin, - sizeof(struct linger)); -} - -int igloo_sock_set_nodelay(igloo_sock_t sock) -{ - int nodelay = 1; - - return setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (void *)&nodelay, - sizeof(int)); -} - -static int igloo_sock_set_keepalive(igloo_sock_t sock) -{ - int keepalive = 1; - return setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (void *)&keepalive, - sizeof(int)); -} - -/* igloo_sock_close -** -** close the socket -*/ -int igloo_sock_close(igloo_sock_t sock) -{ -#ifdef _WIN32 - return closesocket(sock); -#else - return close(sock); -#endif -} - -/* igloo_sock_write_bytes -** -** write bytes to the socket -** this function will _NOT_ block -*/ -int igloo_sock_write_bytes(igloo_sock_t sock, const void *buff, size_t len) -{ - /* sanity check */ - if (!buff) { - return igloo_SOCK_ERROR; - } else if (len <= 0) { - return igloo_SOCK_ERROR; - } /*else if (!igloo_sock_valid_socket(sock)) { - return igloo_SOCK_ERROR; - } */ - - return send(sock, buff, len, 0); -} - -/* igloo_sock_write -** -** write a formatted string to the socket -** this function must only be called with a blocking socket. -** will truncate the string if it's greater than 1024 chars. -*/ -int igloo_sock_write(igloo_sock_t sock, const char *fmt, ...) -{ - int rc; - va_list ap; - - va_start (ap, fmt); - rc = igloo_sock_write_fmt (sock, fmt, ap); - va_end (ap); - - return rc; -} - -#ifdef HAVE_OLD_VSNPRINTF -int igloo_sock_write_fmt(igloo_sock_t sock, const char *fmt, va_list ap) -{ - va_list ap_local; - unsigned int len = 1024; - char *buff = NULL; - int ret; - - /* don't go infinite, but stop at some huge limit */ - while (len < 2*1024*1024) - { - char *tmp = realloc (buff, len); - ret = -1; - if (tmp == NULL) - break; - buff = tmp; - va_copy (ap_local, ap); - ret = vsnprintf (buff, len, fmt, ap_local); - if (ret > 0) - { - ret = igloo_sock_write_bytes (sock, buff, ret); - break; - } - len += 8192; - } - free (buff); - return ret; -} -#else -int igloo_sock_write_fmt(igloo_sock_t sock, const char *fmt, va_list ap) -{ - char buffer [1024], *buff = buffer; - int len; - int rc = igloo_SOCK_ERROR; - va_list ap_retry; - - va_copy (ap_retry, ap); - - len = vsnprintf (buff, sizeof (buffer), fmt, ap); - - if (len > 0) - { - if ((size_t)len < sizeof (buffer)) /* common case */ - rc = igloo_sock_write_bytes(sock, buff, (size_t)len); - else - { - /* truncated */ - buff = malloc (++len); - if (buff) - { - len = vsnprintf (buff, len, fmt, ap_retry); - if (len > 0) - rc = igloo_sock_write_bytes (sock, buff, len); - free (buff); - } - } - } - va_end (ap_retry); - - return rc; -} -#endif - - -int igloo_sock_read_bytes(igloo_sock_t sock, char *buff, size_t len) -{ - - /*if (!igloo_sock_valid_socket(sock)) return 0; */ - if (!buff) return 0; - if (len <= 0) return 0; - - return recv(sock, buff, len, 0); -} - -/* igloo_sock_read_line -** -** Read one line of at max len bytes from sock into buff. -** If ok, return 1 and nullterminate buff. Otherwize return 0. -** Terminating \n is not put into the buffer. -** -** this function will probably not work on sockets in nonblocking mode -*/ -int igloo_sock_read_line(igloo_sock_t sock, char *buff, const int len) -{ - char c = '\0'; - int read_bytes, pos; - - /*if (!igloo_sock_valid_socket(sock)) { - return 0; - } else*/ if (!buff) { - return 0; - } else if (len <= 0) { - return 0; - } - - pos = 0; - read_bytes = recv(sock, &c, 1, 0); - - if (read_bytes < 0) { - return 0; - } - - while ((c != '\n') && (pos < len) && (read_bytes == 1)) { - if (c != '\r') - buff[pos++] = c; - read_bytes = recv(sock, &c, 1, 0); - } - - if (read_bytes == 1) { - buff[pos] = '\0'; - return 1; - } else { - return 0; - } -} - -/* see if a connection has been established. If timeout is < 0 then wait - * indefinitely, else wait for the stated number of seconds. - * return igloo_SOCK_TIMEOUT for timeout - * return igloo_SOCK_ERROR for failure - * return 0 for try again, interrupted - * return 1 for ok - */ -#ifdef HAVE_POLL -int igloo_sock_connected (igloo_sock_t sock, int timeout) -{ - struct pollfd check; - int val = igloo_SOCK_ERROR; - socklen_t size = sizeof val; - - check.fd = sock; - check.events = POLLOUT; - switch (poll (&check, 1, timeout*1000)) - { - case 0: return igloo_SOCK_TIMEOUT; - default: - /* on windows getsockopt.val is defined as char* */ - if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (void*) &val, &size) == 0) - { - if (val == 0) - return 1; - igloo_sock_set_error (val); - } - /* fall through */ - case -1: - if (igloo_sock_recoverable (igloo_sock_error())) - return 0; - return igloo_SOCK_ERROR; - } -} - -#else - -int igloo_sock_connected (igloo_sock_t sock, int timeout) -{ - fd_set wfds; - int val = igloo_SOCK_ERROR; - socklen_t size = sizeof val; - struct timeval tv, *timeval = NULL; - - /* make a timeout of <0 be indefinite */ - if (timeout >= 0) - { - tv.tv_sec = timeout; - tv.tv_usec = 0; - timeval = &tv; - } - - FD_ZERO(&wfds); - FD_SET(sock, &wfds); - - switch (select(sock + 1, NULL, &wfds, NULL, timeval)) - { - case 0: - return igloo_SOCK_TIMEOUT; - default: - /* on windows getsockopt.val is defined as char* */ - if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (void*) &val, &size) == 0) - { - if (val == 0) - return 1; - igloo_sock_set_error (val); - } - /* fall through */ - case -1: - if (igloo_sock_recoverable (igloo_sock_error())) - return 0; - return igloo_SOCK_ERROR; - } -} -#endif - -igloo_sock_t igloo_sock_connect_wto (const char *hostname, int port, int timeout) -{ - return igloo_sock_connect_wto_bind(hostname, port, NULL, timeout); -} - -#ifdef HAVE_GETADDRINFO - -igloo_sock_t igloo_sock_connect_non_blocking (const char *hostname, unsigned port) -{ - int sock = igloo_SOCK_ERROR; - struct addrinfo *ai, *head, hints; - char service[8]; - - memset (&hints, 0, sizeof (hints)); - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - - snprintf (service, sizeof (service), "%u", port); - - if (getaddrinfo (hostname, service, &hints, &head)) - return igloo_SOCK_ERROR; - - ai = head; - while (ai) - { - if ((sock = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol)) - > -1) - { - igloo_sock_set_blocking (sock, 0); - if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0 && - !sock_connect_pending(igloo_sock_error())) - { - igloo_sock_close (sock); - sock = igloo_SOCK_ERROR; - } - else - break; - } - ai = ai->ai_next; - } - if (head) freeaddrinfo (head); - - return sock; -} - -/* issue a connect, but return after the timeout (seconds) is reached. If - * timeout is 0 or less then we will wait until the OS gives up on the connect - * The socket is returned - */ -igloo_sock_t igloo_sock_connect_wto_bind (const char *hostname, int port, const char *bnd, int timeout) -{ - igloo_sock_t sock = igloo_SOCK_ERROR; - struct addrinfo *ai, *head, *b_head=NULL, hints; - char service[8]; - - memset (&hints, 0, sizeof (hints)); - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - snprintf (service, sizeof (service), "%u", port); - - if (getaddrinfo (hostname, service, &hints, &head)) - return igloo_SOCK_ERROR; - - ai = head; - while (ai) - { - if ((sock = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol)) >= 0) - { - if (timeout > 0) - igloo_sock_set_blocking (sock, 0); - - if (bnd) - { - struct addrinfo b_hints; - memset (&b_hints, 0, sizeof(b_hints)); - b_hints.ai_family = ai->ai_family; - b_hints.ai_socktype = ai->ai_socktype; - b_hints.ai_protocol = ai->ai_protocol; - if (getaddrinfo (bnd, NULL, &b_hints, &b_head) || - bind (sock, b_head->ai_addr, b_head->ai_addrlen) < 0) - { - igloo_sock_close (sock); - sock = igloo_SOCK_ERROR; - break; - } - } - - if (connect (sock, ai->ai_addr, ai->ai_addrlen) == 0) - break; - - /* loop as the connect maybe async */ - while (sock != igloo_SOCK_ERROR) - { - if (igloo_sock_recoverable (igloo_sock_error())) - { - int connected = igloo_sock_connected (sock, timeout); - if (connected == 0) /* try again, interrupted */ - continue; - if (connected == 1) /* connected */ - { - if (timeout >= 0) - igloo_sock_set_blocking(sock, 1); - break; - } - } - igloo_sock_close (sock); - sock = igloo_SOCK_ERROR; - } - if (sock != igloo_SOCK_ERROR) - break; - } - ai = ai->ai_next; - } - if (b_head) - freeaddrinfo (b_head); - freeaddrinfo (head); - - return sock; -} - - -igloo_sock_t igloo_sock_get_server_socket (int port, const char *sinterface) -{ - struct sockaddr_storage sa; - struct addrinfo hints, *res, *ai; - char service [10]; - int sock; - - if (port < 0) - return igloo_SOCK_ERROR; - - memset (&sa, 0, sizeof(sa)); - memset (&hints, 0, sizeof(hints)); - - hints.ai_family = AF_UNSPEC; - hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG | AI_NUMERICSERV | AI_NUMERICHOST; - hints.ai_socktype = SOCK_STREAM; - snprintf (service, sizeof (service), "%d", port); - - if (getaddrinfo (sinterface, service, &hints, &res)) - return igloo_SOCK_ERROR; - ai = res; - do - { - int on = 1; - sock = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol); - if (sock < 0) - continue; - - setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, (const void *)&on, sizeof(on)); - on = 0; -#ifdef IPV6_V6ONLY - setsockopt (sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof on); -#endif - - if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) - { - igloo_sock_close (sock); - continue; - } - freeaddrinfo (res); - return sock; - - } while ((ai = ai->ai_next)); - - freeaddrinfo (res); - return igloo_SOCK_ERROR; -} - - -#else - - -int sock_try_connection (igloo_sock_t sock, const char *hostname, unsigned int port) -{ - struct sockaddr_in sin, server; - char ip[MAX_ADDR_LEN]; - - if (!hostname || !hostname[0] || port == 0) - return -1; - - memset(&sin, 0, sizeof(struct sockaddr_in)); - memset(&server, 0, sizeof(struct sockaddr_in)); - - if (!igloo_resolver_getip(hostname, ip, MAX_ADDR_LEN)) - { - igloo_sock_close (sock); - return -1; - } - - if (inet_aton(ip, (struct in_addr *)&sin.sin_addr) == 0) - { - igloo_sock_close(sock); - return -1; - } - - memcpy(&server.sin_addr, &sin.sin_addr, sizeof(struct sockaddr_in)); - - server.sin_family = AF_INET; - server.sin_port = htons((short)port); - - return connect(sock, (struct sockaddr *)&server, sizeof(server)); -} - -igloo_sock_t igloo_sock_connect_non_blocking (const char *hostname, unsigned port) -{ - igloo_sock_t sock; - - sock = socket(AF_INET, SOCK_STREAM, 0); - if (sock == igloo_SOCK_ERROR) - return igloo_SOCK_ERROR; - - igloo_sock_set_blocking (sock, 0); - sock_try_connection (sock, hostname, port); - - return sock; -} - -igloo_sock_t igloo_sock_connect_wto_bind (const char *hostname, int port, const char *bnd, int timeout) -{ - igloo_sock_t sock; - - sock = socket(AF_INET, SOCK_STREAM, 0); - if (sock == igloo_SOCK_ERROR) - return igloo_SOCK_ERROR; - - if (bnd) - { - struct sockaddr_in sa; - - memset(&sa, 0, sizeof(sa)); - sa.sin_family = AF_INET; - - if (inet_aton (bnd, &sa.sin_addr) == 0 || - bind (sock, (struct sockaddr *)&sa, sizeof(sa)) < 0) - { - igloo_sock_close (sock); - return igloo_SOCK_ERROR; - } - } - - if (timeout) - { - igloo_sock_set_blocking (sock, 0); - if (sock_try_connection (sock, hostname, port) < 0) - { - int ret = igloo_sock_connected (sock, timeout); - if (ret <= 0) - { - igloo_sock_close (sock); - return igloo_SOCK_ERROR; - } - } - igloo_sock_set_blocking(sock, 1); - } - else - { - if (sock_try_connection (sock, hostname, port) < 0) - { - igloo_sock_close (sock); - sock = igloo_SOCK_ERROR; - } - } - return sock; -} - - -/* igloo_sock_get_server_socket -** -** create a socket for incoming requests on a specified port and -** interface. if interface is null, listen on all interfaces. -** returns the socket, or igloo_SOCK_ERROR on failure -*/ -igloo_sock_t igloo_sock_get_server_socket(int port, const char *sinterface) -{ - struct sockaddr_in sa; - int error, opt; - igloo_sock_t sock; - char ip[MAX_ADDR_LEN]; - - if (port < 0) - return igloo_SOCK_ERROR; - - /* defaults */ - memset(&sa, 0, sizeof(sa)); - - /* set the interface to bind to if specified */ - if (sinterface != NULL) { - if (!igloo_resolver_getip(sinterface, ip, sizeof (ip))) - return igloo_SOCK_ERROR; - - if (!inet_aton(ip, &sa.sin_addr)) { - return igloo_SOCK_ERROR; - } else { - sa.sin_family = AF_INET; - sa.sin_port = htons((short)port); - } - } else { - sa.sin_addr.s_addr = INADDR_ANY; - sa.sin_family = AF_INET; - sa.sin_port = htons((short)port); - } - - /* get a socket */ - sock = socket (AF_INET, SOCK_STREAM, 0); - if (sock == -1) - return igloo_SOCK_ERROR; - - /* reuse it if we can */ - opt = 1; - setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const void *)&opt, sizeof(int)); - - /* bind socket to port */ - error = bind(sock, (struct sockaddr *)&sa, sizeof (struct sockaddr_in)); - if (error == -1) - return igloo_SOCK_ERROR; - - return sock; -} - -#endif - -void igloo_sock_set_send_buffer (igloo_sock_t sock, int win_size) -{ - setsockopt (sock, SOL_SOCKET, SO_SNDBUF, (char *) &win_size, sizeof(win_size)); -} - -int igloo_sock_listen(igloo_sock_t serversock, int backlog) -{ - if (!igloo_sock_valid_socket(serversock)) - return 0; - - if (backlog <= 0) - backlog = 10; - - return (listen(serversock, backlog) == 0); -} - -igloo_sock_t igloo_sock_accept(igloo_sock_t serversock, char *ip, size_t len) -{ -#ifdef HAVE_GETNAMEINFO - struct sockaddr_storage sa; -#else - struct sockaddr_in sa; -#endif - igloo_sock_t ret; - socklen_t slen; - - if (ip == NULL || len == 0 || !igloo_sock_valid_socket(serversock)) - return igloo_SOCK_ERROR; - - slen = sizeof(sa); - ret = accept(serversock, (struct sockaddr *)&sa, &slen); - - if (ret != igloo_SOCK_ERROR) - { -#ifdef HAVE_GETNAMEINFO - if (getnameinfo ((struct sockaddr *)&sa, slen, ip, len, NULL, 0, NI_NUMERICHOST)) - snprintf (ip, len, "unknown"); -#else - /* inet_ntoa is not reentrant, we should protect this */ - strncpy(ip, inet_ntoa(sa.sin_addr), len); -#endif - igloo_sock_set_nolinger(ret); - igloo_sock_set_keepalive(ret); - } - - return ret; -} - diff --git a/net/test_resolver.c b/net/test_resolver.c deleted file mode 100644 index 3a43fa7..0000000 --- a/net/test_resolver.c +++ /dev/null @@ -1,17 +0,0 @@ -#include -#include - -#include - -int main() -{ - char buff[1024]; - - igloo_resolver_initialize(); - - printf("I got %s, when looking up %s.\n", igloo_resolver_getip("bach.greenwitch.com", buff, 1024), "bach.greenwitch.com"); - printf("I got %s, when looking up %s.\n", igloo_resolver_getname("207.181.249.14", buff, 1024), "207.181.249.14"); - - return 0; -} - diff --git a/src/libigloo.c b/src/libigloo.c index 79f5a6a..828165f 100644 --- a/src/libigloo.c +++ b/src/libigloo.c @@ -72,6 +72,7 @@ static void igloo_initialize__free(igloo_ro_t self) return; igloo_resolver_shutdown(); + igloo_socketaddr_shutdown(); igloo_sock_shutdown(); igloo_thread_shutdown(); igloo_log_shutdown(); @@ -87,6 +88,7 @@ igloo_ro_t igloo_initialize(void) igloo_thread_initialize(); igloo_sock_initialize(); igloo_resolver_initialize(); + igloo_socketaddr_initialize(); } snprintf(name, sizeof(name), "", igloo_initialize__refc); diff --git a/src/private.h b/src/private.h index 7b312e2..5acf975 100644 --- a/src/private.h +++ b/src/private.h @@ -24,6 +24,7 @@ #endif #include +#include /* init/shutdown of the library */ void igloo_thread_initialize(void); @@ -33,6 +34,8 @@ void igloo_sock_initialize(void); void igloo_sock_shutdown(void); void igloo_resolver_initialize(void); void igloo_resolver_shutdown(void); +void igloo_socketaddr_initialize(void); +void igloo_socketaddr_shutdown(void); void igloo_log_initialize(void); void igloo_log_shutdown(void); @@ -70,4 +73,11 @@ void igloo_private__snprintf(char *str, size_t size, const char *format, ...); igloo_ro_t igloo_get_default_instance(void); +int igloo_socketaddr_get_sysid_domain(igloo_socketaddr_domain_t domain); +int igloo_socketaddr_get_sysid_type(igloo_socketaddr_type_t type); +int igloo_socketaddr_get_sysid_protocol(igloo_socketaddr_protocol_t protocol); + +// NOTE: We use generic types here to avoid socket headers for all units. +igloo_socketaddr_t * igloo_socketaddr_new_from_sockaddr(igloo_socketaddr_domain_t domain_hint, igloo_socketaddr_type_t type_hint, igloo_socketaddr_protocol_t protocol_hint, const void * /* const struct sockaddr * */ addr, size_t /* socklen_t */ addr_len, const char *name, igloo_ro_t associated, igloo_ro_t instance, igloo_error_t *error); + #endif diff --git a/src/socket.c b/src/socket.c new file mode 100644 index 0000000..9d6c03c --- /dev/null +++ b/src/socket.c @@ -0,0 +1,833 @@ +/* Icecast + * + * This program is distributed under the GNU General Public License, version 2. + * A copy of this license is included with this source. + * + * Copyright 2019, Philipp "ph3-der-loewe" Schafft , + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifndef _WIN32 +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#else +#include +#endif + +#include +#include +#include +#include +#include "private.h" + +struct igloo_socket_tag { + igloo_ro_base_t __base; + + igloo_socketaddr_domain_t domain; + igloo_socketaddr_type_t type; + igloo_socketaddr_protocol_t protocol; + + igloo_socketaddr_t *local_physical; + igloo_socketaddr_t *peer_physical; + + igloo_socket_action_t action; + + int syssock; + + int connected; +}; + +static void __free(igloo_ro_t self); +static igloo_ro_t __get_interface_t(igloo_ro_t self, const igloo_ro_type_t *type, const char *name, igloo_ro_t associated, igloo_ro_t instance); + +igloo_RO_PUBLIC_TYPE(igloo_socket_t, + igloo_RO_TYPEDECL_FREE(__free), + igloo_RO_TYPEDECL_GET_INTERFACE(__get_interface_t) + ); + +static inline void __close_socket(int syssock) +{ +#ifndef _WIN32 + close(syssock); +#else + closesocket(syssock); +#endif +} + +static void __free(igloo_ro_t self) +{ + igloo_socket_t *sock = igloo_RO_TO_TYPE(self, igloo_socket_t); + + __close_socket(sock->syssock); +} + +static ssize_t __read_with_flags(igloo_ro_t backend_object, void *buffer, size_t len, igloo_error_t *error, int flags) +{ + igloo_socket_t *sock = igloo_RO_TO_TYPE(backend_object, igloo_socket_t); + ssize_t ret = recv(sock->syssock, buffer, len, 0); + + if (ret < 0) { + *error = igloo_ERROR_GENERIC; + } else { + *error = igloo_ERROR_NONE; + } + + return ret; +} +static ssize_t __read(igloo_INTERFACE_BASIC_ARGS, void *buffer, size_t len, igloo_error_t *error) +{ + return __read_with_flags(*backend_object, buffer, len, error, 0); +} +static ssize_t __peek(igloo_INTERFACE_BASIC_ARGS, void *buffer, size_t len, igloo_error_t *error) +{ + return __read_with_flags(*backend_object, buffer, len, error, MSG_PEEK); +} +static ssize_t __write(igloo_INTERFACE_BASIC_ARGS, const void *buffer, size_t len, igloo_error_t *error) +{ + igloo_socket_t *sock = igloo_RO_TO_TYPE(*backend_object, igloo_socket_t); + ssize_t ret = send(sock->syssock, buffer, len, MSG_NOSIGNAL); + + if (ret < 0) { + *error = igloo_ERROR_GENERIC; + } else { + *error = igloo_ERROR_NONE; + } + + return ret; +} + +static igloo_error_t __sync(igloo_INTERFACE_BASIC_ARGS, igloo_io_opflag_t flags) +{ + return igloo_ERROR_NONE; +} + +igloo_error_t __set_blockingmode__socket(igloo_socket_t *sock, libigloo_io_blockingmode_t mode) { +#ifdef _WIN32 +#ifdef __MINGW32__ + u_long varblock = 1; +#else + int varblock = 1; +#endif +#else + int flags; +#endif + +#ifdef _WIN32 + if (block) + varblock = 0; + return ioctlsocket(sock->syssock, FIONBIO, &varblock) == 0 ? igloo_ERROR_NONE : igloo_ERROR_GENERIC; +#else + flags = fcntl(sock->syssock, F_GETFL); + if (flags == -1) + return igloo_ERROR_GENERIC; + + flags |= O_NONBLOCK; + if (mode == igloo_IO_BLOCKINGMODE_FULL) { + flags -= O_NONBLOCK; + } + + if (fcntl(sock->syssock, F_SETFL, flags) == 0) { + return igloo_ERROR_NONE; + } else { + return igloo_ERROR_GENERIC; + } +#endif +} +igloo_error_t __set_blockingmode(igloo_INTERFACE_BASIC_ARGS, libigloo_io_blockingmode_t mode) { + igloo_socket_t *sock = igloo_RO_TO_TYPE(*backend_object, igloo_socket_t); + return __set_blockingmode__socket(sock, mode); +} + +static igloo_error_t __get_blockingmode(igloo_INTERFACE_BASIC_ARGS, libigloo_io_blockingmode_t *mode) +{ +#ifdef _WIN32 + *mode = igloo_IO_BLOCKINGMODE_ERROR; + return igloo_ERROR_GENERIC; +#else + igloo_socket_t *sock = igloo_RO_TO_TYPE(*backend_object, igloo_socket_t); + int flags; + + flags = fcntl(sock->syssock, F_GETFL); + if (flags == -1) { + *mode = igloo_IO_BLOCKINGMODE_ERROR; + return igloo_ERROR_GENERIC; + } + + if (flags & O_NONBLOCK) { + *mode = igloo_IO_BLOCKINGMODE_NONE; + } else { + *mode = igloo_IO_BLOCKINGMODE_FULL; + } + + return igloo_ERROR_NONE; +#endif +} + +static igloo_error_t __get_fd_for_systemcall(igloo_INTERFACE_BASIC_ARGS, int *fd) +{ + igloo_socket_t *sock = igloo_RO_TO_TYPE(*backend_object, igloo_socket_t); + *fd = sock->syssock; + return igloo_ERROR_NONE; +} + +static const igloo_io_ifdesc_t igloo_socket_io_ifdesc = { + igloo_INTERFACE_DESCRIPTION_BASE(igloo_io_ifdesc_t), + .read = __read, + .peek = __peek, + .write = __write, + .sync = __sync, + .set_blockingmode = __set_blockingmode, + .get_blockingmode = __get_blockingmode, + .get_fd_for_systemcall = __get_fd_for_systemcall +}; + +static igloo_ro_t __get_interface_t(igloo_ro_t self, const igloo_ro_type_t *type, const char *name, igloo_ro_t associated, igloo_ro_t instance) +{ + igloo_socket_t *sock = igloo_RO_TO_TYPE(self, igloo_socket_t); + + if (!sock) + return igloo_RO_NULL; + + if (type != igloo_RO_GET_TYPE_BY_SYMBOL(igloo_io_t)) + return igloo_RO_NULL; + + if (!sock->connected) + return igloo_RO_NULL; + + return (igloo_ro_t)igloo_io_new(&igloo_socket_io_ifdesc, self, NULL, name, associated, instance); +} + +static igloo_error_t __bind_or_connect(igloo_socket_t *sock, igloo_socketaddr_t *addr, int do_connect) +{ + union { + struct sockaddr sa; + struct sockaddr_un un; + } sysaddr_store; + struct sockaddr *sa; + socklen_t sa_len; + igloo_socketaddr_domain_t domain; + igloo_socketaddr_type_t type; + igloo_socketaddr_protocol_t protocol; + igloo_error_t error; + int sysaf; + const char *value; + uint16_t port; + struct addrinfo hints, *res, *ai; + char service[10]; + int already_done = 0; + int ret = -1; + + memset(&sysaddr_store, 0, sizeof(sysaddr_store)); + + error = igloo_socketaddr_get_base(addr, &domain, &type, &protocol); + if (error != igloo_ERROR_NONE) + return error; + + sysaf = igloo_socketaddr_get_sysid_domain(domain); + + switch (domain) { + case igloo_SOCKETADDR_DOMAIN_UNIX: + error = igloo_socketaddr_get_path(addr, &value); + if (error != igloo_ERROR_NONE) + return error; + + if (!value || strlen(value) > sizeof(sysaddr_store.un.sun_path)) + return igloo_ERROR_GENERIC; + + sysaddr_store.un.sun_family = sysaf; + strncpy(sysaddr_store.un.sun_path, value, sizeof(sysaddr_store.un.sun_path)); + sa_len = sizeof(sysaddr_store.un); + sa = &(sysaddr_store.sa); + break; + case igloo_SOCKETADDR_DOMAIN_INET4: + case igloo_SOCKETADDR_DOMAIN_INET6: + error = igloo_socketaddr_get_ip(addr, &value); + if (error != igloo_ERROR_NONE) + return error; + + error = igloo_socketaddr_get_port(addr, &port); + if (error != igloo_ERROR_NONE) + return error; + + memset(&hints, 0, sizeof(hints)); + + hints.ai_family = igloo_socketaddr_get_sysid_domain(domain); + hints.ai_socktype = igloo_socketaddr_get_sysid_type(type); + hints.ai_protocol = igloo_socketaddr_get_sysid_protocol(protocol); + hints.ai_flags = AI_ADDRCONFIG|AI_NUMERICSERV|AI_NUMERICHOST; + + if (!do_connect) { + hints.ai_flags |= AI_PASSIVE; + } + + snprintf(service, sizeof(service), "%u", (unsigned int)port); + + if ((ret = getaddrinfo(value, service, &hints, &res)) != 0) { + return igloo_ERROR_GENERIC; + } + + ai = res; + + do { + if (do_connect) { + ret = connect(sock->syssock, ai->ai_addr, ai->ai_addrlen); + } else { + ret = bind(sock->syssock, ai->ai_addr, ai->ai_addrlen); + } + } while (ret != 0 && (ai = ai->ai_next)); + + freeaddrinfo(res); + already_done = 1; + break; + default: + return igloo_ERROR_GENERIC; + break; + } + + + if (!already_done) { + if (do_connect) { + ret = connect(sock->syssock, sa, sa_len); + } else { + ret = bind(sock->syssock, sa, sa_len); + } + } + + if (ret == 0) { + if (do_connect) + sock->connected = 1; + return igloo_ERROR_NONE; + } else { + return igloo_ERROR_GENERIC; + } +} + +igloo_socket_t * igloo_socket_new__real(igloo_socketaddr_domain_t domain, igloo_socketaddr_type_t type, igloo_socketaddr_protocol_t protocol, const char *name, igloo_ro_t associated, igloo_ro_t instance, igloo_error_t *error, int syssock) +{ + igloo_socket_t *sock = igloo_ro_new_raw(igloo_socket_t, name, associated, instance); + + if (!sock) { + if (error) + *error = igloo_ERROR_NOMEM; + return NULL; + } + + sock->domain = domain; + sock->type = type; + sock->protocol = protocol; + + if (syssock >= 0) { + sock->syssock = syssock; + } else { + sock->syssock = socket(igloo_socketaddr_get_sysid_domain(domain), igloo_socketaddr_get_sysid_type(type), igloo_socketaddr_get_sysid_protocol(protocol)); + if (sock->syssock == -1) { + igloo_ro_unref(sock); + if (error) + *error = igloo_ERROR_GENERIC; + return NULL; + } + } + + return sock; +} + +igloo_socket_t * igloo_socket_new(igloo_socketaddr_domain_t domain, igloo_socketaddr_type_t type, igloo_socketaddr_protocol_t protocol, const char *name, igloo_ro_t associated, igloo_ro_t instance, igloo_error_t *error) +{ + return igloo_socket_new__real(domain, type, protocol, name, associated, instance, error, -1); +} + +igloo_socket_t * igloo_socket_new_simple(igloo_socket_endpoint_t endpoint, igloo_socketaddr_t *addr, igloo_error_t *error) +{ + igloo_socketaddr_domain_t domain; + igloo_socketaddr_type_t type; + igloo_socketaddr_protocol_t protocol; + igloo_error_t err; + igloo_socket_t *sock; + + err = igloo_socketaddr_get_base(addr, &domain, &type, &protocol); + if (err != igloo_ERROR_NONE) { + if (error) + *error = err; + return NULL; + } + + sock = igloo_socket_new(domain, type, protocol, NULL, igloo_RO_NULL, addr, &err); + if (!sock) { + if (error) + *error = err; + return NULL; + } + + err = igloo_socket_alter_address(sock, igloo_SOCKET_ADDRESSOP_ADD, endpoint, addr); + if (err != igloo_ERROR_NONE) { + igloo_ro_unref(sock); + if (error) + *error = err; + return NULL; + } + + return sock; +} + +static inline igloo_error_t _replace_addr(igloo_socketaddr_t **storage, igloo_socketaddr_t *addr) +{ + igloo_error_t ret; + + if (addr) { + ret = igloo_ro_ref(addr); + if (ret != igloo_ERROR_NONE) + return ret; + } + + igloo_ro_unref(*storage); + *storage = addr; + + return igloo_ERROR_NONE; +} + +igloo_error_t igloo_socket_alter_address(igloo_socket_t *sock, igloo_socket_addressop_t op, igloo_socket_endpoint_t endpoint, igloo_socketaddr_t *addr) +{ + igloo_socketaddr_t **storage = NULL; + + if (!igloo_RO_IS_VALID(sock, igloo_socket_t)) + return igloo_ERROR_FAULT; + + switch (endpoint) { + case igloo_SOCKET_ENDPOINT_LOCAL: + case igloo_SOCKET_ENDPOINT_LOCAL_PHYSICAL: + storage = &(sock->local_physical); + break; + case igloo_SOCKET_ENDPOINT_PEER: + case igloo_SOCKET_ENDPOINT_PEER_PHYSICAL: + storage = &(sock->peer_physical); + break; + default: + return igloo_ERROR_GENERIC; + break; + } + + switch (op) { + case igloo_SOCKET_ADDRESSOP_CLEAR: + return _replace_addr(storage, NULL); + break; + case igloo_SOCKET_ADDRESSOP_REPLACE: + return _replace_addr(storage, addr); + break; + case igloo_SOCKET_ADDRESSOP_ADD: + if (*storage) + return igloo_ERROR_GENERIC; + return _replace_addr(storage, addr); + break; + case igloo_SOCKET_ADDRESSOP_REMOVE: + if (*storage != addr) + return igloo_ERROR_GENERIC; + return _replace_addr(storage, NULL); + break; + default: + return igloo_ERROR_GENERIC; + break; + } +} + +igloo_socketaddr_t * igloo_socket_get_main_address(igloo_socket_t *sock, igloo_socket_endpoint_t endpoint, igloo_error_t *error) +{ + igloo_socketaddr_t *ret = NULL; + igloo_error_t err; + + if (!igloo_RO_IS_VALID(sock, igloo_socket_t)) { + if (error) + *error = igloo_ERROR_FAULT; + return NULL; + } + + switch (endpoint) { + case igloo_SOCKET_ENDPOINT_LOCAL: + case igloo_SOCKET_ENDPOINT_LOCAL_PHYSICAL: + ret = sock->local_physical; + break; + case igloo_SOCKET_ENDPOINT_PEER: + case igloo_SOCKET_ENDPOINT_PEER_PHYSICAL: + ret = sock->peer_physical; + break; + default: + if (error) + *error = igloo_ERROR_GENERIC; + return NULL; + break; + } + + if (ret) { + err = igloo_ro_ref(ret); + if (err != igloo_ERROR_NONE) { + if (error) + *error = err; + return NULL; + } + } + + if (error) + *error = igloo_ERROR_NONE; + return ret; +} + +igloo_list_t * igloo_socket_get_address(igloo_socket_t *sock, igloo_socket_endpoint_t endpoint, igloo_error_t *error) +{ + igloo_error_t err; + igloo_socketaddr_t *addr; + igloo_list_t *list; + + addr = igloo_socket_get_main_address(sock, endpoint, &err); + if (err != igloo_ERROR_NONE) { + if (error) + *error = err; + return NULL; + } + + list = igloo_ro_new_ext(igloo_list_t, NULL, igloo_RO_NULL, addr); + if (!list) { + igloo_ro_unref(addr); + if (error) + *error = igloo_ERROR_NOMEM; + return NULL; + } + + if (igloo_list_push(list, addr) != 0) { + igloo_ro_unref(addr); + igloo_ro_unref(list); + if (error) + *error = igloo_ERROR_GENERIC; + return NULL; + } + + igloo_ro_unref(addr); + + if (error) + *error = igloo_ERROR_NONE; + + return list; +} + +igloo_error_t igloo_socket_connect(igloo_socket_t *sock) +{ + if (!igloo_RO_IS_VALID(sock, igloo_socket_t)) + return igloo_ERROR_FAULT; + + if (sock->local_physical) { + igloo_error_t error; + error = __bind_or_connect(sock, sock->local_physical, 0); + if (error != igloo_ERROR_NONE) + return error; + } + + return __bind_or_connect(sock, sock->peer_physical, 1); +} + +igloo_error_t igloo_socket_listen(igloo_socket_t *sock, ssize_t backlog) +{ + if (!igloo_RO_IS_VALID(sock, igloo_socket_t)) + return igloo_ERROR_FAULT; + + if (backlog < 1) + backlog = 16; + + if (sock->local_physical) { + igloo_error_t error; + error = __bind_or_connect(sock, sock->local_physical, 0); + if (error != igloo_ERROR_NONE) + return error; + } + + if (listen(sock->syssock, backlog) != 0) + return igloo_ERROR_GENERIC; + + return igloo_ERROR_NONE; +} + +igloo_error_t igloo_socket_shutdown(igloo_socket_t *sock, igloo_socket_shutdown_t how) +{ + int syshow; + + if (!igloo_RO_IS_VALID(sock, igloo_socket_t)) + return igloo_ERROR_FAULT; + + switch (how) { + case igloo_SOCKET_SHUTDOWN_NONE: + return igloo_ERROR_NONE; + break; + case igloo_SOCKET_SHUTDOWN_RECEIVE: + syshow = SHUT_RD; + break; + case igloo_SOCKET_SHUTDOWN_SEND: + syshow = SHUT_WR; + break; + case igloo_SOCKET_SHUTDOWN_RECEIVESEND: + syshow = SHUT_RDWR; + break; + default: + return igloo_ERROR_INVAL; + break; + } + + if (shutdown(sock->syssock, syshow) != 0) + return igloo_ERROR_GENERIC; + + return igloo_ERROR_NONE; +} + +igloo_socket_t * igloo_socket_accept(igloo_socket_t *sock, const char *name, igloo_ro_t associated, igloo_error_t *error) +{ + struct sockaddr_storage addr; + socklen_t addr_len = sizeof(addr); + igloo_socket_t *ret; + igloo_socketaddr_t *peer; + int res; + int domain; + + if (!igloo_RO_IS_VALID(sock, igloo_socket_t)) { + if (error) + *error = igloo_ERROR_FAULT; + return NULL; + } + + res = accept(sock->syssock, (struct sockaddr*)&addr, &addr_len); + if (res < 0) { + if (error) + *error = igloo_ERROR_GENERIC; + return NULL; + } + + if (addr_len >= sizeof(struct sockaddr)) { + domain = ((struct sockaddr*)&addr)->sa_family; + } else { + domain = igloo_socketaddr_get_sysid_domain(sock->domain); + } + + ret = igloo_socket_new__real(domain, sock->type, sock->protocol, name, associated, sock, error, res); + if (ret == NULL) { + __close_socket(res); + return NULL; + } + + ret->connected = 1; + + if (domain == igloo_socketaddr_get_sysid_domain(sock->domain)) { + igloo_socket_alter_address(ret, igloo_SOCKET_ADDRESSOP_REPLACE, igloo_SOCKET_ENDPOINT_LOCAL_PHYSICAL, sock->local_physical); + } + + peer = igloo_socketaddr_new_from_sockaddr(sock->domain, sock->type, sock->protocol, &addr, addr_len, NULL, igloo_RO_NULL, sock, NULL); + if (peer) { + igloo_socket_alter_address(ret, igloo_SOCKET_ADDRESSOP_REPLACE, igloo_SOCKET_ENDPOINT_PEER_PHYSICAL, peer); + igloo_ro_unref(peer); + } + + if (error) + *error = igloo_ERROR_NONE; + return ret; +} + +igloo_error_t igloo_socket_control(igloo_socket_t *sock, igloo_socket_control_t control, ...) +{ + igloo_error_t ret = igloo_ERROR_GENERIC; + va_list ap; + size_t argst; + int tmp; + + if (!igloo_RO_IS_VALID(sock, igloo_socket_t)) + return igloo_ERROR_FAULT; + + va_start(ap, control); + switch (control) { + case igloo_SOCKET_CONTROL_NONE: + ret = igloo_ERROR_NONE; + break; + case igloo_SOCKET_CONTROL_SET_NODELAY: + tmp = 1; + if (setsockopt(sock->syssock, IPPROTO_TCP, TCP_NODELAY, &tmp, sizeof(tmp)) != 0) { + ret = igloo_ERROR_GENERIC; + } else { + ret = igloo_ERROR_NONE; + } + break; + case igloo_SOCKET_CONTROL_SET_SEND_BUFFER: + case igloo_SOCKET_CONTROL_SET_RECEIVE_BUFFER: + argst = va_arg(ap, size_t); + tmp = argst; + if (setsockopt(sock->syssock, SOL_SOCKET, control == igloo_SOCKET_CONTROL_SET_SEND_BUFFER ? SO_SNDBUF : SO_RCVBUF, &tmp, sizeof(tmp)) != 0) { + ret = igloo_ERROR_GENERIC; + } else { + ret = igloo_ERROR_NONE; + } + break; + } + va_end(ap); + + return ret; +} + +igloo_error_t igloo_socket_nonblocking(igloo_socket_t *sock, igloo_socket_action_t action) { + igloo_error_t error; + + if (!igloo_RO_IS_VALID(sock, igloo_socket_t)) + return igloo_ERROR_FAULT; + + switch (action) { + case igloo_SOCKET_ACTION_NONE: + error = __set_blockingmode__socket(sock, igloo_IO_BLOCKINGMODE_FULL); + if (error != igloo_ERROR_NONE) + return error; + sock->action = action; + + return igloo_ERROR_NONE; + break; + case igloo_SOCKET_ACTION_CONNECT: + case igloo_SOCKET_ACTION_ACCEPT: + error = __set_blockingmode__socket(sock, igloo_IO_BLOCKINGMODE_NONE); + if (error != igloo_ERROR_NONE) + return error; + sock->action = action; + + if (action == igloo_SOCKET_ACTION_CONNECT) { + error = __bind_or_connect(sock, sock->peer_physical, 1); + if (error != igloo_ERROR_GENERIC) + return error; + } + + return igloo_ERROR_NONE; + break; + default: + return igloo_ERROR_INVAL; + break; + } +} + +static igloo_error_t igloo_socket_nonblocking__get_return(igloo_socket_t *sock, int in, int out, int error) +{ + int val; + socklen_t val_len = sizeof(val); + + if (error) + return igloo_ERROR_IO; + + switch (sock->action) { + case igloo_SOCKET_ACTION_CONNECT: + if (!out) { + return igloo_ERROR_AGAIN; + } + + if (getsockopt(sock->syssock, SOL_SOCKET, SO_ERROR, &val, &val_len) != 0) { + return igloo_ERROR_GENERIC; + } + + if (val) { + return igloo_ERROR_AGAIN; + } + + igloo_socket_nonblocking(sock, igloo_SOCKET_ACTION_NONE); + sock->connected = 1; + return igloo_ERROR_NONE; + break; + case igloo_SOCKET_ACTION_ACCEPT: + if (in) { + return igloo_ERROR_NONE; + } else { + return igloo_ERROR_AGAIN; + } + break; + default: + return igloo_ERROR_INVAL; + break; + } +} + +#ifdef IGLOO_CTC_HAVE_SYS_SELECT_H +igloo_error_t igloo_socket_nonblocking_select_set(igloo_socket_t *sock, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, int *maxfd) +{ + if (!igloo_RO_IS_VALID(sock, igloo_socket_t) || !readfds || !writefds || !exceptfds || !maxfd) + return igloo_ERROR_FAULT; + + switch (sock->action) { + case igloo_SOCKET_ACTION_CONNECT: + FD_SET(sock->syssock, writefds); + break; + case igloo_SOCKET_ACTION_ACCEPT: + FD_SET(sock->syssock, readfds); + break; + default: + return igloo_ERROR_INVAL; + break; + } + + FD_SET(sock->syssock, exceptfds); + + if (*maxfd < sock->syssock) + *maxfd = sock->syssock; + + return igloo_ERROR_NONE; +} + +igloo_error_t igloo_socket_nonblocking_select_clear(igloo_socket_t *sock, fd_set *readfds, fd_set *writefds, fd_set *exceptfds) +{ + if (!igloo_RO_IS_VALID(sock, igloo_socket_t) || !readfds || !writefds || !exceptfds) + return igloo_ERROR_FAULT; + + FD_CLR(sock->syssock, readfds); + FD_CLR(sock->syssock, writefds); + FD_CLR(sock->syssock, exceptfds); + + return igloo_ERROR_NONE; +} +igloo_error_t igloo_socket_nonblocking_select_result(igloo_socket_t *sock, fd_set *readfds, fd_set *writefds, fd_set *exceptfds) +{ + if (!igloo_RO_IS_VALID(sock, igloo_socket_t) || !readfds || !writefds || !exceptfds) + return igloo_ERROR_FAULT; + + return igloo_socket_nonblocking__get_return(sock, FD_ISSET(sock->syssock, readfds), FD_ISSET(sock->syssock, writefds), FD_ISSET(sock->syssock, exceptfds)); +} +#endif + + +#ifdef IGLOO_CTC_HAVE_POLL +igloo_error_t igloo_socket_nonblocking_poll_fill(igloo_socket_t *sock, struct pollfd *fd) +{ + if (!igloo_RO_IS_VALID(sock, igloo_socket_t) || !fd) + return igloo_ERROR_FAULT; + + memset(fd, 0, sizeof(*fd)); + fd->fd = sock->syssock; + + switch (sock->action) { + case igloo_SOCKET_ACTION_CONNECT: + fd->events = POLLOUT; + break; + case igloo_SOCKET_ACTION_ACCEPT: + fd->events = POLLIN; + break; + default: + return igloo_ERROR_INVAL; + break; + } + + return igloo_ERROR_NONE; +} +igloo_error_t igloo_socket_nonblocking_poll_result(igloo_socket_t *sock, struct pollfd *fd) +{ + if (!igloo_RO_IS_VALID(sock, igloo_socket_t) || !fd) + return igloo_ERROR_FAULT; + + if (fd->fd != sock->syssock) + return igloo_ERROR_INVAL; + + return igloo_socket_nonblocking__get_return(sock, fd->revents & POLLIN, fd->revents & POLLOUT, fd->revents & (POLLERR|POLLHUP|POLLNVAL)); +} +#endif diff --git a/src/socketaddr.c b/src/socketaddr.c new file mode 100644 index 0000000..f59dd5d --- /dev/null +++ b/src/socketaddr.c @@ -0,0 +1,715 @@ +/* Icecast + * + * This program is distributed under the GNU General Public License, version 2. + * A copy of this license is included with this source. + * + * Copyright 2019, Philipp "ph3-der-loewe" Schafft , + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#ifndef _WIN32 +#ifndef HAVE_INET_PTON +#include +#endif +#include +#include +#include +#include +#else +#include +#endif + +#include +#include +#include + +/* Shouldn't this be 40? Taken from the old sock.h -- ph3-der-loewe, 2019-09-19 */ +#define MAX_ADDR_LEN 46 + +#if !(defined(HAVE_GETNAMEINFO) && defined(HAVE_GETADDRINFO)) +static igloo_mutex_t igloo__resolver_mutex; +#endif + +#define SET_PORT 0x0001U + +struct igloo_socketaddr_tag { + igloo_ro_base_t __base; + + igloo_socketaddr_domain_t domain; + igloo_socketaddr_type_t type; + igloo_socketaddr_protocol_t protocol; + + unsigned int set; + + char *node; + char *ip; + char *path; + uint16_t port; +}; + +static void __free(igloo_ro_t self); + +igloo_RO_PUBLIC_TYPE(igloo_socketaddr_t, + igloo_RO_TYPEDECL_FREE(__free), + igloo_RO_TYPEDECL_NEW_NOOP() + ); + +static void __free(igloo_ro_t self) +{ + igloo_socketaddr_t *addr = igloo_RO_TO_TYPE(self, igloo_socketaddr_t); + free(addr->node); + free(addr->ip); + free(addr->path); +} + +void igloo_socketaddr_initialize(void) +{ +#if !(defined(HAVE_GETNAMEINFO) && defined(HAVE_GETADDRINFO)) + igloo_thread_mutex_create(&igloo__resolver_mutex); +#endif + + /* keep dns connects (TCP) open */ +#ifdef HAVE_SETHOSTENT + sethostent(1); +#endif +} + +void igloo_socketaddr_shutdown(void) +{ +#if !(defined(HAVE_GETNAMEINFO) && defined(HAVE_GETADDRINFO)) + igloo_thread_mutex_destroy(&igloo__resolver_mutex); +#endif + +#ifdef HAVE_ENDHOSTENT + endhostent(); +#endif +} + +static inline igloo_error_t _replace_string(char **rep, const char *str) +{ + char *val = NULL; + + if (str) { + val = strdup(str); + if (!val) + return igloo_ERROR_NOMEM; + } + + free(*rep); + *rep = val; + + return igloo_ERROR_NONE; +} + +int igloo_socketaddr_get_sysid_domain(igloo_socketaddr_domain_t domain) +{ + switch (domain) { + case igloo_SOCKETADDR_DOMAIN_UNSPEC: + return AF_UNSPEC; + break; + case igloo_SOCKETADDR_DOMAIN_UNIX: + return AF_UNIX; + break; + case igloo_SOCKETADDR_DOMAIN_INET4: + return AF_INET; + break; + case igloo_SOCKETADDR_DOMAIN_INET6: + return AF_INET6; + break; + } + + return -1; +} + +igloo_socketaddr_domain_t igloo_socketaddr_get_id_domain(int domain) +{ + switch (domain) { + case AF_UNSPEC: + return igloo_SOCKETADDR_DOMAIN_UNSPEC; + break; + case AF_UNIX: + return igloo_SOCKETADDR_DOMAIN_UNIX; + break; + case AF_INET: + return igloo_SOCKETADDR_DOMAIN_INET4; + break; + case AF_INET6: + return igloo_SOCKETADDR_DOMAIN_INET6; + break; + default: + return igloo_SOCKETADDR_DOMAIN_UNSPEC; + break; + } +} + +int igloo_socketaddr_get_sysid_type(igloo_socketaddr_type_t type) +{ + switch (type) { + case igloo_SOCKETADDR_TYPE_STREAM: + return SOCK_STREAM; + break; + case igloo_SOCKETADDR_TYPE_DGRAM: + return SOCK_DGRAM; + break; + case igloo_SOCKETADDR_TYPE_SEQPACK: + return SOCK_SEQPACKET; + break; +#ifdef SOCK_RDM + case igloo_SOCKETADDR_TYPE_RDM: + return SOCK_RDM; + break; +#endif + case igloo_SOCKETADDR_TYPE_UNSPEC: + return -1; + } + + return -1; +} + +int igloo_socketaddr_get_sysid_protocol(igloo_socketaddr_protocol_t protocol) +{ + switch (protocol) { + case igloo_SOCKETADDR_PROTOCOL_UNSPEC: + return 0; + break; + case igloo_SOCKETADDR_PROTOCOL_TCP: + return IPPROTO_TCP; + break; + case igloo_SOCKETADDR_PROTOCOL_UDP: + return IPPROTO_UDP; + break; +#ifdef IPPROTO_DCCP + case igloo_SOCKETADDR_PROTOCOL_DCCP: + return IPPROTO_DCCP; + break; +#endif +#ifdef IPPROTO_SCTP + case igloo_SOCKETADDR_PROTOCOL_SCTP: + return IPPROTO_SCTP; + break; +#endif +#ifdef IPPROTO_UDPLITE + case igloo_SOCKETADDR_PROTOCOL_UDPLITE: + return IPPROTO_UDPLITE; + break; +#endif + } + + return -1; +} + +igloo_error_t igloo_socketaddr_domain2str(const char **str, igloo_socketaddr_domain_t domain) +{ + const char *ret = NULL; + + if (!str) + return igloo_ERROR_FAULT; + + switch (domain) { + case igloo_SOCKETADDR_DOMAIN_UNSPEC: + ret = "unspec"; + break; + case igloo_SOCKETADDR_DOMAIN_UNIX: + ret = "unix"; + break; + case igloo_SOCKETADDR_DOMAIN_INET4: + ret = "inet4"; + break; + case igloo_SOCKETADDR_DOMAIN_INET6: + ret = "inet6"; + break; + } + + if (ret) { + *str = ret; + return igloo_ERROR_NONE; + } else { + return igloo_ERROR_NOENT; + } +} + +igloo_error_t igloo_socketaddr_str2domain(igloo_socketaddr_domain_t *domain, const char *str) +{ + if (!domain || !str) + return igloo_ERROR_FAULT; + + if (strcasecmp(str, "unspec") == 0) { + *domain = igloo_SOCKETADDR_DOMAIN_UNSPEC; + } else if (strcasecmp(str, "unix") == 0) { + *domain = igloo_SOCKETADDR_DOMAIN_UNIX; + } else if (strcasecmp(str, "inet4") == 0 || strcasecmp(str, "legacy-inet") == 0) { + *domain = igloo_SOCKETADDR_DOMAIN_INET4; + } else if (strcasecmp(str, "inet6") == 0) { + *domain = igloo_SOCKETADDR_DOMAIN_INET6; + } + + return igloo_ERROR_NOENT; +} + +igloo_error_t igloo_socketaddr_type2str(const char **str, igloo_socketaddr_type_t type) +{ + const char *ret = NULL; + + if (!str) + return igloo_ERROR_FAULT; + + switch (type) { + case igloo_SOCKETADDR_TYPE_UNSPEC: + ret = "unspec"; + break; + case igloo_SOCKETADDR_TYPE_STREAM: + ret = "stream"; + break; + case igloo_SOCKETADDR_TYPE_DGRAM: + ret = "dgram"; + break; + case igloo_SOCKETADDR_TYPE_SEQPACK: + ret = "seqpack"; + break; + case igloo_SOCKETADDR_TYPE_RDM: + ret = "rdm"; + break; + } + + if (ret) { + *str = ret; + return igloo_ERROR_NONE; + } else { + return igloo_ERROR_NOENT; + } +} +igloo_error_t igloo_socketaddr_str2type(igloo_socketaddr_type_t *type, const char *str) +{ + if (!type || !str) + return igloo_ERROR_FAULT; + + if (strcasecmp(str, "unspec") == 0) { + *type = igloo_SOCKETADDR_TYPE_UNSPEC; + } else if (strcasecmp(str, "stream") == 0) { + *type = igloo_SOCKETADDR_TYPE_STREAM; + } else if (strcasecmp(str, "dgram") == 0 || strcasecmp(str, "datagram") == 0) { + *type = igloo_SOCKETADDR_TYPE_DGRAM; + } else if (strcasecmp(str, "seqpack") == 0 || strcasecmp(str, "seqpacket") == 0) { + *type = igloo_SOCKETADDR_TYPE_SEQPACK; + } else if (strcasecmp(str, "rdm") == 0) { + *type = igloo_SOCKETADDR_TYPE_RDM; + } + + return igloo_ERROR_NOENT; +} + +igloo_error_t igloo_socketaddr_protocol2str(const char **str, igloo_socketaddr_protocol_t protocol) +{ + const char *ret = NULL; + + if (!str) + return igloo_ERROR_FAULT; + + switch (protocol) { + case igloo_SOCKETADDR_PROTOCOL_UNSPEC: + ret = "unspec"; + break; + case igloo_SOCKETADDR_PROTOCOL_TCP: + ret = "tcp"; + break; + case igloo_SOCKETADDR_PROTOCOL_UDP: + ret = "udp"; + break; + case igloo_SOCKETADDR_PROTOCOL_DCCP: + ret = "dccp"; + break; + case igloo_SOCKETADDR_PROTOCOL_SCTP: + ret = "sctp"; + break; + case igloo_SOCKETADDR_PROTOCOL_UDPLITE: + ret = "udplite"; + break; + } + + if (ret) { + *str = ret; + return igloo_ERROR_NONE; + } else { + return igloo_ERROR_NOENT; + } +} +igloo_error_t igloo_socketaddr_str2protocol(igloo_socketaddr_protocol_t *protocol, const char *str) +{ + if (!protocol || !str) + return igloo_ERROR_FAULT; + + if (strcasecmp(str, "unspec") == 0) { + *protocol = igloo_SOCKETADDR_PROTOCOL_UNSPEC; + } else if (strcasecmp(str, "tcp") == 0) { + *protocol = igloo_SOCKETADDR_PROTOCOL_TCP; + } else if (strcasecmp(str, "udp") == 0) { + *protocol = igloo_SOCKETADDR_PROTOCOL_UDP; + } else if (strcasecmp(str, "dccp") == 0) { + *protocol = igloo_SOCKETADDR_PROTOCOL_DCCP; + } else if (strcasecmp(str, "sctp") == 0) { + *protocol = igloo_SOCKETADDR_PROTOCOL_SCTP; + } else if (strcasecmp(str, "udplite") == 0 || strcasecmp(str, "udp-lite") == 0) { + *protocol = igloo_SOCKETADDR_PROTOCOL_UDPLITE; + } + + return igloo_ERROR_NOENT; +} + + +void igloo_socketaddr_complete(igloo_socketaddr_t *addr) +{ + if (!igloo_RO_IS_VALID(addr, igloo_socketaddr_t)) + return; + + if (addr->type == igloo_SOCKETADDR_TYPE_UNSPEC) { + switch (addr->protocol) { + case igloo_SOCKETADDR_PROTOCOL_TCP: + addr->type = igloo_SOCKETADDR_TYPE_STREAM; + break; + case igloo_SOCKETADDR_PROTOCOL_UDP: + case igloo_SOCKETADDR_PROTOCOL_UDPLITE: + case igloo_SOCKETADDR_PROTOCOL_DCCP: + addr->type = igloo_SOCKETADDR_TYPE_STREAM; + break; + default: + /* noop */ + break; + } + } +} + +#ifdef HAVE_INET_PTON +static inline int _is_ip(const char *what) +{ + union { + struct in_addr v4addr; + struct in6_addr v6addr; + } addr_u; + + if (inet_pton(AF_INET, what, &addr_u.v4addr) <= 0) + return inet_pton(AF_INET6, what, &addr_u.v6addr) > 0 ? 1 : 0; + + return 1; +} + +#else +static inline int _is_ip(const char *what) +{ + struct in_addr inp; + + return inet_aton(what, &inp); +} +#endif + +#if defined(HAVE_GETNAMEINFO) && defined(HAVE_GETADDRINFO) +static const char *_get_ip(igloo_socketaddr_t *addr, const char *name, char *buff, size_t len) +{ + struct addrinfo *head, hints; + const char *ret = NULL; + + if (_is_ip(name)) { + strncpy(buff, name, len); + buff[len-1] = '\0'; + return buff; + } + + memset(&hints, 0, sizeof (hints)); + hints.ai_family = igloo_socketaddr_get_sysid_domain(addr->domain); + hints.ai_socktype = igloo_socketaddr_get_sysid_type(addr->type); + hints.ai_protocol = igloo_socketaddr_get_sysid_protocol(addr->protocol); + + if (getaddrinfo(name, NULL, &hints, &head)) + return NULL; + + if (head) { + if (getnameinfo(head->ai_addr, head->ai_addrlen, buff, len, NULL, 0, NI_NUMERICHOST) == 0) + ret = buff; + freeaddrinfo(head); + } + + return ret; +} + +static igloo_error_t _get_service(igloo_socketaddr_t *addr, const char *name, uint16_t *port) +{ + struct addrinfo *head, hints; + igloo_error_t ret; + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = igloo_socketaddr_get_sysid_domain(addr->domain); + hints.ai_socktype = igloo_socketaddr_get_sysid_type(addr->type); + hints.ai_protocol = igloo_socketaddr_get_sysid_protocol(addr->protocol); + + if (getaddrinfo(NULL, name, &hints, &head)) + return igloo_ERROR_GENERIC; + + if (head) { + ret = igloo_ERROR_NONE; + switch (head->ai_addr->sa_family) { + case AF_INET: + *port = ntohs(((struct sockaddr_in*)head->ai_addr)->sin_port); + break; + case AF_INET6: + *port = ntohs(((struct sockaddr_in6*)head->ai_addr)->sin6_port); + break; + default: + ret = igloo_ERROR_GENERIC; + break; + } + freeaddrinfo(head); + return ret; + } + + return igloo_ERROR_GENERIC; +} +#else + +static const char *_get_ip(igloo_socketaddr_t *addr, const char *name, char *buff, size_t len) +{ + struct hostent *host; + const char *ret = NULL; + + if (_is_ip(name)) { + strncpy(buff, name, len); + buff[len-1] = '\0'; + return buff; + } + + igloo_thread_mutex_lock(&igloo__resolver_mutex); + host = gethostbyname(name); + if (host) { + char *temp = inet_ntoa(*(struct in_addr *)host->h_addr); + ret = strncpy(buff, temp, len); + buff[len-1] = '\0'; + } + igloo_thread_mutex_unlock(&igloo__resolver_mutex); + + return ret; +} + +static igloo_error_t _get_service(igloo_socketaddr_t *addr, const char *name, uint16_t *port) +{ + const char *proto = NULL; + struct servent *res; + igloo_error_t ret = igloo_ERROR_GENERIC; + + switch (addr->protocol) { + case igloo_SOCKETADDR_PROTOCOL_TCP: + proto = "tcp"; + break; + case igloo_SOCKETADDR_PROTOCOL_UDP: + proto = "udp"; + break; + case igloo_SOCKETADDR_PROTOCOL_DCCP: + proto = "dccp"; + break; + case igloo_SOCKETADDR_PROTOCOL_SCTP: + proto = "sctp"; + break; + case igloo_SOCKETADDR_PROTOCOL_UDPLITE: + proto = "udplite"; + break; + default: + return igloo_ERROR_INVAL; + break; + } + + igloo_thread_mutex_lock(&igloo__resolver_mutex); + res = getservbyname(name, proto); + if (res) { + *port = ntohs(res->s_port); + ret = igloo_ERROR_NONE; + } + igloo_thread_mutex_unlock(&igloo__resolver_mutex); + + return ret; +} + +#endif + +igloo_socketaddr_t * igloo_socketaddr_new(igloo_socketaddr_domain_t domain, igloo_socketaddr_type_t type, igloo_socketaddr_protocol_t protocol, const char *name, igloo_ro_t associated, igloo_ro_t instance, igloo_error_t *error) +{ + igloo_socketaddr_t *addr = igloo_ro_new_raw(igloo_socketaddr_t, name, associated, instance); + + if (!addr) { + if (error) + *error = igloo_ERROR_NOMEM; + return NULL; + } + + addr->domain = domain; + addr->type = type; + addr->protocol = protocol; + + igloo_socketaddr_complete(addr); + + if (error) + *error = igloo_ERROR_NONE; + + return addr; +} + +igloo_socketaddr_t * igloo_socketaddr_new_from_sockaddr(igloo_socketaddr_domain_t domain_hint, igloo_socketaddr_type_t type_hint, igloo_socketaddr_protocol_t protocol_hint, const void * /* const struct sockaddr * */ addr, size_t /* socklen_t */ addr_len, const char *name, igloo_ro_t associated, igloo_ro_t instance, igloo_error_t *error) +{ + igloo_socketaddr_t *ret; + const struct sockaddr *sysaddr = addr; + char ip[80]; + char service[80]; + + if (addr_len < sizeof(*sysaddr)) { + if (error) + *error = igloo_ERROR_FAULT; + return NULL; + } + + domain_hint = igloo_socketaddr_get_id_domain(sysaddr->sa_family); + + ret = igloo_socketaddr_new(domain_hint, type_hint, protocol_hint, name, associated, instance, error); + if (ret == NULL) + return NULL; + + if (getnameinfo(sysaddr, addr_len, ip, sizeof(ip), service, sizeof(service), NI_NUMERICHOST|NI_NUMERICSERV) == 0) { + igloo_socketaddr_set_node(ret, ip); + igloo_socketaddr_set_service(ret, service); + } + + return ret; +} + + +igloo_error_t igloo_socketaddr_get_base(igloo_socketaddr_t *addr, igloo_socketaddr_domain_t *domain, igloo_socketaddr_type_t *type, igloo_socketaddr_protocol_t *protocol) +{ + if (!igloo_RO_IS_VALID(addr, igloo_socketaddr_t)) + return igloo_ERROR_FAULT; + + if (domain) + *domain = addr->domain; + if (type) + *type = addr->type; + if (protocol) + *protocol = addr->protocol; + + return igloo_ERROR_NONE; +} + +igloo_error_t igloo_socketaddr_set_node(igloo_socketaddr_t *addr, const char *node) +{ + if (!igloo_RO_IS_VALID(addr, igloo_socketaddr_t)) + return igloo_ERROR_FAULT; + + if (addr->domain == igloo_SOCKETADDR_DOMAIN_UNIX) + return igloo_ERROR_GENERIC; + + if (!node) { + _replace_string(&(addr->node), NULL); + _replace_string(&(addr->ip), NULL); + return igloo_ERROR_NONE; + } + + if (_is_ip(node)) { + return _replace_string(&(addr->ip), node); + } else { + return _replace_string(&(addr->node), node); + } +} + +igloo_error_t igloo_socketaddr_get_ip(igloo_socketaddr_t *addr, const char **ip) +{ + if (!igloo_RO_IS_VALID(addr, igloo_socketaddr_t)) + return igloo_ERROR_FAULT; + + if (!addr->ip && addr->node) { + char ip[MAX_ADDR_LEN]; + _replace_string(&(addr->ip), _get_ip(addr, addr->node, ip, sizeof(ip))); + } + + if (!addr->ip) + return igloo_ERROR_GENERIC; + + if (ip) + *ip = addr->ip; + + igloo_socketaddr_complete(addr); + + return igloo_ERROR_NONE; +} + +igloo_error_t igloo_socketaddr_set_port(igloo_socketaddr_t *addr, uint16_t port) +{ + if (!igloo_RO_IS_VALID(addr, igloo_socketaddr_t)) + return igloo_ERROR_FAULT; + + if (addr->domain == igloo_SOCKETADDR_DOMAIN_UNIX) + return igloo_ERROR_GENERIC; + + addr->port = port; + addr->set |= SET_PORT; + + igloo_socketaddr_complete(addr); + + return igloo_ERROR_NONE; +} + +igloo_error_t igloo_socketaddr_get_port(igloo_socketaddr_t *addr, uint16_t *port) +{ + if (!igloo_RO_IS_VALID(addr, igloo_socketaddr_t)) + return igloo_ERROR_FAULT; + + if (!(addr->set & SET_PORT)) + return igloo_ERROR_GENERIC; + + if (port) + *port = addr->port; + + return igloo_ERROR_NONE; +} + +igloo_error_t igloo_socketaddr_set_service(igloo_socketaddr_t *addr, const char *service) +{ + igloo_error_t ret; + uint16_t port; + + if (!igloo_RO_IS_VALID(addr, igloo_socketaddr_t)) + return igloo_ERROR_FAULT; + + ret = _get_service(addr, service, &port); + if (ret != igloo_ERROR_NONE) + return ret; + + return igloo_socketaddr_set_port(addr, port); +} + +igloo_error_t igloo_socketaddr_set_path(igloo_socketaddr_t *addr, const char *path) +{ + if (!igloo_RO_IS_VALID(addr, igloo_socketaddr_t)) + return igloo_ERROR_FAULT; + + if (addr->domain != igloo_SOCKETADDR_DOMAIN_UNIX) + return igloo_ERROR_GENERIC; + + return _replace_string(&(addr->path), path); +} + +#define _get_string(key) \ +igloo_error_t igloo_socketaddr_get_ ## key (igloo_socketaddr_t *addr, const char **key) \ +{ \ + if (!igloo_RO_IS_VALID(addr, igloo_socketaddr_t)) \ + return igloo_ERROR_FAULT; \ +\ + if (!addr->key) \ + return igloo_ERROR_GENERIC; \ +\ + if (key) \ + *key = addr->key; \ +\ + return igloo_ERROR_NONE; \ +} + +_get_string(node) +_get_string(path)