opkg: Fix #ifdef

[oweals/opkg-lede.git] / opkg_download.c

diff --git a/opkg_download.c b/opkg_download.c
index 6859e92ee9d7c043781ed72cdd270b5bb092dd91..c0a66fe3229555f083ce4365da863eee1b650995 100644 (file)
--- a/opkg_download.c
+++ b/opkg_download.c
@@ -43,7 +43,7 @@ curl_progress_func (void* data,
     int i;
     int p = d*100/t;
 
-#ifdef LIBOPKG
+#ifdef OPKG_LIB
     if (opkg_cb_download_progress)
     {
        opkg_cb_download_progress (p);
@@ -144,6 +144,14 @@ int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name
        curl_easy_setopt (curl, CURLOPT_WRITEDATA, file);
        curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
        curl_easy_setopt (curl, CURLOPT_PROGRESSFUNCTION, curl_progress_func);
+       if (conf->http_proxy || conf->ftp_proxy)
+       {
+           char *userpwd;
+           sprintf_alloc (&userpwd, "%s:%s", conf->proxy_user,
+                   conf->proxy_passwd);
+           curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, userpwd);
+           free (userpwd);
+       }
        res = curl_easy_perform (curl);
        curl_easy_cleanup (curl);
        fclose (file);