Skip to content

Commit fef75b3

Browse files
authored
Merge pull request #12731 from kivaisan/fix_socketaddress_verification
Testing: Fix multihoming test compilation issues
2 parents 05dd4ce + 949856d commit fef75b3

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

TESTS/network/multihoming/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static void _ifup()
8181
SocketAddress eth_ip_address_if;
8282
LWIP::get_instance().get_ip_address_if(&eth_ip_address_if, interface_name[interface_num]);
8383
printf("IP_if: %s\n", eth_ip_address.get_ip_address());
84-
TEST_ASSERT_EQUAL(eth_ip_address_if, eth_ip_address);
84+
TEST_ASSERT(eth_ip_address_if == eth_ip_address);
8585
interface_num++;
8686

8787
wifi = WiFiInterface::get_default_instance();
@@ -112,7 +112,7 @@ static void _ifup()
112112
SocketAddress wifi_ip_address_if;
113113
LWIP::get_instance().get_ip_address_if(&wifi_ip_address_if, interface_name[interface_num]);
114114
printf("IP_if: %s\n", STRING_VERIFY(wifi_ip_address_if.get_ip_address()));
115-
TEST_ASSERT_EQUAL(wifi_ip_address_if, wifi_ip_address);
115+
TEST_ASSERT(wifi_ip_address_if == wifi_ip_address);
116116
SocketAddress wifi_netmask;
117117
wifi->get_netmask(&wifi_netmask);
118118
printf("Netmask: %s\n", STRING_VERIFY(wifi_netmask.get_ip_address()));

TESTS/network/multihoming/multihoming_tests.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#include "nsapi_dns.h"
2020
#include "mbed_trace.h"
2121

22+
#define TRACE_GROUP "GRNT"
23+
2224
#ifndef MULTIHOMING_TESTS_H
2325
#define MULTIHOMING_TESTS_H
2426

features/netsocket/SocketAddress.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ SocketAddress::SocketAddress(const SocketAddress &addr) : _addr(addr._addr), _po
4444

4545
bool SocketAddress::set_ip_address(const char *addr)
4646
{
47-
_ip_address.reset();
47+
_ip_address = nullptr;
4848

4949
if (addr && stoip4(addr, strlen(addr), _addr.bytes)) {
5050
_addr.version = NSAPI_IPv4;
@@ -73,7 +73,7 @@ void SocketAddress::set_ip_bytes(const void *bytes, nsapi_version_t version)
7373

7474
void SocketAddress::set_addr(const nsapi_addr_t &addr)
7575
{
76-
_ip_address.reset();
76+
_ip_address = nullptr;
7777
_addr = addr;
7878
}
7979

0 commit comments

Comments
 (0)