Differences From Artifact [e7074a55dd]:
- File
src/socket.m
— part of check-in
[ab89c47f42]
at
2019-01-07 22:59:58
on branch trunk
— Partially fix sockets on Nintendo 3DS/Wii
This does not fully fix it yet, but at least the socket tests in the
test suite pass on 3DS now. (user: js, size: 14769) [annotate] [blame] [check-ins using]
To Artifact [b2488d7024]:
- File src/socket.m — part of check-in [bceb7ed4c9] at 2019-03-08 00:35:48 on branch trunk — Use dot syntax (user: js, size: 14749) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
251 252 253 254 255 256 257 | addrIn->sin_port = OF_BSWAP16_IF_LE(port); #ifdef OF_WII addrIn->sin_len = ret.length; #endif components = [IPv4 componentsSeparatedByString: @"."]; | | | | | 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 |
addrIn->sin_port = OF_BSWAP16_IF_LE(port);
#ifdef OF_WII
addrIn->sin_len = ret.length;
#endif
components = [IPv4 componentsSeparatedByString: @"."];
if (components.count != 4)
@throw [OFInvalidFormatException exception];
addr = 0;
for (OFString *component in components) {
intmax_t number;
if (component.length == 0)
@throw [OFInvalidFormatException exception];
if ([component indexOfCharacterFromSet:
whitespaceCharacterSet] != OF_NOT_FOUND)
@throw [OFInvalidFormatException exception];
number = component.decimalValue;
if (number < 0 || number > UINT8_MAX)
@throw [OFInvalidFormatException exception];
addr = (addr << 8) | (number & 0xFF);
}
|
| ︙ | ︙ | |||
290 291 292 293 294 295 296 |
{
uintmax_t number;
if ([component indexOfCharacterFromSet:
[OFCharacterSet whitespaceCharacterSet]] != OF_NOT_FOUND)
@throw [OFInvalidFormatException exception];
| | | 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 |
{
uintmax_t number;
if ([component indexOfCharacterFromSet:
[OFCharacterSet whitespaceCharacterSet]] != OF_NOT_FOUND)
@throw [OFInvalidFormatException exception];
number = component.hexadecimalValue;
if (number > UINT16_MAX)
@throw [OFInvalidFormatException exception];
return (uint16_t)number;
}
|
| ︙ | ︙ | |||
323 324 325 326 327 328 329 |
doubleColon = [IPv6 rangeOfString: @"::"].location;
if (doubleColon != OF_NOT_FOUND) {
OFString *left = [IPv6 substringWithRange:
of_range(0, doubleColon)];
OFString *right = [IPv6 substringWithRange:
| | | | | | | 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 |
doubleColon = [IPv6 rangeOfString: @"::"].location;
if (doubleColon != OF_NOT_FOUND) {
OFString *left = [IPv6 substringWithRange:
of_range(0, doubleColon)];
OFString *right = [IPv6 substringWithRange:
of_range(doubleColon + 2, IPv6.length - doubleColon - 2)];
OFArray OF_GENERIC(OFString *) *leftComponents;
OFArray OF_GENERIC(OFString *) *rightComponents;
size_t i;
if ([right hasPrefix: @":"] || [right containsString: @"::"])
@throw [OFInvalidFormatException exception];
leftComponents = [left componentsSeparatedByString: @":"];
rightComponents = [right componentsSeparatedByString: @":"];
if (leftComponents.count + rightComponents.count > 7)
@throw [OFInvalidFormatException exception];
i = 0;
for (OFString *component in leftComponents) {
uint16_t number = parseIPv6Component(component);
addrIn6->sin6_addr.s6_addr[i++] = number >> 8;
addrIn6->sin6_addr.s6_addr[i++] = number;
}
i = 16;
for (OFString *component in rightComponents.reversedArray) {
uint16_t number = parseIPv6Component(component);
addrIn6->sin6_addr.s6_addr[--i] = number >> 8;
addrIn6->sin6_addr.s6_addr[--i] = number;
}
} else {
OFArray OF_GENERIC(OFString *) *components =
[IPv6 componentsSeparatedByString: @":"];
size_t i;
if (components.count != 8)
@throw [OFInvalidFormatException exception];
i = 0;
for (OFString *component in components) {
uint16_t number;
if (component.length == 0)
@throw [OFInvalidFormatException exception];
number = parseIPv6Component(component);
addrIn6->sin6_addr.s6_addr[i++] = number >> 8;
addrIn6->sin6_addr.s6_addr[i++] = number;
}
|
| ︙ | ︙ |