third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-04-15 00:20:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove log_message

Browse Source
This commit is contained in:
yrutschle 2021-09-27 12:51:37 +02:00
parent 4d3cc9c925
commit 66caf8a31b
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.c
View File

@ -503,7 +503,7 @@ char* sprintaddr(char* buf, size_t size, struct addrinfo *a)
cfg.numeric ? NI_NUMERICHOST | NI_NUMERICSERV : 0 ); cfg.numeric ? NI_NUMERICHOST | NI_NUMERICSERV : 0 );
if (res) { if (res) {
log_message(LOG_ERR, "sprintaddr:getnameinfo: %s\n", gai_strerror(res)); print_message(msg_system_error, "sprintaddr:getnameinfo: %s\n", gai_strerror(res));
/* Name resolution failed: do it numerically instead */ /* Name resolution failed: do it numerically instead */
res = getnameinfo(a->ai_addr, a->ai_addrlen, res = getnameinfo(a->ai_addr, a->ai_addrlen,
host, sizeof(host), host, sizeof(host),
@ -511,7 +511,7 @@ char* sprintaddr(char* buf, size_t size, struct addrinfo *a)
NI_NUMERICHOST | NI_NUMERICSERV); NI_NUMERICHOST | NI_NUMERICSERV);
/* should not fail but... */ /* should not fail but... */
if (res) { if (res) {
log_message(LOG_ERR, "sprintaddr:getnameinfo(NUM): %s\n", gai_strerror(res)); print_message(msg_system_error, "sprintaddr:getnameinfo(NUM): %s\n", gai_strerror(res));
strcpy(host, "?"); strcpy(host, "?");
strcpy(serv, "?"); strcpy(serv, "?");
} }
@ -549,7 +549,7 @@ int resolve_split_name(struct addrinfo **out, char* host, char* serv)
res = getaddrinfo(host, serv, &hint, out); res = getaddrinfo(host, serv, &hint, out);
if (res) if (res)
log_message(LOG_ERR, "%s `%s:%s'\n", gai_strerror(res), host, serv); print_message(msg_system_error, "%s `%s:%s'\n", gai_strerror(res), host, serv);
return res; return res;
} }

2
common.h
View File

@ -47,7 +47,7 @@
#define CHECK_RES_RETURN(res, str, ret) \ #define CHECK_RES_RETURN(res, str, ret) \
if (res == -1) { \ if (res == -1) { \
log_message(LOG_CRIT, "%s:%d:%s:%d:%s\n", __FILE__, __LINE__, str, errno, strerror(errno)); \ print_message(msg_system_error, "%s:%d:%s:%d:%s\n", __FILE__, __LINE__, str, errno, strerror(errno)); \
return ret; \ return ret; \
} }

20
log.c
View File

@ -146,24 +146,6 @@ void setup_syslog(const char* bin_name) {
} }
/* Log to syslog or stderr if foreground */
void log_message(int type, const char* msg, ...)
{
va_list ap;
va_start(ap, msg);
if (cfg.foreground)
vfprintf(stderr, msg, ap);
va_end(ap);
if (do_syslog) {
va_start(ap, msg);
vsyslog(type, msg, ap);
va_end(ap);
}
}
/* syslogs who connected to where /* syslogs who connected to where
* desc: string description of the connection. if NULL, log_connection will * desc: string description of the connection. if NULL, log_connection will
* manage on its own * manage on its own
@ -181,7 +163,7 @@ void log_connection(struct connection_desc* desc, const struct connection *cnx)
get_connection_desc(desc, cnx); get_connection_desc(desc, cnx);
} }
log_message(LOG_INFO, "%s:connection from %s to %s forwarded from %s to %s\n", print_message(msg_connections, "%s:connection from %s to %s forwarded from %s to %s\n",
cnx->proto->name, cnx->proto->name,
desc->peer, desc->peer,
desc->service, desc->service,