ObjFW  Diff

Differences From Artifact [fd66b3751b]:

To Artifact [b9d1cba50d]:


390
391
392
393
394
395
396
397
398


399
400
401


402
403
404
405
406
407
408
390
391
392
393
394
395
396


397
398
399


400
401
402
403
404
405
406
407
408







-
-
+
+

-
-
+
+







		return of_socket_address_parse_ipv6(IP, port);
	} @catch (OFInvalidFormatException *e) {
		return of_socket_address_parse_ipv4(IP, port);
	}
}

bool
of_socket_address_equal(of_socket_address_t *address1,
    of_socket_address_t *address2)
of_socket_address_equal(const of_socket_address_t *address1,
    const of_socket_address_t *address2)
{
	struct sockaddr_in *addrIn1, *addrIn2;
	struct sockaddr_in6 *addrIn6_1, *addrIn6_2;
	const struct sockaddr_in *addrIn1, *addrIn2;
	const struct sockaddr_in6 *addrIn6_1, *addrIn6_2;

	if (address1->family != address2->family)
		return false;

	switch (address1->family) {
	case OF_SOCKET_ADDRESS_FAMILY_IPV4:
#ifndef OF_WII
443
444
445
446
447
448
449
450

451
452
453
454
455
456
457
443
444
445
446
447
448
449

450
451
452
453
454
455
456
457







-
+







		@throw [OFInvalidArgumentException exception];
	}

	return true;
}

uint32_t
of_socket_address_hash(of_socket_address_t *address)
of_socket_address_hash(const of_socket_address_t *address)
{
	uint32_t hash;

	OF_HASH_INIT(hash);
	OF_HASH_ADD(hash, address->family);

	switch (address->family) {