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 /transport.c | |
parent | f3ee9ca53bc04e9770747ea58951135d60b11a8d (diff) | |
download | git-c915f11eb4922e154e29cf62d3b549d65c06a170.tar.gz |
connect & http: support -4 and -6 switches for remote operationsew/force-ipv4
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 'transport.c')
-rw-r--r-- | transport.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/transport.c b/transport.c index 9ae71849d6..afcec433f3 100644 --- a/transport.c +++ b/transport.c @@ -489,6 +489,12 @@ static int connect_setup(struct transport *transport, int for_push) if (data->conn) return 0; + switch (transport->family) { + case TRANSPORT_FAMILY_ALL: break; + case TRANSPORT_FAMILY_IPV4: flags |= CONNECT_IPV4; break; + case TRANSPORT_FAMILY_IPV6: flags |= CONNECT_IPV6; break; + } + data->conn = git_connect(data->fd, transport->url, for_push ? data->options.receivepack : data->options.uploadpack, |