osaf/services/saf/amf/amfd/include/si.h | 1 +
osaf/services/saf/amf/amfd/si_dep.cc | 14 +++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/osaf/services/saf/amf/amfd/include/si.h
b/osaf/services/saf/amf/amfd/include/si.h
--- a/osaf/services/saf/amf/amfd/include/si.h
+++ b/osaf/services/saf/amf/amfd/include/si.h
@@ -144,6 +144,7 @@ public:
void set_dep_state(AVD_SI_DEP_STATE state);
bool si_active();
bool all_sponsors_active();
+ void unassign();
private:
AVD_SI(const AVD_SI&);
diff --git a/osaf/services/saf/amf/amfd/si_dep.cc
b/osaf/services/saf/amf/amfd/si_dep.cc
--- a/osaf/services/saf/amf/amfd/si_dep.cc
+++ b/osaf/services/saf/amf/amfd/si_dep.cc
@@ -1416,11 +1416,11 @@ void avd_sidep_start_tolerance_timer_for
*
* @param[in] si
**/
-void avd_si_unassign(AVD_SI *si)
+void AVD_SI::unassign()
{
AVD_SU_SI_REL *sisu;
- for (sisu = si->list_of_sisu;sisu;sisu = sisu->si_next) {
+ for (sisu = list_of_sisu;sisu;sisu = sisu->si_next) {
if (sisu->fsm != AVD_SU_SI_STATE_UNASGN)
avd_susi_del_send(sisu);
}
@@ -1463,7 +1463,7 @@ void avd_sidep_unassign_dependents(AVD_S
* else start Tolerance timer
*/
if
(m_NCS_MDS_DEST_EQUAL(&sisu->su->su_on_node->adest,&su->su_on_node->adest)) {
- avd_si_unassign(dep_si);
+ dep_si->unassign();
} else {
if((dep_si->si_dep_state != AVD_SI_TOL_TIMER_RUNNING) ||
(dep_si->si_dep_state !=
AVD_SI_READY_TO_UNASSIGN)) {
@@ -1561,7 +1561,7 @@ bool avd_sidep_is_si_failover_possible(A
(m_NCS_MDS_DEST_EQUAL(&si->list_of_sisu->su->su_on_node->adest,&su->su_on_node->adest)))
||
(valid_stdby_sisu == NULL)) {
- avd_si_unassign(si);
+ si->unassign();
failover_possible = false;
if (si->num_dependents > 0)
avd_sidep_unassign_dependents(si, su);
@@ -1574,7 +1574,7 @@ bool avd_sidep_is_si_failover_possible(A
* No need to to do role failover stop the Tolerance
timer and delete the assignments
*/
sidep_stop_tol_timer(avd_cb, si);
- avd_si_unassign(si);
+ si->unassign();
failover_possible = false;
if (si->num_dependents > 0)
@@ -1598,7 +1598,7 @@ bool avd_sidep_is_si_failover_possible(A
((spons_si_node->si->list_of_sisu) &&
(spons_si_node->si->list_of_sisu->si_next == AVD_SU_SI_REL_NULL) &&
(m_NCS_MDS_DEST_EQUAL(&spons_si_node->si->list_of_sisu->su->su_on_node->adest,&su->su_on_node->adest)))
||
((assignmemt_status == false) &&
(valid_stdby_sisu == NULL))) {
- avd_si_unassign(si);
+ si->unassign();
failover_possible = false;
goto done;
}
@@ -1623,7 +1623,7 @@ bool avd_sidep_is_si_failover_possible(A
if ((si->saAmfSIAdminState == SA_AMF_ADMIN_LOCKED) ||
(!valid_standby)) {
failover_possible = false;
- avd_si_unassign(si);
+ si->unassign();
}
goto done;
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
