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 #7014 from KariHaapalehto/interface_check 

Add check for _interface
pull/6752/merge
Cruz Monrreal 2018-05-29 10:42:19 -05:00 committed by GitHub
parent b70f6e056d 8540b1ea23
commit 7418260b78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
features/netsocket/EMACInterface.cpp
View File

@ -70,12 +70,15 @@ nsapi_error_t EMACInterface::connect()
nsapi_error_t EMACInterface::disconnect() nsapi_error_t EMACInterface::disconnect()
{ {
if (_interface) {
return _interface->bringdown(); return _interface->bringdown();
}
return NSAPI_ERROR_NO_CONNECTION;
} }
const char *EMACInterface::get_mac_address() const char *EMACInterface::get_mac_address()
{ {
if (_interface->get_mac_address(_mac_address, sizeof(_mac_address))) { if (_interface && _interface->get_mac_address(_mac_address, sizeof(_mac_address))) {
return _mac_address; return _mac_address;
} }
return NULL; return NULL;
@ -83,7 +86,7 @@ const char *EMACInterface::get_mac_address()
const char *EMACInterface::get_ip_address() const char *EMACInterface::get_ip_address()
{ {
if (_interface->get_ip_address(_ip_address, sizeof(_ip_address))) { if (_interface && _interface->get_ip_address(_ip_address, sizeof(_ip_address))) {
return _ip_address; return _ip_address;
} }
@ -92,7 +95,7 @@ const char *EMACInterface::get_ip_address()
const char *EMACInterface::get_netmask() const char *EMACInterface::get_netmask()
{ {
if (_interface->get_netmask(_netmask, sizeof(_netmask))) { if (_interface && _interface->get_netmask(_netmask, sizeof(_netmask))) {
return _netmask; return _netmask;
} }
@ -101,7 +104,7 @@ const char *EMACInterface::get_netmask()
const char *EMACInterface::get_gateway() const char *EMACInterface::get_gateway()
{ {
if (_interface->get_gateway(_gateway, sizeof(_gateway))) { if (_interface && _interface->get_gateway(_gateway, sizeof(_gateway))) {
return _gateway; return _gateway;
} }