X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpaths.h;h=67fe8a300ebb70d6e5081f94aafa7c57dc8b354a;hp=e905094d566d9a25b702bef3445c1ab6c64958fa;hb=0460a745e355158559c01b25f8138404f21b5d92;hpb=227620704107a19c03824ae146249fff4a939839

diff --git a/discover/paths.h b/discover/paths.h
index e905094..67fe8a3 100644
--- a/discover/paths.h
+++ b/discover/paths.h
@@ -2,6 +2,8 @@
 #define PATHS_H
 
 #include <url/url.h>
+#include <waiter/waiter.h>
+#include <process/process.h>
 
 /**
  * Utility function for joining two paths. Adds a / between a and b if
@@ -16,6 +18,7 @@ char *join_paths(void *alloc_ctx, const char *a, const char *b);
  */
 const char *mount_base(void);
 
+struct load_task;
 
 struct load_url_result {
 	enum {
@@ -26,9 +29,13 @@ struct load_url_result {
 			     * (sync will see a NULL result) */
 
 		LOAD_ASYNC, /* async load still in progress */
+
+		LOAD_CANCELLED,
 	} status;
-	const char	*local;
-	bool		cleanup_local;
+	struct pb_url		*url;
+	const char		*local;
+	bool			cleanup_local;
+	struct load_task	*task;
 };
 
 /* callback type for asynchronous loads. The callback implementation is
@@ -36,9 +43,17 @@ struct load_url_result {
  */
 typedef void (*load_url_complete)(struct load_url_result *result, void *data);
 
+/* Start transfers that were waiting for network connectivity */
+void pending_network_jobs_start(void);
+void pending_network_jobs_cancel(void);
+
 /* Load a (potentially remote) file, and return a guaranteed-local name */
 struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
-		load_url_complete complete, void *data);
+		load_url_complete complete, void *data,
+		waiter_cb stdout_cb, void *stdout_data);
+
+/* Cancel a pending load */
+void load_url_async_cancel(struct load_url_result *res);
 
 struct load_url_result *load_url(void *ctx, struct pb_url *url);