dhtlog updates

[oweals/gnunet.git] / src / util / client.c

diff --git a/src/util/client.c b/src/util/client.c
index 86b36bfbba10b0d3c4b2e6849858dec5c973e708..3431ac44855fab17542c16e60ff1887d4d91ff22 100644 (file)
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -136,7 +136,6 @@ struct TransmitGetResponseContext
   void *rn_cls;
 };
 
-
 /**
  * Struct to refer to a GNUnet TCP connection.
  * This is more than just a socket because if the server
@@ -158,6 +157,7 @@ struct GNUNET_CLIENT_Connection
 
   /**
    * Our configuration.
+   * FIXME: why do we DUP the configuration? Avoid this!
    */
   struct GNUNET_CONFIGURATION_Handle *cfg;
 
@@ -250,19 +250,54 @@ struct GNUNET_CLIENT_Connection
    * Are we ignoring shutdown signals?
    */
   int ignore_shutdown;
+  
+  /**
+   * How often have we tried to connect?
+   */
+  unsigned int attempts;
 
 };
 
 
+/**
+ * Try to connect to the service.
+ *
+ * @param sched scheduler to use
+ * @param service_name name of service to connect to
+ * @param cfg configuration to use
+ * @param attempt counter used to alternate between IP and UNIX domain sockets
+ * @return NULL on error
+ */
 static struct GNUNET_CONNECTION_Handle *
 do_connect (struct GNUNET_SCHEDULER_Handle *sched,
             const char *service_name,
-            const struct GNUNET_CONFIGURATION_Handle *cfg)
+            const struct GNUNET_CONFIGURATION_Handle *cfg,
+           unsigned int attempt)
 {
   struct GNUNET_CONNECTION_Handle *sock;
   char *hostname;
+  char *unixpath;
   unsigned long long port;
 
+#if AF_UNIX
+  if (0 == attempt % 2)
+    {
+      /* on even rounds, try UNIX */
+      if (GNUNET_OK ==
+         GNUNET_CONFIGURATION_get_value_string (cfg,
+                                                service_name,
+                                                "UNIXPATH", &unixpath))
+       {
+         sock = GNUNET_CONNECTION_create_from_connect_to_unixpath (sched,
+                                                                   cfg,
+                                                                   unixpath);
+         GNUNET_free (unixpath);
+         if (sock != NULL)
+           return sock;
+       }
+    }
+#endif
+
   if ((GNUNET_OK !=
        GNUNET_CONFIGURATION_get_value_number (cfg,
                                               service_name,
@@ -291,8 +326,7 @@ do_connect (struct GNUNET_SCHEDULER_Handle *sched,
   sock = GNUNET_CONNECTION_create_from_connect (sched,
                                                 cfg,
                                                 hostname,
-                                                port,
-                                                GNUNET_SERVER_MAX_MESSAGE_SIZE);
+                                                port);
   GNUNET_free (hostname);
   return sock;
 }
@@ -314,10 +348,13 @@ GNUNET_CLIENT_connect (struct GNUNET_SCHEDULER_Handle *sched,
   struct GNUNET_CLIENT_Connection *ret;
   struct GNUNET_CONNECTION_Handle *sock;
 
-  sock = do_connect (sched, service_name, cfg);
+  sock = do_connect (sched, 
+                    service_name, 
+                    cfg, 0);
   if (sock == NULL)
     return NULL;
   ret = GNUNET_malloc (sizeof (struct GNUNET_CLIENT_Connection));
+  ret->attempts = 1;
   ret->sock = sock;
   ret->sched = sched;
   ret->service_name = GNUNET_strdup (service_name);
@@ -486,6 +523,12 @@ receive_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   char mbuf[msize];
   struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) mbuf;
 
+#if DEBUG_CLIENT
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Received message of type %u and size %u\n",
+             ntohs (cmsg->type),
+             msize);
+#endif
   sock->receive_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_assert (GNUNET_YES == sock->msg_complete);
   GNUNET_assert (sock->received_pos >= msize);
@@ -532,63 +575,15 @@ GNUNET_CLIENT_receive (struct GNUNET_CLIENT_Connection *sock,
     }
   else
     {
+      GNUNET_assert (sock->in_receive == GNUNET_NO);
       sock->in_receive = GNUNET_YES;
       GNUNET_CONNECTION_receive (sock->sock,
-                                 GNUNET_SERVER_MAX_MESSAGE_SIZE,
+                                 GNUNET_SERVER_MAX_MESSAGE_SIZE - 1,
                                  timeout, &receive_helper, sock);
     }
 }
 
 
-/**
- * If possible, write a shutdown message to the target
- * buffer and destroy the client connection.
- *
- * @param cls the "struct GNUNET_CLIENT_Connection" to destroy
- * @param size number of bytes available in buf
- * @param buf NULL on error, otherwise target buffer
- * @return number of bytes written to buf
- */
-static size_t
-write_shutdown (void *cls, size_t size, void *buf)
-{
-  struct GNUNET_MessageHeader *msg;
-  struct GNUNET_CLIENT_Connection *sock = cls;
-
-  GNUNET_CLIENT_disconnect (sock, GNUNET_YES);
-  if (size < sizeof (struct GNUNET_MessageHeader))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  _("Failed to transmit shutdown request to client.\n"));
-      return 0;                 /* client disconnected */
-    }
-  msg = (struct GNUNET_MessageHeader *) buf;
-  msg->type = htons (GNUNET_MESSAGE_TYPE_SHUTDOWN);
-  msg->size = htons (sizeof (struct GNUNET_MessageHeader));
-  return sizeof (struct GNUNET_MessageHeader);
-}
-
-
-/**
- * Request that the service should shutdown.
- * Afterwards, the connection will automatically be
- * disconnected.  Hence the "sock" should not
- * be used by the caller after this call
- * (calling this function frees "sock" after a while).
- *
- * @param sock the socket connected to the service
- */
-void
-GNUNET_CLIENT_service_shutdown (struct GNUNET_CLIENT_Connection *sock)
-{
-  GNUNET_CONNECTION_notify_transmit_ready (sock->sock,
-                                           sizeof (struct
-                                                   GNUNET_MessageHeader),
-                                           GNUNET_TIME_UNIT_FOREVER_REL,
-                                           &write_shutdown, sock);
-}
-
-
 /**
  * Report service unavailable.
  */
@@ -648,6 +643,7 @@ write_test (void *cls, size_t size, void *buf)
                   _("Failure to transmit TEST request.\n"));
 #endif
       service_test_error (conn->sched, conn->test_cb, conn->test_cb_cls);
+      GNUNET_CLIENT_disconnect (conn, GNUNET_NO);
       return 0;                 /* client disconnected */
     }
 #if DEBUG_CLIENT
@@ -812,7 +808,9 @@ client_notify (void *cls, size_t size, void *buf)
       /* auto-retry */
       GNUNET_CONNECTION_destroy (th->sock->sock, GNUNET_NO);
       th->sock->sock = do_connect (th->sock->sched,
-                                   th->sock->service_name, th->sock->cfg);
+                                   th->sock->service_name, 
+                                  th->sock->cfg,
+                                  th->sock->attempts++);
       GNUNET_assert (NULL != th->sock->sock);
       GNUNET_CONNECTION_ignore_shutdown (th->sock->sock,
                                         th->sock->ignore_shutdown);
@@ -911,7 +909,7 @@ GNUNET_CLIENT_notify_transmit_ready_cancel (struct
     }
   else
     {
-      GNUNET_break (NULL != th->th);
+      GNUNET_assert (NULL != th->th);
       GNUNET_CONNECTION_notify_transmit_ready_cancel (th->th);
     }
   th->sock->th = NULL;