commit d768066ef54270a0d3ccfccd50ae8238db5a2cdd
author San Mehat <san@google.com> Tue May 12 11:16:59 2009 -0700
committer San Mehat <san@google.com> Tue May 12 14:02:32 2009 -0700
tree eea4b978f43fad98d561ef97a7fec0d9d502ac14
parent c73d9e43a0c98a87222ef0c8749d6abba06c7778

libsysutils: Tweak SocketListener and friends

    Signed-off-by: San Mehat <san@google.com>

libsysutils/src/FrameworkListener.cpp

diff --git a/libsysutils/src/FrameworkListener.cpp b/libsysutils/src/FrameworkListener.cpp
index 9210ca5..2a96e9a 100644
--- a/libsysutils/src/FrameworkListener.cpp
+++ b/libsysutils/src/FrameworkListener.cpp
@@ -30,7 +30,7 @@
 }
 
 bool FrameworkListener::onDataAvailable(SocketClient *c) {
-    char buffer[101];
+    char buffer[255];
     int len;
 
     if ((len = read(c->getSocket(), buffer, sizeof(buffer) -1)) < 0) {
@@ -41,15 +41,14 @@
         return false;
     }
 
-    int start = 0;
+    int offset = 0;
     int i;
 
-    buffer[len] = '\0';
-
     for (i = 0; i < len; i++) {
-        if (buffer[i] == '\0') {
-            dispatchCommand(c, buffer + start);
-            start = i + 1;
+        if (buffer[i] == '\n') {
+            buffer[i] = '\0';
+            dispatchCommand(c, buffer + offset);
+            offset = i + 1;
         }
     }
     return true;
@@ -60,11 +59,11 @@
 }
 
 void FrameworkListener::dispatchCommand(SocketClient *cli, char *cmd) {
-
+    LOGD("Dispatching '%s'", cmd);
     char *cm, *last;
 
     if (!(cm = strtok_r(cmd, ":", &last))) {
-        cli->sendMsg("BAD_MSG");
+        cli->sendMsg(500, "Malformatted message", false);
         return;
     }
 
@@ -81,7 +80,6 @@
         }
     }
 
-    LOGE("No cmd handlers defined for '%s'", cmd);
-    cli->sendMsg("UNKNOWN_CMD");
+    cli->sendMsg(500, "Command not recognized", false);
     return;
 }