ObjFW  Check-in [c7a45d0140]

Overview
Comment:Add in_addr_t for MorphOS
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: c7a45d0140bd2103fca91a39f23d5606179781187d1b4f8b30f0609bb135b2f3
User & Date: js on 2017-05-17 00:13:13
Other Links: manifest | tags
Context
2017-05-17
20:31
configure: Better poll() and select() checks check-in: a29197bd35 user: js tags: trunk
00:13
Add in_addr_t for MorphOS check-in: c7a45d0140 user: js tags: trunk
2017-05-16
23:22
runtime.h: Never undefine _Nullable / _Nonnull check-in: 5116a3709c user: js tags: trunk
Changes

Modified src/resolver.m from [1e35fdb00e] to [a07fe0ff30].

223
224
225
226
227
228
229

230
231
232
233
234
235
236
237

		for (retIter = ret, resultsIter = results, addrsIter = addrs,
		    ip = he->h_addr_list; *ip != NULL;
		    retIter++, resultsIter++, addrsIter++, ip++) {
			addrsIter->sin_family = he->h_addrtype;
			addrsIter->sin_port = OF_BSWAP16_IF_LE(port);


			if (he->h_length > sizeof(addrsIter->sin_addr.s_addr))
				@throw [OFOutOfRangeException exception];

			memcpy(&addrsIter->sin_addr.s_addr, *ip, he->h_length);

			resultsIter->family = he->h_addrtype;
			resultsIter->type = type;
			resultsIter->protocol = 0;







>
|







223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238

		for (retIter = ret, resultsIter = results, addrsIter = addrs,
		    ip = he->h_addr_list; *ip != NULL;
		    retIter++, resultsIter++, addrsIter++, ip++) {
			addrsIter->sin_family = he->h_addrtype;
			addrsIter->sin_port = OF_BSWAP16_IF_LE(port);

			if ((size_t)he->h_length >
			    sizeof(addrsIter->sin_addr.s_addr))
				@throw [OFOutOfRangeException exception];

			memcpy(&addrsIter->sin_addr.s_addr, *ip, he->h_length);

			resultsIter->family = he->h_addrtype;
			resultsIter->type = type;
			resultsIter->protocol = 0;

Modified src/socket_helpers.h from [af4d927003] to [2eb48e2252].

60
61
62
63
64
65
66




67
68
69
70
71
72
73
#ifndef SOCK_CLOEXEC
# define SOCK_CLOEXEC 0
#endif

#ifdef OF_WINDOWS
# define close(sock) closesocket(sock)
#endif





#ifdef OF_WII
# define accept(sock, addr, addrlen) net_accept(sock, addr, addrlen)
# define bind(sock, addr, addrlen) net_bind(sock, addr, addrlen)
# define close(sock) net_close(sock)
# define connect(sock, addr, addrlen) net_connect(sock, addr, addrlen)
# define gethostbyname(name) net_gethostbyname(name)







>
>
>
>







60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
#ifndef SOCK_CLOEXEC
# define SOCK_CLOEXEC 0
#endif

#ifdef OF_WINDOWS
# define close(sock) closesocket(sock)
#endif

#ifdef OF_MORPHOS
typedef uint32_t in_addr_t;
#endif

#ifdef OF_WII
# define accept(sock, addr, addrlen) net_accept(sock, addr, addrlen)
# define bind(sock, addr, addrlen) net_bind(sock, addr, addrlen)
# define close(sock) net_close(sock)
# define connect(sock, addr, addrlen) net_connect(sock, addr, addrlen)
# define gethostbyname(name) net_gethostbyname(name)