Jason Riedy | 731043f | 2006-01-25 12:38:36 -0800 | [diff] [blame] | 1 | #include "git-compat-util.h" |
Linus Torvalds | f719259 | 2005-07-04 11:57:58 -0700 | [diff] [blame] | 2 | #include "cache.h" |
Linus Torvalds | 41cb748 | 2005-07-05 15:44:09 -0700 | [diff] [blame] | 3 | #include "pkt-line.h" |
Junio C Hamano | b10d0ec | 2005-07-08 00:02:52 -0700 | [diff] [blame] | 4 | #include "quote.h" |
Junio C Hamano | 6abf5c0 | 2005-10-16 00:25:26 -0700 | [diff] [blame] | 5 | #include "refs.h" |
Shawn O. Pearce | 15a1c012 | 2007-03-12 19:00:19 -0400 | [diff] [blame] | 6 | #include "run-command.h" |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 7 | #include "remote.h" |
Linus Torvalds | f719259 | 2005-07-04 11:57:58 -0700 | [diff] [blame] | 8 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 9 | static char *server_capabilities; |
Johannes Schindelin | 211b5f9 | 2005-10-28 04:48:54 +0200 | [diff] [blame] | 10 | |
Linus Torvalds | 2718ff0 | 2006-07-04 12:29:10 -0700 | [diff] [blame] | 11 | static int check_ref(const char *name, int len, unsigned int flags) |
| 12 | { |
| 13 | if (!flags) |
| 14 | return 1; |
| 15 | |
Andy Whitcroft | c41e20b | 2006-09-05 20:00:17 +0100 | [diff] [blame] | 16 | if (len < 5 || memcmp(name, "refs/", 5)) |
Linus Torvalds | 2718ff0 | 2006-07-04 12:29:10 -0700 | [diff] [blame] | 17 | return 0; |
| 18 | |
| 19 | /* Skip the "refs/" part */ |
| 20 | name += 5; |
| 21 | len -= 5; |
| 22 | |
| 23 | /* REF_NORMAL means that we don't want the magic fake tag refs */ |
| 24 | if ((flags & REF_NORMAL) && check_ref_format(name) < 0) |
| 25 | return 0; |
| 26 | |
| 27 | /* REF_HEADS means that we want regular branch heads */ |
| 28 | if ((flags & REF_HEADS) && !memcmp(name, "heads/", 6)) |
| 29 | return 1; |
| 30 | |
| 31 | /* REF_TAGS means that we want tags */ |
| 32 | if ((flags & REF_TAGS) && !memcmp(name, "tags/", 5)) |
| 33 | return 1; |
| 34 | |
| 35 | /* All type bits clear means that we are ok with anything */ |
| 36 | return !(flags & ~REF_NORMAL); |
| 37 | } |
| 38 | |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 39 | int check_ref_type(const struct ref *ref, int flags) |
| 40 | { |
| 41 | return check_ref(ref->name, strlen(ref->name), flags); |
| 42 | } |
| 43 | |
Junio C Hamano | 40c155f | 2008-09-09 01:27:09 -0700 | [diff] [blame] | 44 | static void add_extra_have(struct extra_have_objects *extra, unsigned char *sha1) |
| 45 | { |
| 46 | ALLOC_GROW(extra->array, extra->nr + 1, extra->alloc); |
| 47 | hashcpy(&(extra->array[extra->nr][0]), sha1); |
| 48 | extra->nr++; |
| 49 | } |
| 50 | |
Linus Torvalds | d1c133f | 2005-07-16 13:55:50 -0700 | [diff] [blame] | 51 | /* |
| 52 | * Read all the refs from the other end |
| 53 | */ |
Junio C Hamano | 1a7141f | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 54 | struct ref **get_remote_heads(int in, struct ref **list, |
Linus Torvalds | 2718ff0 | 2006-07-04 12:29:10 -0700 | [diff] [blame] | 55 | int nr_match, char **match, |
Junio C Hamano | 40c155f | 2008-09-09 01:27:09 -0700 | [diff] [blame] | 56 | unsigned int flags, |
| 57 | struct extra_have_objects *extra_have) |
Linus Torvalds | d1c133f | 2005-07-16 13:55:50 -0700 | [diff] [blame] | 58 | { |
| 59 | *list = NULL; |
| 60 | for (;;) { |
| 61 | struct ref *ref; |
| 62 | unsigned char old_sha1[20]; |
| 63 | static char buffer[1000]; |
| 64 | char *name; |
Johannes Schindelin | 211b5f9 | 2005-10-28 04:48:54 +0200 | [diff] [blame] | 65 | int len, name_len; |
Linus Torvalds | d1c133f | 2005-07-16 13:55:50 -0700 | [diff] [blame] | 66 | |
| 67 | len = packet_read_line(in, buffer, sizeof(buffer)); |
| 68 | if (!len) |
| 69 | break; |
| 70 | if (buffer[len-1] == '\n') |
| 71 | buffer[--len] = 0; |
| 72 | |
Tom Preston-Werner | a807328 | 2008-11-01 11:44:45 -0700 | [diff] [blame] | 73 | if (len > 4 && !prefixcmp(buffer, "ERR ")) |
| 74 | die("remote error: %s", buffer + 4); |
| 75 | |
Linus Torvalds | d1c133f | 2005-07-16 13:55:50 -0700 | [diff] [blame] | 76 | if (len < 42 || get_sha1_hex(buffer, old_sha1) || buffer[40] != ' ') |
| 77 | die("protocol error: expected sha/ref, got '%s'", buffer); |
| 78 | name = buffer + 41; |
Junio C Hamano | 1a7141f | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 79 | |
Johannes Schindelin | 211b5f9 | 2005-10-28 04:48:54 +0200 | [diff] [blame] | 80 | name_len = strlen(name); |
| 81 | if (len != name_len + 41) { |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 82 | free(server_capabilities); |
Shawn Pearce | 9befac4 | 2006-09-02 00:16:31 -0400 | [diff] [blame] | 83 | server_capabilities = xstrdup(name + name_len + 1); |
Johannes Schindelin | 211b5f9 | 2005-10-28 04:48:54 +0200 | [diff] [blame] | 84 | } |
| 85 | |
Junio C Hamano | 40c155f | 2008-09-09 01:27:09 -0700 | [diff] [blame] | 86 | if (extra_have && |
| 87 | name_len == 5 && !memcmp(".have", name, 5)) { |
| 88 | add_extra_have(extra_have, old_sha1); |
| 89 | continue; |
| 90 | } |
| 91 | |
Linus Torvalds | 2718ff0 | 2006-07-04 12:29:10 -0700 | [diff] [blame] | 92 | if (!check_ref(name, name_len, flags)) |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 93 | continue; |
Linus Torvalds | d1c133f | 2005-07-16 13:55:50 -0700 | [diff] [blame] | 94 | if (nr_match && !path_match(name, nr_match, match)) |
| 95 | continue; |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 96 | ref = alloc_ref(buffer + 41); |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 97 | hashcpy(ref->old_sha1, old_sha1); |
Linus Torvalds | d1c133f | 2005-07-16 13:55:50 -0700 | [diff] [blame] | 98 | *list = ref; |
| 99 | list = &ref->next; |
| 100 | } |
| 101 | return list; |
| 102 | } |
| 103 | |
Johannes Schindelin | 211b5f9 | 2005-10-28 04:48:54 +0200 | [diff] [blame] | 104 | int server_supports(const char *feature) |
| 105 | { |
Johannes Schindelin | 1f5881b | 2005-10-28 05:56:41 +0200 | [diff] [blame] | 106 | return server_capabilities && |
| 107 | strstr(server_capabilities, feature) != NULL; |
Johannes Schindelin | 211b5f9 | 2005-10-28 04:48:54 +0200 | [diff] [blame] | 108 | } |
| 109 | |
Linus Torvalds | 013e7c7 | 2005-07-04 13:24:30 -0700 | [diff] [blame] | 110 | int path_match(const char *path, int nr, char **match) |
| 111 | { |
| 112 | int i; |
| 113 | int pathlen = strlen(path); |
| 114 | |
| 115 | for (i = 0; i < nr; i++) { |
| 116 | char *s = match[i]; |
| 117 | int len = strlen(s); |
| 118 | |
| 119 | if (!len || len > pathlen) |
| 120 | continue; |
| 121 | if (memcmp(path + pathlen - len, s, len)) |
| 122 | continue; |
| 123 | if (pathlen > len && path[pathlen - len - 1] != '/') |
| 124 | continue; |
| 125 | *s = 0; |
Junio C Hamano | 9546010 | 2006-05-11 15:28:44 -0700 | [diff] [blame] | 126 | return (i + 1); |
Linus Torvalds | 013e7c7 | 2005-07-04 13:24:30 -0700 | [diff] [blame] | 127 | } |
| 128 | return 0; |
| 129 | } |
| 130 | |
Linus Torvalds | 2386d65 | 2005-07-13 18:46:20 -0700 | [diff] [blame] | 131 | enum protocol { |
| 132 | PROTO_LOCAL = 1, |
| 133 | PROTO_SSH, |
| 134 | PROTO_GIT, |
| 135 | }; |
| 136 | |
| 137 | static enum protocol get_protocol(const char *name) |
| 138 | { |
| 139 | if (!strcmp(name, "ssh")) |
| 140 | return PROTO_SSH; |
| 141 | if (!strcmp(name, "git")) |
| 142 | return PROTO_GIT; |
Linus Torvalds | c05186c | 2005-10-14 17:14:56 -0700 | [diff] [blame] | 143 | if (!strcmp(name, "git+ssh")) |
| 144 | return PROTO_SSH; |
| 145 | if (!strcmp(name, "ssh+git")) |
| 146 | return PROTO_SSH; |
Linus Torvalds | 72a4f4b | 2007-08-01 10:03:37 -0700 | [diff] [blame] | 147 | if (!strcmp(name, "file")) |
| 148 | return PROTO_LOCAL; |
Linus Torvalds | 2386d65 | 2005-07-13 18:46:20 -0700 | [diff] [blame] | 149 | die("I don't handle protocol '%s'", name); |
| 150 | } |
| 151 | |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 152 | #define STR_(s) # s |
| 153 | #define STR(s) STR_(s) |
Linus Torvalds | 2386d65 | 2005-07-13 18:46:20 -0700 | [diff] [blame] | 154 | |
hpa | 49744d6 | 2005-09-28 16:52:21 -0700 | [diff] [blame] | 155 | #ifndef NO_IPV6 |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 156 | |
Alex Riesen | ba50532 | 2007-05-23 23:34:27 +0200 | [diff] [blame] | 157 | static const char *ai_name(const struct addrinfo *ai) |
| 158 | { |
Benjamin Kramer | 785a985 | 2009-04-24 14:16:41 +0200 | [diff] [blame] | 159 | static char addr[NI_MAXHOST]; |
| 160 | if (getnameinfo(ai->ai_addr, ai->ai_addrlen, addr, sizeof(addr), NULL, 0, |
| 161 | NI_NUMERICHOST) != 0) |
Alex Riesen | ba50532 | 2007-05-23 23:34:27 +0200 | [diff] [blame] | 162 | strcpy(addr, "(unknown)"); |
Benjamin Kramer | 785a985 | 2009-04-24 14:16:41 +0200 | [diff] [blame] | 163 | |
Alex Riesen | ba50532 | 2007-05-23 23:34:27 +0200 | [diff] [blame] | 164 | return addr; |
| 165 | } |
| 166 | |
Jon Loeliger | 5ad312b | 2006-06-06 22:58:41 -0500 | [diff] [blame] | 167 | /* |
| 168 | * Returns a connected socket() fd, or else die()s. |
| 169 | */ |
Michael S. Tsirkin | 7841ce7 | 2007-05-16 20:09:41 +0300 | [diff] [blame] | 170 | static int git_tcp_connect_sock(char *host, int flags) |
Linus Torvalds | 2386d65 | 2005-07-13 18:46:20 -0700 | [diff] [blame] | 171 | { |
Petr Baudis | ac3bc6c | 2006-07-01 23:56:26 +0200 | [diff] [blame] | 172 | int sockfd = -1, saved_errno = 0; |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 173 | char *colon, *end; |
Timo Hirvonen | 554fe20 | 2006-06-28 12:04:39 +0300 | [diff] [blame] | 174 | const char *port = STR(DEFAULT_GIT_PORT); |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 175 | struct addrinfo hints, *ai0, *ai; |
| 176 | int gai; |
Alex Riesen | ba50532 | 2007-05-23 23:34:27 +0200 | [diff] [blame] | 177 | int cnt = 0; |
Linus Torvalds | 2386d65 | 2005-07-13 18:46:20 -0700 | [diff] [blame] | 178 | |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 179 | if (host[0] == '[') { |
| 180 | end = strchr(host + 1, ']'); |
| 181 | if (end) { |
| 182 | *end = 0; |
| 183 | end++; |
| 184 | host++; |
| 185 | } else |
| 186 | end = host; |
| 187 | } else |
| 188 | end = host; |
| 189 | colon = strchr(end, ':'); |
| 190 | |
Linus Torvalds | ce6f8e7 | 2005-07-23 11:10:21 -0700 | [diff] [blame] | 191 | if (colon) { |
| 192 | *colon = 0; |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 193 | port = colon + 1; |
Linus Torvalds | 608d48b | 2007-03-27 09:50:20 -0700 | [diff] [blame] | 194 | if (!*port) |
| 195 | port = "<none>"; |
Linus Torvalds | ce6f8e7 | 2005-07-23 11:10:21 -0700 | [diff] [blame] | 196 | } |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 197 | |
| 198 | memset(&hints, 0, sizeof(hints)); |
| 199 | hints.ai_socktype = SOCK_STREAM; |
| 200 | hints.ai_protocol = IPPROTO_TCP; |
| 201 | |
Michael S. Tsirkin | 7841ce7 | 2007-05-16 20:09:41 +0300 | [diff] [blame] | 202 | if (flags & CONNECT_VERBOSE) |
| 203 | fprintf(stderr, "Looking up %s ... ", host); |
| 204 | |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 205 | gai = getaddrinfo(host, port, &hints, &ai); |
| 206 | if (gai) |
Linus Torvalds | 608d48b | 2007-03-27 09:50:20 -0700 | [diff] [blame] | 207 | die("Unable to look up %s (port %s) (%s)", host, port, gai_strerror(gai)); |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 208 | |
Michael S. Tsirkin | 7841ce7 | 2007-05-16 20:09:41 +0300 | [diff] [blame] | 209 | if (flags & CONNECT_VERBOSE) |
| 210 | fprintf(stderr, "done.\nConnecting to %s (port %s) ... ", host, port); |
| 211 | |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 212 | for (ai0 = ai; ai; ai = ai->ai_next) { |
Jon Loeliger | 5ad312b | 2006-06-06 22:58:41 -0500 | [diff] [blame] | 213 | sockfd = socket(ai->ai_family, |
| 214 | ai->ai_socktype, ai->ai_protocol); |
Petr Baudis | ac3bc6c | 2006-07-01 23:56:26 +0200 | [diff] [blame] | 215 | if (sockfd < 0) { |
| 216 | saved_errno = errno; |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 217 | continue; |
Petr Baudis | ac3bc6c | 2006-07-01 23:56:26 +0200 | [diff] [blame] | 218 | } |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 219 | if (connect(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) { |
Petr Baudis | ac3bc6c | 2006-07-01 23:56:26 +0200 | [diff] [blame] | 220 | saved_errno = errno; |
Alex Riesen | 7cbf2f2 | 2007-06-12 22:52:10 +0200 | [diff] [blame] | 221 | fprintf(stderr, "%s[%d: %s]: errno=%s\n", |
Alex Riesen | ba50532 | 2007-05-23 23:34:27 +0200 | [diff] [blame] | 222 | host, |
| 223 | cnt, |
| 224 | ai_name(ai), |
Alex Riesen | ba50532 | 2007-05-23 23:34:27 +0200 | [diff] [blame] | 225 | strerror(saved_errno)); |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 226 | close(sockfd); |
| 227 | sockfd = -1; |
| 228 | continue; |
Linus Torvalds | 2386d65 | 2005-07-13 18:46:20 -0700 | [diff] [blame] | 229 | } |
Alex Riesen | ba50532 | 2007-05-23 23:34:27 +0200 | [diff] [blame] | 230 | if (flags & CONNECT_VERBOSE) |
| 231 | fprintf(stderr, "%s ", ai_name(ai)); |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 232 | break; |
Linus Torvalds | 2386d65 | 2005-07-13 18:46:20 -0700 | [diff] [blame] | 233 | } |
| 234 | |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 235 | freeaddrinfo(ai0); |
Linus Torvalds | 2386d65 | 2005-07-13 18:46:20 -0700 | [diff] [blame] | 236 | |
Linus Torvalds | 2386d65 | 2005-07-13 18:46:20 -0700 | [diff] [blame] | 237 | if (sockfd < 0) |
Petr Baudis | ac3bc6c | 2006-07-01 23:56:26 +0200 | [diff] [blame] | 238 | die("unable to connect a socket (%s)", strerror(saved_errno)); |
YOSHIFUJI Hideaki | 5ba8844 | 2005-07-21 09:10:36 -0400 | [diff] [blame] | 239 | |
Michael S. Tsirkin | 7841ce7 | 2007-05-16 20:09:41 +0300 | [diff] [blame] | 240 | if (flags & CONNECT_VERBOSE) |
| 241 | fprintf(stderr, "done.\n"); |
| 242 | |
Jon Loeliger | 5ad312b | 2006-06-06 22:58:41 -0500 | [diff] [blame] | 243 | return sockfd; |
Linus Torvalds | 2386d65 | 2005-07-13 18:46:20 -0700 | [diff] [blame] | 244 | } |
| 245 | |
hpa | 49744d6 | 2005-09-28 16:52:21 -0700 | [diff] [blame] | 246 | #else /* NO_IPV6 */ |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 247 | |
Jon Loeliger | 5ad312b | 2006-06-06 22:58:41 -0500 | [diff] [blame] | 248 | /* |
| 249 | * Returns a connected socket() fd, or else die()s. |
| 250 | */ |
Michael S. Tsirkin | 7841ce7 | 2007-05-16 20:09:41 +0300 | [diff] [blame] | 251 | static int git_tcp_connect_sock(char *host, int flags) |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 252 | { |
Petr Baudis | ac3bc6c | 2006-07-01 23:56:26 +0200 | [diff] [blame] | 253 | int sockfd = -1, saved_errno = 0; |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 254 | char *colon, *end; |
| 255 | char *port = STR(DEFAULT_GIT_PORT), *ep; |
| 256 | struct hostent *he; |
| 257 | struct sockaddr_in sa; |
| 258 | char **ap; |
| 259 | unsigned int nport; |
Alex Riesen | ba50532 | 2007-05-23 23:34:27 +0200 | [diff] [blame] | 260 | int cnt; |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 261 | |
| 262 | if (host[0] == '[') { |
| 263 | end = strchr(host + 1, ']'); |
| 264 | if (end) { |
| 265 | *end = 0; |
| 266 | end++; |
| 267 | host++; |
| 268 | } else |
| 269 | end = host; |
| 270 | } else |
| 271 | end = host; |
| 272 | colon = strchr(end, ':'); |
| 273 | |
| 274 | if (colon) { |
| 275 | *colon = 0; |
| 276 | port = colon + 1; |
| 277 | } |
| 278 | |
Michael S. Tsirkin | 7841ce7 | 2007-05-16 20:09:41 +0300 | [diff] [blame] | 279 | if (flags & CONNECT_VERBOSE) |
| 280 | fprintf(stderr, "Looking up %s ... ", host); |
| 281 | |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 282 | he = gethostbyname(host); |
| 283 | if (!he) |
| 284 | die("Unable to look up %s (%s)", host, hstrerror(h_errno)); |
| 285 | nport = strtoul(port, &ep, 10); |
| 286 | if ( ep == port || *ep ) { |
| 287 | /* Not numeric */ |
| 288 | struct servent *se = getservbyname(port,"tcp"); |
| 289 | if ( !se ) |
Alexander Potashev | d753070 | 2009-01-04 21:38:41 +0300 | [diff] [blame] | 290 | die("Unknown port %s", port); |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 291 | nport = se->s_port; |
| 292 | } |
| 293 | |
Michael S. Tsirkin | 7841ce7 | 2007-05-16 20:09:41 +0300 | [diff] [blame] | 294 | if (flags & CONNECT_VERBOSE) |
| 295 | fprintf(stderr, "done.\nConnecting to %s (port %s) ... ", host, port); |
| 296 | |
Alex Riesen | ba50532 | 2007-05-23 23:34:27 +0200 | [diff] [blame] | 297 | for (cnt = 0, ap = he->h_addr_list; *ap; ap++, cnt++) { |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 298 | sockfd = socket(he->h_addrtype, SOCK_STREAM, 0); |
Petr Baudis | ac3bc6c | 2006-07-01 23:56:26 +0200 | [diff] [blame] | 299 | if (sockfd < 0) { |
| 300 | saved_errno = errno; |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 301 | continue; |
Petr Baudis | ac3bc6c | 2006-07-01 23:56:26 +0200 | [diff] [blame] | 302 | } |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 303 | |
| 304 | memset(&sa, 0, sizeof sa); |
| 305 | sa.sin_family = he->h_addrtype; |
Peter Anvin | 6573faf | 2005-09-28 17:26:44 -0700 | [diff] [blame] | 306 | sa.sin_port = htons(nport); |
Paul Serice | c616421 | 2005-11-22 07:54:23 -0600 | [diff] [blame] | 307 | memcpy(&sa.sin_addr, *ap, he->h_length); |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 308 | |
| 309 | if (connect(sockfd, (struct sockaddr *)&sa, sizeof sa) < 0) { |
Petr Baudis | ac3bc6c | 2006-07-01 23:56:26 +0200 | [diff] [blame] | 310 | saved_errno = errno; |
Alex Riesen | 7cbf2f2 | 2007-06-12 22:52:10 +0200 | [diff] [blame] | 311 | fprintf(stderr, "%s[%d: %s]: errno=%s\n", |
Alex Riesen | ba50532 | 2007-05-23 23:34:27 +0200 | [diff] [blame] | 312 | host, |
| 313 | cnt, |
| 314 | inet_ntoa(*(struct in_addr *)&sa.sin_addr), |
Alex Riesen | ba50532 | 2007-05-23 23:34:27 +0200 | [diff] [blame] | 315 | strerror(saved_errno)); |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 316 | close(sockfd); |
| 317 | sockfd = -1; |
| 318 | continue; |
| 319 | } |
Alex Riesen | ba50532 | 2007-05-23 23:34:27 +0200 | [diff] [blame] | 320 | if (flags & CONNECT_VERBOSE) |
| 321 | fprintf(stderr, "%s ", |
| 322 | inet_ntoa(*(struct in_addr *)&sa.sin_addr)); |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 323 | break; |
| 324 | } |
| 325 | |
| 326 | if (sockfd < 0) |
Petr Baudis | ac3bc6c | 2006-07-01 23:56:26 +0200 | [diff] [blame] | 327 | die("unable to connect a socket (%s)", strerror(saved_errno)); |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 328 | |
Michael S. Tsirkin | 7841ce7 | 2007-05-16 20:09:41 +0300 | [diff] [blame] | 329 | if (flags & CONNECT_VERBOSE) |
| 330 | fprintf(stderr, "done.\n"); |
| 331 | |
Jon Loeliger | 5ad312b | 2006-06-06 22:58:41 -0500 | [diff] [blame] | 332 | return sockfd; |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 333 | } |
| 334 | |
hpa | 49744d6 | 2005-09-28 16:52:21 -0700 | [diff] [blame] | 335 | #endif /* NO_IPV6 */ |
hpa | 4c505f7 | 2005-09-28 16:37:58 -0700 | [diff] [blame] | 336 | |
Jon Loeliger | 5ad312b | 2006-06-06 22:58:41 -0500 | [diff] [blame] | 337 | |
Michael S. Tsirkin | 7841ce7 | 2007-05-16 20:09:41 +0300 | [diff] [blame] | 338 | static void git_tcp_connect(int fd[2], char *host, int flags) |
Jon Loeliger | 5ad312b | 2006-06-06 22:58:41 -0500 | [diff] [blame] | 339 | { |
Michael S. Tsirkin | 7841ce7 | 2007-05-16 20:09:41 +0300 | [diff] [blame] | 340 | int sockfd = git_tcp_connect_sock(host, flags); |
Jon Loeliger | 5ad312b | 2006-06-06 22:58:41 -0500 | [diff] [blame] | 341 | |
| 342 | fd[0] = sockfd; |
Junio C Hamano | ec587fd | 2007-01-21 17:10:51 -0800 | [diff] [blame] | 343 | fd[1] = dup(sockfd); |
Jon Loeliger | 5ad312b | 2006-06-06 22:58:41 -0500 | [diff] [blame] | 344 | } |
| 345 | |
| 346 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 347 | static char *git_proxy_command; |
Paul Collins | f801477 | 2005-11-04 14:57:16 +0000 | [diff] [blame] | 348 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 349 | static int git_proxy_command_options(const char *var, const char *value, |
| 350 | void *cb) |
Paul Collins | f801477 | 2005-11-04 14:57:16 +0000 | [diff] [blame] | 351 | { |
Junio C Hamano | e814bc4 | 2005-11-19 03:48:56 -0800 | [diff] [blame] | 352 | if (!strcmp(var, "core.gitproxy")) { |
YOSHIFUJI Hideaki / 吉藤英明 | c3df856 | 2005-11-22 12:18:23 +0900 | [diff] [blame] | 353 | const char *for_pos; |
| 354 | int matchlen = -1; |
| 355 | int hostlen; |
Erik Faye-Lund | 15112c9 | 2009-03-11 02:38:12 +0000 | [diff] [blame] | 356 | const char *rhost_name = cb; |
| 357 | int rhost_len = strlen(rhost_name); |
YOSHIFUJI Hideaki / 吉藤英明 | c3df856 | 2005-11-22 12:18:23 +0900 | [diff] [blame] | 358 | |
Junio C Hamano | e814bc4 | 2005-11-19 03:48:56 -0800 | [diff] [blame] | 359 | if (git_proxy_command) |
Paul Collins | f801477 | 2005-11-04 14:57:16 +0000 | [diff] [blame] | 360 | return 0; |
Junio C Hamano | c64b9ad | 2008-02-11 10:52:15 -0800 | [diff] [blame] | 361 | if (!value) |
| 362 | return config_error_nonbool(var); |
Junio C Hamano | e814bc4 | 2005-11-19 03:48:56 -0800 | [diff] [blame] | 363 | /* [core] |
| 364 | * ;# matches www.kernel.org as well |
| 365 | * gitproxy = netcatter-1 for kernel.org |
| 366 | * gitproxy = netcatter-2 for sample.xz |
| 367 | * gitproxy = netcatter-default |
| 368 | */ |
YOSHIFUJI Hideaki / 吉藤英明 | c3df856 | 2005-11-22 12:18:23 +0900 | [diff] [blame] | 369 | for_pos = strstr(value, " for "); |
Junio C Hamano | e814bc4 | 2005-11-19 03:48:56 -0800 | [diff] [blame] | 370 | if (!for_pos) |
| 371 | /* matches everybody */ |
| 372 | matchlen = strlen(value); |
| 373 | else { |
| 374 | hostlen = strlen(for_pos + 5); |
| 375 | if (rhost_len < hostlen) |
| 376 | matchlen = -1; |
| 377 | else if (!strncmp(for_pos + 5, |
| 378 | rhost_name + rhost_len - hostlen, |
| 379 | hostlen) && |
| 380 | ((rhost_len == hostlen) || |
| 381 | rhost_name[rhost_len - hostlen -1] == '.')) |
| 382 | matchlen = for_pos - value; |
| 383 | else |
| 384 | matchlen = -1; |
Paul Collins | f801477 | 2005-11-04 14:57:16 +0000 | [diff] [blame] | 385 | } |
Junio C Hamano | e814bc4 | 2005-11-19 03:48:56 -0800 | [diff] [blame] | 386 | if (0 <= matchlen) { |
| 387 | /* core.gitproxy = none for kernel.org */ |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 388 | if (matchlen == 4 && |
Junio C Hamano | e814bc4 | 2005-11-19 03:48:56 -0800 | [diff] [blame] | 389 | !memcmp(value, "none", 4)) |
| 390 | matchlen = 0; |
Pierre Habouzit | 182af83 | 2007-09-16 00:32:36 +0200 | [diff] [blame] | 391 | git_proxy_command = xmemdupz(value, matchlen); |
Junio C Hamano | e814bc4 | 2005-11-19 03:48:56 -0800 | [diff] [blame] | 392 | } |
| 393 | return 0; |
Paul Collins | f801477 | 2005-11-04 14:57:16 +0000 | [diff] [blame] | 394 | } |
| 395 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 396 | return git_default_config(var, value, cb); |
Paul Collins | f801477 | 2005-11-04 14:57:16 +0000 | [diff] [blame] | 397 | } |
| 398 | |
Junio C Hamano | e814bc4 | 2005-11-19 03:48:56 -0800 | [diff] [blame] | 399 | static int git_use_proxy(const char *host) |
Paul Collins | f801477 | 2005-11-04 14:57:16 +0000 | [diff] [blame] | 400 | { |
| 401 | git_proxy_command = getenv("GIT_PROXY_COMMAND"); |
Erik Faye-Lund | 15112c9 | 2009-03-11 02:38:12 +0000 | [diff] [blame] | 402 | git_config(git_proxy_command_options, (void*)host); |
Junio C Hamano | e814bc4 | 2005-11-19 03:48:56 -0800 | [diff] [blame] | 403 | return (git_proxy_command && *git_proxy_command); |
Paul Collins | f801477 | 2005-11-04 14:57:16 +0000 | [diff] [blame] | 404 | } |
| 405 | |
Junio C Hamano | c78963d | 2006-06-28 03:50:33 -0700 | [diff] [blame] | 406 | static void git_proxy_connect(int fd[2], char *host) |
Paul Collins | f801477 | 2005-11-04 14:57:16 +0000 | [diff] [blame] | 407 | { |
Timo Hirvonen | 554fe20 | 2006-06-28 12:04:39 +0300 | [diff] [blame] | 408 | const char *port = STR(DEFAULT_GIT_PORT); |
Paul Collins | f801477 | 2005-11-04 14:57:16 +0000 | [diff] [blame] | 409 | char *colon, *end; |
Shawn O. Pearce | 15a1c012 | 2007-03-12 19:00:19 -0400 | [diff] [blame] | 410 | const char *argv[4]; |
| 411 | struct child_process proxy; |
Paul Collins | f801477 | 2005-11-04 14:57:16 +0000 | [diff] [blame] | 412 | |
| 413 | if (host[0] == '[') { |
| 414 | end = strchr(host + 1, ']'); |
| 415 | if (end) { |
| 416 | *end = 0; |
| 417 | end++; |
| 418 | host++; |
| 419 | } else |
| 420 | end = host; |
| 421 | } else |
| 422 | end = host; |
| 423 | colon = strchr(end, ':'); |
| 424 | |
| 425 | if (colon) { |
| 426 | *colon = 0; |
| 427 | port = colon + 1; |
| 428 | } |
| 429 | |
Shawn O. Pearce | 15a1c012 | 2007-03-12 19:00:19 -0400 | [diff] [blame] | 430 | argv[0] = git_proxy_command; |
| 431 | argv[1] = host; |
| 432 | argv[2] = port; |
| 433 | argv[3] = NULL; |
| 434 | memset(&proxy, 0, sizeof(proxy)); |
| 435 | proxy.argv = argv; |
| 436 | proxy.in = -1; |
| 437 | proxy.out = -1; |
| 438 | if (start_command(&proxy)) |
| 439 | die("cannot start proxy %s", argv[0]); |
| 440 | fd[0] = proxy.out; /* read from proxy stdout */ |
| 441 | fd[1] = proxy.in; /* write to proxy stdin */ |
Paul Collins | f801477 | 2005-11-04 14:57:16 +0000 | [diff] [blame] | 442 | } |
| 443 | |
Christian Couder | 0f503d7 | 2006-09-11 07:04:50 +0200 | [diff] [blame] | 444 | #define MAX_CMD_LEN 1024 |
| 445 | |
Linus Torvalds | 2af202b | 2009-06-18 10:28:43 -0700 | [diff] [blame] | 446 | static char *get_port(char *host) |
Luben Tuikov | 2e77666 | 2007-09-01 02:36:31 -0700 | [diff] [blame] | 447 | { |
| 448 | char *end; |
| 449 | char *p = strchr(host, ':'); |
| 450 | |
| 451 | if (p) { |
René Scharfe | 8f14825 | 2008-12-21 02:12:11 +0100 | [diff] [blame] | 452 | long port = strtol(p + 1, &end, 10); |
| 453 | if (end != p + 1 && *end == '\0' && 0 <= port && port < 65536) { |
Luben Tuikov | 2e77666 | 2007-09-01 02:36:31 -0700 | [diff] [blame] | 454 | *p = '\0'; |
| 455 | return p+1; |
| 456 | } |
| 457 | } |
| 458 | |
| 459 | return NULL; |
| 460 | } |
| 461 | |
Johannes Schindelin | fb32c91 | 2008-02-10 03:06:57 +0000 | [diff] [blame] | 462 | static struct child_process no_fork; |
| 463 | |
Linus Torvalds | f719259 | 2005-07-04 11:57:58 -0700 | [diff] [blame] | 464 | /* |
Johannes Schindelin | fb32c91 | 2008-02-10 03:06:57 +0000 | [diff] [blame] | 465 | * This returns a dummy child_process if the transport protocol does not |
| 466 | * need fork(2), or a struct child_process object if it does. Once done, |
| 467 | * finish the connection with finish_connect() with the value returned from |
| 468 | * this function (it is safe to call finish_connect() with NULL to support |
| 469 | * the former case). |
Franck Bui-Huu | f42a5c4 | 2006-09-12 11:00:13 +0200 | [diff] [blame] | 470 | * |
Johannes Schindelin | fb32c91 | 2008-02-10 03:06:57 +0000 | [diff] [blame] | 471 | * If it returns, the connect is successful; it just dies on errors (this |
| 472 | * will hopefully be changed in a libification effort, to return NULL when |
| 473 | * the connection failed). |
Linus Torvalds | f719259 | 2005-07-04 11:57:58 -0700 | [diff] [blame] | 474 | */ |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 475 | struct child_process *git_connect(int fd[2], const char *url_orig, |
Johannes Sixt | 98158e9 | 2007-10-19 21:47:53 +0200 | [diff] [blame] | 476 | const char *prog, int flags) |
Linus Torvalds | f719259 | 2005-07-04 11:57:58 -0700 | [diff] [blame] | 477 | { |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 478 | char *url = xstrdup(url_orig); |
Benjamin Kramer | 8e76bf3 | 2009-03-13 13:51:33 +0100 | [diff] [blame] | 479 | char *host, *path; |
YOSHIFUJI Hideaki / 吉藤英明 | 356bece | 2005-12-21 19:23:42 +0900 | [diff] [blame] | 480 | char *end; |
| 481 | int c; |
Johannes Sixt | 98158e9 | 2007-10-19 21:47:53 +0200 | [diff] [blame] | 482 | struct child_process *conn; |
Andreas Ericsson | faea9cc | 2005-11-17 20:37:14 +0100 | [diff] [blame] | 483 | enum protocol protocol = PROTO_LOCAL; |
Serge E. Hallyn | da2a95b | 2006-04-17 10:14:47 -0500 | [diff] [blame] | 484 | int free_path = 0; |
Luben Tuikov | 2e77666 | 2007-09-01 02:36:31 -0700 | [diff] [blame] | 485 | char *port = NULL; |
Johannes Sixt | f364cb8 | 2007-10-19 21:47:54 +0200 | [diff] [blame] | 486 | const char **arg; |
| 487 | struct strbuf cmd; |
Linus Torvalds | f719259 | 2005-07-04 11:57:58 -0700 | [diff] [blame] | 488 | |
Junio C Hamano | f0b7367 | 2006-06-19 18:25:21 -0700 | [diff] [blame] | 489 | /* Without this we cannot rely on waitpid() to tell |
| 490 | * what happened to our children. |
| 491 | */ |
| 492 | signal(SIGCHLD, SIG_DFL); |
| 493 | |
Andreas Ericsson | faea9cc | 2005-11-17 20:37:14 +0100 | [diff] [blame] | 494 | host = strstr(url, "://"); |
Brian Gianforcaro | eeefa7c | 2009-09-01 01:35:10 -0400 | [diff] [blame] | 495 | if (host) { |
Andreas Ericsson | faea9cc | 2005-11-17 20:37:14 +0100 | [diff] [blame] | 496 | *host = '\0'; |
| 497 | protocol = get_protocol(url); |
| 498 | host += 3; |
YOSHIFUJI Hideaki / 吉藤英明 | 356bece | 2005-12-21 19:23:42 +0900 | [diff] [blame] | 499 | c = '/'; |
| 500 | } else { |
Linus Torvalds | f719259 | 2005-07-04 11:57:58 -0700 | [diff] [blame] | 501 | host = url; |
YOSHIFUJI Hideaki / 吉藤英明 | 356bece | 2005-12-21 19:23:42 +0900 | [diff] [blame] | 502 | c = ':'; |
| 503 | } |
| 504 | |
Ilari Liusvaara | 9aa5053 | 2010-01-26 20:24:42 +0200 | [diff] [blame] | 505 | /* |
| 506 | * Don't do destructive transforms with git:// as that |
Junio C Hamano | 9517e6b | 2010-02-03 21:23:18 -0800 | [diff] [blame] | 507 | * protocol code does '[]' unwrapping of its own. |
Ilari Liusvaara | 9aa5053 | 2010-01-26 20:24:42 +0200 | [diff] [blame] | 508 | */ |
YOSHIFUJI Hideaki / 吉藤英明 | 356bece | 2005-12-21 19:23:42 +0900 | [diff] [blame] | 509 | if (host[0] == '[') { |
| 510 | end = strchr(host + 1, ']'); |
| 511 | if (end) { |
Ilari Liusvaara | 9aa5053 | 2010-01-26 20:24:42 +0200 | [diff] [blame] | 512 | if (protocol != PROTO_GIT) { |
| 513 | *end = 0; |
| 514 | host++; |
| 515 | } |
YOSHIFUJI Hideaki / 吉藤英明 | 356bece | 2005-12-21 19:23:42 +0900 | [diff] [blame] | 516 | end++; |
YOSHIFUJI Hideaki / 吉藤英明 | 356bece | 2005-12-21 19:23:42 +0900 | [diff] [blame] | 517 | } else |
| 518 | end = host; |
| 519 | } else |
| 520 | end = host; |
| 521 | |
| 522 | path = strchr(end, c); |
Johannes Sixt | be50181 | 2007-11-30 22:51:10 +0100 | [diff] [blame] | 523 | if (path && !has_dos_drive_prefix(end)) { |
Linus Torvalds | 72a4f4b | 2007-08-01 10:03:37 -0700 | [diff] [blame] | 524 | if (c == ':') { |
Andreas Ericsson | faea9cc | 2005-11-17 20:37:14 +0100 | [diff] [blame] | 525 | protocol = PROTO_SSH; |
YOSHIFUJI Hideaki / 吉藤英明 | 356bece | 2005-12-21 19:23:42 +0900 | [diff] [blame] | 526 | *path++ = '\0'; |
Linus Torvalds | 72a4f4b | 2007-08-01 10:03:37 -0700 | [diff] [blame] | 527 | } |
| 528 | } else |
| 529 | path = end; |
Linus Torvalds | 2386d65 | 2005-07-13 18:46:20 -0700 | [diff] [blame] | 530 | |
Andreas Ericsson | faea9cc | 2005-11-17 20:37:14 +0100 | [diff] [blame] | 531 | if (!path || !*path) |
| 532 | die("No path specified. See 'man git-pull' for valid url syntax"); |
| 533 | |
| 534 | /* |
| 535 | * null-terminate hostname and point path to ~ for URL's like this: |
| 536 | * ssh://host.xz/~user/repo |
| 537 | */ |
| 538 | if (protocol != PROTO_LOCAL && host != url) { |
| 539 | char *ptr = path; |
| 540 | if (path[1] == '~') |
| 541 | path++; |
Serge E. Hallyn | da2a95b | 2006-04-17 10:14:47 -0500 | [diff] [blame] | 542 | else { |
Shawn Pearce | 9befac4 | 2006-09-02 00:16:31 -0400 | [diff] [blame] | 543 | path = xstrdup(ptr); |
Serge E. Hallyn | da2a95b | 2006-04-17 10:14:47 -0500 | [diff] [blame] | 544 | free_path = 1; |
| 545 | } |
Andreas Ericsson | faea9cc | 2005-11-17 20:37:14 +0100 | [diff] [blame] | 546 | |
| 547 | *ptr = '\0'; |
| 548 | } |
| 549 | |
Luben Tuikov | 2e77666 | 2007-09-01 02:36:31 -0700 | [diff] [blame] | 550 | /* |
| 551 | * Add support for ssh port: ssh://host.xy:<port>/... |
| 552 | */ |
| 553 | if (protocol == PROTO_SSH && host != url) |
| 554 | port = get_port(host); |
| 555 | |
Paul Collins | f801477 | 2005-11-04 14:57:16 +0000 | [diff] [blame] | 556 | if (protocol == PROTO_GIT) { |
Jon Loeliger | 5ad312b | 2006-06-06 22:58:41 -0500 | [diff] [blame] | 557 | /* These underlying connection commands die() if they |
| 558 | * cannot connect. |
| 559 | */ |
Shawn Pearce | 9befac4 | 2006-09-02 00:16:31 -0400 | [diff] [blame] | 560 | char *target_host = xstrdup(host); |
Junio C Hamano | e814bc4 | 2005-11-19 03:48:56 -0800 | [diff] [blame] | 561 | if (git_use_proxy(host)) |
Junio C Hamano | c78963d | 2006-06-28 03:50:33 -0700 | [diff] [blame] | 562 | git_proxy_connect(fd, host); |
Serge E. Hallyn | da2a95b | 2006-04-17 10:14:47 -0500 | [diff] [blame] | 563 | else |
Michael S. Tsirkin | 7841ce7 | 2007-05-16 20:09:41 +0300 | [diff] [blame] | 564 | git_tcp_connect(fd, host, flags); |
Jon Loeliger | 5ad312b | 2006-06-06 22:58:41 -0500 | [diff] [blame] | 565 | /* |
| 566 | * Separate original protocol components prog and path |
Shawn O. Pearce | 73bb33a | 2009-06-04 18:33:32 -0700 | [diff] [blame] | 567 | * from extended host header with a NUL byte. |
| 568 | * |
| 569 | * Note: Do not add any other headers here! Doing so |
| 570 | * will cause older git-daemon servers to crash. |
Jon Loeliger | 5ad312b | 2006-06-06 22:58:41 -0500 | [diff] [blame] | 571 | */ |
| 572 | packet_write(fd[1], |
| 573 | "%s %s%chost=%s%c", |
| 574 | prog, path, 0, |
| 575 | target_host, 0); |
| 576 | free(target_host); |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 577 | free(url); |
Serge E. Hallyn | da2a95b | 2006-04-17 10:14:47 -0500 | [diff] [blame] | 578 | if (free_path) |
| 579 | free(path); |
Johannes Schindelin | fb32c91 | 2008-02-10 03:06:57 +0000 | [diff] [blame] | 580 | return &no_fork; |
Paul Collins | f801477 | 2005-11-04 14:57:16 +0000 | [diff] [blame] | 581 | } |
Linus Torvalds | 2386d65 | 2005-07-13 18:46:20 -0700 | [diff] [blame] | 582 | |
Johannes Sixt | 98158e9 | 2007-10-19 21:47:53 +0200 | [diff] [blame] | 583 | conn = xcalloc(1, sizeof(*conn)); |
Christian Couder | 0f503d7 | 2006-09-11 07:04:50 +0200 | [diff] [blame] | 584 | |
Johannes Sixt | f364cb8 | 2007-10-19 21:47:54 +0200 | [diff] [blame] | 585 | strbuf_init(&cmd, MAX_CMD_LEN); |
| 586 | strbuf_addstr(&cmd, prog); |
| 587 | strbuf_addch(&cmd, ' '); |
| 588 | sq_quote_buf(&cmd, path); |
| 589 | if (cmd.len >= MAX_CMD_LEN) |
| 590 | die("command line too long"); |
Christian Couder | 0f503d7 | 2006-09-11 07:04:50 +0200 | [diff] [blame] | 591 | |
Johannes Sixt | f364cb8 | 2007-10-19 21:47:54 +0200 | [diff] [blame] | 592 | conn->in = conn->out = -1; |
Edward Z. Yang | 36ad53f | 2009-05-31 18:15:21 +0200 | [diff] [blame] | 593 | conn->argv = arg = xcalloc(7, sizeof(*arg)); |
Johannes Sixt | f364cb8 | 2007-10-19 21:47:54 +0200 | [diff] [blame] | 594 | if (protocol == PROTO_SSH) { |
| 595 | const char *ssh = getenv("GIT_SSH"); |
Edward Z. Yang | 36ad53f | 2009-05-31 18:15:21 +0200 | [diff] [blame] | 596 | int putty = ssh && strcasestr(ssh, "plink"); |
Johannes Sixt | f364cb8 | 2007-10-19 21:47:54 +0200 | [diff] [blame] | 597 | if (!ssh) ssh = "ssh"; |
Luben Tuikov | 2e77666 | 2007-09-01 02:36:31 -0700 | [diff] [blame] | 598 | |
Johannes Sixt | f364cb8 | 2007-10-19 21:47:54 +0200 | [diff] [blame] | 599 | *arg++ = ssh; |
Edward Z. Yang | 36ad53f | 2009-05-31 18:15:21 +0200 | [diff] [blame] | 600 | if (putty && !strcasestr(ssh, "tortoiseplink")) |
| 601 | *arg++ = "-batch"; |
Johannes Sixt | f364cb8 | 2007-10-19 21:47:54 +0200 | [diff] [blame] | 602 | if (port) { |
Edward Z. Yang | 36ad53f | 2009-05-31 18:15:21 +0200 | [diff] [blame] | 603 | /* P is for PuTTY, p is for OpenSSH */ |
| 604 | *arg++ = putty ? "-P" : "-p"; |
Johannes Sixt | f364cb8 | 2007-10-19 21:47:54 +0200 | [diff] [blame] | 605 | *arg++ = port; |
Martin Sivak | 4852f72 | 2005-08-03 17:15:42 +0200 | [diff] [blame] | 606 | } |
Johannes Sixt | f364cb8 | 2007-10-19 21:47:54 +0200 | [diff] [blame] | 607 | *arg++ = host; |
Matt Draisey | 016fb48 | 2006-01-19 15:58:03 -0500 | [diff] [blame] | 608 | } |
Johannes Sixt | f364cb8 | 2007-10-19 21:47:54 +0200 | [diff] [blame] | 609 | else { |
Giuseppe Bilotta | 48a7c1c | 2010-02-25 00:34:14 +0100 | [diff] [blame] | 610 | /* remove repo-local variables from the environment */ |
| 611 | conn->env = local_repo_env; |
Johannes Sixt | 4cfb2a4 | 2010-01-25 13:32:44 +0100 | [diff] [blame] | 612 | conn->use_shell = 1; |
Johannes Sixt | f364cb8 | 2007-10-19 21:47:54 +0200 | [diff] [blame] | 613 | } |
| 614 | *arg++ = cmd.buf; |
| 615 | *arg = NULL; |
| 616 | |
| 617 | if (start_command(conn)) |
| 618 | die("unable to fork"); |
| 619 | |
| 620 | fd[0] = conn->out; /* read from child's stdout */ |
| 621 | fd[1] = conn->in; /* write to child's stdin */ |
| 622 | strbuf_release(&cmd); |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 623 | free(url); |
Serge E. Hallyn | da2a95b | 2006-04-17 10:14:47 -0500 | [diff] [blame] | 624 | if (free_path) |
| 625 | free(path); |
Johannes Sixt | 98158e9 | 2007-10-19 21:47:53 +0200 | [diff] [blame] | 626 | return conn; |
Linus Torvalds | f719259 | 2005-07-04 11:57:58 -0700 | [diff] [blame] | 627 | } |
| 628 | |
Johannes Sixt | 98158e9 | 2007-10-19 21:47:53 +0200 | [diff] [blame] | 629 | int finish_connect(struct child_process *conn) |
Linus Torvalds | f719259 | 2005-07-04 11:57:58 -0700 | [diff] [blame] | 630 | { |
Johannes Sixt | f364cb8 | 2007-10-19 21:47:54 +0200 | [diff] [blame] | 631 | int code; |
Johannes Schindelin | fb32c91 | 2008-02-10 03:06:57 +0000 | [diff] [blame] | 632 | if (!conn || conn == &no_fork) |
Franck Bui-Huu | f42a5c4 | 2006-09-12 11:00:13 +0200 | [diff] [blame] | 633 | return 0; |
| 634 | |
Johannes Sixt | f364cb8 | 2007-10-19 21:47:54 +0200 | [diff] [blame] | 635 | code = finish_command(conn); |
| 636 | free(conn->argv); |
Johannes Sixt | 98158e9 | 2007-10-19 21:47:53 +0200 | [diff] [blame] | 637 | free(conn); |
Johannes Sixt | f364cb8 | 2007-10-19 21:47:54 +0200 | [diff] [blame] | 638 | return code; |
Linus Torvalds | f719259 | 2005-07-04 11:57:58 -0700 | [diff] [blame] | 639 | } |