4520246d35
The problem was: if a socket is shared between SocketListener and another thread, only if the last reference is removed by SocketListener can the socket be closed, otherwise the socket will leak. This sometimes happens in netd's dnsproxyd. This change let the SocketClient own the socket and close the socket when the SocketClient is destructed. Change-Id: I2865fbfe9ee4d8b3e43d7e02919dbb2d261f70de
52 lines
1.3 KiB
C++
52 lines
1.3 KiB
C++
#ifndef _SOCKET_CLIENT_H
|
|
#define _SOCKET_CLIENT_H
|
|
|
|
#include "../../../frameworks/base/include/utils/List.h"
|
|
|
|
#include <pthread.h>
|
|
#include <sys/types.h>
|
|
|
|
class SocketClient {
|
|
int mSocket;
|
|
bool mSocketOwned;
|
|
pthread_mutex_t mWriteMutex;
|
|
|
|
/* Peer process ID */
|
|
pid_t mPid;
|
|
|
|
/* Peer user ID */
|
|
uid_t mUid;
|
|
|
|
/* Peer group ID */
|
|
gid_t mGid;
|
|
|
|
/* Reference count (starts at 1) */
|
|
pthread_mutex_t mRefCountMutex;
|
|
int mRefCount;
|
|
|
|
public:
|
|
SocketClient(int sock, bool owned);
|
|
virtual ~SocketClient();
|
|
|
|
int getSocket() { return mSocket; }
|
|
pid_t getPid() const { return mPid; }
|
|
uid_t getUid() const { return mUid; }
|
|
gid_t getGid() const { return mGid; }
|
|
|
|
// Send null-terminated C strings:
|
|
int sendMsg(int code, const char *msg, bool addErrno);
|
|
int sendMsg(const char *msg);
|
|
|
|
// Sending binary data:
|
|
int sendData(const void *data, int len);
|
|
|
|
// Optional reference counting. Reference count starts at 1. If
|
|
// it's decremented to 0, it deletes itself.
|
|
// SocketListener creates a SocketClient (at refcount 1) and calls
|
|
// decRef() when it's done with the client.
|
|
void incRef();
|
|
bool decRef(); // returns true at 0 (but note: SocketClient already deleted)
|
|
};
|
|
|
|
typedef android::List<SocketClient *> SocketClientCollection;
|
|
#endif
|