*** empty log message ***

[sympathy.git] / src / symsocket.c

diff --git a/src/symsocket.c b/src/symsocket.c
index fde1b2d4d898e47fda9c481dc53a597afebc7176..ee5869a23c3220c4d95f637789ac91717074a695 100644 (file)
--- a/src/symsocket.c
+++ b/src/symsocket.c
@@ -6,10 +6,23 @@
  *
  */
 
-static char rcsid[] = "$Id$";
+static char rcsid[] =
+  "$Id$";
 
 /*
  * $Log$
+ * Revision 1.5  2008/02/20 22:54:22  staffcvs
+ * *** empty log message ***
+ *
+ * Revision 1.4  2008/02/20 18:31:53  james
+ * *** empty log message ***
+ *
+ * Revision 1.3  2008/02/14 02:46:44  james
+ * *** empty log message ***
+ *
+ * Revision 1.2  2008/02/14 00:57:58  james
+ * *** empty log message ***
+ *
  * Revision 1.1  2008/02/13 18:05:06  james
  * *** empty log message ***
  *
@@ -22,13 +35,71 @@ static char rcsid[] = "$Id$";
 #define BUF_SIZE 16384
 #define MAX_TXN 4096
 
+int
+wrap_recv (int fd, void *buf, int len)
+{
+  int red;
+
+  red = recv (fd, buf, len, 0);
+  if (!red)
+    return -1;
+
+  if ((red < 0) && (errno == EAGAIN))
+    red = 0;
+
+  return red;
+}
+
+int
+wrap_send (int fd, void *buf, int len)
+{
+  int writ;
+
+  errno = 0;
+
+  writ = send (fd, buf, len, MSG_NOSIGNAL);
+
+  if (!writ)
+    return -1;
+
+  if ((writ < 0) && (errno == EAGAIN))
+    writ = 0;
+
+  return writ;
+}
+
+void
+socket_free (Socket * s)
+{
+  if (!s)
+    return;
+  if (s->read_buf)
+    slide_free (s->read_buf);
+  if (s->write_buf)
+    slide_free (s->write_buf);
+  if (s->path_to_unlink)
+    {
+      unlink (s->path_to_unlink);
+      free (s->path_to_unlink);
+    }
+  close (s->fd);
+  free (s);
+}
 
-void socket_free(Socket *s)
+void
+socket_free_parent (Socket * s)
 {
-if (!s) return;
-if (s->read_buf) slide_free(s->read_buf);
-if (s->write_buf) slide_free(s->write_buf);
-close(s->fd);
+  if (!s)
+    return;
+  if (s->read_buf)
+    slide_free (s->read_buf);
+  if (s->write_buf)
+    slide_free (s->write_buf);
+  if (s->path_to_unlink)
+    free (s->path_to_unlink);
+  close (s->fd);
+
+  free (s);
 }
 
 
@@ -78,6 +149,7 @@ socket_listen (char *path)
   ret->write_buf = NULL;
 
   ret->fd = fd;
+  ret->path_to_unlink = strdup (path);
 
 
   return ret;
@@ -122,7 +194,6 @@ socket_connect (char *path)
   struct sockaddr_un *sun;
   Socket *ret;
 
-  unlink (path);
 
   fd = socket (PF_UNIX, SOCK_STREAM, 0);
 
@@ -158,29 +229,58 @@ socket_connect (char *path)
   return ret;
 }
 
-Socket *
-socket_post_select (Socket * s, fd_set * rfds, fd_set * wfds)
+void
+socket_consume_msg (Socket * s)
+{
+  int n;
+
+  if (!s->msg)
+    return;
+
+  ipc_consume_message_in_slide (s->read_buf);
+  s->msg = ipc_check_for_message_in_slide (s->read_buf);
+
+}
+
+void
+socket_pre_select (Socket * s, fd_set * rfds, fd_set * wfds)
 {
   char buf[1024];
   int n;
 
+  /*Server socket */
   if (SOCKET_IS_LISTENER (s))
     {
-      if (!FD_ISSET (s->fd, rfds))
-        return NULL;
-
-      return socket_accept (s);
+      FD_SET (s->fd, rfds);
+      return;
     }
 
+  if (!SLIDE_EMPTY (s->write_buf))
+    FD_SET (s->fd, wfds);
+
+  if (!SLIDE_FULL (s->read_buf))
+    FD_SET (s->fd, rfds);
+
+}
+
+int
+socket_post_select (Socket * s, fd_set * rfds, fd_set * wfds)
+{
+  char buf[1024];
+  int n;
+  int error = 0;
+
 
   if ((!SLIDE_EMPTY (s->write_buf)) && FD_ISSET (s->fd, wfds))
     {
       n =
         (SLIDE_BYTES (s->write_buf) >
          MAX_TXN) ? MAX_TXN : SLIDE_BYTES (s->write_buf);
-      n = write (s->fd, SLIDE_RPTR (s->write_buf), n);
+      n = wrap_send (s->fd, SLIDE_RPTR (s->write_buf), n);
       if (n > 0)
         slide_consume (s->write_buf, n);
+      if (n < 0)
+        error = -1;
     }
 
   if (!SLIDE_FULL (s->read_buf) && FD_ISSET (s->fd, rfds))
@@ -188,62 +288,42 @@ socket_post_select (Socket * s, fd_set * rfds, fd_set * wfds)
       n =
         (SLIDE_SPACE (s->read_buf) >
          MAX_TXN) ? MAX_TXN : SLIDE_SPACE (s->read_buf);
-      n = read (s->fd, SLIDE_RPTR (s->read_buf), n);
-
+      n = wrap_recv (s->fd, SLIDE_WPTR (s->read_buf), n);
       if (n > 0)
         slide_added (s->read_buf, n);
+      if (n < 0)
+        error = -1;
     }
 
-  if (SLIDE_BYTES (s->read_buf) >= sizeof (IPC_Msg))
-    {
-      s->msg = ipc_check_for_message_in_slide(s->read_buf);
-    } else {
-      s->msg=NULL;
-    }
+  s->msg = ipc_check_for_message_in_slide (s->read_buf);
 
-
-  return NULL;
+  return error;
 
 }
 
-void socket_consume_msg(Socket *s) 
-{
-int n;
-
-if (!s->msg) return;
-
-n=s->msg->size;
-
-slide_consume(s->read_buf,n);
 
-  if (SLIDE_BYTES (s->read_buf) >= sizeof (IPC_Msg))
-    {
-      s->msg = ipc_check_for_message_in_slide(s->read_buf);
-    } else {
-      s->msg=NULL;
-    }
-
-}
-
-void
-socket_pre_select (Socket * s, fd_set * rfds, fd_set * wfds)
+int
+socket_write (Socket * s, void *buf, int len)
 {
-  char buf[1024];
   int n;
 
-  /*Server socket */
-  if (SOCKET_IS_LISTENER (s))
-    {
-      FD_SET (s->fd, rfds);
-      return;
-    }
-
-  if (!SLIDE_EMPTY (s->write_buf))
-    FD_SET (s->fd, wfds);
+  slide_expand (s->write_buf, len);
+  memcpy (SLIDE_WPTR (s->write_buf), buf, len);
+  slide_added (s->write_buf, len);
 
-  if (!SLIDE_FULL (s->read_buf))
-    FD_SET (s->fd, rfds);
+  n =
+    (SLIDE_BYTES (s->write_buf) >
+     MAX_TXN) ? MAX_TXN : SLIDE_BYTES (s->write_buf);
+  n = wrap_send (s->fd, SLIDE_RPTR (s->write_buf), n);
+  {
+    uint8_t *c = SLIDE_RPTR (s->write_buf);
+  }
 
-}
+  if (n > 0)
+    slide_consume (s->write_buf, n);
 
+  if (n < 0)
+    return -1;
 
+  return len;
+}