ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12731 from kivaisan/fix_socketaddress_verification 

Testing: Fix multihoming test compilation issues
pull/12778/head
Martin Kojtal 2020-04-15 09:21:18 +02:00 committed by GitHub
parent 05dd4ce633 949856d967
commit fef75b3b52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TESTS/network/multihoming/main.cpp
View File

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

2
TESTS/network/multihoming/multihoming_tests.h
View File

@ -19,6 +19,8 @@
#include "nsapi_dns.h" #include "nsapi_dns.h"
#include "mbed_trace.h" #include "mbed_trace.h"
#define TRACE_GROUP "GRNT"
#ifndef MULTIHOMING_TESTS_H #ifndef MULTIHOMING_TESTS_H
#define MULTIHOMING_TESTS_H #define MULTIHOMING_TESTS_H

4
features/netsocket/SocketAddress.cpp
View File

@ -44,7 +44,7 @@ SocketAddress::SocketAddress(const SocketAddress &addr) : _addr(addr._addr), _po
bool SocketAddress::set_ip_address(const char *addr) bool SocketAddress::set_ip_address(const char *addr)
{ {
_ip_address.reset(); _ip_address = nullptr;
if (addr && stoip4(addr, strlen(addr), _addr.bytes)) { if (addr && stoip4(addr, strlen(addr), _addr.bytes)) {
_addr.version = NSAPI_IPv4; _addr.version = NSAPI_IPv4;
@ -73,7 +73,7 @@ void SocketAddress::set_ip_bytes(const void *bytes, nsapi_version_t version)
void SocketAddress::set_addr(const nsapi_addr_t &addr) void SocketAddress::set_addr(const nsapi_addr_t &addr)
{ {
_ip_address.reset(); _ip_address = nullptr;
_addr = addr; _addr = addr;
} }