e8ffa449fd
android_get_control_socket has a warning from the implicit cast from long to int. The warning was being hidden because cutils/sockets.h was included with -isystem. Move android_get_control_socket to sockets.cpp, since we don't want header only dependencies anyways, and fix the warning with a range check and a static_cast. Bug: 31492149 Test: m -j <module that uses sockets.h and -Wall> Change-Id: I1f394ab26d4ec8a7dd0e7907c10416d7f8647624
68 lines
2.3 KiB
C++
68 lines
2.3 KiB
C++
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
|
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
// This file contains socket implementation that can be shared between
|
|
// platforms as long as the correct headers are included.
|
|
|
|
#include <cutils/sockets.h>
|
|
|
|
#if !defined(_WIN32)
|
|
#include <netinet/in.h>
|
|
#endif
|
|
|
|
int socket_get_local_port(cutils_socket_t sock) {
|
|
sockaddr_storage addr;
|
|
socklen_t addr_size = sizeof(addr);
|
|
|
|
if (getsockname(sock, reinterpret_cast<sockaddr*>(&addr), &addr_size) == 0) {
|
|
// sockaddr_in and sockaddr_in6 always overlap the port field.
|
|
return ntohs(reinterpret_cast<sockaddr_in*>(&addr)->sin_port);
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
int android_get_control_socket(const char* name) {
|
|
char key[64];
|
|
snprintf(key, sizeof(key), ANDROID_SOCKET_ENV_PREFIX "%s", name);
|
|
|
|
const char* val = getenv(key);
|
|
if (!val) {
|
|
return -1;
|
|
}
|
|
|
|
errno = 0;
|
|
long ret = strtol(val, NULL, 10);
|
|
if (errno) {
|
|
return -1;
|
|
}
|
|
if (ret < 0 || ret > INT_MAX) {
|
|
return -1;
|
|
}
|
|
|
|
return static_cast<int>(ret);
|
|
}
|