projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Indentation fixed
[umurmur.git]
/
src
/
log.c
diff --git
a/src/log.c
b/src/log.c
index ebb5cd1c0ae1e4b4965da971df41a3484f538928..31f96c01d97959db3229deb6d1d4cc8da80c491c 100644
(file)
--- a/
src/log.c
+++ b/
src/log.c
@@
-182,6
+182,7
@@
void Log_info_client(client_t *client, const char *logstring, ...)
va_list argp;
char buf[STRSIZE + 1];
int offset = 0;
va_list argp;
char buf[STRSIZE + 1];
int offset = 0;
+ uint16_t port;
if (termprint || logfile)
offset = sprintf(buf, "INFO: ");
if (termprint || logfile)
offset = sprintf(buf, "INFO: ");
@@
-190,11
+191,17
@@
void Log_info_client(client_t *client, const char *logstring, ...)
offset += vsnprintf(&buf[offset], STRSIZE - offset, logstring, argp);
va_end(argp);
offset += vsnprintf(&buf[offset], STRSIZE - offset, logstring, argp);
va_end(argp);
+ if(client->remote_tcp.ss_family == AF_INET)
+ port = ntohs(((struct sockaddr_in*)&client->remote_tcp)->sin_port);
+ else
+ port = ntohs(((struct sockaddr_in6*)&client->remote_tcp)->sin6_port);
+
offset += snprintf(&buf[offset], STRSIZE - offset, " - [%d] %s@%s:%d",
offset += snprintf(&buf[offset], STRSIZE - offset, " - [%d] %s@%s:%d",
- client->sessionId,
- client->username == NULL ? "" : client->username,
- inet_ntoa(client->remote_tcp.sin_addr),
- ntohs(client->remote_tcp.sin_port));
+ client->sessionId,
+ client->username == NULL ? "" : client->username,
+ client->addressString,
+ port);
+
if (termprint)
fprintf(stderr, "%s\n", buf);
else if (logfile)
if (termprint)
fprintf(stderr, "%s\n", buf);
else if (logfile)