diff options
Diffstat (limited to 'ospfd/ospf_snmp.c')
| -rw-r--r-- | ospfd/ospf_snmp.c | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c index 755634a2f1..f068efc8db 100644 --- a/ospfd/ospf_snmp.c +++ b/ospfd/ospf_snmp.c @@ -2590,13 +2590,10 @@ static void ospfTrapNbrStateChange(struct ospf_neighbor *on) oid_copy_addr(index, &(on->address.u.prefix4), IN_ADDR_SIZE); index[IN_ADDR_SIZE] = 0; - smux_trap(ospf_variables, - sizeof ospf_variables / sizeof(struct variable), - ospf_trap_oid, sizeof ospf_trap_oid / sizeof(oid), ospf_oid, + smux_trap(ospf_variables, array_size(ospf_variables), ospf_trap_oid, + array_size(ospf_trap_oid), ospf_oid, sizeof ospf_oid / sizeof(oid), index, IN_ADDR_SIZE + 1, - ospfNbrTrapList, - sizeof ospfNbrTrapList / sizeof(struct trap_object), - NBRSTATECHANGE); + ospfNbrTrapList, array_size(ospfNbrTrapList), NBRSTATECHANGE); } static void ospfTrapVirtNbrStateChange(struct ospf_neighbor *on) @@ -2608,12 +2605,10 @@ static void ospfTrapVirtNbrStateChange(struct ospf_neighbor *on) oid_copy_addr(index, &(on->address.u.prefix4), IN_ADDR_SIZE); index[IN_ADDR_SIZE] = 0; - smux_trap(ospf_variables, - sizeof ospf_variables / sizeof(struct variable), - ospf_trap_oid, sizeof ospf_trap_oid / sizeof(oid), ospf_oid, + smux_trap(ospf_variables, array_size(ospf_variables), ospf_trap_oid, + array_size(ospf_trap_oid), ospf_oid, sizeof ospf_oid / sizeof(oid), index, IN_ADDR_SIZE + 1, - ospfVirtNbrTrapList, - sizeof ospfVirtNbrTrapList / sizeof(struct trap_object), + ospfVirtNbrTrapList, array_size(ospfVirtNbrTrapList), VIRTNBRSTATECHANGE); } @@ -2649,13 +2644,10 @@ static void ospfTrapIfStateChange(struct ospf_interface *oi) oid_copy_addr(index, &(oi->address->u.prefix4), IN_ADDR_SIZE); index[IN_ADDR_SIZE] = 0; - smux_trap(ospf_variables, - sizeof ospf_variables / sizeof(struct variable), - ospf_trap_oid, sizeof ospf_trap_oid / sizeof(oid), ospf_oid, + smux_trap(ospf_variables, array_size(ospf_variables), ospf_trap_oid, + array_size(ospf_trap_oid), ospf_oid, sizeof ospf_oid / sizeof(oid), index, IN_ADDR_SIZE + 1, - ospfIfTrapList, - sizeof ospfIfTrapList / sizeof(struct trap_object), - IFSTATECHANGE); + ospfIfTrapList, array_size(ospfIfTrapList), IFSTATECHANGE); } static void ospfTrapVirtIfStateChange(struct ospf_interface *oi) @@ -2667,12 +2659,10 @@ static void ospfTrapVirtIfStateChange(struct ospf_interface *oi) oid_copy_addr(index, &(oi->address->u.prefix4), IN_ADDR_SIZE); index[IN_ADDR_SIZE] = 0; - smux_trap(ospf_variables, - sizeof ospf_variables / sizeof(struct variable), - ospf_trap_oid, sizeof ospf_trap_oid / sizeof(oid), ospf_oid, + smux_trap(ospf_variables, array_size(ospf_variables), ospf_trap_oid, + array_size(ospf_trap_oid), ospf_oid, sizeof ospf_oid / sizeof(oid), index, IN_ADDR_SIZE + 1, - ospfVirtIfTrapList, - sizeof ospfVirtIfTrapList / sizeof(struct trap_object), + ospfVirtIfTrapList, array_size(ospfVirtIfTrapList), VIRTIFSTATECHANGE); } |