tlshd_handshake_parms: Add a textualised peer address and populate it from peeraddr.
PATCH 4/7 tlshd_handshake_parms: Add a textualised peer address and populate it from peeraddr.
Make use of this in the logging instead of calling getnameinfo() on the fly. We may also need this later if we want GnuTLS to verify the host address.
Signed-off-by Ken Milmore <[email protected]>
--- src/tlshd/handshake.c | 5 ++--- src/tlshd/log.c | 18 +++++------------- src/tlshd/netlink.c | 12 ++++++++++++ src/tlshd/tlshd.h | 7 +++---- 4 files changed, 22 insertions(+), 20 deletions(-)
src/tlshd/handshake.c +2 -3
@@ -186,9 +186,8 @@ out:keyctl_unlink (parms.keyring,KEY_SPEC_SESSION_KEYRING );if (parms.session_status) { -tlshd_log_failure (parms.peername, parms.peeraddr, - parms.peeraddr_len); +tlshd_log_failure (parms.peername, parms.peeraddr_txt);return ; } -tlshd_log_success (parms.peername, parms.peeraddr, parms.peeraddr_len); +tlshd_log_success (parms.peername, parms.peeraddr_txt); }
src/tlshd/log.c +5 -13
@@ -51,16 +51,12 @@ int tlshd_stderr;* @salen: length of IP address * */ -void tlshd_log_success (const char *hostname,const struct sockaddr *sap, -socklen_t salen) +void tlshd_log_success (const char *hostname,const char *addr_txt) { -char buf[NI_MAXHOST ]; - -getnameinfo (sap, salen, buf,sizeof (buf),NULL ,0 ,NI_NUMERICHOST );if (hostname[0 ] =='\0' ) hostname ="<unknown>" ;syslog (LOG_INFO ,"Handshake with '%s' (%s) was successful\n" , - hostname, buf); + hostname, addr_txt); }/**
@@ -70,17 +66,13 @@ void tlshd_log_success(const char *hostname, const struct sockaddr *sap,* @salen: length of IP address * */ -void tlshd_log_failure (const char *hostname,const struct sockaddr *sap, -socklen_t salen) +void tlshd_log_failure (const char *hostname,const char *addr_txt) { -if (salen) { -char buf[NI_MAXHOST ]; - -getnameinfo (sap, salen, buf,sizeof (buf),NULL ,0 ,NI_NUMERICHOST ); +if (addr_txt[0 ] !='\0' ) {if (hostname[0 ] =='\0' ) hostname ="<unknown>" ;syslog (LOG_ERR ,"Handshake with '%s' (%s) failed\n" , - hostname, buf); + hostname, addr_txt); }else syslog (LOG_ERR ,"Handshake request failed\n" ); }
src/tlshd/netlink.c +12 -0
@@ -224,6 +224,7 @@ static void tlshd_parse_certificate(struct tlshd_handshake_parms *parms, }static char tlshd_peername[NI_MAXHOST ] ="" ; +static char tlshd_peeraddr_txt[NI_MAXHOST ] ="" ;static struct sockaddr_storage tlshd_peeraddr = {0 };static int tlshd_genl_valid_handler (struct nl_msg *msg,void *arg)
@@ -281,6 +282,16 @@ static int tlshd_genl_valid_handler(struct nl_msg *msg, void *arg)tlshd_parse_peer_identity (parms, tb[HANDSHAKE_A_ACCEPT_PEER_IDENTITY ]);tlshd_parse_certificate (parms, tb[HANDSHAKE_A_ACCEPT_CERTIFICATE ]); +/* Textualize the peer address */ + err =getnameinfo (parms->peeraddr, parms->peeraddr_len, + tlshd_peeraddr_txt,sizeof (tlshd_peeraddr_txt), +NULL ,0 ,NI_NUMERICHOST ); +if (err) { +tlshd_log_gai_error (err); + tlshd_peeraddr_txt[0 ] ='\0' ; +return NL_STOP ; + } +if (peername)strncpy (tlshd_peername, peername,sizeof (tlshd_peername) -1 );else {
@@ -299,6 +310,7 @@ static int tlshd_genl_valid_handler(struct nl_msg *msg, void *arg)static const struct tlshd_handshake_parms tlshd_default_handshake_parms = { .peername = tlshd_peername, + .peeraddr_txt = tlshd_peeraddr_txt, .peeraddr = (struct sockaddr *)&tlshd_peeraddr, .peeraddr_len =0 , .sockfd =-1 ,
src/tlshd/tlshd.h +3 -4
@@ -29,6 +29,7 @@ struct nl_sock;struct tlshd_handshake_parms {char *peername; +char *peeraddr_txt;struct sockaddr *peeraddr;socklen_t peeraddr_len;int sockfd;
@@ -96,10 +97,8 @@ extern void tlshd_log_init(const char *progname);extern void tlshd_log_shutdown (void );extern void tlshd_log_close (void ); -extern void tlshd_log_success (const char *hostname, -const struct sockaddr *sap,socklen_t salen); -extern void tlshd_log_failure (const char *hostname, -const struct sockaddr *sap,socklen_t salen); +extern void tlshd_log_success (const char *hostname,const char *addr_txt); +extern void tlshd_log_failure (const char *hostname,const char *addr_txt);extern void tlshd_log_debug (const char *fmt, ...);extern void tlshd_log_notice (const char *fmt, ...);
Signature · 1 line
2.47.2