gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r9853 - GNUnet/src/applications/fs/fsui


From: gnunet
Subject: [GNUnet-SVN] r9853 - GNUnet/src/applications/fs/fsui
Date: Mon, 21 Dec 2009 20:50:23 +0100

Author: nevans
Date: 2009-12-21 20:50:23 +0100 (Mon, 21 Dec 2009)
New Revision: 9853

Modified:
   GNUnet/src/applications/fs/fsui/upload.c
Log:
Add fsui support to return loc uri instead of chk uri for gnunet-insert when 
inserted with anonymity 0

Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c    2009-12-21 19:49:08 UTC (rev 
9852)
+++ GNUnet/src/applications/fs/fsui/upload.c    2009-12-21 19:50:23 UTC (rev 
9853)
@@ -401,6 +401,7 @@
       return NULL;
     }
   utc->state = GNUNET_FSUI_COMPLETED;
+  loc = NULL;
   if (utc->shared->doIndex != GNUNET_SYSERR)
     {
       if (utc->child == NULL)
@@ -526,8 +527,7 @@
                                            utc->shared->priority,
                                            utc->shared->expiration, loc,
                                            utc->meta);
-      GNUNET_ECRS_uri_destroy (loc);
-      loc = NULL;
+
       fi.meta = utc->meta;
       fi.uri = utc->uri;
       if (utc->shared->doIndex != GNUNET_SYSERR)
@@ -548,7 +548,16 @@
   event.data.UploadCompleted.uc.pcctx = utc->parent->cctx;
   event.data.UploadCompleted.total = utc->total;
   event.data.UploadCompleted.filename = utc->filename;
-  event.data.UploadCompleted.uri = utc->uri;
+
+  if (loc != NULL)
+  {
+    event.data.UploadCompleted.uri = GNUNET_ECRS_uri_duplicate(loc);
+    GNUNET_ECRS_uri_destroy (loc);
+    loc = NULL;
+  }
+  else
+    event.data.UploadCompleted.uri = utc->uri;
+
   utc->shared->ctx->ecb (utc->shared->ctx->ecbClosure, &event);
   if (utc->child != NULL)
     UNLINK (filename);





reply via email to

[Prev in Thread] Current Thread [Next in Thread]