CP: Fix bug in trasmit time accounting comparison

sidcha · sidcha · commit 5d8296aeeca9 · 2026-04-05T17:29:04.000+05:30
Commit 810d33d ("Better calculate the transmit timeout for packets") introduced a way to account for the trasmit time in when waiting for responsed by pre-computing an absolute time when the response is expected but then compared it with a duration returned by osdp_millis_since(). This patch fixes the issue by adjusting the comparison to the current tick value. Related-to: #292 Fixes: 810d33d Signed-off-by: Siddharth Chandrasekaran <sidcha.dev@gmail.com>
diff --git a/src/osdp_cp.c b/src/osdp_cp.c
@@ -870,7 +870,7 @@ static int cp_phy_state_update(struct osdp_pd *pd)
 			cp_phy_state_wait(pd, OSDP_CMD_RETRY_WAIT_MS);
 			return OSDP_CP_ERR_DEFER;
 		}
-		if (osdp_millis_since(pd->phy_tstamp) > pd->resp_expected) {
+		if (osdp_millis_now() > pd->resp_expected) {
 			if (pd->phy_retry_count < OSDP_CMD_MAX_RETRIES) {
 				pd->phy_retry_count += 1;
 				LOG_WRN("No response in 200ms; probing (%d)",

Original file line number	Diff line number	Diff line change
`@@ -870,7 +870,7 @@ static int cp_phy_state_update(struct osdp_pd *pd)`
`870`	`870`	`cp_phy_state_wait(pd, OSDP_CMD_RETRY_WAIT_MS);`
`871`	`871`	`return OSDP_CP_ERR_DEFER;`
`872`	`872`	`}`
`873`		`- if (osdp_millis_since(pd->phy_tstamp) > pd->resp_expected) {`
	`873`	`+ if (osdp_millis_now() > pd->resp_expected) {`
`874`	`874`	`if (pd->phy_retry_count < OSDP_CMD_MAX_RETRIES) {`
`875`	`875`	`pd->phy_retry_count += 1;`
`876`	`876`	`LOG_WRN("No response in 200ms; probing (%d)",`