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

git-daemon: fix remote port number in log entry

Browse Source 
The port number in struct sockaddr_in needs to be converted from network
byte order to host byte order (on some architectures).

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Gerrit Pape 2007-11-05 09:16:22 +00:00 committed by Junio C Hamano
parent fb159580a1
commit c67359be45
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.c
View File

@ -540,7 +540,7 @@ static int execute(struct sockaddr *addr)
if (addr->sa_family == AF_INET) { if (addr->sa_family == AF_INET) {
struct sockaddr_in *sin_addr = (void *) addr; struct sockaddr_in *sin_addr = (void *) addr;
inet_ntop(addr->sa_family, &sin_addr->sin_addr, addrbuf, sizeof(addrbuf)); inet_ntop(addr->sa_family, &sin_addr->sin_addr, addrbuf, sizeof(addrbuf));
port = sin_addr->sin_port; port = ntohs(sin_addr->sin_port);
#ifndef NO_IPV6 #ifndef NO_IPV6
} else if (addr && addr->sa_family == AF_INET6) { } else if (addr && addr->sa_family == AF_INET6) {
struct sockaddr_in6 *sin6_addr = (void *) addr; struct sockaddr_in6 *sin6_addr = (void *) addr;
@ -550,7 +550,7 @@ static int execute(struct sockaddr *addr)
inet_ntop(AF_INET6, &sin6_addr->sin6_addr, buf, sizeof(addrbuf) - 1); inet_ntop(AF_INET6, &sin6_addr->sin6_addr, buf, sizeof(addrbuf) - 1);
strcat(buf, "]"); strcat(buf, "]");
port = sin6_addr->sin6_port; port = ntohs(sin6_addr->sin6_port);
#endif #endif
} }
loginfo("Connection from %s:%d", addrbuf, port); loginfo("Connection from %s:%d", addrbuf, port);