output/log: IPv6 addr display per cfg

When configured, display the compressed form of the IPv6 address.

Issue: 7399
pull/14941/head
Jeff Lucovsky 6 months ago committed by Victor Julien
parent 4af77975e3
commit 809fb56612

@ -180,8 +180,10 @@ static TmEcode AlertDebugLogger(ThreadVars *tv, const Packet *p, void *thread_da
PrintInet(AF_INET, (const void *)GET_IPV4_DST_ADDR_PTR(p), dstip, sizeof(dstip));
} else {
DEBUG_VALIDATE_BUG_ON(!(PacketIsIPv6(p)));
PrintInet(AF_INET6, (const void *)GET_IPV6_SRC_ADDR(p), srcip, sizeof(srcip));
PrintInet(AF_INET6, (const void *)GET_IPV6_DST_ADDR(p), dstip, sizeof(dstip));
PrintInetIPv6((const void *)GET_IPV6_SRC_ADDR(p), srcip, sizeof(srcip),
aft->file_ctx->compress_ipv6);
PrintInetIPv6((const void *)GET_IPV6_DST_ADDR(p), dstip, sizeof(dstip),
aft->file_ctx->compress_ipv6);
}
MemBufferWriteString(aft->buffer, "SRC IP: %s\n"

@ -121,8 +121,10 @@ int AlertFastLogger(ThreadVars *tv, void *data, const Packet *p)
PrintInet(AF_INET, (const void *)GET_IPV4_SRC_ADDR_PTR(p), srcip, sizeof(srcip));
PrintInet(AF_INET, (const void *)GET_IPV4_DST_ADDR_PTR(p), dstip, sizeof(dstip));
} else if (PacketIsIPv6(p)) {
PrintInet(AF_INET6, (const void *)GET_IPV6_SRC_ADDR(p), srcip, sizeof(srcip));
PrintInet(AF_INET6, (const void *)GET_IPV6_DST_ADDR(p), dstip, sizeof(dstip));
PrintInetIPv6((const void *)GET_IPV6_SRC_ADDR(p), srcip, sizeof(srcip),
aft->file_ctx->compress_ipv6);
PrintInetIPv6((const void *)GET_IPV6_DST_ADDR(p), dstip, sizeof(dstip),
aft->file_ctx->compress_ipv6);
} else {
decoder_event = 1;
}

@ -272,8 +272,10 @@ static TmEcode AlertSyslogIPv6(ThreadVars *tv, const Packet *p, void *data)
}
char srcip[46], dstip[46];
PrintInet(AF_INET6, (const void *)GET_IPV6_SRC_ADDR(p), srcip, sizeof(srcip));
PrintInet(AF_INET6, (const void *)GET_IPV6_DST_ADDR(p), dstip, sizeof(dstip));
PrintInetIPv6(
(const void *)GET_IPV6_SRC_ADDR(p), srcip, sizeof(srcip), ast->file_ctx->compress_ipv6);
PrintInetIPv6(
(const void *)GET_IPV6_DST_ADDR(p), dstip, sizeof(dstip), ast->file_ctx->compress_ipv6);
for (int i = 0; i < p->alerts.cnt; i++) {
const PacketAlert *pa = &p->alerts.alerts[i];

@ -83,8 +83,10 @@ static int LogTcpDataLoggerDir(ThreadVars *tv, void *thread_data, const Flow *f,
PrintInet(AF_INET, (const void *)&f->src.addr_data32[0], srcip, sizeof(srcip));
PrintInet(AF_INET, (const void *)&f->dst.addr_data32[0], dstip, sizeof(dstip));
} else if (FLOW_IS_IPV6(f)) {
PrintInet(AF_INET6, (const void *)f->src.addr_data32, srcip, sizeof(srcip));
PrintInet(AF_INET6, (const void *)f->dst.addr_data32, dstip, sizeof(dstip));
PrintInetIPv6((const void *)f->src.addr_data32, srcip, sizeof(srcip),
td->file_ctx->compress_ipv6);
PrintInetIPv6((const void *)f->dst.addr_data32, dstip, sizeof(dstip),
td->file_ctx->compress_ipv6);
}
char name[PATH_MAX];
@ -126,8 +128,10 @@ static int LogTcpDataLoggerFile(ThreadVars *tv, void *thread_data, const Flow *f
PrintInet(AF_INET, (const void *)&f->src.addr_data32[0], srcip, sizeof(srcip));
PrintInet(AF_INET, (const void *)&f->dst.addr_data32[0], dstip, sizeof(dstip));
} else if (FLOW_IS_IPV6(f)) {
PrintInet(AF_INET6, (const void *)f->src.addr_data32, srcip, sizeof(srcip));
PrintInet(AF_INET6, (const void *)f->dst.addr_data32, dstip, sizeof(dstip));
PrintInetIPv6((const void *)f->src.addr_data32, srcip, sizeof(srcip),
td->file_ctx->compress_ipv6);
PrintInetIPv6((const void *)f->dst.addr_data32, dstip, sizeof(dstip),
td->file_ctx->compress_ipv6);
}
char name[PATH_MAX];

Loading…
Cancel
Save