Skip to content

Nanostack: Fix return code for unsupported socket options #7832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 21, 2018
Merged

Nanostack: Fix return code for unsupported socket options #7832

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions features/nanostack/nanostack-interface/Nanostack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,12 +793,15 @@ nsapi_error_t Nanostack::setsockopt(void *handle, int level, int optname, const
break;
}
default:
return NSAPI_ERROR_PARAMETER;
return NSAPI_ERROR_UNSUPPORTED;
}
}

if (::socket_setsockopt(socket->socket_id, level, optname, optval, optlen) == 0) {
int retcode = ::socket_setsockopt(socket->socket_id, level, optname, optval, optlen);
if (retcode == 0) {
return NSAPI_ERROR_OK;
} else if (retcode == -2) {
return NSAPI_ERROR_UNSUPPORTED;
} else {
return NSAPI_ERROR_PARAMETER;
}
Expand All @@ -812,19 +815,19 @@ nsapi_error_t Nanostack::getsockopt(void *handle, int level, int optname, void *
return NSAPI_ERROR_NO_SOCKET;
}

nsapi_error_t ret;

NanostackLockGuard lock;

uint16_t optlen16 = *optlen;
if (::socket_getsockopt(socket->socket_id, level, optname, optval, &optlen16) == 0) {
ret = NSAPI_ERROR_OK;

int retcode = ::socket_getsockopt(socket->socket_id, level, optname, optval, &optlen16);
if (retcode == 0) {
*optlen = optlen16;
return NSAPI_ERROR_OK;
} else if (retcode == -2) {
return NSAPI_ERROR_UNSUPPORTED;
} else {
ret = NSAPI_ERROR_PARAMETER;
return NSAPI_ERROR_PARAMETER;
}

return ret;
}

nsapi_error_t Nanostack::socket_listen(void *handle, int backlog)
Expand Down