Re: [PATCH v4 11/15] daemon: report connection from root-process
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 13, 2010, 22:55 UTC
- Message-ID
- <7vlj61hfe7.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1286833829-5116-12-git-send-email-kusmabite@gmail.com>
Erik Faye-Lund <kusmabite@gmail.com> writes:
Show 33 quoted lines
> Report incoming connections from the process that
> accept() the connection instead of the handling
> process.
>
> This enables "Connection from"-reporting on
> Windows, where getpeername(0, ...) consistently
> fails.
>
> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
> ---
> daemon.c | 72 ++++++++++++++++++++++++++++++-------------------------------
> 1 files changed, 35 insertions(+), 37 deletions(-)
>
> diff --git a/daemon.c b/daemon.c
> index 8a44fb9..1574f75 100644
> --- a/daemon.c
> +++ b/daemon.c
> @@ -516,38 +516,11 @@ static void parse_host_arg(char *extra_args, int buflen)
> }
>
>
> -static int execute(struct sockaddr *addr)
> +static int execute(void)
> {
> -...
> - }
> - loginfo("Connection from %s:%d", addrbuf, port);
> - setenv("REMOTE_ADDR", addrbuf, 1);
> ...
> + else {
> + loginfo("[%"PRIuMAX"] Connection from %s:%d",
> + (uintmax_t)cld.pid, addrstr, port);
> add_child(&cld, addr, addrlen);Hmm, loginfo() calls logreport() and adds the process information as necessary to the output. Wouldn't this patch give the pid information twice?