-more new api

diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index 0ab7ed7318b557bffeeb635c8abf86599b0e2937..382781e0a7d709c815f62ef6e053ab6afdce7a07 100644 (file)
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -719,7 +719,7 @@ get_request_id (struct GNUNET_GNS_Handle *h)
 void
 GNUNET_GNS_cancel_lookup_request (struct GNUNET_GNS_LookupRequest *lr)
 {
-  GNUNET_assert (NULL == lr->gns_handle);
+  GNUNET_assert (NULL != lr->gns_handle);
 
   GNUNET_CONTAINER_DLL_remove (lr->gns_handle->pending_head,
                                lr->gns_handle->pending_tail,

diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index fe2bde1d1bb5fb238dc7db25475394d895766bd9..d1ef663315ea1c03eaad15c7d9d31bfe0b885bf0 100644 (file)
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -64,6 +64,18 @@ static int raw = 0;
 
 static enum GNUNET_GNS_RecordType rtype;
 
+/* Handle to lookup request */
+static struct GNUNET_GNS_LookupRequest *lookup_request;
+
+/* Handle to shorten request */
+static struct GNUNET_GNS_ShortenRequest *shorten_request;
+
+/* Handle to get authority request */
+static struct GNUNET_GNS_GetAuthRequest *getauth_request;
+
+/* shutdown task */
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+
 /**
  * Task run on shutdown.  Cleans up everything.
  *
@@ -74,21 +86,29 @@ static void
 do_shutdown (void *cls,
             const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  if (NULL != lookup_request)
+    GNUNET_GNS_cancel_lookup_request (lookup_request);
+
+  if (NULL != shorten_request)
+    GNUNET_GNS_cancel_shorten_request (shorten_request);
+
+  if (NULL != getauth_request)
+    GNUNET_GNS_cancel_get_auth_request (getauth_request);
+
   if (NULL != gns)
-  {
     GNUNET_GNS_disconnect (gns);
-    gns = NULL;
-  }
 }
 
 
 static void
 process_shorten_result(void* cls, const char* nshort)
 {
+  shorten_request = NULL;
   if (raw)
     printf("%s", nshort);
   else
     printf("%s shortened to %s\n", (char*) cls, nshort);
+  GNUNET_SCHEDULER_cancel (shutdown_task);
   GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
 }
 
@@ -100,6 +120,7 @@ process_lookup_result(void* cls, uint32_t rd_count,
   char* name = (char*) cls;
   const char* typename;
   char* string_val;
+  lookup_request = NULL;
   
   if (!raw) {
     if (rd_count == 0)
@@ -122,14 +143,16 @@ process_lookup_result(void* cls, uint32_t rd_count,
       printf("Got %s record: %s\n", typename, string_val);
 
   }
-
+  GNUNET_SCHEDULER_cancel (shutdown_task);
   GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
 }
 
 static void
 process_auth_result(void* cls, const char* auth)
 {
+  getauth_request = NULL;
   printf ("%s\n", auth);
+  GNUNET_SCHEDULER_cancel (shutdown_task);
   GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
 }
 
@@ -156,6 +179,10 @@ run (void *cls, char *const *args, const char *cfgfile,
   struct GNUNET_CRYPTO_ShortHashCode private_zone;
   struct GNUNET_CRYPTO_ShortHashCode shorten_zone;
 
+  shorten_request = NULL;
+  lookup_request = NULL;
+  getauth_request = NULL;
+
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
                                                            "ZONEKEY", &keyfile))
   {
@@ -265,7 +292,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   
   if (NULL != shorten_name)
   {
-    GNUNET_GNS_shorten_zone (gns, shorten_name,
+    shorten_request = GNUNET_GNS_shorten_zone (gns, shorten_name,
                              &private_zone,
                              &shorten_zone,
                              zone,
@@ -277,7 +304,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Lookup\n");
-    GNUNET_GNS_lookup_zone (gns, lookup_name,
+    lookup_request = GNUNET_GNS_lookup_zone (gns, lookup_name,
                             zone,
                             rtype,
                             GNUNET_NO, //Use DHT
@@ -287,14 +314,15 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   if (NULL != auth_name)
   {
-    GNUNET_GNS_get_authority(gns, auth_name, &process_auth_result, auth_name);
+    getauth_request = GNUNET_GNS_get_authority(gns, auth_name,
+                                               &process_auth_result, auth_name);
   }
 
   if (NULL != shorten_key)
     GNUNET_CRYPTO_rsa_key_free (shorten_key);
   
-  // FIXME: do work here...
-  //GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+  shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                                &do_shutdown, NULL);
 }
 
 

diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index 91df6373d3bf69e88e9b3ab8f743b9d3ae32d802..618d3c2c2787d3dc6b955fc6cb7d0de309df1d5c 100644 (file)
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -52,13 +52,19 @@ extern "C"
 struct GNUNET_GNS_Handle;
 
 /**
- * Handle to control a get operation.
+ * Handle to control a lookup operation.
  */
-struct GNUNET_GNS_LookupHandle;
+struct GNUNET_GNS_LookupRequest;
 
 /**
- * Handle to control a shorten operation
+ * Handle to control a shorten operation.
  */
+struct GNUNET_GNS_ShortenRequest;
+
+/**
+ * Handle to control a get authority operation
+ */
+struct GNUNET_GNS_GetAuthRequest;
 
 /**
  * Record types
@@ -304,7 +310,7 @@ GNUNET_GNS_get_authority (struct GNUNET_GNS_Handle *handle,
  * @param gar the lookup request to cancel
  */
 void
-GNUNET_GNS_cancel_get_auth_request (struct GNUNET_GNS_GetAuthRequest *gar)
+GNUNET_GNS_cancel_get_auth_request (struct GNUNET_GNS_GetAuthRequest *gar);
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {