mrpd: call lvatimer stop on MRP_EVENT_LVATIMER

diff --git a/daemons/mrpd/mmrp.c b/daemons/mrpd/mmrp.c
index 85c9afb..a6883a8 100644 (file)
--- a/daemons/mrpd/mmrp.c
+++ b/daemons/mrpd/mmrp.c
@@ -199,6 +199,7 @@ int mmrp_event(int event, struct mmrp_attribute *rattrib)
 
        switch (event) {
        case MRP_EVENT_LVATIMER:
+               mrp_lvatimer_stop(&(MMRP_db->mrp_db));
                mrp_jointimer_stop(&(MMRP_db->mrp_db));
                /* update state */
                attrib = MMRP_db->attrib_list;

diff --git a/daemons/mrpd/mrp.c b/daemons/mrpd/mrp.c
index 5cdb7e9..a7a454b 100644 (file)
--- a/daemons/mrpd/mrp.c
+++ b/daemons/mrpd/mrp.c
@@ -354,6 +354,7 @@ int mrp_lvatimer_fsm(struct mrp_database *mrp_db, int event)
                break;
        case MRP_EVENT_LVATIMER:
                la_state = MRP_TIMER_ACTIVE;
+               mrp_lvatimer_stop(mrp_db);
                mrp_lvatimer_start(mrp_db);
                break;
        default:

diff --git a/daemons/mrpd/msrp.c b/daemons/mrpd/msrp.c
index 136b153..191ad18 100644 (file)
--- a/daemons/mrpd/msrp.c
+++ b/daemons/mrpd/msrp.c
@@ -249,6 +249,7 @@ int msrp_event(int event, struct msrp_attribute *rattrib)
 
        switch (event) {
        case MRP_EVENT_LVATIMER:
+               mrp_lvatimer_stop(&(MSRP_db->mrp_db));
                mrp_jointimer_stop(&(MSRP_db->mrp_db));
                /* update state */
                attrib = MSRP_db->attrib_list;

diff --git a/daemons/mrpd/mvrp.c b/daemons/mrpd/mvrp.c
index 92a41ca..85b6025 100644 (file)
--- a/daemons/mrpd/mvrp.c
+++ b/daemons/mrpd/mvrp.c
@@ -145,6 +145,7 @@ int mvrp_event(int event, struct mvrp_attribute *rattrib)
 
        switch (event) {
        case MRP_EVENT_LVATIMER:
+               mrp_lvatimer_stop(&(MVRP_db->mrp_db));
                mrp_jointimer_stop(&(MVRP_db->mrp_db));
                /* update state */
                attrib = MVRP_db->attrib_list;