Formalize the process of soft-fails in CP state machine

goToMain · Nov 29, 2019 · a78e0b8 · a78e0b8
1 parent c86f084
commit a78e0b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/osdp_cp.c b/src/osdp_cp.c
@@ -609,15 +609,18 @@ int cp_cmd_dispatcher(struct osdp_pd *p, int cmd)
 
 int cp_state_update(struct osdp_pd *pd)
 {
-	int phy_state;
+	int phy_state, soft_fail;
 
 	phy_state = cp_phy_state_update(pd);
 	if (phy_state == 1 ||	/* commands are being executed */
 	    phy_state == 2)	/* in-between commands */
 		return -1 * phy_state;
 
+	/* Certain states can fail without causing PD offline */
+	soft_fail = (pd->state == CP_STATE_SC_CHLNG);
+
 	/* phy state error -- cleanup */
-	if (phy_state < 0 && (pd->state != CP_STATE_SC_CHLNG)) {
+	if (phy_state < 0 && soft_fail == 0) {
 		cp_set_offline(pd);
 	}
 

diff --git a/test/test-mixed-fsm.c b/test/test-mixed-fsm.c
@@ -121,7 +121,7 @@ int test_mixed_fsm_setup(struct test *t)
 		osdp_cp_teardown((osdp_cp_t *) test_data.cp_ctx);
 		return -1;
 	}
-	osdp_set_log_level(LOG_DEBUG);
+	// osdp_set_log_level(LOG_DEBUG);
 	t->mock_data = (void *)&test_data;
 	return 0;
 }