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

 static inline bool fetch_curl_send_callback(const fetch_msg *msg,
 		struct fetch_curl_context *ctx)
+{
+	ctx->locked = true;
+	__menuet__debug_out("Inside curl_send_cb, Calling send_cb()\n");
 	ctx->locked = true;
 	fetch_send_callback(msg, ctx->fetchh);
+	ctx->locked = false;
-	ctx->locked = false;
+	__menuet__debug_out("Returning ctx->aborted.\n");
 	return ctx->aborted;
+}
 static bool fetch_curl_send_header(struct fetch_curl_context *ctx,
 		const char *fmt, ...)
+{
-	fetch_msg msg;
+	fetch_msg msg;
 	char header[64];
 	va_list ap;
 	__menuet__debug_out("Inside fetch_curl_send_header\n");
+	va_start(ap, fmt);
-	va_start(ap, fmt);
+	vsnprintf(header, sizeof header, fmt, ap);
-	vsnprintf(header, sizeof header, fmt, ap);
+	va_end(ap);
+	__menuet__debug_out("Header is : ");
+	__menuet__debug_out(header);
+	msg.type = FETCH_HEADER;
-	va_end(ap);
+	msg.data.header_or_data.buf = (const uint8_t *) header;
 	msg.data.header_or_data.len = strlen(header);
-	msg.type = FETCH_HEADER;
+	__menuet__debug_out("\nCalling fetch_curl_send_callback\n");
 	msg.data.header_or_data.buf = (const uint8_t *) header;
 fetch_file_process_error_aborted:
 	return;
+}
-int is_pid(int k)
-{
-	int error;
-asm volatile ("int $0x40":"=a"(error):"a"(18), "b"(21), "c"(k));
-return error;
-}
-int kill_pid(int k)
-{
-	int error;
-asm volatile ("int $0x40":"=a"(error):"a"(18), "b"(18), "c"(k));
-return error;
-}
 static void fetch_curl_process(struct fetch_curl_context *ctx) {
 	char ps[96], str[128];
 	sprintf(ps, "Yay! Path is %s", ctx->path);
-	execl ("/sys/@notify", ps, 0);
-	fetch_msg msg;
- /* ERSATZ DOWNLOADER */
- /*
-char zapzap[]="HOOLE!
";
-size_t file_size=strlen(zapzap);
-char *buffer = (char*)malloc(file_size * sizeof(char));
-memcpy(buffer, zapzap, file_size * sizeof(char));
-*/
 	execl ("/sys/@notify", ps, 0);
 	fetch_msg msg;
     __menuet__debug_out("AHOY!\n");
 	struct http_msg *http_ahoy;
-	unsigned int wererat = 0;
-    char * pa=ctx->path;
-    asm volatile ("pusha");
+	unsigned int wererat = 0;
-    wererat = http_get(pa);
+    char * pa=ctx->path;
-	asm volatile ("popa");
-	__menuet__debug_out("HTTP GOT!\n");
+    //    asm volatile ("pusha");		// TODO: verify if this is still needed. It used to be an issue with the library but should be fixed now.
+    wererat = http_get(pa, NULL);	// TODO: a pointer to additional headers (for cookies etc) can be placed here in the future.
-	int result;
+    //    asm volatile ("popa");		// ....
-    http_ahoy=wererat;
+    if(wererat == 0) /* Error condition : http_get returned 0 */
-    sprintf (str, "Header %d bytes, content %d bytes, recieved %d bytes\n", http_ahoy->header_length, http_ahoy->content_length, http_ahoy->content_received);
+      __menuet__debug_out("http_get() failed. [ Return Value 0 ]\n");
-    __menuet__debug_out(str);
+    else
-    asm volatile ("pusha");
-    result = http_process(wererat);
-    asm volatile ("popa");
+      __menuet__debug_out("http_get() Succeeded!. [ Return Value Non zero ]\n");
-    while (result == -1)  {
-		asm volatile ("pusha");
+    __menuet__debug_out("HTTP GOT!\n");
+    int result = 1337;
+    char result_str[12];
+    char wererat_str[13];
-		result = http_process(wererat);
+    http_ahoy = wererat;
-		asm volatile ("popa");
-	}
+    sprintf (str, "Header %u bytes, content %u bytes, received %u bytes\n", http_ahoy->header_length, http_ahoy->content_length, http_ahoy->content_received);
-    http_ahoy=wererat;
+    __menuet__debug_out(str);
-    sprintf (str, "Header %d bytes, content %d bytes, recieved %d bytes\n", http_ahoy->header_length, http_ahoy->content_length, http_ahoy->content_received);
-    __menuet__debug_out(str);
+    __menuet__debug_out("Going into the do while loop for http_process\n");
-    __menuet__debug_out("All content is here\n");
+    do  {
-	size_t file_size=http_ahoy->content_received;
+      //          sprintf(result_str, "%d", result);
+      //          __menuet__debug_out("Result is : ");
-	char *buffer = (char*)malloc(file_size * sizeof(char));
+      //          __menuet__debug_out(result_str);
+      //          __menuet__debug_out("\n");
+		//		asm volatile ("pusha");	// TODO: verify if this is still needed. It used to be an issue with the library but should be fixed now.
-	memcpy(buffer, &(http_ahoy->data)+http_ahoy->header_length, file_size);
+		result = http_process(wererat);
+		//		asm volatile ("popa");	// ....
+    } while ((result != 0));
-	// http_free(wererat);
+    __menuet__debug_out("After the do while loop for http_process.\n");
     __menuet__debug_out("memcopied\n==\n");
     if(result == 0)
-	//__menuet__debug_out(buffer);
+      __menuet__debug_out("http_process() worked successfully!\n");
-	//__menuet__debug_out("memcopied\n==\n");
+    else
       __menuet__debug_out("http_process() failed!\n");
-//char zapzap[]="HOOLE!
";
+//    http_ahoy = wererat;		// really needed again??
-//file_size=strlen(zapzap);
+      sprintf (str, "Header %u bytes, content %u bytes, received %u bytes\n", http_ahoy->header_length, http_ahoy->content_length, http_ahoy->content_received);
-//char *buffer = (char*)malloc(file_size * sizeof(char));
+    __menuet__debug_out(str);
 //memcpy(buffer, zapzap, file_size * sizeof(char));
+/* fetch is going to be successful */
+	__menuet__debug_out("Calling fetch_set_http_code call\n");
+	fetch_set_http_code(ctx->fetchh, http_ahoy->status);
+	__menuet__debug_out("Returned from fetch_set_http_code call\n");
-/* fetch is going to be successful */
+	/* Any callback can result in the fetch being aborted.
+	 * Therefore, we _must_ check for this after _every_ call to
+	 * fetch_file_send_callback().
+	 */
+	__menuet__debug_out("Calling fetch_curl_send_header: 1\n");
-	fetch_set_http_code(ctx->fetchh, 200);
+	if (fetch_curl_send_header(ctx, "Content-Type: %s",
+			fetch_filetype(ctx->path)))
 		goto fetch_file_process_aborted;
 	/* Any callback can result in the fetch being aborted.
+	/* main data loop */
-	 * Therefore, we _must_ check for this after _every_ call to
+	__menuet__debug_out("inside main data loop\n");
-	 * fetch_file_send_callback().
+		msg.type = FETCH_DATA;
-	 */
+		msg.data.header_or_data.buf = http_ahoy->content_ptr; 	// lets pray this works..x2
-	if (fetch_curl_send_header(ctx, "Content-Type: %s",
+		msg.data.header_or_data.len = http_ahoy->content_received;
-			fetch_filetype(ctx->path)))
+	__menuet__debug_out("Calling fetch_curl_send_callback\n");
-		goto fetch_file_process_aborted;
+		fetch_curl_send_callback(&msg, ctx);
 	__menuet__debug_out("Calling http_free with wererat = ");

Subversion Repositories Kolibri OS

(root)/contrib/network/netsurf/netsurf/content/fetchers/curl.c – Rev 4364 → 4821

HOOLE!

HOOLE!