matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

ospf6d: correctly protect packet debugs in ospf6_write

Browse source 
Some unprotected debugs need to have macro protection,
Split these into the existing covering macro section to remove
a check per-packet from the main path.

Signed-off-by: Pat Ruddy <pat@voltanet.io>
This commit is contained in:
Pat Ruddy 2021-06-25 10:10:31 +01:00
parent 0dd5ec1297
commit a91f9d699c
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ospf6d/ospf6_message.c
View file

@ -1927,7 +1927,7 @@ static int ospf6_write(struct thread *thread)
flog_err(EC_LIB_DEVELOPMENT, flog_err(EC_LIB_DEVELOPMENT,
"Could not send entire message"); "Could not send entire message");
if (IS_OSPF6_DEBUG_MESSAGE(oh->type, SEND)) { if (IS_OSPF6_DEBUG_MESSAGE(oh->type, SEND_HDR)) {
inet_ntop(AF_INET6, &op->dst, dstname, sizeof(dstname)); inet_ntop(AF_INET6, &op->dst, dstname, sizeof(dstname));
inet_ntop(AF_INET6, oi->linklocal_addr, srcname, inet_ntop(AF_INET6, oi->linklocal_addr, srcname,
sizeof(srcname)); sizeof(srcname));
@ -1937,6 +1937,27 @@ static int ospf6_write(struct thread *thread)
oi->interface->name); oi->interface->name);
zlog_debug(" src: %s", srcname); zlog_debug(" src: %s", srcname);
zlog_debug(" dst: %s", dstname); zlog_debug(" dst: %s", dstname);
switch (oh->type) {
case OSPF6_MESSAGE_TYPE_HELLO:
ospf6_hello_print(oh, OSPF6_ACTION_SEND);
break;
case OSPF6_MESSAGE_TYPE_DBDESC:
ospf6_dbdesc_print(oh, OSPF6_ACTION_SEND);
break;
case OSPF6_MESSAGE_TYPE_LSREQ:
ospf6_lsreq_print(oh, OSPF6_ACTION_SEND);
break;
case OSPF6_MESSAGE_TYPE_LSUPDATE:
ospf6_lsupdate_print(oh, OSPF6_ACTION_SEND);
break;
case OSPF6_MESSAGE_TYPE_LSACK:
ospf6_lsack_print(oh, OSPF6_ACTION_SEND);
break;
default:
zlog_debug("Unknown message");
assert(0);
break;
}
} }
switch (oh->type) { switch (oh->type) {
case OSPF6_MESSAGE_TYPE_HELLO: case OSPF6_MESSAGE_TYPE_HELLO:
@ -1957,19 +1978,15 @@ static int ospf6_write(struct thread *thread)
break; break;
case OSPF6_MESSAGE_TYPE_DBDESC: case OSPF6_MESSAGE_TYPE_DBDESC:
oi->db_desc_out++; oi->db_desc_out++;
ospf6_dbdesc_print(oh, OSPF6_ACTION_SEND);
break; break;
case OSPF6_MESSAGE_TYPE_LSREQ: case OSPF6_MESSAGE_TYPE_LSREQ:
oi->ls_req_out++; oi->ls_req_out++;
ospf6_lsreq_print(oh, OSPF6_ACTION_SEND);
break; break;
case OSPF6_MESSAGE_TYPE_LSUPDATE: case OSPF6_MESSAGE_TYPE_LSUPDATE:
oi->ls_upd_out++; oi->ls_upd_out++;
ospf6_lsupdate_print(oh, OSPF6_ACTION_SEND);
break; break;
case OSPF6_MESSAGE_TYPE_LSACK: case OSPF6_MESSAGE_TYPE_LSACK:
oi->ls_ack_out++; oi->ls_ack_out++;
ospf6_lsack_print(oh, OSPF6_ACTION_SEND);
break; break;
default: default:
zlog_debug("Unknown message"); zlog_debug("Unknown message");