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

am 6fd75635: Merge "Fetch peer credentials for local sockets" into gingerbread

Browse source 
Merge commit '6fd75635d820754295557c300ccee89c643864cc' into gingerbread-plus-aosp

* commit '6fd75635d820754295557c300ccee89c643864cc':
  Fetch peer credentials for local sockets
This commit is contained in:
Kenny Root 2010-09-14 14:39:18 -07:00 • committed by Android Git Automerger
commit 1db75e7b9b
2 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/sysutils/SocketClient.h
View file

@ -4,16 +4,29 @@
#include "../../../frameworks/base/include/utils/List.h" #include "../../../frameworks/base/include/utils/List.h"
#include <pthread.h> #include <pthread.h>
#include <sys/types.h>
class SocketClient { class SocketClient {
int mSocket; int mSocket;
pthread_mutex_t mWriteMutex; pthread_mutex_t mWriteMutex;
/* Peer process ID */
pid_t mPid;
/* Peer user ID */
uid_t mUid;
/* Peer group ID */
gid_t mGid;
public: public:
SocketClient(int sock); SocketClient(int sock);
virtual ~SocketClient() {} virtual ~SocketClient() {}
int getSocket() { return mSocket; } int getSocket() { return mSocket; }
pid_t getPid() const { return mPid; }
uid_t getUid() const { return mUid; }
gid_t getGid() const { return mGid; }
int sendMsg(int code, const char *msg, bool addErrno); int sendMsg(int code, const char *msg, bool addErrno);
int sendMsg(const char *msg); int sendMsg(const char *msg);

20
libsysutils/src/SocketClient.cpp
View file

@ -1,5 +1,6 @@
#include <alloca.h> #include <alloca.h>
#include <errno.h> #include <errno.h>
#include <sys/socket.h>
#include <sys/types.h> #include <sys/types.h>
#include <pthread.h> #include <pthread.h>
#include <string.h> #include <string.h>
@ -9,9 +10,24 @@
#include <sysutils/SocketClient.h> #include <sysutils/SocketClient.h>
SocketClient::SocketClient(int socket) { SocketClient::SocketClient(int socket)
mSocket = socket; : mSocket(socket)
, mPid(-1)
, mUid(-1)
, mGid(-1)
{
pthread_mutex_init(&mWriteMutex, NULL); pthread_mutex_init(&mWriteMutex, NULL);
struct ucred creds;
socklen_t szCreds = sizeof(creds);
memset(&creds, 0, szCreds);
int err = getsockopt(socket, SOL_SOCKET, SO_PEERCRED, &creds, &szCreds);
if (err == 0) {
mPid = creds.pid;
mUid = creds.uid;
mGid = creds.gid;
}
} }
int SocketClient::sendMsg(int code, const char *msg, bool addErrno) { int SocketClient::sendMsg(int code, const char *msg, bool addErrno) {