[GNUnet-SVN] r15874 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2011-07-07 16:57:22 +0200 (Thu, 07 Jul 2011)
New Revision: 15874

Modified:
   gnunet/src/util/gnunet-resolver.c
   gnunet/src/util/resolver_api.c
Log:
fix

Modified: gnunet/src/util/gnunet-resolver.c
===================================================================
--- gnunet/src/util/gnunet-resolver.c   2011-07-07 14:15:31 UTC (rev 15873)
+++ gnunet/src/util/gnunet-resolver.c   2011-07-07 14:57:22 UTC (rev 15874)
@@ -81,6 +81,14 @@
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
+  GNUNET_PROGRAM_run (argc,
+                     argv,
+                     "gnunet-resolver [hostname]",
+                     gettext_noop
+                     ("Test GNUnet DNS resolver code."),
+                     options, &run, NULL);
+  fprintf (stderr, "again...\n");
+
   return (GNUNET_OK ==
           GNUNET_PROGRAM_run (argc,
                               argv,

Modified: gnunet/src/util/resolver_api.c
===================================================================
--- gnunet/src/util/resolver_api.c      2011-07-07 14:15:31 UTC (rev 15873)
+++ gnunet/src/util/resolver_api.c      2011-07-07 14:57:22 UTC (rev 15874)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     (C) 2009, 2011 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -224,6 +224,7 @@
 GNUNET_RESOLVER_connect (const struct GNUNET_CONFIGURATION_Handle *c)
 {
   check_config (c);
+  backoff = GNUNET_TIME_UNIT_MILLISECONDS;
   cfg = c;
 }
 
@@ -255,6 +256,7 @@
       GNUNET_SCHEDULER_cancel (s_task);
       s_task = GNUNET_SCHEDULER_NO_TASK;
     }
+  cfg = NULL;
 }
 
 
@@ -707,8 +709,7 @@
   r_task = GNUNET_SCHEDULER_add_delayed (backoff,
                                         &reconnect_task,
                                         NULL);
-  backoff = GNUNET_TIME_relative_max (GNUNET_TIME_UNIT_SECONDS,
-                                     GNUNET_TIME_relative_multiply (backoff, 
2));
+  backoff = GNUNET_TIME_relative_multiply (backoff, 2);
 }