1
0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-02 12:20:51 +00:00

ipfilter: Include the IP address in error message

Include the IP address in the message when a hashnode add error occurs.
This helps to identify the ippool.conf statement that the error occurred.

MFC after:	1 week
This commit is contained in:
Cy Schubert 2024-11-08 08:30:53 -08:00
parent 3a2cb65b6e
commit 9da30a23a5

View File

@ -53,9 +53,28 @@ load_hashnode(int unit, char *name, iphtent_t *node, int ttl,
if (err != 0) if (err != 0)
if (!(opts & OPT_DONOTHING)) { if (!(opts & OPT_DONOTHING)) {
char msg[80]; char msg[255];
char ipaddr[80], mask_msg[10], mask[8];
snprintf(msg, sizeof(msg), "%s node from lookup hash table(%s)", what, name); inet_ntop(ipe.ipe_family,
ipe.ipe_addr.vptr, ipaddr,
sizeof(ipaddr));
#ifdef USE_INET6
if (ipe.ipe_family == AF_INET) {
#endif
inet_ntop(ipe.ipe_family,
ipe.ipe_mask.vptr, mask,
sizeof(mask));
mask_msg[0]='/';
mask_msg[1]='\0';
strlcat(mask_msg, mask, sizeof(mask_msg));
#ifdef USE_INET6
} else {
mask_msg[0]='\0';
}
#endif
snprintf(msg, sizeof(msg), "%s node from lookup hash table(%s) node(%s%s)", what, name, ipaddr, mask_msg);
return (ipf_perror_fd(pool_fd(), iocfunc, msg)); return (ipf_perror_fd(pool_fd(), iocfunc, msg));
} }
return (0); return (0);