Differences From Artifact [fac7286c11]:
- File
src/socket.m
— part of check-in
[2f73172fd6]
at
2018-07-29 14:41:24
on branch trunk
— socket.m: Rename sin to addrIn
This avoids shadowing sin(). (user: js, size: 9757) [annotate] [blame] [check-ins using]
To Artifact [93c697cb3c]:
- File
src/socket.m
— part of check-in
[e36455441d]
at
2018-08-04 15:35:14
on branch trunk
— Use OF_HAVE_IPV6 instead of HAVE_IPV6
This has always been wrong. (user: js, size: 9786) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
241 242 243 244 245 246 247 | @throw [OFInvalidFormatException exception]; objc_autoreleasePoolPop(pool); return ret; } | | | | | | | 241 242 243 244 245 246 247 248 249 250 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 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 | @throw [OFInvalidFormatException exception]; objc_autoreleasePoolPop(pool); return ret; } #ifdef OF_HAVE_IPV6 static of_socket_address_t parseIPv6(OFString *IPv6, uint16_t port) { void *pool = objc_autoreleasePoolPush(); of_socket_address_t ret; struct sockaddr_in6 *addrIn6 = (struct sockaddr_in6 *)&ret.address; memset(&ret, '\0', sizeof(ret)); ret.length = sizeof(struct sockaddr_in6); addrIn6->sin6_family = AF_INET6; addrIn6->sin6_port = OF_BSWAP16_IF_LE(port); if (inet_pton(AF_INET6, [IPv6 cStringWithEncoding: [OFLocale encoding]], &addrIn6->sin6_addr) != 1) @throw [OFInvalidFormatException exception]; objc_autoreleasePoolPop(pool); return ret; } #endif of_socket_address_t of_socket_address_parse_ip(OFString *IP, uint16_t port) { #ifdef OF_HAVE_IPV6 @try { return parseIPv6(IP, port); } @catch (OFInvalidFormatException *e) { #endif return parseIPv4(IP, port); #ifdef OF_HAVE_IPV6 } #endif } bool of_socket_address_equal(of_socket_address_t *address1, of_socket_address_t *address2) { struct sockaddr_in *addrIn1, *addrIn2; #ifdef OF_HAVE_IPV6 struct sockaddr_in6 *addrIn6_1, *addrIn6_2; #endif if (address1->address.ss_family != address2->address.ss_family) return false; switch (address1->address.ss_family) { |
︙ | ︙ | |||
311 312 313 314 315 316 317 | if (addrIn1->sin_port != addrIn2->sin_port) return false; if (addrIn1->sin_addr.s_addr != addrIn2->sin_addr.s_addr) return false; break; | | | 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 | if (addrIn1->sin_port != addrIn2->sin_port) return false; if (addrIn1->sin_addr.s_addr != addrIn2->sin_addr.s_addr) return false; break; #ifdef OF_HAVE_IPV6 case AF_INET6: if (address1->length < sizeof(struct sockaddr_in6) || address2->length < sizeof(struct sockaddr_in6)) @throw [OFInvalidArgumentException exception]; addrIn6_1 = (struct sockaddr_in6 *)&address1->address; addrIn6_2 = (struct sockaddr_in6 *)&address2->address; |
︙ | ︙ | |||
341 342 343 344 345 346 347 | } uint32_t of_socket_address_hash(of_socket_address_t *address) { uint32_t hash = of_hash_seed; struct sockaddr_in *addrIn; | | | 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 | } uint32_t of_socket_address_hash(of_socket_address_t *address) { uint32_t hash = of_hash_seed; struct sockaddr_in *addrIn; #ifdef OF_HAVE_IPV6 struct sockaddr_in6 *addrIn6; uint32_t subhash; #endif hash += address->address.ss_family; switch (address->address.ss_family) { |
︙ | ︙ | |||
364 365 366 367 368 369 370 | addrIn = (struct sockaddr_in *)&address->address; hash += (addrIn->sin_port << 1); hash ^= addrIn->sin_addr.s_addr; break; | | | | 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 | addrIn = (struct sockaddr_in *)&address->address; hash += (addrIn->sin_port << 1); hash ^= addrIn->sin_addr.s_addr; break; #ifdef OF_HAVE_IPV6 case AF_INET6: if (address->length < sizeof(struct sockaddr_in6)) @throw [OFInvalidArgumentException exception]; addrIn6 = (struct sockaddr_in6 *)&address->address; hash += (addrIn6->sin6_port << 1); OF_HASH_INIT(subhash); for (size_t i = 0; i < sizeof(addrIn6->sin6_addr.s6_addr); i++) OF_HASH_ADD(subhash, addrIn6->sin6_addr.s6_addr[i]); OF_HASH_FINALIZE(subhash); hash ^= subhash; break; #endif |
︙ | ︙ | |||
409 410 411 412 413 414 415 | if (port != NULL) *port = OF_BSWAP16_IF_LE(addrIn->sin_port); return [OFString stringWithCString: buffer encoding: [OFLocale encoding]]; } | | | | | | 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 438 439 440 441 442 443 444 445 446 447 448 449 | if (port != NULL) *port = OF_BSWAP16_IF_LE(addrIn->sin_port); return [OFString stringWithCString: buffer encoding: [OFLocale encoding]]; } #ifdef OF_HAVE_IPV6 static OFString * IPv6String(const of_socket_address_t *address, uint16_t *port) { const struct sockaddr_in6 *addrIn6 = (const struct sockaddr_in6 *)&address->address; char buffer[INET6_ADDRSTRLEN]; if (inet_ntop(AF_INET, &addrIn6->sin6_addr, buffer, sizeof(buffer)) == NULL) @throw [OFInvalidArgumentException exception]; if (port != NULL) *port = OF_BSWAP16_IF_LE(addrIn6->sin6_port); return [OFString stringWithCString: buffer encoding: [OFLocale encoding]]; } #endif OFString * of_socket_address_ip_string(const of_socket_address_t *address, uint16_t *port) { switch (address->address.ss_family) { case AF_INET: return IPv4String(address, port); #ifdef OF_HAVE_IPV6 case AF_INET6: return IPv6String(address, port); #endif default: @throw [OFInvalidArgumentException exception]; } } |