From: Jonathan Nieder <jrnieder@gmail.com>
To: "Eduardo Trápani" <etrapani@gmail.com>
Cc: git@vger.kernel.org, "René Scharfe" <rene.scharfe@lsrfire.ath.cx>,
"YOSHIFUJI Hideaki" <yoshfuji@linux-ipv6.org>
Subject: Re: git: Wrong parsing of ssh urls with IPv6 literals ignores port
Date: Sun, 10 Jun 2012 04:05:16 -0500 [thread overview]
Message-ID: <20120610090516.GA30177@burratino> (raw)
In-Reply-To: <20111022001704.3115.87464.reportbug@hejmo>
Hi Eduardo,
Eduardo Trápani wrote[1]:
> git clone ssh://[2001:0:53aa:64c:1845:430c:4179:d71f]:3333/deponejo/unua
>
> Will try to connect to port 22 and not 3333. The port number seems to be
> ignored.
True. How about something like this (untested)?
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
[1] http://bugs.debian.org/646178
connect.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git i/connect.c w/connect.c
index 912cddee..7ec1b258 100644
--- i/connect.c
+++ w/connect.c
@@ -494,11 +494,19 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
if (host[0] == '[') {
end = strchr(host + 1, ']');
if (end) {
- if (protocol != PROTO_GIT) {
+ if (protocol == PROTO_GIT)
+ end++;
+ else {
*end = 0;
host++;
+ end++;
+ if (!*end || *end == c)
+ ; /* good */
+ else if (protocol == PROTO_SSH && c != ':' && *end == ':')
+ port = end + 1;
+ else
+ die("garbage after [] string in URL");
}
- end++;
} else
end = host;
} else
@@ -535,7 +543,7 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
/*
* Add support for ssh port: ssh://host.xy:<port>/...
*/
- if (protocol == PROTO_SSH && host != url)
+ if (protocol == PROTO_SSH && host != url && !port)
port = get_port(host);
if (protocol == PROTO_GIT) {
next parent reply other threads:[~2012-06-10 9:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20111022001704.3115.87464.reportbug@hejmo>
2012-06-10 9:05 ` Jonathan Nieder [this message]
2012-06-12 18:46 ` git: Wrong parsing of ssh urls with IPv6 literals ignores port René Scharfe
2012-06-12 20:29 ` Jonathan Nieder
2012-06-12 21:00 ` Jonathan Nieder
2012-06-13 16:33 ` René Scharfe
2012-06-13 17:21 ` Junio C Hamano
2012-06-13 19:43 ` Jonathan Nieder
2012-06-13 20:10 ` Junio C Hamano
2012-06-13 20:39 ` Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120610090516.GA30177@burratino \
--to=jrnieder@gmail.com \
--cc=etrapani@gmail.com \
--cc=git@vger.kernel.org \
--cc=rene.scharfe@lsrfire.ath.cx \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).