Differences From Artifact [4800955ec9]:
- File
src/OFTCPSocket.m
— part of check-in
[ffb91daffe]
at
2013-06-11 23:33:16
on branch trunk
— Initial sockets support for the Wii.
Not functional yet due to bugs in the SDK.
Bugs found so far:* Binding to port 0 fails instead of choosing a free port.
* gethostbyname() does not work for IPs.
* getsockname() is missing.
* struct sockaddr_storage is missing.I have not decided yet whether I fix those bugs in the SDK (I already
implemented getsockname() and added struct sockaddr_stroage and it seems
to work) or if I work around them in ObjFW. This will mainly depend on
how cooperative the developers of the Wii SDK are. (user: js, size: 17114) [annotate] [blame] [check-ins using]
To Artifact [73d0c39dd0]:
- File
src/OFTCPSocket.m
— part of check-in
[8faa16f249]
at
2013-06-13 01:59:45
on branch trunk
— Try inet_addr() before gethostbyname().
gethostbyname() is not required to accept an IP address and does not do
so on the Wii. (user: js, size: 17988) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
93 94 95 96 97 98 99 100 101 102 103 104 105 106 |
# define connect(sock, addr, addrlen) net_connect(sock, addr, addrlen)
# define gethostbyname(name) net_gethostbyname(name)
# define getsockname(sock, addr, addrlen) net_getsockname(sock, addr, addrlen)
# define listen(sock, backlog) net_listen(sock, backlog)
# define setsockopt(sock, level, name, value, len) \
net_setsockopt(sock, level, name, value, len)
# define socket(domain, type, proto) net_socket(domain, type, proto)
#endif
/* References for static linking */
void _references_to_categories_of_OFTCPSocket(void)
{
_OFTCPSocket_SOCKS5_reference = 1;
}
| > | 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 |
# define connect(sock, addr, addrlen) net_connect(sock, addr, addrlen)
# define gethostbyname(name) net_gethostbyname(name)
# define getsockname(sock, addr, addrlen) net_getsockname(sock, addr, addrlen)
# define listen(sock, backlog) net_listen(sock, backlog)
# define setsockopt(sock, level, name, value, len) \
net_setsockopt(sock, level, name, value, len)
# define socket(domain, type, proto) net_socket(domain, type, proto)
typedef u32 in_addr_t;
#endif
/* References for static linking */
void _references_to_categories_of_OFTCPSocket(void)
{
_OFTCPSocket_SOCKS5_reference = 1;
}
|
| ︙ | ︙ | |||
371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 |
#else
bool connected = false;
struct hostent *he;
struct sockaddr_in addr;
char **ip;
# ifdef OF_HAVE_THREADS
OFDataArray *addrlist;
addrlist = [[OFDataArray alloc] initWithItemSize: sizeof(char**)];
[mutex lock];
# endif
if ((he = gethostbyname([host cStringWithEncoding:
OF_STRING_ENCODING_NATIVE])) == NULL) {
# ifdef OF_HAVE_THREADS
[addrlist release];
[mutex unlock];
# endif
@throw [OFAddressTranslationFailedException
exceptionWithClass: [self class]
socket: self
host: host];
}
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < | 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 |
#else
bool connected = false;
struct hostent *he;
struct sockaddr_in addr;
char **ip;
# ifdef OF_HAVE_THREADS
OFDataArray *addrlist;
# endif
memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
addr.sin_port = OF_BSWAP16_IF_LE(port);
if ((addr.sin_addr.s_addr = inet_addr([host cStringWithEncoding:
OF_STRING_ENCODING_NATIVE])) != (in_addr_t)(-1)) {
if ((_socket = socket(AF_INET, SOCK_STREAM,
0)) == INVALID_SOCKET) {
@throw [OFConnectionFailedException
exceptionWithClass: [self class]
socket: self
host: host
port: port];
}
if (connect(_socket, (struct sockaddr*)&addr,
sizeof(addr)) == -1) {
close(_socket);
_socket = INVALID_SOCKET;
@throw [OFConnectionFailedException
exceptionWithClass: [self class]
socket: self
host: host
port: port];
}
if (_SOCKS5Host != nil)
[self OF_SOCKS5ConnectToHost: destinationHost
port: destinationPort];
return;
}
# ifdef OF_HAVE_THREADS
addrlist = [[OFDataArray alloc] initWithItemSize: sizeof(char**)];
[mutex lock];
# endif
if ((he = gethostbyname([host cStringWithEncoding:
OF_STRING_ENCODING_NATIVE])) == NULL) {
# ifdef OF_HAVE_THREADS
[addrlist release];
[mutex unlock];
# endif
@throw [OFAddressTranslationFailedException
exceptionWithClass: [self class]
socket: self
host: host];
}
if (he->h_addrtype != AF_INET ||
(_socket = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) {
# ifdef OF_HAVE_THREADS
[addrlist release];
[mutex unlock];
# endif
@throw [OFConnectionFailedException
|
| ︙ | ︙ | |||
558 559 560 561 562 563 564 | socket: self host: host port: port]; } freeaddrinfo(res); #else | < < < < < < < < < < < < < < < < < | > | > > > > > | | | | | > > > > > > | > | | > | > > > | 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 |
socket: self
host: host
port: port];
}
freeaddrinfo(res);
#else
memset(&addr, 0, sizeof(addr));
addr.in.sin_family = AF_INET;
addr.in.sin_port = OF_BSWAP16_IF_LE(port);
if ((addr.in.sin_addr.s_addr = inet_addr([host cStringWithEncoding:
OF_STRING_ENCODING_NATIVE])) == (in_addr_t)(-1)) {
# ifdef OF_HAVE_THREADS
[mutex lock];
@try {
# endif
struct hostent *he;
if ((he = gethostbyname([host cStringWithEncoding:
OF_STRING_ENCODING_NATIVE])) == NULL)
@throw [OFAddressTranslationFailedException
exceptionWithClass: [self class]
socket: self
host: host];
if (he->h_addrtype != AF_INET ||
he->h_addr_list[0] == NULL) {
@throw [OFAddressTranslationFailedException
exceptionWithClass: [self class]
socket: self
host: host];
}
memcpy(&addr.in.sin_addr.s_addr, he->h_addr_list[0],
he->h_length);
# ifdef OF_HAVE_THREADS
} @finally {
[mutex unlock];
}
# endif
}
if ((_socket = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
@throw [OFBindFailedException exceptionWithClass: [self class]
socket: self
host: host
port: port];
if (setsockopt(_socket, SOL_SOCKET, SO_REUSEADDR, (const char*)&one,
|
| ︙ | ︙ |