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

smux: remove tick argument from smux_trap()

Browse source 
smux_trap() contains an argument whose use appears to be to set
sysUpTime.0/timestamp field in SNMP trap. However, this value is not
used in smux_trap(). Moreover, it is expected that this field is the
value of sysUpTime.0 when the trap was sent and not any other time
related to the trap. To avoid any confusion, we remove this field from
the signature of the function.
This commit is contained in:
Vincent Bernat 2012-05-24 21:22:01 +02:00
parent d6be5fb9bc
commit 4b89e45d92
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bgpd/bgp_snmp.c
View file

@ -853,7 +853,7 @@ bgpTrapEstablished (struct peer *peer)
smux_trap (bgp_oid, sizeof bgp_oid / sizeof (oid), smux_trap (bgp_oid, sizeof bgp_oid / sizeof (oid),
index, IN_ADDR_SIZE, index, IN_ADDR_SIZE,
bgpTrapList, sizeof bgpTrapList / sizeof (struct trap_object), bgpTrapList, sizeof bgpTrapList / sizeof (struct trap_object),
bm->start_time - bgp_clock (), BGPESTABLISHED); BGPESTABLISHED);
} }
void void
@ -872,7 +872,7 @@ bgpTrapBackwardTransition (struct peer *peer)
smux_trap (bgp_oid, sizeof bgp_oid / sizeof (oid), smux_trap (bgp_oid, sizeof bgp_oid / sizeof (oid),
index, IN_ADDR_SIZE, index, IN_ADDR_SIZE,
bgpTrapList, sizeof bgpTrapList / sizeof (struct trap_object), bgpTrapList, sizeof bgpTrapList / sizeof (struct trap_object),
bm->start_time - bgp_clock (), BGPBACKWARDTRANSITION); BGPBACKWARDTRANSITION);
} }
void void

2
lib/agentx.c
View file

@ -125,7 +125,7 @@ int
smux_trap (const oid *name, size_t namelen, smux_trap (const oid *name, size_t namelen,
const oid *iname, size_t inamelen, const oid *iname, size_t inamelen,
const struct trap_object *trapobj, size_t trapobjlen, const struct trap_object *trapobj, size_t trapobjlen,
unsigned int tick, u_char sptrap) u_char sptrap)
{ {
return 1; return 1;
} }

2
lib/smux.c
View file

@ -972,7 +972,7 @@ int
smux_trap (const oid *name, size_t namelen, smux_trap (const oid *name, size_t namelen,
const oid *iname, size_t inamelen, const oid *iname, size_t inamelen,
const struct trap_object *trapobj, size_t trapobjlen, const struct trap_object *trapobj, size_t trapobjlen,
unsigned int tick, u_char sptrap) u_char sptrap)
{ {
unsigned int i; unsigned int i;
u_char buf[BUFSIZ]; u_char buf[BUFSIZ];

2
lib/smux.h
View file

@ -78,7 +78,7 @@ extern int smux_header_generic (struct variable *, oid [], size_t *,
int, size_t *, WriteMethod **); int, size_t *, WriteMethod **);
extern int smux_trap (const oid *, size_t, const oid *, size_t, extern int smux_trap (const oid *, size_t, const oid *, size_t,
const struct trap_object *, const struct trap_object *,
size_t, unsigned int, u_char); size_t, u_char);
extern int oid_compare (oid *, int, oid *, int); extern int oid_compare (oid *, int, oid *, int);
extern void oid2in_addr (oid [], int, struct in_addr *); extern void oid2in_addr (oid [], int, struct in_addr *);

8
ospfd/ospf_snmp.c
View file

@ -2616,7 +2616,7 @@ ospfTrapNbrStateChange (struct ospf_neighbor *on)
index, IN_ADDR_SIZE + 1, index, IN_ADDR_SIZE + 1,
ospfNbrTrapList, ospfNbrTrapList,
sizeof ospfNbrTrapList / sizeof (struct trap_object), sizeof ospfNbrTrapList / sizeof (struct trap_object),
time (NULL), NBRSTATECHANGE); NBRSTATECHANGE);
} }
void void
@ -2633,7 +2633,7 @@ ospfTrapVirtNbrStateChange (struct ospf_neighbor *on)
index, IN_ADDR_SIZE + 1, index, IN_ADDR_SIZE + 1,
ospfVirtNbrTrapList, ospfVirtNbrTrapList,
sizeof ospfVirtNbrTrapList / sizeof (struct trap_object), sizeof ospfVirtNbrTrapList / sizeof (struct trap_object),
time (NULL), VIRTNBRSTATECHANGE); VIRTNBRSTATECHANGE);
} }
void void
@ -2652,7 +2652,7 @@ ospfTrapIfStateChange (struct ospf_interface *oi)
index, IN_ADDR_SIZE + 1, index, IN_ADDR_SIZE + 1,
ospfIfTrapList, ospfIfTrapList,
sizeof ospfIfTrapList / sizeof (struct trap_object), sizeof ospfIfTrapList / sizeof (struct trap_object),
time (NULL), IFSTATECHANGE); IFSTATECHANGE);
} }
void void
@ -2669,7 +2669,7 @@ ospfTrapVirtIfStateChange (struct ospf_interface *oi)
index, IN_ADDR_SIZE + 1, index, IN_ADDR_SIZE + 1,
ospfVirtIfTrapList, ospfVirtIfTrapList,
sizeof ospfVirtIfTrapList / sizeof (struct trap_object), sizeof ospfVirtIfTrapList / sizeof (struct trap_object),
time (NULL), VIRTIFSTATECHANGE); VIRTIFSTATECHANGE);
} }
/* Register OSPF2-MIB. */ /* Register OSPF2-MIB. */
void void