X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=opkg_download.c;h=3370b1f60a9253b5e17cc9a9a1793f48c209dad4;hp=c0a66fe3229555f083ce4365da863eee1b650995;hb=924a46bf92e346c820f42f74a6792653894944e2;hpb=dd4f9919f1b184ce2c4df7f805b89462fcbf0158

diff --git a/opkg_download.c b/opkg_download.c
index c0a66fe..3370b1f 100644
--- a/opkg_download.c
+++ b/opkg_download.c
@@ -34,11 +34,11 @@ opkg_download_progress_callback opkg_cb_download_progress = NULL;
 #endif
 
 int
-curl_progress_func (void* data,
-                         double t, /* dltotal */
-                         double d, /* dlnow */
-                         double ultotal,
-                         double ulnow)
+curl_progress_func (char* url,
+		    double t, /* dltotal */
+		    double d, /* dlnow */
+		    double ultotal,
+		    double ulnow)
 {
     int i;
     int p = d*100/t;
@@ -46,7 +46,7 @@ curl_progress_func (void* data,
 #ifdef OPKG_LIB
     if (opkg_cb_download_progress)
     {
-	opkg_cb_download_progress (p);
+	opkg_cb_download_progress (p, url);
 	return 0;
     }
 #endif
@@ -142,7 +142,8 @@ int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name
     {
 	curl_easy_setopt (curl, CURLOPT_URL, src);
 	curl_easy_setopt (curl, CURLOPT_WRITEDATA, file);
-	curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
+	curl_easy_setopt (curl, CURLOPT_NOPROGRESS, 0);
+	curl_easy_setopt (curl, CURLOPT_PROGRESSDATA, src);
 	curl_easy_setopt (curl, CURLOPT_PROGRESSFUNCTION, curl_progress_func);
 	if (conf->http_proxy || conf->ftp_proxy)
 	{