o Do not do args->f_id.addr_type == 6 when there is

IS_IP6_FLOW_ID() exactly for that.
This commit is contained in:
Maxim Konovalov 2006-10-11 12:14:28 +00:00
parent f16ccf6814
commit 428b67b194
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=163237

View File

@ -881,7 +881,7 @@ ipfw_log(struct ip_fw *f, u_int hlen, struct ip_fw_args *args,
src[0] = '\0';
dst[0] = '\0';
#ifdef INET6
if (args->f_id.addr_type == 6) {
if (IS_IP6_FLOW_ID(&(args->f_id))) {
snprintf(src, sizeof(src), "[%s]",
ip6_sprintf(&args->f_id.src_ip6));
snprintf(dst, sizeof(dst), "[%s]",
@ -956,7 +956,7 @@ ipfw_log(struct ip_fw *f, u_int hlen, struct ip_fw_args *args,
}
#ifdef INET6
if (args->f_id.addr_type == 6) {
if (IS_IP6_FLOW_ID(&(args->f_id))) {
if (offset & (IP6F_OFF_MASK | IP6F_MORE_FRAG))
snprintf(SNPARGS(fragment, 0),
" (frag %08x:%d@%d%s)",