diff --git a/include/tinycsocket.h b/include/tinycsocket.h index 6be40f3..79b0f8a 100644 --- a/include/tinycsocket.h +++ b/include/tinycsocket.h @@ -29,7 +29,7 @@ #ifndef TINYCSOCKET_INTERNAL_H_ #define TINYCSOCKET_INTERNAL_H_ -static const char* const TCS_VERSION_TXT = "v0.3.67"; +static const char* const TCS_VERSION_TXT = "v0.3.68"; static const char* const TCS_LICENSE_TXT = "Copyright 2018 Markus Lindelöw\n" "\n" @@ -158,7 +158,7 @@ static const char* const TCS_LICENSE_TXT = * - TcsResult tcs_address_to_str(const struct TcsAddress* address, char out_str[70]); * - bool tcs_address_is_equal(const struct TcsAddress* l, const struct TcsAddress* r); * - bool tcs_address_is_any(const struct TcsAddress* addr); -* - bool tcs_address_is_local(const struct TcsAddress* addr); +* - bool tcs_address_is_link_local(const struct TcsAddress* addr); * - bool tcs_address_is_loopback(const struct TcsAddress* addr); * - bool tcs_address_is_multicast(const struct TcsAddress* addr); * - bool tcs_address_is_broadcast(const struct TcsAddress* addr); @@ -2313,7 +2313,7 @@ bool tcs_address_is_equal(const struct TcsAddress* l, const struct TcsAddress* r bool tcs_address_is_any(const struct TcsAddress* addr); /** @brief Check if the address is a link-local address. */ -bool tcs_address_is_local(const struct TcsAddress* addr); +bool tcs_address_is_link_local(const struct TcsAddress* addr); /** @brief Check if the address is a loopback address. */ bool tcs_address_is_loopback(const struct TcsAddress* addr); @@ -4611,7 +4611,7 @@ TcsResult tcs_address_socket_family(TcsSocket socket_ctx, TcsAddressFamily* out_ // tcs_address_to_str() is defined in tinycsocket_common.c // tcs_address_is_equal() is defined in tinycsocket_common.c // tcs_address_is_any() is defined in tinycsocket_common.c -// tcs_address_is_local() is defined in tinycsocket_common.c +// tcs_address_is_link_local() is defined in tinycsocket_common.c // tcs_address_is_loopback() is defined in tinycsocket_common.c // tcs_address_is_multicast() is defined in tinycsocket_common.c // tcs_address_is_broadcast() is defined in tinycsocket_common.c @@ -6465,7 +6465,7 @@ TcsResult tcs_address_socket_family(TcsSocket socket_ctx, TcsAddressFamily* out_ // tcs_address_to_str() is defined in tinycsocket_common.c // tcs_address_is_equal() is defined in tinycsocket_common.c // tcs_address_is_any() is defined in tinycsocket_common.c -// tcs_address_is_local() is defined in tinycsocket_common.c +// tcs_address_is_link_local() is defined in tinycsocket_common.c // tcs_address_is_loopback() is defined in tinycsocket_common.c // tcs_address_is_multicast() is defined in tinycsocket_common.c // tcs_address_is_broadcast() is defined in tinycsocket_common.c @@ -8035,7 +8035,7 @@ bool tcs_address_is_any(const struct TcsAddress* addr) } } -bool tcs_address_is_local(const struct TcsAddress* addr) +bool tcs_address_is_link_local(const struct TcsAddress* addr) { if (addr == NULL) return false; diff --git a/src/tinycsocket_common.c b/src/tinycsocket_common.c index 579b015..94d0540 100644 --- a/src/tinycsocket_common.c +++ b/src/tinycsocket_common.c @@ -1558,7 +1558,7 @@ bool tcs_address_is_any(const struct TcsAddress* addr) } } -bool tcs_address_is_local(const struct TcsAddress* addr) +bool tcs_address_is_link_local(const struct TcsAddress* addr) { if (addr == NULL) return false; diff --git a/src/tinycsocket_internal.h b/src/tinycsocket_internal.h index fdef499..e111917 100644 --- a/src/tinycsocket_internal.h +++ b/src/tinycsocket_internal.h @@ -23,7 +23,7 @@ #ifndef TINYCSOCKET_INTERNAL_H_ #define TINYCSOCKET_INTERNAL_H_ -static const char* const TCS_VERSION_TXT = "v0.3.67"; +static const char* const TCS_VERSION_TXT = "v0.3.68"; static const char* const TCS_LICENSE_TXT = "Copyright 2018 Markus Lindelöw\n" "\n" @@ -152,7 +152,7 @@ static const char* const TCS_LICENSE_TXT = * - TcsResult tcs_address_to_str(const struct TcsAddress* address, char out_str[70]); * - bool tcs_address_is_equal(const struct TcsAddress* l, const struct TcsAddress* r); * - bool tcs_address_is_any(const struct TcsAddress* addr); -* - bool tcs_address_is_local(const struct TcsAddress* addr); +* - bool tcs_address_is_link_local(const struct TcsAddress* addr); * - bool tcs_address_is_loopback(const struct TcsAddress* addr); * - bool tcs_address_is_multicast(const struct TcsAddress* addr); * - bool tcs_address_is_broadcast(const struct TcsAddress* addr); @@ -2307,7 +2307,7 @@ bool tcs_address_is_equal(const struct TcsAddress* l, const struct TcsAddress* r bool tcs_address_is_any(const struct TcsAddress* addr); /** @brief Check if the address is a link-local address. */ -bool tcs_address_is_local(const struct TcsAddress* addr); +bool tcs_address_is_link_local(const struct TcsAddress* addr); /** @brief Check if the address is a loopback address. */ bool tcs_address_is_loopback(const struct TcsAddress* addr); diff --git a/src/tinycsocket_posix.c b/src/tinycsocket_posix.c index 4049ce1..4ab6342 100644 --- a/src/tinycsocket_posix.c +++ b/src/tinycsocket_posix.c @@ -1923,7 +1923,7 @@ TcsResult tcs_address_socket_family(TcsSocket socket_ctx, TcsAddressFamily* out_ // tcs_address_to_str() is defined in tinycsocket_common.c // tcs_address_is_equal() is defined in tinycsocket_common.c // tcs_address_is_any() is defined in tinycsocket_common.c -// tcs_address_is_local() is defined in tinycsocket_common.c +// tcs_address_is_link_local() is defined in tinycsocket_common.c // tcs_address_is_loopback() is defined in tinycsocket_common.c // tcs_address_is_multicast() is defined in tinycsocket_common.c // tcs_address_is_broadcast() is defined in tinycsocket_common.c diff --git a/src/tinycsocket_win32.c b/src/tinycsocket_win32.c index 668bbfb..5456574 100644 --- a/src/tinycsocket_win32.c +++ b/src/tinycsocket_win32.c @@ -1842,7 +1842,7 @@ TcsResult tcs_address_socket_family(TcsSocket socket_ctx, TcsAddressFamily* out_ // tcs_address_to_str() is defined in tinycsocket_common.c // tcs_address_is_equal() is defined in tinycsocket_common.c // tcs_address_is_any() is defined in tinycsocket_common.c -// tcs_address_is_local() is defined in tinycsocket_common.c +// tcs_address_is_link_local() is defined in tinycsocket_common.c // tcs_address_is_loopback() is defined in tinycsocket_common.c // tcs_address_is_multicast() is defined in tinycsocket_common.c // tcs_address_is_broadcast() is defined in tinycsocket_common.c diff --git a/tests/tests.cpp b/tests/tests.cpp index d8e84ad..4d7e673 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -2115,7 +2115,7 @@ TEST_CASE("IPv6 address parse compressed") CHECK(addr.data.ip6.address.bytes[0] == 0xFE); CHECK(addr.data.ip6.address.bytes[1] == 0x80); CHECK(addr.data.ip6.address.bytes[15] == 0x01); - CHECK(tcs_address_is_local(&addr)); + CHECK(tcs_address_is_link_local(&addr)); CHECK(tcs_address_parse("2001:db8::1", &addr) == TCS_SUCCESS); CHECK(addr.data.ip6.address.bytes[0] == 0x20); @@ -2193,7 +2193,7 @@ TEST_CASE("IPv6 address parse with port") CHECK(tcs_address_parse("[fe80::1%3]:8080", &addr) == TCS_SUCCESS); CHECK(addr.data.ip6.port == 8080); CHECK(addr.data.ip6.scope_id == 3); - CHECK(tcs_address_is_local(&addr)); + CHECK(tcs_address_is_link_local(&addr)); CHECK(tcs_address_parse("[::1]:65535", &addr) == TCS_SUCCESS); CHECK(addr.data.ip6.port == 65535); @@ -2207,7 +2207,7 @@ TEST_CASE("IPv6 address parse with scope id") CHECK(tcs_address_parse("fe80::1%3", &addr) == TCS_SUCCESS); CHECK(addr.family == TCS_AF_IP6); CHECK(addr.data.ip6.scope_id == 3); - CHECK(tcs_address_is_local(&addr)); + CHECK(tcs_address_is_link_local(&addr)); } TEST_CASE("IPv6 address parse invalid") @@ -2335,7 +2335,7 @@ TEST_CASE("IPv6 address utility functions") TcsAddress link_local; tcs_address_parse("fe80::1", &link_local); - CHECK(tcs_address_is_local(&link_local)); + CHECK(tcs_address_is_link_local(&link_local)); } TEST_CASE("IPv6 address resolve loopback")