add --no-same-permissions as well

Tag v33
Return on error here too.
2026-09-06 05:41:43 +00:00 · 2017-03-09 14:52:37 +00:00 · 2016-11-01 09:20:19 -07:00 · 2016-11-01 09:15:12 -07:00 · 2016-11-01 09:15:12 -07:00
3 changed files with 15 additions and 2 deletions
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ([2.66])
-AC_INIT(clr-debug-info, 32, arjan@linux.intel.com)
+AC_INIT(clr-debug-info, 33, arjan@linux.intel.com)
 AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects])
 AM_SILENT_RULES([yes])
 AC_PROG_CC
@@ -85,6 +85,7 @@ void try_to_get(const char *path, int pid, time_t timestamp)
        if (ret == 0 && cred.pid == pid) {
                printf("Recursion\n");
                close(sockfd);
+                return;
        }

        command = NULL;
@@ -191,6 +191,18 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
        curl_easy_setopt(curl, CURLOPT_WRITEDATA, file);
        curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);

+        /*
+         * Some sane timeout values to prevent stalls
+         *
+         * Connect timeout is for first connection to the server.
+         * The low speed timeout is for slow downloads. Since many
+         * files are several mB large, we want to prevent them from
+         * taking forever. (1kB/sec avg over 30secs).
+         */
+        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 30);
+        curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 30);
+        curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1024);
+
        if (timestamp) {
                curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
                curl_easy_setopt(curl, CURLOPT_TIMEVALUE, timestamp);
@@ -225,7 +237,7 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
                stat(filename, &statbuf);
                if (statbuf.st_size > 0 &&
                    asprintf(&command,
-                             "tar -C /var/cache/debuginfo/%s --no-same-owner  -xf %s",
+                             "tar -C /var/cache/debuginfo/%s --no-same-owner  --no-same-permissions  -xf %s",
                             prefix,
                             filename) >= 0) {
                        if (system(command) != 0) {
Author	SHA1	Message	Date
Arjan van de Ven	72b1120a40	add --no-same-permissions as well	2017-03-09 14:52:37 +00:00
Auke Kok	d3d5fab301	Tag v33	2016-11-01 09:20:19 -07:00
Auke Kok	e377433a9d	Return on error here too. Missed a 'return' catching an error.	2016-11-01 09:15:12 -07:00
Auke Kok	afa92c77b1	Add reasonable connection timeout limits. Adds a 30second connection timeout, and a low bandwith timeout value (at 1kb/sec over 30 seconds) where the attempt will fail. This provides some feedback to users that network issues are preventing debug info from being loaded.	2016-11-01 09:15:12 -07:00