undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Log peer address when git-daemon called from inetd

Browse Source 
When we run git-daemon from inetd, even with the --verbose option, it
doesn't log the peer address. That logic was only in the standalone
daemon code -- move it to the execute() function instead. Tested with
both IPv6 and Legacy IP clients, in both inetd and daemon mode.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Acked-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
David Woodhouse 2006-06-20 15:38:13 +01:00 committed by Junio C Hamano
parent c07eee1f2a
commit 5b276ee4fb
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
daemon.c
View File

@ -264,11 +264,34 @@ static int upload(char *dir)
return -1; return -1;
} }
static int execute(void) static int execute(struct sockaddr *addr)
{ {
static char line[1000]; static char line[1000];
int pktlen, len; int pktlen, len;
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 = 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 = sin6_addr->sin6_port;
#endif
}
loginfo("Connection from %s:%d", addrbuf, port);
}
alarm(init_timeout ? init_timeout : timeout); alarm(init_timeout ? init_timeout : timeout);
pktlen = packet_read_line(0, line, sizeof(line)); pktlen = packet_read_line(0, line, sizeof(line));
alarm(0); alarm(0);
@ -414,8 +437,6 @@ static void check_max_connections(void)
static void handle(int incoming, struct sockaddr *addr, int addrlen) static void handle(int incoming, struct sockaddr *addr, int addrlen)
{ {
pid_t pid = fork(); pid_t pid = fork();
char addrbuf[256] = "";
int port = -1;
if (pid) { if (pid) {
unsigned idx; unsigned idx;
@ -436,26 +457,7 @@ static void handle(int incoming, struct sockaddr *addr, int addrlen)
dup2(incoming, 1); dup2(incoming, 1);
close(incoming); close(incoming);
if (addr->sa_family == AF_INET) { exit(execute(addr));
struct sockaddr_in *sin_addr = (void *) addr;
inet_ntop(AF_INET, &sin_addr->sin_addr, addrbuf, sizeof(addrbuf));
port = sin_addr->sin_port;
#ifndef NO_IPV6
} else if (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 = sin6_addr->sin6_port;
#endif
}
loginfo("Connection from %s:%d", addrbuf, port);
exit(execute());
} }
static void child_handler(int signo) static void child_handler(int signo)
@ -751,8 +753,16 @@ int main(int argc, char **argv)
} }
if (inetd_mode) { if (inetd_mode) {
struct sockaddr_storage ss;
struct sockaddr *peer = (struct sockaddr *)&ss;
socklen_t slen = sizeof(ss);
fclose(stderr); //FIXME: workaround fclose(stderr); //FIXME: workaround
return execute();
if (getpeername(0, peer, &slen))
peer = NULL;
return execute(peer);
} }
return serve(port); return serve(port);