ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes If5359c26,I5d09be41

Browse source 
* changes:
  Use a function instead of a macro.
  Mark sockets on accept().
This commit is contained in:
Sreeram Ramachandran 2014-05-14 19:41:45 +00:00 • committed by Gerrit Code Review
commit f03397fad4
1 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
libnetd_client/NetdClient.cpp
View file

@ -18,12 +18,22 @@
#include "netd_client/FwmarkCommands.h" #include "netd_client/FwmarkCommands.h"
#include <sys/socket.h> #include <sys/socket.h>
#include <unistd.h>
namespace { namespace {
int closeFdAndRestoreErrno(int fd) {
int error = errno;
close(fd);
errno = error;
return -1;
}
typedef int (*ConnectFunctionType)(int, const sockaddr*, socklen_t); typedef int (*ConnectFunctionType)(int, const sockaddr*, socklen_t);
typedef int (*AcceptFunctionType)(int, sockaddr*, socklen_t*);
ConnectFunctionType libcConnect = 0; ConnectFunctionType libcConnect = 0;
AcceptFunctionType libcAccept = 0;
int netdClientConnect(int sockfd, const sockaddr* addr, socklen_t addrlen) { int netdClientConnect(int sockfd, const sockaddr* addr, socklen_t addrlen) {
if (FwmarkClient::shouldSetFwmark(sockfd, addr)) { if (FwmarkClient::shouldSetFwmark(sockfd, addr)) {
@ -35,6 +45,28 @@ int netdClientConnect(int sockfd, const sockaddr* addr, socklen_t addrlen) {
return libcConnect(sockfd, addr, addrlen); return libcConnect(sockfd, addr, addrlen);
} }
int netdClientAccept(int sockfd, sockaddr* addr, socklen_t* addrlen) {
int acceptedSocket = libcAccept(sockfd, addr, addrlen);
if (acceptedSocket == -1) {
return -1;
}
sockaddr socketAddress;
if (!addr) {
socklen_t socketAddressLen = sizeof(socketAddress);
if (getsockname(acceptedSocket, &socketAddress, &socketAddressLen) == -1) {
return closeFdAndRestoreErrno(acceptedSocket);
}
addr = &socketAddress;
}
if (FwmarkClient::shouldSetFwmark(acceptedSocket, addr)) {
char data[] = {FWMARK_COMMAND_ON_ACCEPT};
if (!FwmarkClient().send(data, sizeof(data), acceptedSocket)) {
return closeFdAndRestoreErrno(acceptedSocket);
}
}
return acceptedSocket;
}
} // namespace } // namespace
extern "C" void netdClientInitConnect(ConnectFunctionType* function) { extern "C" void netdClientInitConnect(ConnectFunctionType* function) {
@ -43,3 +75,10 @@ extern "C" void netdClientInitConnect(ConnectFunctionType* function) {
*function = netdClientConnect; *function = netdClientConnect;
} }
} }
extern "C" void netdClientInitAccept(AcceptFunctionType* function) {
if (function && *function) {
libcAccept = *function;
*function = netdClientAccept;
}
}