Revert "New NativeDaemonConnector protocol adds a seqnum."
Reverting because it seems to break `adb reboot`
This reverts commit dc58e73071aa829a5038caf37211f6b3e2d7b275.
Change-Id: Ib8cc4379254694398cbb7f3e7a64c20e1ed8c1ba
diff --git a/libsysutils/src/SocketListener.cpp b/libsysutils/src/SocketListener.cpp
index 8f5329c..3f871ea 100644
--- a/libsysutils/src/SocketListener.cpp
+++ b/libsysutils/src/SocketListener.cpp
@@ -29,8 +29,6 @@
#include <sysutils/SocketListener.h>
#include <sysutils/SocketClient.h>
-#define DBG 0
-
SocketListener::SocketListener(const char *socketName, bool listen) {
mListen = listen;
mSocketName = socketName;
@@ -75,7 +73,6 @@
mSocketName, strerror(errno));
return -1;
}
- if (DBG) SLOGE("got mSock = %d for %s", mSock, mSocketName);
}
if (mListen && listen(mSock, 4) < 0) {
@@ -167,11 +164,11 @@
max = fd;
}
pthread_mutex_unlock(&mClientsLock);
- if (DBG) SLOGE("mListen=%d, max=%d, mSocketName=%s", mListen, max, mSocketName);
+
if ((rc = select(max + 1, &read_fds, NULL, NULL, NULL)) < 0) {
if (errno == EINTR)
continue;
- SLOGE("select failed (%s) mListen=%d, max=%d", strerror(errno), mListen, max);
+ SLOGE("select failed (%s)", strerror(errno));
sleep(1);
continue;
} else if (!rc)
@@ -187,7 +184,6 @@
do {
alen = sizeof(addr);
c = accept(mSock, &addr, &alen);
- if (DBG) SLOGE("%s got %d from accept", mSocketName, c);
} while (c < 0 && errno == EINTR);
if (c < 0) {
SLOGE("accept failed (%s)", strerror(errno));
@@ -221,7 +217,6 @@
* connection-based, remove and destroy it */
if (!onDataAvailable(c) && mListen) {
/* Remove the client from our array */
- if (DBG) SLOGE("going to zap %d for %s", c->getSocket(), mSocketName);
pthread_mutex_lock(&mClientsLock);
for (it = mClients->begin(); it != mClients->end(); ++it) {
if (*it == c) {
@@ -249,3 +244,15 @@
}
pthread_mutex_unlock(&mClientsLock);
}
+
+void SocketListener::sendBroadcast(const char *msg) {
+ pthread_mutex_lock(&mClientsLock);
+ SocketClientCollection::iterator i;
+
+ for (i = mClients->begin(); i != mClients->end(); ++i) {
+ if ((*i)->sendMsg(msg)) {
+ SLOGW("Error sending broadcast (%s)", strerror(errno));
+ }
+ }
+ pthread_mutex_unlock(&mClientsLock);
+}