smux: remove `tick` argument from smux_trap()

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.

diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c
index f6b105631cde911c1be821411f0a4bf1b97197c5..a995ff6c2d82664ce3be5fc71e754a3e8b6f5b7f 100644 (file)
--- a/bgpd/bgp_snmp.c
+++ b/bgpd/bgp_snmp.c
@@ -853,7 +853,7 @@ bgpTrapEstablished (struct peer *peer)
   smux_trap (bgp_oid, sizeof bgp_oid / sizeof (oid),
             index, IN_ADDR_SIZE,
             bgpTrapList, sizeof bgpTrapList / sizeof (struct trap_object),
-            bm->start_time - bgp_clock (), BGPESTABLISHED);
+            BGPESTABLISHED);
 }
 
 void
@@ -872,7 +872,7 @@ bgpTrapBackwardTransition (struct peer *peer)
   smux_trap (bgp_oid, sizeof bgp_oid / sizeof (oid),
             index, IN_ADDR_SIZE,
             bgpTrapList, sizeof bgpTrapList / sizeof (struct trap_object),
-            bm->start_time - bgp_clock (), BGPBACKWARDTRANSITION);
+            BGPBACKWARDTRANSITION);
 }
 
 void

diff --git a/lib/agentx.c b/lib/agentx.c
index 9cf6de5e062e5437d8ce5cfdbe708aac2716dce7..2358581f8962c3b05692e838bd53469585396baf 100644 (file)
--- a/lib/agentx.c
+++ b/lib/agentx.c
@@ -125,7 +125,7 @@ int
 smux_trap (const oid *name, size_t namelen,
           const oid *iname, size_t inamelen,
           const struct trap_object *trapobj, size_t trapobjlen,
-          unsigned int tick, u_char sptrap)
+          u_char sptrap)
 {
   return 1;
 }

diff --git a/lib/smux.c b/lib/smux.c
index 29370050f84b920329cd90ef2e0ff54dbfc9dfbc..38c7018e9904c4fa8ee28e5e00803f15d732c65a 100644 (file)
--- a/lib/smux.c
+++ b/lib/smux.c
@@ -972,7 +972,7 @@ int
 smux_trap (const oid *name, size_t namelen,
           const oid *iname, size_t inamelen,
           const struct trap_object *trapobj, size_t trapobjlen,
-          unsigned int tick, u_char sptrap)
+          u_char sptrap)
 {
   unsigned int i;
   u_char buf[BUFSIZ];

diff --git a/lib/smux.h b/lib/smux.h
index 83ae56ce956dbd3f331de56e02478fc6ffab51a6..78460e68b83ef04f7ea1542b4b2968dea8c89c9a 100644 (file)
--- a/lib/smux.h
+++ b/lib/smux.h
@@ -78,7 +78,7 @@ extern int smux_header_generic (struct variable *, oid [], size_t *,
                                 int, size_t *, WriteMethod **);
 extern int smux_trap (const oid *, size_t, const oid *, size_t, 
                      const struct trap_object *, 
-                      size_t, unsigned int, u_char);
+                      size_t, u_char);
 
 extern int oid_compare (oid *, int, oid *, int);
 extern void oid2in_addr (oid [], int, struct in_addr *);

diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index 739dcae1cdeacffb0f80a7929ff0f72d4df85177..409153b839722e6f4232a444ceebe257a237da7a 100644 (file)
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -2616,7 +2616,7 @@ ospfTrapNbrStateChange (struct ospf_neighbor *on)
              index,  IN_ADDR_SIZE + 1,
              ospfNbrTrapList, 
              sizeof ospfNbrTrapList / sizeof (struct trap_object),
-             time (NULL), NBRSTATECHANGE);
+             NBRSTATECHANGE);
 }
 
 void
@@ -2633,7 +2633,7 @@ ospfTrapVirtNbrStateChange (struct ospf_neighbor *on)
              index,  IN_ADDR_SIZE + 1,
              ospfVirtNbrTrapList, 
              sizeof ospfVirtNbrTrapList / sizeof (struct trap_object),
-             time (NULL), VIRTNBRSTATECHANGE);
+             VIRTNBRSTATECHANGE);
 }
 
 void
@@ -2652,7 +2652,7 @@ ospfTrapIfStateChange (struct ospf_interface *oi)
              index, IN_ADDR_SIZE + 1,
              ospfIfTrapList, 
              sizeof ospfIfTrapList / sizeof (struct trap_object),
-             time (NULL), IFSTATECHANGE);
+             IFSTATECHANGE);
 }
 
 void
@@ -2669,7 +2669,7 @@ ospfTrapVirtIfStateChange (struct ospf_interface *oi)
              index, IN_ADDR_SIZE + 1,
              ospfVirtIfTrapList,
              sizeof ospfVirtIfTrapList / sizeof (struct trap_object),
-             time (NULL), VIRTIFSTATECHANGE);
+             VIRTIFSTATECHANGE);
 }
 /* Register OSPF2-MIB. */
 void