| Comment: | Remove AppleTalk support again
It seems that neither Windows nor macOS support DDP sockets, but only It seems that DDP is not meant to be used directly, while Linux and |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
0b4f713964cc177ff4ba241fa321f03e |
| User & Date: | js on 2022-10-30 18:58:13 |
| Other Links: | manifest | tags |
|
2022-10-31
| ||
| 21:35 | Restore AppleTalk support (check-in: e70159ebb5 user: js tags: trunk) | |
|
2022-10-30
| ||
| 18:58 | Remove AppleTalk support again (check-in: 0b4f713964 user: js tags: trunk) | |
| 18:30 | utils/ofarc: Remove pointless range check (check-in: b01c12cecd user: js tags: trunk) | |
Modified configure.ac from [9e644529b8] to [9d8d865f65].
| ︙ | ︙ | |||
1567 1568 1569 1570 1571 1572 1573 |
#endif
], [
AC_DEFINE(OF_HAVE_IPX, 1, [Whether we have IPX/SPX])
AC_SUBST(USE_SRCS_IPX, '${SRCS_IPX}')
])
])
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 |
#endif
], [
AC_DEFINE(OF_HAVE_IPX, 1, [Whether we have IPX/SPX])
AC_SUBST(USE_SRCS_IPX, '${SRCS_IPX}')
])
])
AC_CHECK_FUNCS(paccept accept4, break)
AC_CHECK_FUNCS(kqueue1 kqueue, [
AC_DEFINE(HAVE_KQUEUE, 1, [Whether we have kqueue])
AC_SUBST(OF_KQUEUE_KERNEL_EVENT_OBSERVER_M,
"OFKqueueKernelEventObserver.m")
break
|
| ︙ | ︙ |
Modified extra.mk.in from [8e59637d10] to [a3fba56a2a].
| ︙ | ︙ | |||
75 76 77 78 79 80 81 | TESTS_LIBS = @TESTS_LIBS@ TESTS_STATIC_LIB = @TESTS_STATIC_LIB@ TLS = @TLS@ TLS_CPPFLAGS = @TLS_CPPFLAGS@ TLS_LIBS = @TLS_LIBS@ UNICODE_M = @UNICODE_M@ USE_INCLUDES_ATOMIC = @USE_INCLUDES_ATOMIC@ | < | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | TESTS_LIBS = @TESTS_LIBS@ TESTS_STATIC_LIB = @TESTS_STATIC_LIB@ TLS = @TLS@ TLS_CPPFLAGS = @TLS_CPPFLAGS@ TLS_LIBS = @TLS_LIBS@ UNICODE_M = @UNICODE_M@ USE_INCLUDES_ATOMIC = @USE_INCLUDES_ATOMIC@ USE_SRCS_FILES = @USE_SRCS_FILES@ USE_SRCS_IPX = @USE_SRCS_IPX@ USE_SRCS_PLUGINS = @USE_SRCS_PLUGINS@ USE_SRCS_SOCKETS = @USE_SRCS_SOCKETS@ USE_SRCS_THREADS = @USE_SRCS_THREADS@ USE_SRCS_UNIX_SOCKETS = @USE_SRCS_UNIX_SOCKETS@ USE_SRCS_WINDOWS = @USE_SRCS_WINDOWS@ WRAPPER = @WRAPPER@ |
Modified src/Makefile from [90eb2c6ebd] to [bbebb28fe1].
| ︙ | ︙ | |||
132 133 134 135 136 137 138 | OFHTTPServer.m \ OFSequencedPacketSocket.m \ OFSocket.m \ OFStreamSocket.m \ OFTCPSocket.m \ OFTLSStream.m \ OFUDPSocket.m \ | < < | 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 |
OFHTTPServer.m \
OFSequencedPacketSocket.m \
OFSocket.m \
OFStreamSocket.m \
OFTCPSocket.m \
OFTLSStream.m \
OFUDPSocket.m \
${USE_SRCS_IPX} \
${USE_SRCS_UNIX_SOCKETS}
SRCS_IPX = OFIPXSocket.m \
OFSPXSocket.m \
OFSPXStreamSocket.m
SRCS_UNIX_SOCKETS = OFUNIXDatagramSocket.m \
OFUNIXStreamSocket.m
SRCS_THREADS = OFCondition.m \
OFMutex.m \
|
| ︙ | ︙ |
Deleted src/OFDDPSocket.h version [987ad37c95].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted src/OFDDPSocket.m version [b54a9f63cf].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Modified src/OFDatagramSocket.m from [946605e073] to [bbb2f277d7].
| ︙ | ︙ | |||
209 210 211 212 213 214 215 | break; #endif #ifdef OF_HAVE_IPX case AF_IPX: sender->family = OFSocketAddressFamilyIPX; break; #endif | < < < < < | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 | break; #endif #ifdef OF_HAVE_IPX case AF_IPX: sender->family = OFSocketAddressFamilyIPX; break; #endif default: sender->family = OFSocketAddressFamilyUnknown; break; } return ret; } |
| ︙ | ︙ |
Modified src/OFSocket.h from [77a6b954f7] to [fc6ec6273c].
| ︙ | ︙ | |||
40 41 42 43 44 45 46 | #endif #ifdef OF_HAVE_AFUNIX_H # include <afunix.h> #endif #ifdef OF_HAVE_NETIPX_IPX_H # include <netipx/ipx.h> #endif | < < < < < < | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | #endif #ifdef OF_HAVE_AFUNIX_H # include <afunix.h> #endif #ifdef OF_HAVE_NETIPX_IPX_H # include <netipx/ipx.h> #endif #ifdef OF_WINDOWS # include <windows.h> # include <ws2tcpip.h> # ifdef OF_HAVE_IPX # include <wsipx.h> # endif #endif /** @file */ #ifdef OF_WII # include <network.h> #endif |
| ︙ | ︙ | |||
105 106 107 108 109 110 111 | OFSocketAddressFamilyIPv4, /** IPv6 */ OFSocketAddressFamilyIPv6, /** UNIX */ OFSocketAddressFamilyUNIX, /** IPX */ OFSocketAddressFamilyIPX, | < < | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 |
OFSocketAddressFamilyIPv4,
/** IPv6 */
OFSocketAddressFamilyIPv6,
/** UNIX */
OFSocketAddressFamilyUNIX,
/** IPX */
OFSocketAddressFamilyIPX,
/** Any address family */
OFSocketAddressFamilyAny = 255
} OFSocketAddressFamily;
#ifndef OF_HAVE_IPV6
struct sockaddr_in6 {
sa_family_t sin6_family;
|
| ︙ | ︙ | |||
148 149 150 151 152 153 154 | # define IPX_NODE_LEN 6 # define sipx_family sa_family # define sipx_network sa_netnum # define sipx_node sa_nodenum # define sipx_port sa_socket #endif | < < < < < < < < < < < < < < < < < < | 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 |
# define IPX_NODE_LEN 6
# define sipx_family sa_family
# define sipx_network sa_netnum
# define sipx_node sa_nodenum
# define sipx_port sa_socket
#endif
/**
* @struct OFSocketAddress OFSocket.h ObjFW/OFSocket.h
*
* @brief A struct which represents a host / port pair for a socket.
*/
typedef struct OF_BOXABLE {
OFSocketAddressFamily family;
/*
* We can't use struct sockaddr as it can contain variable length
* arrays.
*/
union {
struct sockaddr_in in;
struct sockaddr_in6 in6;
struct sockaddr_un un;
struct sockaddr_ipx ipx;
} sockaddr;
socklen_t length;
} OFSocketAddress;
#ifdef __cplusplus
extern "C" {
#endif
|
| ︙ | ︙ | |||
239 240 241 242 243 244 245 |
* @param node The node in the IPX network
* @param port The IPX port (sometimes called socket number) on the node
* @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);
| < < < < < < < < < < < < | 213 214 215 216 217 218 219 220 221 222 223 224 225 226 |
* @param node The node in the IPX network
* @param port The IPX port (sometimes called socket number) on the node
* @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 Compares two OFSocketAddress for equality.
*
* @param address1 The address to compare with the second address
* @param address2 The second address
* @return Whether the two addresses are equal
*/
|
| ︙ | ︙ | |||
358 359 360 361 362 363 364 | * @brief Returns the IPX port of the specified @ref OFSocketAddress. * * @param address The address on which to get the port * @return The port of the address */ extern uint16_t OFSocketAddressIPXPort(const OFSocketAddress *_Nonnull address); | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 320 321 322 323 324 325 326 327 328 329 330 331 332 333 | * @brief Returns the IPX port of the specified @ref OFSocketAddress. * * @param address The address on which to get the port * @return The port of the address */ extern uint16_t OFSocketAddressIPXPort(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); #if !defined(OF_WII) && !defined(OF_NINTENDO_3DS) extern int OFGetSockName(OFSocketHandle sock, struct sockaddr *restrict addr, |
| ︙ | ︙ |
Modified src/OFSocket.m from [4fc1cbbf22] to [d0ea6d0ea9].
| ︙ | ︙ | |||
569 570 571 572 573 574 575 | sizeof(ret.sockaddr.ipx.sipx_network)); memcpy(ret.sockaddr.ipx.sipx_node, node, IPX_NODE_LEN); ret.sockaddr.ipx.sipx_port = OFToBigEndian16(port); return ret; } | < < < < < < < < < < < < < < < < < < < < < < | 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 |
sizeof(ret.sockaddr.ipx.sipx_network));
memcpy(ret.sockaddr.ipx.sipx_node, node, IPX_NODE_LEN);
ret.sockaddr.ipx.sipx_port = OFToBigEndian16(port);
return ret;
}
bool
OFSocketAddressEqual(const OFSocketAddress *address1,
const OFSocketAddress *address2)
{
const struct sockaddr_in *addrIn1, *addrIn2;
const struct sockaddr_in6 *addrIn6_1, *addrIn6_2;
const struct sockaddr_ipx *addrIPX1, *addrIPX2;
void *pool;
OFString *path1, *path2;
bool ret;
if (address1->family != address2->family)
return false;
|
| ︙ | ︙ | |||
675 676 677 678 679 680 681 | if (memcmp(&addrIPX1->sipx_network, &addrIPX2->sipx_network, 4) != 0) return false; if (memcmp(addrIPX1->sipx_node, addrIPX2->sipx_node, IPX_NODE_LEN) != 0) return false; | < < < < < < < < < < < < < < < < | 653 654 655 656 657 658 659 660 661 662 663 664 665 666 | if (memcmp(&addrIPX1->sipx_network, &addrIPX2->sipx_network, 4) != 0) return false; if (memcmp(addrIPX1->sipx_node, addrIPX2->sipx_node, IPX_NODE_LEN) != 0) return false; return true; default: @throw [OFInvalidArgumentException exception]; } } unsigned long |
| ︙ | ︙ | |||
767 768 769 770 771 772 773 | for (size_t i = 0; i < sizeof(network); i++) OFHashAddByte(&hash, network[i]); for (size_t i = 0; i < IPX_NODE_LEN; i++) OFHashAddByte(&hash, address->sockaddr.ipx.sipx_node[i]); | < < < < < < < < < | 729 730 731 732 733 734 735 736 737 738 739 740 741 742 | for (size_t i = 0; i < sizeof(network); i++) OFHashAddByte(&hash, network[i]); for (size_t i = 0; i < IPX_NODE_LEN; i++) OFHashAddByte(&hash, address->sockaddr.ipx.sipx_node[i]); break; default: @throw [OFInvalidArgumentException exception]; } OFHashFinalize(&hash); |
| ︙ | ︙ | |||
991 992 993 994 995 996 997 |
OFSocketAddressIPXPort(const OFSocketAddress *address)
{
if (address->family != OFSocketAddressFamilyIPX)
@throw [OFInvalidArgumentException exception];
return OFFromBigEndian16(address->sockaddr.ipx.sipx_port);
}
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 944 945 946 947 948 949 950 |
OFSocketAddressIPXPort(const OFSocketAddress *address)
{
if (address->family != OFSocketAddressFamilyIPX)
@throw [OFInvalidArgumentException exception];
return OFFromBigEndian16(address->sockaddr.ipx.sipx_port);
}
|
Modified src/ObjFW.h from [940f93b1b8] to [db1b63a56b].
| ︙ | ︙ | |||
89 90 91 92 93 94 95 | # import "OFUNIXStreamSocket.h" # endif # ifdef OF_HAVE_IPX # import "OFIPXSocket.h" # import "OFSPXSocket.h" # import "OFSPXStreamSocket.h" # endif | < < < | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | # import "OFUNIXStreamSocket.h" # endif # ifdef OF_HAVE_IPX # import "OFIPXSocket.h" # import "OFSPXSocket.h" # import "OFSPXStreamSocket.h" # endif # import "OFHTTPClient.h" # import "OFHTTPCookie.h" # import "OFHTTPCookieManager.h" # import "OFHTTPRequest.h" # import "OFHTTPResponse.h" # import "OFHTTPServer.h" #endif |
| ︙ | ︙ | |||
208 209 210 211 212 213 214 | # import "OFBindUNIXSocketFailedException.h" # import "OFConnectUNIXSocketFailedException.h" # endif # ifdef OF_HAVE_IPX # import "OFBindIPXSocketFailedException.h" # import "OFConnectSPXSocketFailedException.h" # endif | < < < | 205 206 207 208 209 210 211 212 213 214 215 216 217 218 | # import "OFBindUNIXSocketFailedException.h" # import "OFConnectUNIXSocketFailedException.h" # endif # ifdef OF_HAVE_IPX # import "OFBindIPXSocketFailedException.h" # import "OFConnectSPXSocketFailedException.h" # endif #endif #ifdef OF_HAVE_THREADS # import "OFBroadcastConditionFailedException.h" # import "OFConditionStillWaitingException.h" # import "OFJoinThreadFailedException.h" # import "OFSignalConditionFailedException.h" # import "OFStartThreadFailedException.h" |
| ︙ | ︙ |
Modified src/exceptions/Makefile from [0588e3b54e] to [302ddd0bab].
| ︙ | ︙ | |||
61 62 63 64 65 66 67 | OFConnectSocketFailedException.m \ OFDNSQueryFailedException.m \ OFHTTPRequestFailedException.m \ OFListenOnSocketFailedException.m \ OFObserveKernelEventsFailedException.m \ OFResolveHostFailedException.m \ OFTLSHandshakeFailedException.m \ | < < | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 |
OFConnectSocketFailedException.m \
OFDNSQueryFailedException.m \
OFHTTPRequestFailedException.m \
OFListenOnSocketFailedException.m \
OFObserveKernelEventsFailedException.m \
OFResolveHostFailedException.m \
OFTLSHandshakeFailedException.m \
${USE_SRCS_IPX} \
${USE_SRCS_UNIX_SOCKETS}
SRCS_IPX = OFBindIPXSocketFailedException.m \
OFConnectSPXSocketFailedException.m
SRCS_UNIX_SOCKETS = OFBindUNIXSocketFailedException.m \
OFConnectUNIXSocketFailedException.m
SRCS_THREADS = OFBroadcastConditionFailedException.m \
OFConditionStillWaitingException.m \
OFJoinThreadFailedException.m \
|
| ︙ | ︙ |
Deleted src/exceptions/OFBindDDPSocketFailedException.h version [218affa1e0].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted src/exceptions/OFBindDDPSocketFailedException.m version [dbb639a5e2].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Modified src/objfw-defs.h.in from [b415425796] to [46516d773c].
1 2 3 4 | #undef OF_APPLE_RUNTIME #undef OF_BIG_ENDIAN #undef OF_FLOAT_BIG_ENDIAN #undef OF_HAVE_AFUNIX_H | < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | #undef OF_APPLE_RUNTIME #undef OF_BIG_ENDIAN #undef OF_FLOAT_BIG_ENDIAN #undef OF_HAVE_AFUNIX_H #undef OF_HAVE_ATOMIC_BUILTINS #undef OF_HAVE_ATOMIC_OPS #undef OF_HAVE_BUILTIN_BSWAP16 #undef OF_HAVE_BUILTIN_BSWAP32 #undef OF_HAVE_BUILTIN_BSWAP64 #undef OF_HAVE_CHMOD #undef OF_HAVE_CHOWN #undef OF_HAVE_FILES #undef OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR #undef OF_HAVE_IPV6 #undef OF_HAVE_IPX #undef OF_HAVE_LIMITS_H #undef OF_HAVE_LINK #undef OF_HAVE_MAX_ALIGN_T #undef OF_HAVE_NETINET_IN_H #undef OF_HAVE_NETINET_TCP_H #undef OF_HAVE_NETIPX_IPX_H #undef OF_HAVE_OSATOMIC #undef OF_HAVE_OSATOMIC_64 #undef OF_HAVE_PIPE #undef OF_HAVE_PLEDGE |
| ︙ | ︙ |
Modified tests/Makefile from [90bcdcd287] to [2482a8a4a6].
| ︙ | ︙ | |||
71 72 73 74 75 76 77 |
${OF_HTTP_CLIENT_TESTS_M} \
OFHTTPCookieTests.m \
OFHTTPCookieManagerTests.m \
OFKernelEventObserverTests.m \
OFSocketTests.m \
OFTCPSocketTests.m \
OFUDPSocketTests.m \
| < < | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 |
${OF_HTTP_CLIENT_TESTS_M} \
OFHTTPCookieTests.m \
OFHTTPCookieManagerTests.m \
OFKernelEventObserverTests.m \
OFSocketTests.m \
OFTCPSocketTests.m \
OFUDPSocketTests.m \
${USE_SRCS_IPX} \
${USE_SRCS_UNIX_SOCKETS}
SRCS_IPX = OFIPXSocketTests.m \
OFSPXSocketTests.m \
OFSPXStreamSocketTests.m
SRCS_UNIX_SOCKETS = OFUNIXDatagramSocketTests.m \
OFUNIXStreamSocketTests.m
SRCS_THREADS = OFThreadTests.m
SRCS_WINDOWS = OFWindowsRegistryKeyTests.m
|
| ︙ | ︙ |
Modified tests/TestsAppDelegate.h from [1f4a8a0dc4] to [951626637b].
| ︙ | ︙ | |||
67 68 69 70 71 72 73 | - (void)blockTests; @end @interface TestsAppDelegate (OFCharacterSetTests) - (void)characterSetTests; @end | < < < < | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | - (void)blockTests; @end @interface TestsAppDelegate (OFCharacterSetTests) - (void)characterSetTests; @end @interface TestsAppDelegate (OFDNSResolverTests) - (void)DNSResolverTests; @end @interface TestsAppDelegate (OFDataTests) - (void)dataTests; @end |
| ︙ | ︙ |
Modified tests/TestsAppDelegate.m from [5b13043c48] to [0808a007fb].
| ︙ | ︙ | |||
416 417 418 419 420 421 422 | [self UNIXStreamSocketTests]; # endif # ifdef OF_HAVE_IPX [self IPXSocketTests]; [self SPXSocketTests]; [self SPXStreamSocketTests]; # endif | < < < | 416 417 418 419 420 421 422 423 424 425 426 427 428 429 | [self UNIXStreamSocketTests]; # endif # ifdef OF_HAVE_IPX [self IPXSocketTests]; [self SPXSocketTests]; [self SPXStreamSocketTests]; # endif [self kernelEventObserverTests]; #endif #ifdef OF_HAVE_THREADS [self threadTests]; #endif [self URITests]; #if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_THREADS) |
| ︙ | ︙ |