summaryrefslogtreecommitdiffstats
path: root/include/sysutils/SocketClient.h
diff options
context:
space:
mode:
authorGuang Zhu <guangzhu@google.com>2012-02-07 19:13:28 -0800
committerGuang Zhu <guangzhu@google.com>2012-02-07 19:26:54 -0800
commita8185a622e368d1957e18a3ee9d29d45eda12cfc (patch)
treea98a179d56f71e2280e1b48f4cc5807fa630eac2 /include/sysutils/SocketClient.h
parentdc58e73071aa829a5038caf37211f6b3e2d7b275 (diff)
downloadsystem_core-a8185a622e368d1957e18a3ee9d29d45eda12cfc.zip
system_core-a8185a622e368d1957e18a3ee9d29d45eda12cfc.tar.gz
system_core-a8185a622e368d1957e18a3ee9d29d45eda12cfc.tar.bz2
Revert "New NativeDaemonConnector protocol adds a seqnum."
Reverting because it seems to break `adb reboot` This reverts commit dc58e73071aa829a5038caf37211f6b3e2d7b275. Change-Id: Ib8cc4379254694398cbb7f3e7a64c20e1ed8c1ba
Diffstat (limited to 'include/sysutils/SocketClient.h')
-rw-r--r--include/sysutils/SocketClient.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/include/sysutils/SocketClient.h b/include/sysutils/SocketClient.h
index 96323ac..7d2b1d6 100644
--- a/include/sysutils/SocketClient.h
+++ b/include/sysutils/SocketClient.h
@@ -24,9 +24,6 @@ class SocketClient {
pthread_mutex_t mRefCountMutex;
int mRefCount;
- pthread_mutex_t mCmdNumMutex;
- int mCmdNum;
-
public:
SocketClient(int sock, bool owned);
virtual ~SocketClient();
@@ -35,13 +32,12 @@ public:
pid_t getPid() const { return mPid; }
uid_t getUid() const { return mUid; }
gid_t getGid() const { return mGid; }
- void setCmdNum(int cmdNum);
- int getCmdNum();
// Send null-terminated C strings:
int sendMsg(int code, const char *msg, bool addErrno);
+ int sendMsg(const char *msg);
- //Sending binary data:
+ // Sending binary data:
int sendData(const void *data, int len);
// Optional reference counting. Reference count starts at 1. If
@@ -50,10 +46,6 @@ public:
// decRef() when it's done with the client.
void incRef();
bool decRef(); // returns true at 0 (but note: SocketClient already deleted)
-
-private:
- // Send null-terminated C strings
- int sendMsg(const char *msg);
};
typedef android::List<SocketClient *> SocketClientCollection;