Changeset 4051Tweet

Timestamp:

Nov 27, 2009, 12:46:27 PM (13 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Replaced direct write()'s on socket by send_to_client(). Should not break anything.

File:

• neercs/trunk/src/server.c (modified) (7 diffs)

neercs/trunk/src/server.c

@@ -42 +42 @@
 static int handle_attach(struct screen_list *screen_list, char *buf);
 
-static int send_to_client(const char *msg, struct screen_list *screen_list)
+static int send_to_client(const char *msg, int size, struct screen_list *screen_list)
 {
     int ret;
     if (!screen_list->socket[SOCK_CLIENT])
         connect_socket(screen_list, SOCK_CLIENT);
-    debug("Sending message (%.8s,%d) to client on socket %d", msg, strlen(msg),
+    debug("Sending message (%s,%d) to client on socket %d", msg, size,
           screen_list->socket[SOCK_CLIENT]);
     if (!screen_list->socket[SOCK_CLIENT])
         ret = -1;
     else
-        ret = write(screen_list->socket[SOCK_CLIENT], msg, strlen(msg));
+        ret = write(screen_list->socket[SOCK_CLIENT], msg, size);
     if (ret < 0 && errno != EAGAIN)
     {
@@ -89 +89 @@
     bytes = snprintf(buf, sizeof(buf) - 1, "TITLE %s", title);
     buf[bytes] = '\0';
-    return send_to_client(buf, screen_list);
+    return send_to_client(buf, strlen(buf), screen_list);
 }
 
@@ -100 +100 @@
     buf[bytes] = '\0';
 
-    return send_to_client(buf, screen_list);
+    return send_to_client(buf, strlen(buf), screen_list);
 }
 
@@ -149 +149 @@
             written = 0;
             sprintf(buf2, "UPDATE %10d %10d", x, y);
-            ret =
-                write(screen_list->socket[SOCK_CLIENT], buf2,
-                      strlen(buf2) + 1);
+            ret = send_to_client(buf2, strlen(buf2)+1, screen_list);
             if (ret < 29 && errno != EAGAIN)
             {
@@ -163 +161 @@
                 /* Block to write the end of the message */
                 fcntl(screen_list->socket[SOCK_CLIENT], F_SETFL, 0);
-                n = write(screen_list->socket[SOCK_CLIENT],
-                          (char *)buf + written,
-                          towrite > bufsize ? bufsize : towrite);
+                n = send_to_client((char*) buf+written, towrite > bufsize ? bufsize : towrite, screen_list);
                 if (n < 0)
                 {
@@ -182 +178 @@
                 caca_get_cursor_y(screen_list->cv));
         /* FIXME check value of r */
-        int r =
-            write(screen_list->socket[SOCK_CLIENT], buf2, strlen(buf2) + 1);
+            int r = send_to_client(buf2, strlen(buf2) + 1,screen_list);
         (void)r;
 #if defined HAVE_CACA_DIRTY_RECTANGLES
@@ -199 +194 @@
     if (screen_list->socket[SOCK_CLIENT])
     {
-        send_to_client("DETACH", screen_list);
+        send_to_client("DETACH", 6, screen_list);
         close(screen_list->socket[SOCK_CLIENT]);
         screen_list->socket[SOCK_CLIENT] = 0;