X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=hcconn.c;h=10d01a8c81ddb4aca0e2947dad6a7d44f192e90b;hb=d2906090b274ce2698952608ccf737912f7725d5;hp=aac7cc17b65d78a039c444fe3b8f15156475c00c;hpb=6cec0cf819f2ad00f89543eb07b19add0b5739ba;p=cascardo%2Frnetproxy.git

diff --git a/hcconn.c b/hcconn.c
index aac7cc1..10d01a8 100644
--- a/hcconn.c
+++ b/hcconn.c
@@ -111,28 +111,40 @@ hc_conn_watch (GIOChannel *channel, GIOCondition cond, gpointer data)
   int fd = g_io_channel_unix_get_fd (channel);
   char buffer;
   int r;
-  switch (cond)
+  if (cond & G_IO_IN)
     {
-    case G_IO_IN:
       event = HC_EVENT_READ;
       r = recv (fd, &buffer, 1, MSG_PEEK);
       if (r == 0)
-        event = HC_EVENT_CLOSE;
-      break;
-    case G_IO_HUP:
+        {
+          event = HC_EVENT_CLOSE;
+        }
+      else if (r == -1)
+        {
+          /* FIXME: create HC_EVENT_ERROR */
+          event = HC_EVENT_CLOSE;
+        }
+    }
+  else if (cond & G_IO_HUP)
+    {
+      event = HC_EVENT_CLOSE;
+    }
+  else if (cond & G_IO_ERR)
+    {
+      /* FIXME: create HC_EVENT_ERROR */
       event = HC_EVENT_CLOSE;
-      break;
-    default:
+    }
+  else
+    {
       /* TODO: handle other conditions and create error event */
       g_warning ("Received an unexpected IO condition.");
-      break;
     }
   if (conn->func)
     conn->func (conn, event, conn->data);
   return TRUE;
 }
 
-void
+int
 hc_conn_set_driver_channel (HCConn *conn, int fd)
 {
   struct channel_layer *layer = g_slice_new (struct channel_layer);
@@ -142,12 +154,14 @@ hc_conn_set_driver_channel (HCConn *conn, int fd)
   conn->write = hc_conn_channel_write;
   conn->close = hc_conn_channel_close;
   /* TODO: We must watch other events */
-  layer->watch = g_io_add_watch (layer->channel, G_IO_IN | G_IO_HUP,
+  layer->watch = g_io_add_watch (layer->channel,
+                                 G_IO_IN | G_IO_HUP | G_IO_ERR,
                                  hc_conn_watch, conn);
   /* TODO: connection should be asynchronous so this could make sense */
   if (conn->func)
     conn->func (conn, HC_EVENT_CONNECT, conn->data);
   fcntl (fd, F_SETFL, fcntl (fd, F_GETFL, 0) | O_NONBLOCK);
+  return 0;
 }
 
 
@@ -173,7 +187,9 @@ hc_conn_set_callback (HCConn *conn, HCClientFunc func, gpointer data)
 ssize_t
 hc_conn_read (HCConn *conn, char *buffer, size_t len)
 {
-  return conn->read (conn->layer, buffer, len);
+  if (conn->read)
+    return conn->read (conn->layer, buffer, len);
+  return 0;
 }
 
 void
@@ -182,12 +198,18 @@ hc_conn_write (HCConn *conn, char *buffer, size_t len)
   /* TODO: Do buffering or something like that */
   /* Do we really need to? */
   /* In case of error, we should do something */
-  conn->write (conn->layer, buffer, len);
+  if (conn->write)
+    conn->write (conn->layer, buffer, len);
 }
 
 void
 hc_conn_close (HCConn *conn)
 {
-  conn->close (conn->layer);
+  if (conn->close)
+    conn->close (conn->layer);
+  conn->read = NULL;
+  conn->write = NULL;
+  conn->close = NULL;
+  conn->func = NULL;
   g_slice_free (HCConn, conn);
 }