@@ -42,23 +42,17 @@ # include #endif #ifdef OF_HAVE_NETIPX_IPX_H # include #endif -#ifdef OF_HAVE_NETATALK_AT_H -# include -#endif #ifdef OF_WINDOWS # include # include # ifdef OF_HAVE_IPX # include # endif -# ifdef OF_HAVE_APPLETALK -# include -# endif #endif /** @file */ #ifdef OF_WII @@ -107,12 +101,10 @@ OFSocketAddressFamilyIPv6, /** UNIX */ OFSocketAddressFamilyUNIX, /** IPX */ OFSocketAddressFamilyIPX, - /** AppleTalk */ - OFSocketAddressFamilyAppleTalk, /** Any address family */ OFSocketAddressFamilyAny = 255 } OFSocketAddressFamily; #ifndef OF_HAVE_IPV6 @@ -150,27 +142,10 @@ # define sipx_network sa_netnum # define sipx_node sa_nodenum # define sipx_port sa_socket #endif -#ifndef OF_HAVE_APPLETALK -struct sockaddr_at { - sa_family_t sat_family; - uint8_t sat_port; - struct at_addr { - uint16_t s_net; - uint8_t s_node; - } sat_addr; -}; -#endif -#ifdef OF_WINDOWS -# define sat_port sat_socket -#else -# define sat_net sat_addr.s_net -# define sat_node sat_addr.s_node -#endif - /** * @struct OFSocketAddress OFSocket.h ObjFW/OFSocket.h * * @brief A struct which represents a host / port pair for a socket. */ @@ -183,11 +158,10 @@ union { struct sockaddr_in in; struct sockaddr_in6 in6; struct sockaddr_un un; struct sockaddr_ipx ipx; - struct sockaddr_at at; } sockaddr; socklen_t length; } OFSocketAddress; #ifdef __cplusplus @@ -241,22 +215,10 @@ * @return An IPX socket address with the specified node, network and port. */ extern OFSocketAddress OFSocketAddressMakeIPX(uint32_t network, const unsigned char node[_Nonnull IPX_NODE_LEN], uint16_t port); -/** - * @brief Creates an AppleTalk address for the specified network, node and port. - * - * @param network The AppleTalk network - * @param node The node in the AppleTalk network - * @param port The AppleTalk (sometimes called socket number) on the node - * @return An AppleTalk socket address with the specified node, network and - * port. - */ -extern OFSocketAddress OFSocketAddressMakeAppleTalk(uint16_t network, - uint8_t node, uint8_t port); - /** * @brief Compares two OFSocketAddress for equality. * * @param address1 The address to compare with the second address * @param address2 The second address @@ -360,64 +322,10 @@ * @param address The address on which to get the port * @return The port of the address */ extern uint16_t OFSocketAddressIPXPort(const OFSocketAddress *_Nonnull address); -/** - * @brief Sets the AppleTalk network of the specified @ref OFSocketAddress. - * - * @param address The address on which to set the AppleTalk network - * @param network The AppleTalk network to set on the address - */ -extern void OFSocketAddressSetAppleTalkNetwork( - OFSocketAddress *_Nonnull address, uint16_t network); - -/** - * @brief Returns the AppleTalk network of the specified @ref OFSocketAddress. - * - * @param address The address on which to get the AppleTalk network - * @return The AppleTalk network of the address - */ -extern uint16_t OFSocketAddressAppleTalkNetwork( - const OFSocketAddress *_Nonnull address); - -/** - * @brief Sets the AppleTalk node of the specified @ref OFSocketAddress. - * - * @param address The address on which to set the AppleTalk node - * @param node The AppleTalk node to set on the address - */ -extern void OFSocketAddressSetAppleTalkNode(OFSocketAddress *_Nonnull address, - uint8_t node); - -/** - * @brief Gets the AppleTalk node of the specified @ref OFSocketAddress. - * - * @param address The address on which to get the AppleTalk node - * @return The AppleTalk node of the address - */ -extern uint8_t OFSocketAddressAppleTalkNode( - const OFSocketAddress *_Nonnull address); - -/** - * @brief Sets the AppleTalk port of the specified @ref OFSocketAddress. - * - * @param address The address on which to set the port - * @param port The port to set on the address - */ -extern void OFSocketAddressSetAppleTalkPort(OFSocketAddress *_Nonnull address, - uint8_t port); - -/** - * @brief Returns the AppleTalk port of the specified @ref OFSocketAddress. - * - * @param address The address on which to get the port - * @return The port of the address - */ -extern uint8_t OFSocketAddressAppleTalkPort( - const OFSocketAddress *_Nonnull address); - extern bool OFSocketInit(void); #if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS) && !defined(OF_MORPHOS) extern void OFSocketDeinit(void); #endif extern int OFSocketErrNo(void);