WebSVN – Kolibri OS – Diff – /programs/network/netsurf/netsurf/content/fetchers/curl.c

 /* uncomment this to use scheduler based calling
 #define FETCHER_CURLL_SCHEDULED 1
-*/
-typedef int X509_STORE_CTX;
-typedef int X509;
-#define CURL_ERROR_SIZE 0
-typedef int CURLcode;
-typedef int curl_infotype;
-/** SSL certificate info */
-struct cert_info {
-	X509 *cert;		/**< Pointer to certificate */
-	long err;		/**< OpenSSL error code */
-};
+*/
-/** Information for a single fetch. */
+struct fetch_curl_context {
+	struct fetch_curl_context *r_next, *r_prev;
-struct curl_fetch_info {
-	struct fetch *fetch_handle; /**< The fetch handle we're parented by. */
-	CURL * curl_handle;	/**< cURL handle if being fetched, or 0. */
+	struct fetch *fetchh; /**< Handle for this fetch */
-	bool had_headers;	/**< Headers have been processed. */
-	bool abort;		/**< Abort requested. */
-	bool stopped;		/**< Download stopped on purpose. */
-	bool only_2xx;		/**< Only HTTP 2xx responses acceptable. */
-	bool downgrade_tls;	/**< Downgrade to TLS <= 1.0 */
-	nsurl *url;		/**< URL of this fetch. */
-	lwc_string *host;	/**< The hostname of this fetch. */
-	struct curl_slist *headers;	/**< List of request headers. */
-	char *location;		/**< Response Location header, or 0. */
-	unsigned long content_length;	/**< Response Content-Length, or 0. */
-	char *cookie_string;	/**< Cookie string for this fetch */
-	char *realm;		/**< HTTP Auth Realm */
-	char *post_urlenc;	/**< Url encoded POST string, or 0. */
-	long http_code; /**< HTTP result code from cURL. */
-	struct curl_httppost *post_multipart;	/**< Multipart post data, or 0. */
-#define MAX_CERTS 10
-	struct cert_info cert_data[MAX_CERTS];	/**< HTTPS certificate data */
-	unsigned int last_progress_update;	/**< Time of last progress update */
-};
+	bool aborted; /**< Flag indicating fetch has been aborted */
+	bool locked; /**< Flag indicating entry is already entered */
-struct cache_handle {
 	CURL *handle; /**< The cached cURL handle */
-	lwc_string *host;   /**< The host for which this handle is cached */
-	struct cache_handle *r_prev; /**< Previous cached handle in ring. */
-	struct cache_handle *r_next; /**< Next cached handle in ring. */
-};
+	nsurl *url; /**< The full url the fetch refers to */
-CURLM *fetch_curl_multi;		/**< Global cURL multi handle. */
+	char *path; /**< The actual path to be used with open() */
-/** Curl handle with default options set; not used for transfers. */
-static CURL *fetch_blank_curl;
-static struct cache_handle *curl_handle_ring = 0; /**< Ring of cached handles */
-static int curl_fetchers_registered = 0;
+	time_t file_etag; /**< Request etag for file (previous st.m_time) */
-static bool curl_with_openssl;
+};
-static char fetch_error_buffer[CURL_ERROR_SIZE]; /**< Error buffer for cURL. */
+static struct fetch_curl_context *ring = NULL;
 static char fetch_proxy_userpwd[100];	/**< Proxy authentication details. */
-static bool fetch_curl_initialise(lwc_string *scheme);
+static bool fetch_curl_initialise(lwc_string *scheme); //here
-static void fetch_curl_finalise(lwc_string *scheme);
+static void fetch_curl_finalise(lwc_string *scheme); //here
-static bool fetch_curl_can_fetch(const nsurl *url);
-static void * fetch_curl_setup(struct fetch *parent_fetch, nsurl *url,
-		 bool only_2xx, bool downgrade_tls, const char *post_urlenc,
-		 const struct fetch_multipart_data *post_multipart,
-		 const char **headers);
-static bool fetch_curl_start(void *vfetch);
-static bool fetch_curl_initiate_fetch(struct curl_fetch_info *fetch,
+static bool fetch_curl_can_fetch(const nsurl *url); //here
-		CURL *handle);
+static void * fetch_curl_setup(struct fetch *parent_fetch, nsurl *url,
-static CURL *fetch_curl_get_handle(lwc_string *host);
-static void fetch_curl_cache_handle(CURL *handle, lwc_string *host);
+		 bool only_2xx, bool downgrade_tls, const char *post_urlenc,
-static CURLcode fetch_curl_set_options(struct curl_fetch_info *f);
+		 const struct fetch_multipart_data *post_multipart,
-static CURLcode fetch_curl_sslctxfun(CURL *curl_handle, void *_sslctx,
-				     void *p);
-static void fetch_curl_abort(void *vf);
-static void fetch_curl_stop(struct curl_fetch_info *f);
-static void fetch_curl_free(void *f);
-static void fetch_curl_poll(lwc_string *scheme_ignored);
-static void fetch_curl_done(CURL *curl_handle, CURLcode result);
-static int fetch_curl_progress(void *clientp, double dltotal, double dlnow,
-		double ultotal, double ulnow);
-static int fetch_curl_ignore_debug(CURL *handle,
-				   curl_infotype type,
-				   char *data,
-				   size_t size,
-				   void *userptr);
-static size_t fetch_curl_data(char *data, size_t size, size_t nmemb,
-			      void *_f);
-static size_t fetch_curl_header(char *data, size_t size, size_t nmemb,
-				void *_f);
-static bool fetch_curl_process_headers(struct curl_fetch_info *f);
-static struct curl_httppost *fetch_curl_post_convert(
+		 const char **headers); //here
-		const struct fetch_multipart_data *control);
+static bool fetch_curl_start(void *vfetch); //here
 static int fetch_curl_verify_callback(int preverify_ok,
 LOG(("curl register\n"));
 lwc_intern_string("http", SLEN("http"), &scheme);
 	if (!fetch_add_fetcher(scheme,
-				fetch_curl_initialise,
+				fetch_curl_initialise, //here
-				fetch_curl_can_fetch,
+				fetch_curl_can_fetch, //here
 				fetch_curl_setup,
 				fetch_curl_start,
-				fetch_curl_abort,
+				fetch_curl_abort, //here
-				fetch_curl_free,
+				fetch_curl_free, //here
 #ifdef FETCHER_CURLL_SCHEDULED
 				       NULL,
 #else
-				fetch_curl_poll,
+				fetch_curl_poll, //here
 #endif
-				fetch_curl_finalise)) {
+				fetch_curl_finalise)) {  //here
 			LOG(("Unable to register cURL fetcher for HTTP"));
 void fetch_curl_finalise(lwc_string *scheme)
+{
 LOG(("curl finali\n"));
+}
-bool fetch_curl_can_fetch(const nsurl *url)
+static bool fetch_curl_can_fetch(const nsurl *url)
+{
 	LOG(("curl can fetch\n"));
-	return false;
+	return true; //let's lie a bit
+}
 /**
+ *
  * Some private data can be passed as the last parameter to fetch_start, and
  * callbacks will contain this.
  */
+void * fetch_curl_setup (struct fetch *fetchh,
+		 nsurl *url,
+		 bool only_2xx,
-void * fetch_curl_setup(struct fetch *parent_fetch, nsurl *url,
+		 bool downgrade_tls,
-		 bool only_2xx, bool downgrade_tls, const char *post_urlenc,
+		 const char *post_urlenc,
 		 const struct fetch_multipart_data *post_multipart,
 		 const char **headers)
+{
+	LOG(("curl setup\n"));
-LOG(("curl setup\n"));
+	struct fetch_curl_context *ctx;
+	int i;
-return;
-}
+	ctx = calloc(1, sizeof(*ctx));
+	if (ctx == NULL)
-/**
- * Dispatch a single job
+		return NULL;
- */
-bool fetch_curl_start(void *vfetch)
+	ctx->path = url_to_path(nsurl_access(url));
+	if (ctx->path == NULL) {
-{
-LOG(("curl start\n"));
-	return 0;
-}
-/**
- * Initiate a fetch from the queue.
- *
- * Called with a fetch structure and a CURL handle to be used to fetch the
- * content.
- *
- * This will return whether or not the fetch was successfully initiated.
- */
+		free(ctx);
-bool fetch_curl_initiate_fetch(struct curl_fetch_info *fetch, CURL *handle)
+		return NULL;
-{
-	LOG(("curl initi fetch\n"));
-	return 0;
-}
+	}
-/**
+	ctx->url = nsurl_ref(url);
- * Find a CURL handle to use to dispatch a job
  */
-CURL *fetch_curl_get_handle(lwc_string *host)
+	ctx->fetchh = fetchh;
-LOG(("curl get handle\n"));
+	RING_INSERT(ring, ctx);
-	return 0;
+	return ctx;
-}
-/**
- * Cache a CURL handle for the provided host (if wanted)
- */
-void fetch_curl_cache_handle(CURL *handle, lwc_string *host)
-{
-	LOG(("curl cache handle\n"));
+}
-/**
- * Set options specific for a fetch.
+/**
- */
+ * Dispatch a single job
+ */
+bool fetch_curl_start(void *vfetch)
+{
+LOG(("curl start\n"));
+	return true;
-typedef int CURLcode;
+}
 CURLcode
-fetch_curl_set_options(struct curl_fetch_info *f)
-	LOG(("curl set options\n"));
 	return -1;
+/**
-}
+ * Abort a fetch.
+ */
+void fetch_curl_abort(void *ctx)
+{
+	struct fetch_curl_context *c = ctx;
+	/* To avoid the poll loop having to deal with the fetch context
+	 * disappearing from under it, we simply flag the abort here.
+	 * The poll loop itself will perform the appropriate cleanup.
+	 */
-/**
+	c->aborted = true;
- * cURL SSL setup callback
+}
- */
-CURLcode
-fetch_curl_sslctxfun(CURL *curl_handle, void *_sslctx, void *parm)
+/**
-{
+ * Free a fetch structure and associated resources.
+ */
-	LOG(("curlcodessl\n"));
+void fetch_curl_free(void *ctx)
-	return -1;
+{
-}
-/**
+	struct fetch_curl_context *c = ctx;
- * Abort a fetch.
+	nsurl_unref(c->url);
+	free(c->path);
+	RING_REMOVE(ring, c);
+	free(ctx);
- */
+}
-void fetch_curl_abort(void *vf)
-{
-LOG(("curl abort\n"));
-}
+static inline bool fetch_curl_send_callback(const fetch_msg *msg,
 		struct fetch_curl_context *ctx)
+{
+	ctx->locked = true;
+	fetch_send_callback(msg, ctx->fetchh);
-/**
+	ctx->locked = false;
+	return ctx->aborted;
- * Clean up the provided fetch object and free it.
+}
- *
- * Will prod the queue afterwards to allow pending requests to be initiated.
- */
+static bool fetch_curl_send_header(struct fetch_curl_context *ctx,
-void fetch_curl_stop(struct curl_fetch_info *f)
+		const char *fmt, ...)
-{
-	LOG(("curl stop\n"));
+{
-}
+	fetch_msg msg;
+	char header[64];
+	va_list ap;
+	va_start(ap, fmt);
+	vsnprintf(header, sizeof header, fmt, ap);
-/**
+	va_end(ap);
- * Free a fetch structure and associated resources.
- */
+	msg.type = FETCH_HEADER;
+	msg.data.header_or_data.buf = (const uint8_t *) header;
-void fetch_curl_free(void *vf)
+	msg.data.header_or_data.len = strlen(header);
-{
+	fetch_curl_send_callback(&msg, ctx);
 	LOG(("curl free\n"));
+	return ctx->aborted;
+}
+static void fetch_curl_process_error(struct fetch_curl_context *ctx, int code)
+{
-}
+	fetch_msg msg;
+	char buffer[1024];
+	const char *title;
+	char key[8];
+	/* content is going to return error code */
-/**
+	fetch_set_http_code(ctx->fetchh, code);
  * Do some work on current fetches.
- *
- * Must be called regularly to make progress on fetches.
+	/* content type */
- */
-void fetch_curl_poll(lwc_string *scheme_ignored)
+	if (fetch_curl_send_header(ctx, "Content-Type: text/html"))
-{
-	LOG(("curl poll\n"));
+		goto fetch_file_process_error_aborted;
-}
-/**
- * Handle a completed fetch (CURLMSG_DONE from curl_multi_info_read()).
+	snprintf(key, sizeof key, "HTTP%03d", code);
- *
+	title = messages_get(key);
- * \param  curl_handle	curl easy handle of fetch
- */
+	snprintf(buffer, sizeof buffer, "%s"
-void fetch_curl_done(CURL *curl_handle, CURLcode result)
-{
-	LOG(("curl done\n"));
-}
-/**
+			"%s
"
+			"Error %d while fetching file %s
",
- * Callback function for fetch progress.
+			title, title, code, nsurl_access(ctx->url));
+	msg.type = FETCH_DATA;
+	msg.data.header_or_data.buf = (const uint8_t *) buffer;
- */
+	msg.data.header_or_data.len = strlen(buffer);
-int fetch_curl_progress(void *clientp, double dltotal, double dlnow,
-			double ultotal, double ulnow)
 	if (fetch_curl_send_callback(&msg, ctx))
+		goto fetch_file_process_error_aborted;
 	LOG(("curl progress\n"));
-	return 0;
+	msg.type = FETCH_FINISHED;
 	fetch_curl_send_callback(&msg, ctx);
 fetch_file_process_error_aborted:
+	return;
 /**
- * Ignore everything given to it.
- *
- * Used to ignore cURL debug.
- */
-int fetch_curl_ignore_debug(CURL *handle,
-			    curl_infotype type,
-			    char *data,
-			    size_t size,
-			    void *userptr)
-{
+static void fetch_curl_process(struct fetch_curl_context *ctx) {
+	fetch_msg msg;
+	const char * buf = "Hello, file fetcher!
";
+//	fetch_curl_process_error(ctx, 501);
+//	return;
+/* fetch is going to be successful */
+	fetch_set_http_code(ctx->fetchh, 200);
-	LOG(("curl igdebug\n"));
+	/* Any callback can result in the fetch being aborted.
+	 * Therefore, we _must_ check for this after _every_ call to
-	return 0;
+	 * fetch_file_send_callback().
 	 */
+	/* content type */
+	if (fetch_curl_send_header(ctx, "Content-Type: text/html"))
+		goto fetch_file_process_aborted;
-/**
+	/* main data loop */
  * Callback function for cURL.
+		msg.type = FETCH_DATA;
- */
+		msg.data.header_or_data.buf = (const uint8_t *) buf;
+		msg.data.header_or_data.len = strlen(buf);
+		fetch_curl_send_callback(&msg, ctx);
+	if (ctx->aborted == false) {
-size_t fetch_curl_data(char *data, size_t size, size_t nmemb,
-		       void *_f)
 		msg.type = FETCH_FINISHED;
-	LOG(("curl callback\n"));
-		return 0;
-}
-/**
- * Callback function for headers.
- *
- * See RFC 2616 4.2.

Subversion Repositories Kolibri OS

(root)/programs/network/netsurf/netsurf/content/fetchers/curl.c – Rev 3584 → 3616

%s

Hello, file fetcher!