THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

Log peer address when git-daemon called from inetd

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>
tags/v1.4.1-rc1
David Woodhouse Junio C Hamano 13 years ago
parent
commit
5b276ee4fb
1 changed files with 34 additions and 24 deletions
  1. +34
    -24
      daemon.c

+ 34
- 24
daemon.c View File

@@ -264,11 +264,34 @@ static int upload(char *dir)
return -1;
}

static int execute(void)
static int execute(struct sockaddr *addr)
{
static char line[1000];
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);
pktlen = packet_read_line(0, line, sizeof(line));
alarm(0);
@@ -414,8 +437,6 @@ static void check_max_connections(void)
static void handle(int incoming, struct sockaddr *addr, int addrlen)
{
pid_t pid = fork();
char addrbuf[256] = "";
int port = -1;

if (pid) {
unsigned idx;
@@ -436,26 +457,7 @@ static void handle(int incoming, struct sockaddr *addr, int addrlen)
dup2(incoming, 1);
close(incoming);

if (addr->sa_family == AF_INET) {
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());
exit(execute(addr));
}

static void child_handler(int signo)
@@ -751,8 +753,16 @@ int main(int argc, char **argv)
}

if (inetd_mode) {
struct sockaddr_storage ss;
struct sockaddr *peer = (struct sockaddr *)&ss;
socklen_t slen = sizeof(ss);

fclose(stderr); //FIXME: workaround
return execute();

if (getpeername(0, peer, &slen))
peer = NULL;

return execute(peer);
}

return serve(port);


Loading…
Cancel
Save