From: Brandon Williams <bmwill@google.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Stefan Beller <sbeller@google.com>,
Jonathan Tan <jonathantanmy@google.com>,
Segev Finer <segev208@gmail.com>
Subject: Re: [PATCH 3/8] connect: split git:// setup into a separate function
Date: Mon, 20 Nov 2017 13:52:18 -0800 [thread overview]
Message-ID: <20171120215218.GB92506@google.com> (raw)
In-Reply-To: <20171120212327.ssk6vmw2hd5jwbi5@aiede.mtv.corp.google.com>
On 11/20, Jonathan Nieder wrote:
> The git_connect function is growing long. Split the
> PROTO_GIT-specific portion to a separate function to make it easier to
> read.
>
> No functional change intended.
>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> Reviewed-by: Stefan Beller <sbeller@google.com>
> ---
> As before.
>
> connect.c | 103 +++++++++++++++++++++++++++++++++++---------------------------
> 1 file changed, 59 insertions(+), 44 deletions(-)
>
> diff --git a/connect.c b/connect.c
> index aa994d1518..9425229206 100644
> --- a/connect.c
> +++ b/connect.c
> @@ -861,6 +861,64 @@ static enum ssh_variant determine_ssh_variant(const char *ssh_command,
> return ssh_variant;
> }
>
> +/*
> + * Open a connection using Git's native protocol.
> + *
> + * The caller is responsible for freeing hostandport, but this function may
> + * modify it (for example, to truncate it to remove the port part).
> + */
> +static struct child_process *git_connect_git(int fd[2], char *hostandport,
> + const char *path, const char *prog,
> + int flags)
> +{
> + struct child_process *conn;
> + struct strbuf request = STRBUF_INIT;
> + /*
> + * Set up virtual host information based on where we will
> + * connect, unless the user has overridden us in
> + * the environment.
> + */
> + char *target_host = getenv("GIT_OVERRIDE_VIRTUAL_HOST");
> + if (target_host)
> + target_host = xstrdup(target_host);
> + else
> + target_host = xstrdup(hostandport);
> +
> + transport_check_allowed("git");
> +
> + /* These underlying connection commands die() if they
> + * cannot connect.
> + */
I know this is really just code motion but maybe we can fix the style of
the comment here?
> + if (git_use_proxy(hostandport))
> + conn = git_proxy_connect(fd, hostandport);
> + else
> + conn = git_tcp_connect(fd, hostandport, flags);
> + /*
> + * Separate original protocol components prog and path
> + * from extended host header with a NUL byte.
> + *
> + * Note: Do not add any other headers here! Doing so
> + * will cause older git-daemon servers to crash.
> + */
> + strbuf_addf(&request,
> + "%s %s%chost=%s%c",
> + prog, path, 0,
> + target_host, 0);
> +
> + /* If using a new version put that stuff here after a second null byte */
> + if (get_protocol_version_config() > 0) {
> + strbuf_addch(&request, '\0');
> + strbuf_addf(&request, "version=%d%c",
> + get_protocol_version_config(), '\0');
> + }
> +
> + packet_write(fd[1], request.buf, request.len);
> +
> + free(target_host);
> + strbuf_release(&request);
> + return conn;
> +}
> +
> /*
> * This returns the dummy child_process `no_fork` if the transport protocol
> * does not need fork(2), or a struct child_process object if it does. Once
> @@ -892,50 +950,7 @@ struct child_process *git_connect(int fd[2], const char *url,
> printf("Diag: path=%s\n", path ? path : "NULL");
> conn = NULL;
> } else if (protocol == PROTO_GIT) {
> - struct strbuf request = STRBUF_INIT;
> - /*
> - * Set up virtual host information based on where we will
> - * connect, unless the user has overridden us in
> - * the environment.
> - */
> - char *target_host = getenv("GIT_OVERRIDE_VIRTUAL_HOST");
> - if (target_host)
> - target_host = xstrdup(target_host);
> - else
> - target_host = xstrdup(hostandport);
> -
> - transport_check_allowed("git");
> -
> - /* These underlying connection commands die() if they
> - * cannot connect.
> - */
> - if (git_use_proxy(hostandport))
> - conn = git_proxy_connect(fd, hostandport);
> - else
> - conn = git_tcp_connect(fd, hostandport, flags);
> - /*
> - * Separate original protocol components prog and path
> - * from extended host header with a NUL byte.
> - *
> - * Note: Do not add any other headers here! Doing so
> - * will cause older git-daemon servers to crash.
> - */
> - strbuf_addf(&request,
> - "%s %s%chost=%s%c",
> - prog, path, 0,
> - target_host, 0);
> -
> - /* If using a new version put that stuff here after a second null byte */
> - if (get_protocol_version_config() > 0) {
> - strbuf_addch(&request, '\0');
> - strbuf_addf(&request, "version=%d%c",
> - get_protocol_version_config(), '\0');
> - }
> -
> - packet_write(fd[1], request.buf, request.len);
> -
> - free(target_host);
> - strbuf_release(&request);
> + conn = git_connect_git(fd, hostandport, path, prog, flags);
> } else {
> struct strbuf cmd = STRBUF_INIT;
> const char *const *var;
> --
> 2.15.0.448.gf294e3d99a
>
--
Brandon Williams
next prev parent reply other threads:[~2017-11-20 21:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-20 21:21 [PATCH v3 0/8] Coping with unrecognized ssh wrapper scripts in GIT_SSH Jonathan Nieder
2017-11-20 21:22 ` [PATCH 1/8] ssh test: make copy_ssh_wrapper_as clean up after itself Jonathan Nieder
2017-11-20 21:47 ` Brandon Williams
2017-11-21 1:24 ` Junio C Hamano
2017-11-21 1:49 ` [PATCH 1/8 v2] " Jonathan Nieder
2017-11-21 23:42 ` Stefan Beller
2017-11-20 21:22 ` [PATCH 2/8] connect: move no_fork fallback to git_tcp_connect Jonathan Nieder
2017-11-20 21:23 ` [PATCH 3/8] connect: split git:// setup into a separate function Jonathan Nieder
2017-11-20 21:52 ` Brandon Williams [this message]
2017-11-20 22:04 ` Jonathan Nieder
2017-11-20 22:29 ` Brandon Williams
2017-11-20 21:25 ` [PATCH 4/8] connect: split ssh command line options into " Jonathan Nieder
2017-11-20 21:54 ` Brandon Williams
2017-11-20 22:09 ` Jonathan Nieder
2017-11-20 22:28 ` Brandon Williams
2017-11-20 22:19 ` [PATCH v4 " Jonathan Nieder
2017-11-20 21:26 ` [PATCH 5/8] connect: split ssh option computation to its own function Jonathan Nieder
2017-11-21 1:31 ` Junio C Hamano
2017-11-20 21:30 ` [PATCH 6/8] ssh: 'auto' variant to select between 'ssh' and 'simple' Jonathan Nieder
2017-11-20 22:25 ` Brandon Williams
2017-11-21 1:48 ` Junio C Hamano
2017-11-21 2:01 ` Jonathan Nieder
2017-11-20 21:30 ` [PATCH 7/8] ssh: 'simple' variant does not support -4/-6 Jonathan Nieder
2017-11-20 21:31 ` [PATCH 8/8] ssh: 'simple' variant does not support --port Jonathan Nieder
2017-11-20 22:32 ` [PATCH v3 0/8] Coping with unrecognized ssh wrapper scripts in GIT_SSH Brandon Williams
2017-11-22 0:00 ` Stefan Beller
2017-11-22 1:52 ` Junio C Hamano
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=20171120215218.GB92506@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.com \
--cc=sbeller@google.com \
--cc=segev208@gmail.com \
/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).