From: Erik Faye-Lund <kusmabite@gmail.com>
To: git@vger.kernel.org
Cc: msysgit@googlegroups.com, j6t@kdbg.org, avarab@gmail.com,
sunshine@sunshineco.com
Subject: [PATCH v4 11/15] daemon: report connection from root-process
Date: Mon, 11 Oct 2010 23:50:25 +0200 [thread overview]
Message-ID: <1286833829-5116-12-git-send-email-kusmabite@gmail.com> (raw)
In-Reply-To: <1286833829-5116-1-git-send-email-kusmabite@gmail.com>
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)
{
static char line[1000];
int pktlen, len, i;
- if (addr) {
- char addrbuf[256] = "";
- int port = -1;
-
- if (addr->sa_family == AF_INET) {
- struct sockaddr_in *sin_addr = (void *) addr;
- inet_ntop(addr->sa_family, &sin_addr->sin_addr, addrbuf, sizeof(addrbuf));
- port = ntohs(sin_addr->sin_port);
-#ifndef NO_IPV6
- } else if (addr && addr->sa_family == AF_INET6) {
- struct sockaddr_in6 *sin6_addr = (void *) addr;
-
- char *buf = addrbuf;
- *buf++ = '['; *buf = '\0'; /* stpcpy() is cool */
- inet_ntop(AF_INET6, &sin6_addr->sin6_addr, buf, sizeof(addrbuf) - 1);
- strcat(buf, "]");
-
- port = ntohs(sin6_addr->sin6_port);
-#endif
- }
- loginfo("Connection from %s:%d", addrbuf, port);
- setenv("REMOTE_ADDR", addrbuf, 1);
- }
- else {
- unsetenv("REMOTE_ADDR");
- }
-
alarm(init_timeout ? init_timeout : timeout);
pktlen = packet_read_line(0, line, sizeof(line));
alarm(0);
@@ -676,10 +649,35 @@ static void check_dead_children(void)
cradle = &blanket->next;
}
+static char *get_addrstr(int *port, struct sockaddr *addr)
+{
+ static char addrbuf[256] = "";
+ if (addr->sa_family == AF_INET) {
+ struct sockaddr_in *sin_addr = (void *) addr;
+ inet_ntop(addr->sa_family, &sin_addr->sin_addr, addrbuf, sizeof(addrbuf));
+ *port = ntohs(sin_addr->sin_port);
+#ifndef NO_IPV6
+ } else if (addr && addr->sa_family == AF_INET6) {
+ struct sockaddr_in6 *sin6_addr = (void *) addr;
+
+ char *buf = addrbuf;
+ *buf++ = '['; *buf = '\0'; /* stpcpy() is cool */
+ inet_ntop(AF_INET6, &sin6_addr->sin6_addr, buf, sizeof(addrbuf) - 1);
+ strcat(buf, "]");
+
+ *port = ntohs(sin6_addr->sin6_port);
+#endif
+ }
+ return addrbuf;
+}
+
static char **cld_argv;
static void handle(int incoming, struct sockaddr *addr, int addrlen)
{
struct child_process cld = { 0 };
+ char *addrstr, envbuf[300] = "REMOTE_ADDR=";
+ char *env[] = { envbuf, NULL };
+ int port = -1;
if (max_connections && live_children >= max_connections) {
kill_some_child();
@@ -692,14 +690,21 @@ static void handle(int incoming, struct sockaddr *addr, int addrlen)
}
}
+ addrstr = get_addrstr(&port, addr);
+ strcat(envbuf, addrstr);
+
+ cld.env = (const char **)env;
cld.argv = (const char **)cld_argv;
cld.in = incoming;
cld.out = dup(incoming);
if (start_command(&cld))
logerror("unable to fork");
- else
+ else {
+ loginfo("[%"PRIuMAX"] Connection from %s:%d",
+ (uintmax_t)cld.pid, addrstr, port);
add_child(&cld, addr, addrlen);
+ }
close(incoming);
}
@@ -1157,17 +1162,10 @@ int main(int argc, char **argv)
base_path);
if (serve_mode) {
- struct sockaddr_storage ss;
- struct sockaddr *peer = (struct sockaddr *)&ss;
- socklen_t slen = sizeof(ss);
-
if (inetd_mode && !freopen("/dev/null", "w", stderr))
die_errno("failed to redirect stderr to /dev/null");
- if (getpeername(0, peer, &slen))
- peer = NULL;
-
- return execute(peer);
+ return execute();
}
if (detach) {
--
1.7.3.1.199.g72340
next prev parent reply other threads:[~2010-10-11 21:52 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-11 21:50 [PATCH v4 00/15] daemon-win32 Erik Faye-Lund
2010-10-11 21:50 ` [PATCH v4 01/15] mingw: add network-wrappers for daemon Erik Faye-Lund
2010-10-11 22:07 ` Jonathan Nieder
2010-10-11 21:50 ` [PATCH v4 02/15] mingw: implement syslog Erik Faye-Lund
2010-10-11 22:11 ` Jonathan Nieder
2010-10-11 22:28 ` Erik Faye-Lund
2010-10-11 22:37 ` Jonathan Nieder
2010-10-13 12:36 ` Erik Faye-Lund
2010-10-13 19:23 ` Eric Sunshine
2010-10-13 21:17 ` [msysGit] " Pat Thoyts
2010-10-14 0:47 ` Erik Faye-Lund
2010-10-11 21:50 ` [PATCH v4 03/15] compat: add inet_pton and inet_ntop prototypes Erik Faye-Lund
2010-10-11 21:50 ` [PATCH v4 04/15] inet_ntop: fix a couple of old-style decls Erik Faye-Lund
2010-10-11 21:50 ` [PATCH v4 05/15] mingw: use real pid Erik Faye-Lund
2010-10-11 21:50 ` [PATCH v4 06/15] mingw: support waitpid with pid > 0 and WNOHANG Erik Faye-Lund
2010-10-11 21:50 ` [PATCH v4 07/15] mingw: add kill emulation Erik Faye-Lund
2010-10-11 21:50 ` [PATCH v4 08/15] daemon: use run-command api for async serving Erik Faye-Lund
2010-10-13 22:47 ` Junio C Hamano
2010-10-14 10:18 ` Erik Faye-Lund
2010-10-17 4:43 ` Junio C Hamano
2010-10-11 21:50 ` [PATCH v4 09/15] daemon: use full buffered mode for stderr Erik Faye-Lund
2010-10-11 21:50 ` [PATCH v4 10/15] Improve the mingw getaddrinfo stub to handle more use cases Erik Faye-Lund
2010-10-11 21:50 ` Erik Faye-Lund [this message]
2010-10-13 22:55 ` [PATCH v4 11/15] daemon: report connection from root-process Junio C Hamano
2010-10-14 10:50 ` Erik Faye-Lund
2010-10-17 4:43 ` Junio C Hamano
2010-10-17 10:18 ` Erik Faye-Lund
2010-10-11 21:50 ` [PATCH v4 12/15] mingw: import poll-emulation from gnulib Erik Faye-Lund
2010-10-11 21:50 ` [PATCH v4 13/15] mingw: use " Erik Faye-Lund
2010-10-11 21:50 ` [PATCH v4 14/15] daemon: use socklen_t Erik Faye-Lund
2010-10-11 21:50 ` [PATCH v4 15/15] daemon: opt-out on features that require posix Erik Faye-Lund
2010-10-13 23:02 ` Junio C Hamano
2010-10-14 11:02 ` Erik Faye-Lund
2010-10-15 21:16 ` Junio C Hamano
2010-10-18 12:05 ` Erik Faye-Lund
2010-10-18 16:31 ` Jonathan Nieder
2010-10-18 18:13 ` Andreas Schwab
2010-10-18 18:42 ` empty structs Jonathan Nieder
2010-10-21 21:16 ` [PATCH v4 15/15] daemon: opt-out on features that require posix Erik Faye-Lund
2010-10-21 22:00 ` Erik Faye-Lund
2010-10-21 22:03 ` Jonathan Nieder
2010-10-21 22:04 ` Erik Faye-Lund
2010-10-21 23:17 ` Junio C Hamano
2010-10-18 19:26 ` Junio C Hamano
2010-10-21 20:37 ` Erik Faye-Lund
2010-10-21 20:39 ` Jonathan Nieder
2010-10-21 20:54 ` Erik Faye-Lund
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=1286833829-5116-12-git-send-email-kusmabite@gmail.com \
--to=kusmabite@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=msysgit@googlegroups.com \
--cc=sunshine@sunshineco.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).