diff options
| author | Eric Wong <normalperson@yhbt.net> | 2016-02-03 04:09:14 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-12 11:34:14 -0800 |
| commit | c915f11eb4922e154e29cf62d3b549d65c06a170 (patch) | |
| tree | c318d28aff355a3a42a6b7accc3fa0e71588584d /connect.c | |
| parent | f3ee9ca53bc04e9770747ea58951135d60b11a8d (diff) | |
| download | git-c915f11eb4922e154e29cf62d3b549d65c06a170.tar.gz git-c915f11eb4922e154e29cf62d3b549d65c06a170.tar.xz | |
connect & http: support -4 and -6 switches for remote operations
Sometimes it is necessary to force IPv4-only or IPv6-only operation
on networks where name lookups may return a non-routable address and
stall remote operations.
The ssh(1) command has an equivalent switches which we may pass when
we run them. There may be old ssh(1) implementations out there
which do not support these switches; they should report the
appropriate error in that case.
rsync support is untouched for now since it is deprecated and
scheduled to be removed.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Reviewed-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'connect.c')
| -rw-r--r-- | connect.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -357,6 +357,10 @@ static int git_tcp_connect_sock(char *host, int flags) port = "<none>"; memset(&hints, 0, sizeof(hints)); + if (flags & CONNECT_IPV4) + hints.ai_family = AF_INET; + else if (flags & CONNECT_IPV6) + hints.ai_family = AF_INET6; hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = IPPROTO_TCP; @@ -783,6 +787,10 @@ struct child_process *git_connect(int fd[2], const char *url, } argv_array_push(&conn->args, ssh); + if (flags & CONNECT_IPV4) + argv_array_push(&conn->args, "-4"); + else if (flags & CONNECT_IPV6) + argv_array_push(&conn->args, "-6"); if (tortoiseplink) argv_array_push(&conn->args, "-batch"); if (port) { |