Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1 | #include "cache.h" |
| 2 | #include "commit.h" |
Junio C Hamano | 271421c | 2005-09-30 00:07:39 -0700 | [diff] [blame] | 3 | #include "pack.h" |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 4 | #include "walker.h" |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 5 | #include "http.h" |
Johannes Schindelin | 7baa3e8 | 2005-10-15 11:10:46 -0700 | [diff] [blame] | 6 | |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 7 | #define PREV_BUF_SIZE 4096 |
| 8 | #define RANGE_HEADER_SIZE 30 |
| 9 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 10 | struct alt_base |
| 11 | { |
Gerrit Pape | 2afea3b | 2007-03-28 09:46:15 +0000 | [diff] [blame] | 12 | char *base; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 13 | int got_indices; |
| 14 | struct packed_git *packs; |
| 15 | struct alt_base *next; |
| 16 | }; |
| 17 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 18 | enum object_request_state { |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 19 | WAITING, |
| 20 | ABORTED, |
| 21 | ACTIVE, |
| 22 | COMPLETE, |
| 23 | }; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 24 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 25 | struct object_request |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 26 | { |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 27 | struct walker *walker; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 28 | unsigned char sha1[20]; |
| 29 | struct alt_base *repo; |
| 30 | char *url; |
| 31 | char filename[PATH_MAX]; |
| 32 | char tmpfile[PATH_MAX]; |
| 33 | int local; |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 34 | enum object_request_state state; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 35 | CURLcode curl_result; |
| 36 | char errorstr[CURL_ERROR_SIZE]; |
| 37 | long http_code; |
| 38 | unsigned char real_sha1[20]; |
| 39 | SHA_CTX c; |
| 40 | z_stream stream; |
| 41 | int zret; |
| 42 | int rename; |
| 43 | struct active_request_slot *slot; |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 44 | struct object_request *next; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 45 | }; |
| 46 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 47 | struct alternates_request { |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 48 | struct walker *walker; |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 49 | const char *base; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 50 | char *url; |
| 51 | struct buffer *buffer; |
| 52 | struct active_request_slot *slot; |
| 53 | int http_specific; |
| 54 | }; |
| 55 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 56 | struct walker_data { |
| 57 | const char *url; |
| 58 | int got_alternates; |
| 59 | struct alt_base *alt; |
| 60 | struct curl_slist *no_pragma_header; |
| 61 | }; |
| 62 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 63 | static struct object_request *object_queue_head; |
Sergey Vlasov | bc8f265 | 2005-10-13 10:49:53 -0700 | [diff] [blame] | 64 | |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 65 | static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb, |
| 66 | void *data) |
| 67 | { |
Brian Gerst | bf0f910 | 2005-05-18 08:14:09 -0400 | [diff] [blame] | 68 | unsigned char expn[4096]; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 69 | size_t size = eltsize * nmemb; |
| 70 | int posn = 0; |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 71 | struct object_request *obj_req = (struct object_request *)data; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 72 | do { |
Andy Whitcroft | 93822c2 | 2007-01-08 15:58:23 +0000 | [diff] [blame] | 73 | ssize_t retval = xwrite(obj_req->local, |
Florian Forster | 1d7f171 | 2006-06-18 17:18:09 +0200 | [diff] [blame] | 74 | (char *) ptr + posn, size - posn); |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 75 | if (retval < 0) |
| 76 | return posn; |
| 77 | posn += retval; |
| 78 | } while (posn < size); |
| 79 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 80 | obj_req->stream.avail_in = size; |
| 81 | obj_req->stream.next_in = ptr; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 82 | do { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 83 | obj_req->stream.next_out = expn; |
| 84 | obj_req->stream.avail_out = sizeof(expn); |
| 85 | obj_req->zret = inflate(&obj_req->stream, Z_SYNC_FLUSH); |
| 86 | SHA1_Update(&obj_req->c, expn, |
| 87 | sizeof(expn) - obj_req->stream.avail_out); |
| 88 | } while (obj_req->stream.avail_in && obj_req->zret == Z_OK); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 89 | data_received++; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 90 | return size; |
| 91 | } |
| 92 | |
Junio C Hamano | be4a015 | 2006-09-16 10:58:20 -0700 | [diff] [blame] | 93 | static int missing__target(int code, int result) |
| 94 | { |
| 95 | return /* file:// URL -- do we ever use one??? */ |
| 96 | (result == CURLE_FILE_COULDNT_READ_FILE) || |
| 97 | /* http:// and https:// URL */ |
Junio C Hamano | 4adffc7 | 2006-09-16 11:06:02 -0700 | [diff] [blame] | 98 | (code == 404 && result == CURLE_HTTP_RETURNED_ERROR) || |
| 99 | /* ftp:// URL */ |
| 100 | (code == 550 && result == CURLE_FTP_COULDNT_RETR_FILE) |
Junio C Hamano | be4a015 | 2006-09-16 10:58:20 -0700 | [diff] [blame] | 101 | ; |
| 102 | } |
| 103 | |
| 104 | #define missing_target(a) missing__target((a)->http_code, (a)->curl_result) |
| 105 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 106 | static void fetch_alternates(struct walker *walker, const char *base); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 107 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 108 | static void process_object_response(void *callback_data); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 109 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 110 | static void start_object_request(struct walker *walker, |
| 111 | struct object_request *obj_req) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 112 | { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 113 | char *hex = sha1_to_hex(obj_req->sha1); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 114 | char prevfile[PATH_MAX]; |
| 115 | char *url; |
| 116 | char *posn; |
| 117 | int prevlocal; |
| 118 | unsigned char prev_buf[PREV_BUF_SIZE]; |
| 119 | ssize_t prev_read = 0; |
| 120 | long prev_posn = 0; |
| 121 | char range[RANGE_HEADER_SIZE]; |
| 122 | struct curl_slist *range_header = NULL; |
| 123 | struct active_request_slot *slot; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 124 | struct walker_data *data = walker->data; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 125 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 126 | snprintf(prevfile, sizeof(prevfile), "%s.prev", obj_req->filename); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 127 | unlink(prevfile); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 128 | rename(obj_req->tmpfile, prevfile); |
| 129 | unlink(obj_req->tmpfile); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 130 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 131 | if (obj_req->local != -1) |
| 132 | error("fd leakage in start: %d", obj_req->local); |
| 133 | obj_req->local = open(obj_req->tmpfile, |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 134 | O_WRONLY | O_CREAT | O_EXCL, 0666); |
Junio C Hamano | b721e01 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 135 | /* This could have failed due to the "lazy directory creation"; |
| 136 | * try to mkdir the last path component. |
| 137 | */ |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 138 | if (obj_req->local < 0 && errno == ENOENT) { |
| 139 | char *dir = strrchr(obj_req->tmpfile, '/'); |
Junio C Hamano | b721e01 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 140 | if (dir) { |
| 141 | *dir = 0; |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 142 | mkdir(obj_req->tmpfile, 0777); |
Junio C Hamano | b721e01 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 143 | *dir = '/'; |
| 144 | } |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 145 | obj_req->local = open(obj_req->tmpfile, |
Junio C Hamano | b721e01 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 146 | O_WRONLY | O_CREAT | O_EXCL, 0666); |
| 147 | } |
| 148 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 149 | if (obj_req->local < 0) { |
| 150 | obj_req->state = ABORTED; |
Junio C Hamano | bd2afde | 2006-02-22 17:47:10 -0800 | [diff] [blame] | 151 | error("Couldn't create temporary file %s for %s: %s", |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 152 | obj_req->tmpfile, obj_req->filename, strerror(errno)); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 153 | return; |
| 154 | } |
| 155 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 156 | memset(&obj_req->stream, 0, sizeof(obj_req->stream)); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 157 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 158 | inflateInit(&obj_req->stream); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 159 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 160 | SHA1_Init(&obj_req->c); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 161 | |
Gerrit Pape | 2afea3b | 2007-03-28 09:46:15 +0000 | [diff] [blame] | 162 | url = xmalloc(strlen(obj_req->repo->base) + 51); |
| 163 | obj_req->url = xmalloc(strlen(obj_req->repo->base) + 51); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 164 | strcpy(url, obj_req->repo->base); |
| 165 | posn = url + strlen(obj_req->repo->base); |
Gerrit Pape | 2afea3b | 2007-03-28 09:46:15 +0000 | [diff] [blame] | 166 | strcpy(posn, "/objects/"); |
| 167 | posn += 9; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 168 | memcpy(posn, hex, 2); |
| 169 | posn += 2; |
| 170 | *(posn++) = '/'; |
| 171 | strcpy(posn, hex + 2); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 172 | strcpy(obj_req->url, url); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 173 | |
| 174 | /* If a previous temp file is present, process what was already |
| 175 | fetched. */ |
| 176 | prevlocal = open(prevfile, O_RDONLY); |
| 177 | if (prevlocal != -1) { |
| 178 | do { |
Andy Whitcroft | 93d26e4 | 2007-01-08 15:58:08 +0000 | [diff] [blame] | 179 | prev_read = xread(prevlocal, prev_buf, PREV_BUF_SIZE); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 180 | if (prev_read>0) { |
| 181 | if (fwrite_sha1_file(prev_buf, |
| 182 | 1, |
| 183 | prev_read, |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 184 | obj_req) == prev_read) { |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 185 | prev_posn += prev_read; |
| 186 | } else { |
| 187 | prev_read = -1; |
| 188 | } |
| 189 | } |
| 190 | } while (prev_read > 0); |
| 191 | close(prevlocal); |
| 192 | } |
| 193 | unlink(prevfile); |
| 194 | |
| 195 | /* Reset inflate/SHA1 if there was an error reading the previous temp |
| 196 | file; also rewind to the beginning of the local file. */ |
| 197 | if (prev_read == -1) { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 198 | memset(&obj_req->stream, 0, sizeof(obj_req->stream)); |
| 199 | inflateInit(&obj_req->stream); |
| 200 | SHA1_Init(&obj_req->c); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 201 | if (prev_posn>0) { |
| 202 | prev_posn = 0; |
Dana How | b5da246 | 2007-04-05 12:05:57 -0700 | [diff] [blame] | 203 | lseek(obj_req->local, 0, SEEK_SET); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 204 | ftruncate(obj_req->local, 0); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 205 | } |
| 206 | } |
| 207 | |
| 208 | slot = get_active_slot(); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 209 | slot->callback_func = process_object_response; |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 210 | slot->callback_data = obj_req; |
| 211 | obj_req->slot = slot; |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 212 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 213 | curl_easy_setopt(slot->curl, CURLOPT_FILE, obj_req); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 214 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 215 | curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, obj_req->errorstr); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 216 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 217 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, data->no_pragma_header); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 218 | |
| 219 | /* If we have successfully processed data from a previous fetch |
| 220 | attempt, only fetch the data we don't already have. */ |
| 221 | if (prev_posn>0) { |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 222 | if (walker->get_verbosely) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 223 | fprintf(stderr, |
| 224 | "Resuming fetch of object %s at byte %ld\n", |
| 225 | hex, prev_posn); |
| 226 | sprintf(range, "Range: bytes=%ld-", prev_posn); |
| 227 | range_header = curl_slist_append(range_header, range); |
| 228 | curl_easy_setopt(slot->curl, |
| 229 | CURLOPT_HTTPHEADER, range_header); |
| 230 | } |
| 231 | |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 232 | /* Try to get the request started, abort the request on error */ |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 233 | obj_req->state = ACTIVE; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 234 | if (!start_active_slot(slot)) { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 235 | obj_req->state = ABORTED; |
| 236 | obj_req->slot = NULL; |
| 237 | close(obj_req->local); obj_req->local = -1; |
| 238 | free(obj_req->url); |
| 239 | return; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 240 | } |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 241 | } |
| 242 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 243 | static void finish_object_request(struct object_request *obj_req) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 244 | { |
Nick Hengeveld | 50496b2 | 2005-11-03 17:54:52 -0800 | [diff] [blame] | 245 | struct stat st; |
| 246 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 247 | fchmod(obj_req->local, 0444); |
| 248 | close(obj_req->local); obj_req->local = -1; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 249 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 250 | if (obj_req->http_code == 416) { |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 251 | fprintf(stderr, "Warning: requested range invalid; we may already have all the data.\n"); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 252 | } else if (obj_req->curl_result != CURLE_OK) { |
| 253 | if (stat(obj_req->tmpfile, &st) == 0) |
Nick Hengeveld | 50496b2 | 2005-11-03 17:54:52 -0800 | [diff] [blame] | 254 | if (st.st_size == 0) |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 255 | unlink(obj_req->tmpfile); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 256 | return; |
| 257 | } |
| 258 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 259 | inflateEnd(&obj_req->stream); |
| 260 | SHA1_Final(obj_req->real_sha1, &obj_req->c); |
| 261 | if (obj_req->zret != Z_STREAM_END) { |
| 262 | unlink(obj_req->tmpfile); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 263 | return; |
| 264 | } |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 265 | if (hashcmp(obj_req->sha1, obj_req->real_sha1)) { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 266 | unlink(obj_req->tmpfile); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 267 | return; |
| 268 | } |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 269 | obj_req->rename = |
| 270 | move_temp_to_file(obj_req->tmpfile, obj_req->filename); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 271 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 272 | if (obj_req->rename == 0) |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 273 | walker_say(obj_req->walker, "got %s\n", sha1_to_hex(obj_req->sha1)); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 274 | } |
| 275 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 276 | static void process_object_response(void *callback_data) |
| 277 | { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 278 | struct object_request *obj_req = |
| 279 | (struct object_request *)callback_data; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 280 | struct walker *walker = obj_req->walker; |
| 281 | struct walker_data *data = walker->data; |
| 282 | struct alt_base *alt = data->alt; |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 283 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 284 | obj_req->curl_result = obj_req->slot->curl_result; |
| 285 | obj_req->http_code = obj_req->slot->http_code; |
| 286 | obj_req->slot = NULL; |
| 287 | obj_req->state = COMPLETE; |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 288 | |
| 289 | /* Use alternates if necessary */ |
Junio C Hamano | be4a015 | 2006-09-16 10:58:20 -0700 | [diff] [blame] | 290 | if (missing_target(obj_req)) { |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 291 | fetch_alternates(walker, alt->base); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 292 | if (obj_req->repo->next != NULL) { |
| 293 | obj_req->repo = |
| 294 | obj_req->repo->next; |
| 295 | close(obj_req->local); |
| 296 | obj_req->local = -1; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 297 | start_object_request(walker, obj_req); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 298 | return; |
| 299 | } |
| 300 | } |
| 301 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 302 | finish_object_request(obj_req); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 303 | } |
| 304 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 305 | static void release_object_request(struct object_request *obj_req) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 306 | { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 307 | struct object_request *entry = object_queue_head; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 308 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 309 | if (obj_req->local != -1) |
| 310 | error("fd leakage in release: %d", obj_req->local); |
| 311 | if (obj_req == object_queue_head) { |
| 312 | object_queue_head = obj_req->next; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 313 | } else { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 314 | while (entry->next != NULL && entry->next != obj_req) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 315 | entry = entry->next; |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 316 | if (entry->next == obj_req) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 317 | entry->next = entry->next->next; |
| 318 | } |
| 319 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 320 | free(obj_req->url); |
| 321 | free(obj_req); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 322 | } |
| 323 | |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 324 | #ifdef USE_CURL_MULTI |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 325 | static int fill_active_slot(struct walker *walker) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 326 | { |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 327 | struct object_request *obj_req; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 328 | |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 329 | for (obj_req = object_queue_head; obj_req; obj_req = obj_req->next) { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 330 | if (obj_req->state == WAITING) { |
| 331 | if (has_sha1_file(obj_req->sha1)) |
Mark Wooding | 09db444 | 2006-02-01 11:44:28 +0000 | [diff] [blame] | 332 | obj_req->state = COMPLETE; |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 333 | else { |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 334 | start_object_request(walker, obj_req); |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 335 | return 1; |
| 336 | } |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 337 | } |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 338 | } |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 339 | return 0; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 340 | } |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 341 | #endif |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 342 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 343 | static void prefetch(struct walker *walker, unsigned char *sha1) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 344 | { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 345 | struct object_request *newreq; |
| 346 | struct object_request *tail; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 347 | struct walker_data *data = walker->data; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 348 | char *filename = sha1_file_name(sha1); |
| 349 | |
| 350 | newreq = xmalloc(sizeof(*newreq)); |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 351 | newreq->walker = walker; |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 352 | hashcpy(newreq->sha1, sha1); |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 353 | newreq->repo = data->alt; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 354 | newreq->url = NULL; |
| 355 | newreq->local = -1; |
| 356 | newreq->state = WAITING; |
| 357 | snprintf(newreq->filename, sizeof(newreq->filename), "%s", filename); |
| 358 | snprintf(newreq->tmpfile, sizeof(newreq->tmpfile), |
| 359 | "%s.temp", filename); |
Nick Hengeveld | e8dff6b | 2006-06-06 22:22:35 -0700 | [diff] [blame] | 360 | newreq->slot = NULL; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 361 | newreq->next = NULL; |
| 362 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 363 | if (object_queue_head == NULL) { |
| 364 | object_queue_head = newreq; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 365 | } else { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 366 | tail = object_queue_head; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 367 | while (tail->next != NULL) { |
| 368 | tail = tail->next; |
| 369 | } |
| 370 | tail->next = newreq; |
| 371 | } |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 372 | |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 373 | #ifdef USE_CURL_MULTI |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 374 | fill_active_slots(); |
| 375 | step_active_slots(); |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 376 | #endif |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 377 | } |
| 378 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 379 | static int fetch_index(struct walker *walker, struct alt_base *repo, unsigned char *sha1) |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 380 | { |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 381 | char *hex = sha1_to_hex(sha1); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 382 | char *filename; |
| 383 | char *url; |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 384 | char tmpfile[PATH_MAX]; |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 385 | long prev_posn = 0; |
| 386 | char range[RANGE_HEADER_SIZE]; |
| 387 | struct curl_slist *range_header = NULL; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 388 | struct walker_data *data = walker->data; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 389 | |
| 390 | FILE *indexfile; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 391 | struct active_request_slot *slot; |
Nick Hengeveld | cb754fd | 2006-01-31 18:00:37 -0800 | [diff] [blame] | 392 | struct slot_results results; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 393 | |
| 394 | if (has_pack_index(sha1)) |
| 395 | return 0; |
| 396 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 397 | if (walker->get_verbosely) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 398 | fprintf(stderr, "Getting index for pack %s\n", hex); |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 399 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 400 | url = xmalloc(strlen(repo->base) + 64); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 401 | sprintf(url, "%s/objects/pack/pack-%s.idx", repo->base, hex); |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 402 | |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 403 | filename = sha1_pack_index_name(sha1); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 404 | snprintf(tmpfile, sizeof(tmpfile), "%s.temp", filename); |
| 405 | indexfile = fopen(tmpfile, "a"); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 406 | if (!indexfile) |
| 407 | return error("Unable to open local file %s for pack index", |
| 408 | filename); |
| 409 | |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 410 | slot = get_active_slot(); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 411 | slot->results = &results; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 412 | curl_easy_setopt(slot->curl, CURLOPT_FILE, indexfile); |
| 413 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite); |
| 414 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 415 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, data->no_pragma_header); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 416 | slot->local = indexfile; |
| 417 | |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 418 | /* If there is data present from a previous transfer attempt, |
| 419 | resume where it left off */ |
| 420 | prev_posn = ftell(indexfile); |
| 421 | if (prev_posn>0) { |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 422 | if (walker->get_verbosely) |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 423 | fprintf(stderr, |
| 424 | "Resuming fetch of index for pack %s at byte %ld\n", |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 425 | hex, prev_posn); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 426 | sprintf(range, "Range: bytes=%ld-", prev_posn); |
| 427 | range_header = curl_slist_append(range_header, range); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 428 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, range_header); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 429 | } |
| 430 | |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 431 | if (start_active_slot(slot)) { |
| 432 | run_active_slot(slot); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 433 | if (results.curl_result != CURLE_OK) { |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 434 | fclose(indexfile); |
| 435 | return error("Unable to get pack index %s\n%s", url, |
| 436 | curl_errorstr); |
| 437 | } |
| 438 | } else { |
Petr Baudis | 313c471 | 2005-11-12 00:55:16 +0100 | [diff] [blame] | 439 | fclose(indexfile); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 440 | return error("Unable to start request"); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 441 | } |
| 442 | |
| 443 | fclose(indexfile); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 444 | |
Junio C Hamano | b721e01 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 445 | return move_temp_to_file(tmpfile, filename); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 446 | } |
| 447 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 448 | static int setup_index(struct walker *walker, struct alt_base *repo, unsigned char *sha1) |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 449 | { |
| 450 | struct packed_git *new_pack; |
| 451 | if (has_pack_file(sha1)) |
Pavel Roskin | a9486b0 | 2006-07-10 02:57:51 -0400 | [diff] [blame] | 452 | return 0; /* don't list this as something we can get */ |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 453 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 454 | if (fetch_index(walker, repo, sha1)) |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 455 | return -1; |
| 456 | |
| 457 | new_pack = parse_pack_index(sha1); |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 458 | new_pack->next = repo->packs; |
| 459 | repo->packs = new_pack; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 460 | return 0; |
| 461 | } |
| 462 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 463 | static void process_alternates_response(void *callback_data) |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 464 | { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 465 | struct alternates_request *alt_req = |
| 466 | (struct alternates_request *)callback_data; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 467 | struct walker *walker = alt_req->walker; |
| 468 | struct walker_data *cdata = walker->data; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 469 | struct active_request_slot *slot = alt_req->slot; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 470 | struct alt_base *tail = cdata->alt; |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 471 | const char *base = alt_req->base; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 472 | static const char null_byte = '\0'; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 473 | char *data; |
| 474 | int i = 0; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 475 | |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 476 | if (alt_req->http_specific) { |
| 477 | if (slot->curl_result != CURLE_OK || |
| 478 | !alt_req->buffer->posn) { |
Junio C Hamano | dc1b5ea | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 479 | |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 480 | /* Try reusing the slot to get non-http alternates */ |
| 481 | alt_req->http_specific = 0; |
| 482 | sprintf(alt_req->url, "%s/objects/info/alternates", |
| 483 | base); |
| 484 | curl_easy_setopt(slot->curl, CURLOPT_URL, |
| 485 | alt_req->url); |
| 486 | active_requests++; |
| 487 | slot->in_use = 1; |
Nick Hengeveld | c982647 | 2006-03-15 08:59:52 -0800 | [diff] [blame] | 488 | if (slot->finished != NULL) |
| 489 | (*slot->finished) = 0; |
Mark Wooding | a3f583c | 2006-02-01 11:44:39 +0000 | [diff] [blame] | 490 | if (!start_active_slot(slot)) { |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 491 | cdata->got_alternates = -1; |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 492 | slot->in_use = 0; |
Nick Hengeveld | c982647 | 2006-03-15 08:59:52 -0800 | [diff] [blame] | 493 | if (slot->finished != NULL) |
| 494 | (*slot->finished) = 1; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 495 | } |
Mark Wooding | a3f583c | 2006-02-01 11:44:39 +0000 | [diff] [blame] | 496 | return; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 497 | } |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 498 | } else if (slot->curl_result != CURLE_OK) { |
Junio C Hamano | be4a015 | 2006-09-16 10:58:20 -0700 | [diff] [blame] | 499 | if (!missing_target(slot)) { |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 500 | cdata->got_alternates = -1; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 501 | return; |
| 502 | } |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 503 | } |
| 504 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 505 | fwrite_buffer(&null_byte, 1, 1, alt_req->buffer); |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 506 | alt_req->buffer->posn--; |
| 507 | data = alt_req->buffer->buffer; |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 508 | |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 509 | while (i < alt_req->buffer->posn) { |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 510 | int posn = i; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 511 | while (posn < alt_req->buffer->posn && data[posn] != '\n') |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 512 | posn++; |
| 513 | if (data[posn] == '\n') { |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 514 | int okay = 0; |
| 515 | int serverlen = 0; |
| 516 | struct alt_base *newalt; |
| 517 | char *target = NULL; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 518 | if (data[i] == '/') { |
Junio C Hamano | 5df1e0d | 2006-09-12 23:53:27 -0700 | [diff] [blame] | 519 | /* This counts |
| 520 | * http://git.host/pub/scm/linux.git/ |
| 521 | * -----------here^ |
| 522 | * so memcpy(dst, base, serverlen) will |
| 523 | * copy up to "...git.host". |
| 524 | */ |
| 525 | const char *colon_ss = strstr(base,"://"); |
| 526 | if (colon_ss) { |
| 527 | serverlen = (strchr(colon_ss + 3, '/') |
| 528 | - base); |
| 529 | okay = 1; |
| 530 | } |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 531 | } else if (!memcmp(data + i, "../", 3)) { |
Junio C Hamano | 5df1e0d | 2006-09-12 23:53:27 -0700 | [diff] [blame] | 532 | /* Relative URL; chop the corresponding |
| 533 | * number of subpath from base (and ../ |
| 534 | * from data), and concatenate the result. |
| 535 | * |
| 536 | * The code first drops ../ from data, and |
| 537 | * then drops one ../ from data and one path |
| 538 | * from base. IOW, one extra ../ is dropped |
| 539 | * from data than path is dropped from base. |
| 540 | * |
| 541 | * This is not wrong. The alternate in |
| 542 | * http://git.host/pub/scm/linux.git/ |
| 543 | * to borrow from |
| 544 | * http://git.host/pub/scm/linus.git/ |
| 545 | * is ../../linus.git/objects/. You need |
| 546 | * two ../../ to borrow from your direct |
| 547 | * neighbour. |
| 548 | */ |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 549 | i += 3; |
| 550 | serverlen = strlen(base); |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 551 | while (i + 2 < posn && |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 552 | !memcmp(data + i, "../", 3)) { |
| 553 | do { |
| 554 | serverlen--; |
| 555 | } while (serverlen && |
| 556 | base[serverlen - 1] != '/'); |
| 557 | i += 3; |
| 558 | } |
Pavel Roskin | a9486b0 | 2006-07-10 02:57:51 -0400 | [diff] [blame] | 559 | /* If the server got removed, give up. */ |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 560 | okay = strchr(base, ':') - base + 3 < |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 561 | serverlen; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 562 | } else if (alt_req->http_specific) { |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 563 | char *colon = strchr(data + i, ':'); |
| 564 | char *slash = strchr(data + i, '/'); |
| 565 | if (colon && slash && colon < data + posn && |
| 566 | slash < data + posn && colon < slash) { |
| 567 | okay = 1; |
| 568 | } |
| 569 | } |
Junio C Hamano | 5df1e0d | 2006-09-12 23:53:27 -0700 | [diff] [blame] | 570 | /* skip "objects\n" at end */ |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 571 | if (okay) { |
| 572 | target = xmalloc(serverlen + posn - i - 6); |
Junio C Hamano | 5df1e0d | 2006-09-12 23:53:27 -0700 | [diff] [blame] | 573 | memcpy(target, base, serverlen); |
| 574 | memcpy(target + serverlen, data + i, |
| 575 | posn - i - 7); |
| 576 | target[serverlen + posn - i - 7] = 0; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 577 | if (walker->get_verbosely) |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 578 | fprintf(stderr, |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 579 | "Also look at %s\n", target); |
| 580 | newalt = xmalloc(sizeof(*newalt)); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 581 | newalt->next = NULL; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 582 | newalt->base = target; |
| 583 | newalt->got_indices = 0; |
| 584 | newalt->packs = NULL; |
Nick Hengeveld | 8d9fbe5 | 2006-04-04 05:33:18 -0700 | [diff] [blame] | 585 | |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 586 | while (tail->next != NULL) |
| 587 | tail = tail->next; |
| 588 | tail->next = newalt; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 589 | } |
| 590 | } |
| 591 | i = posn + 1; |
| 592 | } |
Sergey Vlasov | bc8f265 | 2005-10-13 10:49:53 -0700 | [diff] [blame] | 593 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 594 | cdata->got_alternates = 1; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 595 | } |
| 596 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 597 | static void fetch_alternates(struct walker *walker, const char *base) |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 598 | { |
| 599 | struct buffer buffer; |
| 600 | char *url; |
| 601 | char *data; |
| 602 | struct active_request_slot *slot; |
Nick Hengeveld | cb754fd | 2006-01-31 18:00:37 -0800 | [diff] [blame] | 603 | struct alternates_request alt_req; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 604 | struct walker_data *cdata = walker->data; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 605 | |
| 606 | /* If another request has already started fetching alternates, |
| 607 | wait for them to arrive and return to processing this request's |
| 608 | curl message */ |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 609 | #ifdef USE_CURL_MULTI |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 610 | while (cdata->got_alternates == 0) { |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 611 | step_active_slots(); |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 612 | } |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 613 | #endif |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 614 | |
| 615 | /* Nothing to do if they've already been fetched */ |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 616 | if (cdata->got_alternates == 1) |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 617 | return; |
| 618 | |
| 619 | /* Start the fetch */ |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 620 | cdata->got_alternates = 0; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 621 | |
| 622 | data = xmalloc(4096); |
| 623 | buffer.size = 4096; |
| 624 | buffer.posn = 0; |
| 625 | buffer.buffer = data; |
| 626 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 627 | if (walker->get_verbosely) |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 628 | fprintf(stderr, "Getting alternates list for %s\n", base); |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 629 | |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 630 | url = xmalloc(strlen(base) + 31); |
| 631 | sprintf(url, "%s/objects/info/http-alternates", base); |
| 632 | |
| 633 | /* Use a callback to process the result, since another request |
| 634 | may fail and need to have alternates loaded before continuing */ |
| 635 | slot = get_active_slot(); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 636 | slot->callback_func = process_alternates_response; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 637 | alt_req.walker = walker; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 638 | slot->callback_data = &alt_req; |
| 639 | |
| 640 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 641 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 642 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
| 643 | |
| 644 | alt_req.base = base; |
| 645 | alt_req.url = url; |
| 646 | alt_req.buffer = &buffer; |
| 647 | alt_req.http_specific = 1; |
| 648 | alt_req.slot = slot; |
| 649 | |
| 650 | if (start_active_slot(slot)) |
| 651 | run_active_slot(slot); |
| 652 | else |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 653 | cdata->got_alternates = -1; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 654 | |
| 655 | free(data); |
| 656 | free(url); |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 657 | } |
| 658 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 659 | static int fetch_indices(struct walker *walker, struct alt_base *repo) |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 660 | { |
| 661 | unsigned char sha1[20]; |
| 662 | char *url; |
| 663 | struct buffer buffer; |
| 664 | char *data; |
| 665 | int i = 0; |
| 666 | |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 667 | struct active_request_slot *slot; |
Nick Hengeveld | cb754fd | 2006-01-31 18:00:37 -0800 | [diff] [blame] | 668 | struct slot_results results; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 669 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 670 | if (repo->got_indices) |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 671 | return 0; |
| 672 | |
| 673 | data = xmalloc(4096); |
| 674 | buffer.size = 4096; |
| 675 | buffer.posn = 0; |
| 676 | buffer.buffer = data; |
| 677 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 678 | if (walker->get_verbosely) |
Petr Baudis | 6fd72e3 | 2005-11-12 01:49:59 +0100 | [diff] [blame] | 679 | fprintf(stderr, "Getting pack list for %s\n", repo->base); |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 680 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 681 | url = xmalloc(strlen(repo->base) + 21); |
| 682 | sprintf(url, "%s/objects/info/packs", repo->base); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 683 | |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 684 | slot = get_active_slot(); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 685 | slot->results = &results; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 686 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 687 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 688 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
| 689 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL); |
| 690 | if (start_active_slot(slot)) { |
| 691 | run_active_slot(slot); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 692 | if (results.curl_result != CURLE_OK) { |
Junio C Hamano | be4a015 | 2006-09-16 10:58:20 -0700 | [diff] [blame] | 693 | if (missing_target(&results)) { |
Nick Hengeveld | 5e3a769 | 2005-11-18 11:03:11 -0800 | [diff] [blame] | 694 | repo->got_indices = 1; |
| 695 | free(buffer.buffer); |
| 696 | return 0; |
| 697 | } else { |
| 698 | repo->got_indices = 0; |
| 699 | free(buffer.buffer); |
| 700 | return error("%s", curl_errorstr); |
| 701 | } |
Sergey Vlasov | bc8f265 | 2005-10-13 10:49:53 -0700 | [diff] [blame] | 702 | } |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 703 | } else { |
Nick Hengeveld | 5e3a769 | 2005-11-18 11:03:11 -0800 | [diff] [blame] | 704 | repo->got_indices = 0; |
Sergey Vlasov | bc8f265 | 2005-10-13 10:49:53 -0700 | [diff] [blame] | 705 | free(buffer.buffer); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 706 | return error("Unable to start request"); |
| 707 | } |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 708 | |
Sergey Vlasov | bc8f265 | 2005-10-13 10:49:53 -0700 | [diff] [blame] | 709 | data = buffer.buffer; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 710 | while (i < buffer.posn) { |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 711 | switch (data[i]) { |
| 712 | case 'P': |
| 713 | i++; |
Junio C Hamano | 455c161 | 2005-12-21 12:10:10 -0800 | [diff] [blame] | 714 | if (i + 52 <= buffer.posn && |
Junio C Hamano | cc44c76 | 2007-02-20 01:53:29 -0800 | [diff] [blame] | 715 | !prefixcmp(data + i, " pack-") && |
Junio C Hamano | 1968d77 | 2007-02-20 01:55:07 -0800 | [diff] [blame] | 716 | !prefixcmp(data + i + 46, ".pack\n")) { |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 717 | get_sha1_hex(data + i + 6, sha1); |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 718 | setup_index(walker, repo, sha1); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 719 | i += 51; |
| 720 | break; |
| 721 | } |
| 722 | default: |
Junio C Hamano | 455c161 | 2005-12-21 12:10:10 -0800 | [diff] [blame] | 723 | while (i < buffer.posn && data[i] != '\n') |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 724 | i++; |
| 725 | } |
| 726 | i++; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 727 | } |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 728 | |
Sergey Vlasov | bc8f265 | 2005-10-13 10:49:53 -0700 | [diff] [blame] | 729 | free(buffer.buffer); |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 730 | repo->got_indices = 1; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 731 | return 0; |
| 732 | } |
| 733 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 734 | static int fetch_pack(struct walker *walker, struct alt_base *repo, unsigned char *sha1) |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 735 | { |
| 736 | char *url; |
| 737 | struct packed_git *target; |
| 738 | struct packed_git **lst; |
| 739 | FILE *packfile; |
| 740 | char *filename; |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 741 | char tmpfile[PATH_MAX]; |
| 742 | int ret; |
| 743 | long prev_posn = 0; |
| 744 | char range[RANGE_HEADER_SIZE]; |
| 745 | struct curl_slist *range_header = NULL; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 746 | struct walker_data *data = walker->data; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 747 | |
| 748 | struct active_request_slot *slot; |
Nick Hengeveld | cb754fd | 2006-01-31 18:00:37 -0800 | [diff] [blame] | 749 | struct slot_results results; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 750 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 751 | if (fetch_indices(walker, repo)) |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 752 | return -1; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 753 | target = find_sha1_pack(sha1, repo->packs); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 754 | if (!target) |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 755 | return -1; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 756 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 757 | if (walker->get_verbosely) { |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 758 | fprintf(stderr, "Getting pack %s\n", |
| 759 | sha1_to_hex(target->sha1)); |
| 760 | fprintf(stderr, " which contains %s\n", |
| 761 | sha1_to_hex(sha1)); |
| 762 | } |
| 763 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 764 | url = xmalloc(strlen(repo->base) + 65); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 765 | sprintf(url, "%s/objects/pack/pack-%s.pack", |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 766 | repo->base, sha1_to_hex(target->sha1)); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 767 | |
| 768 | filename = sha1_pack_name(target->sha1); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 769 | snprintf(tmpfile, sizeof(tmpfile), "%s.temp", filename); |
| 770 | packfile = fopen(tmpfile, "a"); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 771 | if (!packfile) |
| 772 | return error("Unable to open local file %s for pack", |
| 773 | filename); |
| 774 | |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 775 | slot = get_active_slot(); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 776 | slot->results = &results; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 777 | curl_easy_setopt(slot->curl, CURLOPT_FILE, packfile); |
| 778 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite); |
| 779 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 780 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, data->no_pragma_header); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 781 | slot->local = packfile; |
Nick Hengeveld | 1ddea77 | 2005-09-26 10:52:11 -0700 | [diff] [blame] | 782 | |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 783 | /* If there is data present from a previous transfer attempt, |
| 784 | resume where it left off */ |
| 785 | prev_posn = ftell(packfile); |
| 786 | if (prev_posn>0) { |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 787 | if (walker->get_verbosely) |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 788 | fprintf(stderr, |
| 789 | "Resuming fetch of pack %s at byte %ld\n", |
| 790 | sha1_to_hex(target->sha1), prev_posn); |
| 791 | sprintf(range, "Range: bytes=%ld-", prev_posn); |
| 792 | range_header = curl_slist_append(range_header, range); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 793 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, range_header); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 794 | } |
| 795 | |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 796 | if (start_active_slot(slot)) { |
| 797 | run_active_slot(slot); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 798 | if (results.curl_result != CURLE_OK) { |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 799 | fclose(packfile); |
| 800 | return error("Unable to get pack file %s\n%s", url, |
| 801 | curl_errorstr); |
| 802 | } |
| 803 | } else { |
Petr Baudis | 313c471 | 2005-11-12 00:55:16 +0100 | [diff] [blame] | 804 | fclose(packfile); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 805 | return error("Unable to start request"); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 806 | } |
| 807 | |
Shawn O. Pearce | 1c23d79 | 2007-01-09 20:04:52 -0500 | [diff] [blame] | 808 | target->pack_size = ftell(packfile); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 809 | fclose(packfile); |
| 810 | |
Junio C Hamano | b721e01 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 811 | ret = move_temp_to_file(tmpfile, filename); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 812 | if (ret) |
Junio C Hamano | b721e01 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 813 | return ret; |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 814 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 815 | lst = &repo->packs; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 816 | while (*lst != target) |
| 817 | lst = &((*lst)->next); |
| 818 | *lst = (*lst)->next; |
| 819 | |
Junio C Hamano | 271421c | 2005-09-30 00:07:39 -0700 | [diff] [blame] | 820 | if (verify_pack(target, 0)) |
| 821 | return -1; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 822 | install_packed_git(target); |
| 823 | |
| 824 | return 0; |
| 825 | } |
| 826 | |
Mark Wooding | 53f3138 | 2006-02-07 10:07:39 +0000 | [diff] [blame] | 827 | static void abort_object_request(struct object_request *obj_req) |
| 828 | { |
| 829 | if (obj_req->local >= 0) { |
| 830 | close(obj_req->local); |
| 831 | obj_req->local = -1; |
| 832 | } |
| 833 | unlink(obj_req->tmpfile); |
| 834 | if (obj_req->slot) { |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 835 | release_active_slot(obj_req->slot); |
Mark Wooding | 53f3138 | 2006-02-07 10:07:39 +0000 | [diff] [blame] | 836 | obj_req->slot = NULL; |
| 837 | } |
| 838 | release_object_request(obj_req); |
| 839 | } |
| 840 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 841 | static int fetch_object(struct walker *walker, struct alt_base *repo, unsigned char *sha1) |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 842 | { |
| 843 | char *hex = sha1_to_hex(sha1); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 844 | int ret = 0; |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 845 | struct object_request *obj_req = object_queue_head; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 846 | |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 847 | while (obj_req != NULL && hashcmp(obj_req->sha1, sha1)) |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 848 | obj_req = obj_req->next; |
| 849 | if (obj_req == NULL) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 850 | return error("Couldn't find request for %s in the queue", hex); |
Junio C Hamano | 271421c | 2005-09-30 00:07:39 -0700 | [diff] [blame] | 851 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 852 | if (has_sha1_file(obj_req->sha1)) { |
Mark Wooding | 53f3138 | 2006-02-07 10:07:39 +0000 | [diff] [blame] | 853 | abort_object_request(obj_req); |
Nick Hengeveld | 11f0daf | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 854 | return 0; |
| 855 | } |
| 856 | |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 857 | #ifdef USE_CURL_MULTI |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 858 | while (obj_req->state == WAITING) { |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 859 | step_active_slots(); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 860 | } |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 861 | #else |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 862 | start_object_request(walker, obj_req); |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 863 | #endif |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 864 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 865 | while (obj_req->state == ACTIVE) { |
| 866 | run_active_slot(obj_req->slot); |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 867 | } |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 868 | if (obj_req->local != -1) { |
| 869 | close(obj_req->local); obj_req->local = -1; |
Petr Baudis | 313c471 | 2005-11-12 00:55:16 +0100 | [diff] [blame] | 870 | } |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 871 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 872 | if (obj_req->state == ABORTED) { |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 873 | ret = error("Request for %s aborted", hex); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 874 | } else if (obj_req->curl_result != CURLE_OK && |
| 875 | obj_req->http_code != 416) { |
Junio C Hamano | be4a015 | 2006-09-16 10:58:20 -0700 | [diff] [blame] | 876 | if (missing_target(obj_req)) |
Petr Baudis | e2029eb | 2005-10-21 18:18:46 +0200 | [diff] [blame] | 877 | ret = -1; /* Be silent, it is probably in a pack. */ |
| 878 | else |
| 879 | ret = error("%s (curl_result = %d, http_code = %ld, sha1 = %s)", |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 880 | obj_req->errorstr, obj_req->curl_result, |
| 881 | obj_req->http_code, hex); |
| 882 | } else if (obj_req->zret != Z_STREAM_END) { |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 883 | walker->corrupt_object_found++; |
Junio C Hamano | bd2afde | 2006-02-22 17:47:10 -0800 | [diff] [blame] | 884 | ret = error("File %s (%s) corrupt", hex, obj_req->url); |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 885 | } else if (hashcmp(obj_req->sha1, obj_req->real_sha1)) { |
Junio C Hamano | bd2afde | 2006-02-22 17:47:10 -0800 | [diff] [blame] | 886 | ret = error("File %s has bad hash", hex); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 887 | } else if (obj_req->rename < 0) { |
Mark Wooding | 7b934ec | 2006-02-01 11:44:35 +0000 | [diff] [blame] | 888 | ret = error("unable to write sha1 filename %s", |
| 889 | obj_req->filename); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 890 | } |
| 891 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 892 | release_object_request(obj_req); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 893 | return ret; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 894 | } |
| 895 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 896 | static int fetch(struct walker *walker, unsigned char *sha1) |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 897 | { |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 898 | struct walker_data *data = walker->data; |
| 899 | struct alt_base *altbase = data->alt; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 900 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 901 | if (!fetch_object(walker, altbase, sha1)) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 902 | return 0; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 903 | while (altbase) { |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 904 | if (!fetch_pack(walker, altbase, sha1)) |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 905 | return 0; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 906 | fetch_alternates(walker, data->alt->base); |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 907 | altbase = altbase->next; |
| 908 | } |
Junio C Hamano | bd2afde | 2006-02-22 17:47:10 -0800 | [diff] [blame] | 909 | return error("Unable to find %s under %s", sha1_to_hex(sha1), |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 910 | data->alt->base); |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 911 | } |
| 912 | |
Junio C Hamano | 94fa447 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 913 | static inline int needs_quote(int ch) |
| 914 | { |
Florian Forster | cfd432e6 | 2006-06-18 17:18:03 +0200 | [diff] [blame] | 915 | if (((ch >= 'A') && (ch <= 'Z')) |
| 916 | || ((ch >= 'a') && (ch <= 'z')) |
| 917 | || ((ch >= '0') && (ch <= '9')) |
| 918 | || (ch == '/') |
| 919 | || (ch == '-') |
| 920 | || (ch == '.')) |
Junio C Hamano | 94fa447 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 921 | return 0; |
Florian Forster | cfd432e6 | 2006-06-18 17:18:03 +0200 | [diff] [blame] | 922 | return 1; |
Junio C Hamano | 94fa447 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 923 | } |
| 924 | |
| 925 | static inline int hex(int v) |
| 926 | { |
| 927 | if (v < 10) return '0' + v; |
| 928 | else return 'A' + v - 10; |
| 929 | } |
| 930 | |
| 931 | static char *quote_ref_url(const char *base, const char *ref) |
| 932 | { |
| 933 | const char *cp; |
| 934 | char *dp, *qref; |
| 935 | int len, baselen, ch; |
| 936 | |
| 937 | baselen = strlen(base); |
Gerrit Pape | 2afea3b | 2007-03-28 09:46:15 +0000 | [diff] [blame] | 938 | len = baselen + 7; /* "/refs/" + NUL */ |
Junio C Hamano | 94fa447 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 939 | for (cp = ref; (ch = *cp) != 0; cp++, len++) |
| 940 | if (needs_quote(ch)) |
| 941 | len += 2; /* extra two hex plus replacement % */ |
| 942 | qref = xmalloc(len); |
| 943 | memcpy(qref, base, baselen); |
Gerrit Pape | 2afea3b | 2007-03-28 09:46:15 +0000 | [diff] [blame] | 944 | memcpy(qref + baselen, "/refs/", 6); |
| 945 | for (cp = ref, dp = qref + baselen + 6; (ch = *cp) != 0; cp++) { |
Junio C Hamano | 94fa447 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 946 | if (needs_quote(ch)) { |
| 947 | *dp++ = '%'; |
| 948 | *dp++ = hex((ch >> 4) & 0xF); |
| 949 | *dp++ = hex(ch & 0xF); |
| 950 | } |
| 951 | else |
| 952 | *dp++ = ch; |
| 953 | } |
| 954 | *dp = 0; |
| 955 | |
| 956 | return qref; |
| 957 | } |
| 958 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 959 | static int fetch_ref(struct walker *walker, char *ref, unsigned char *sha1) |
Daniel Barkalow | cd541a6 | 2005-06-06 16:38:26 -0400 | [diff] [blame] | 960 | { |
Junio C Hamano | 94fa447 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 961 | char *url; |
Daniel Barkalow | fa3e065 | 2005-06-21 20:45:49 -0400 | [diff] [blame] | 962 | char hex[42]; |
| 963 | struct buffer buffer; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 964 | struct walker_data *data = walker->data; |
| 965 | const char *base = data->alt->base; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 966 | struct active_request_slot *slot; |
Nick Hengeveld | cb754fd | 2006-01-31 18:00:37 -0800 | [diff] [blame] | 967 | struct slot_results results; |
Daniel Barkalow | fa3e065 | 2005-06-21 20:45:49 -0400 | [diff] [blame] | 968 | buffer.size = 41; |
| 969 | buffer.posn = 0; |
| 970 | buffer.buffer = hex; |
| 971 | hex[41] = '\0'; |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 972 | |
Junio C Hamano | 94fa447 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 973 | url = quote_ref_url(base, ref); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 974 | slot = get_active_slot(); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 975 | slot->results = &results; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 976 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer); |
| 977 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); |
| 978 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL); |
| 979 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
| 980 | if (start_active_slot(slot)) { |
| 981 | run_active_slot(slot); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 982 | if (results.curl_result != CURLE_OK) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 983 | return error("Couldn't get %s for %s\n%s", |
| 984 | url, ref, curl_errorstr); |
| 985 | } else { |
| 986 | return error("Unable to start request"); |
| 987 | } |
Daniel Barkalow | fa3e065 | 2005-06-21 20:45:49 -0400 | [diff] [blame] | 988 | |
| 989 | hex[40] = '\0'; |
| 990 | get_sha1_hex(hex, sha1); |
| 991 | return 0; |
Daniel Barkalow | cd541a6 | 2005-06-06 16:38:26 -0400 | [diff] [blame] | 992 | } |
| 993 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 994 | static void cleanup(struct walker *walker) |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 995 | { |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 996 | struct walker_data *data = walker->data; |
| 997 | http_cleanup(); |
| 998 | |
| 999 | curl_slist_free_all(data->no_pragma_header); |
| 1000 | } |
| 1001 | |
| 1002 | struct walker *get_http_walker(const char *url) |
| 1003 | { |
Gerrit Pape | 9c880b3 | 2007-03-28 09:47:35 +0000 | [diff] [blame] | 1004 | char *s; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 1005 | struct walker_data *data = xmalloc(sizeof(struct walker_data)); |
| 1006 | struct walker *walker = xmalloc(sizeof(struct walker)); |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1007 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 1008 | http_init(); |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1009 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 1010 | data->no_pragma_header = curl_slist_append(NULL, "Pragma:"); |
Darrin Thompson | 3dcb90f | 2005-07-12 21:12:40 -0500 | [diff] [blame] | 1011 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 1012 | data->alt = xmalloc(sizeof(*data->alt)); |
| 1013 | data->alt->base = xmalloc(strlen(url) + 1); |
| 1014 | strcpy(data->alt->base, url); |
| 1015 | for (s = data->alt->base + strlen(data->alt->base) - 1; *s == '/'; --s) |
Gerrit Pape | 9c880b3 | 2007-03-28 09:47:35 +0000 | [diff] [blame] | 1016 | *s = 0; |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 1017 | |
| 1018 | data->alt->got_indices = 0; |
| 1019 | data->alt->packs = NULL; |
| 1020 | data->alt->next = NULL; |
| 1021 | data->got_alternates = -1; |
| 1022 | |
| 1023 | walker->corrupt_object_found = 0; |
| 1024 | walker->fetch = fetch; |
| 1025 | walker->fetch_ref = fetch_ref; |
| 1026 | walker->prefetch = prefetch; |
| 1027 | walker->cleanup = cleanup; |
| 1028 | walker->data = data; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1029 | |
Daniel Barkalow | fc57b6a | 2007-09-10 23:02:34 -0400 | [diff] [blame] | 1030 | #ifdef USE_CURL_MULTI |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 1031 | add_fill_function(walker, (int (*)(void *)) fill_active_slot); |
Daniel Barkalow | fc57b6a | 2007-09-10 23:02:34 -0400 | [diff] [blame] | 1032 | #endif |
| 1033 | |
Daniel Barkalow | 30ae764 | 2007-09-10 23:02:45 -0400 | [diff] [blame] | 1034 | return walker; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1035 | } |