diff options
author | Selim Gurun <sgurun@google.com> | 2012-02-27 16:04:37 -0800 |
---|---|---|
committer | Selim Gurun <sgurun@google.com> | 2012-03-07 16:19:52 -0800 |
commit | 7bf4c45f842ded6d6ad6b2d80e052ddf56969723 (patch) | |
tree | 4c5d19db79c7a141062dd81288be0209f8079924 /libsysutils/src | |
parent | 78f6bcf853db3dd9b9b37a0ca4d4ee0374f6835a (diff) | |
download | core-7bf4c45f842ded6d6ad6b2d80e052ddf56969723.tar.gz core-7bf4c45f842ded6d6ad6b2d80e052ddf56969723.tar.bz2 core-7bf4c45f842ded6d6ad6b2d80e052ddf56969723.zip |
Add a utility function to send a code + binary msg
Add a utility function to SocketClient to send a c-string code
prepended to a binary message. This is necessary to be able to
send a binary message while keeping compatible with underlying
text-based protocol.
Change-Id: Ifc6562003a687577d7deb50260533a5147ae4f97
Diffstat (limited to 'libsysutils/src')
-rw-r--r-- | libsysutils/src/SocketClient.cpp | 43 |
1 files changed, 39 insertions, 4 deletions
diff --git a/libsysutils/src/SocketClient.cpp b/libsysutils/src/SocketClient.cpp index d9fc48c5f..d9713a624 100644 --- a/libsysutils/src/SocketClient.cpp +++ b/libsysutils/src/SocketClient.cpp @@ -4,6 +4,7 @@ #include <sys/types.h> #include <pthread.h> #include <string.h> +#include <arpa/inet.h> #define LOG_TAG "SocketClient" #include <cutils/log.h> @@ -78,6 +79,34 @@ int SocketClient::sendMsg(int code, const char *msg, bool addErrno, bool useCmdN return ret; } + +int SocketClient::sendBinaryMsg(int code, const void *data, int len) { + + /* 5 bytes for the code & space + 4 bytes for the len */ + char buf[9]; + /* Write the code */ + snprintf(buf, 5, "%.3d ", code); + /* Write the len */ + uint32_t tmp = htonl(len); + memcpy(buf + 5, &tmp, sizeof(uint32_t)); + + pthread_mutex_lock(&mWriteMutex); + int result = sendDataLocked(buf, sizeof(buf)); + if (result == 0 && len > 0) { + result = sendDataLocked(data, len); + } + pthread_mutex_unlock(&mWriteMutex); + + return result; +} + +// Sends the code (c-string null-terminated). +int SocketClient::sendCode(int code) { + char buf[5]; + snprintf(buf, 5, "%.3d ", code); + return sendData(buf, 5); +} + int SocketClient::sendMsg(const char *msg) { if (mSocket < 0) { errno = EHOSTUNREACH; @@ -92,7 +121,16 @@ int SocketClient::sendMsg(const char *msg) { return 0; } -int SocketClient::sendData(const void* data, int len) { +int SocketClient::sendData(const void *data, int len) { + + pthread_mutex_lock(&mWriteMutex); + int rc = sendDataLocked(data, len); + pthread_mutex_unlock(&mWriteMutex); + + return rc; +} + +int SocketClient::sendDataLocked(const void *data, int len) { int rc = 0; const char *p = (const char*) data; int brtw = len; @@ -101,7 +139,6 @@ int SocketClient::sendData(const void* data, int len) { return 0; } - pthread_mutex_lock(&mWriteMutex); while (brtw > 0) { rc = write(mSocket, p, brtw); if (rc > 0) { @@ -113,7 +150,6 @@ int SocketClient::sendData(const void* data, int len) { if (rc < 0 && errno == EINTR) continue; - pthread_mutex_unlock(&mWriteMutex); if (rc == 0) { SLOGW("0 length write :("); errno = EIO; @@ -122,7 +158,6 @@ int SocketClient::sendData(const void* data, int len) { } return -1; } - pthread_mutex_unlock(&mWriteMutex); return 0; } |