Skip to contentSkip to conversation

dpp: fix removed dpp_reset in Stop()

PATCH Applied James Prestwood 2 participants 2 messages Nov 9, 2023 – Nov 10, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dpp: fix removed dpp_reset in Stop()

It seems in my patch reordering both stop methods lost the actual call to dpp_reset().

---
 src/dpp.c | 8 ++++++++
 1 file changed, 8 insertions(+)
src/dpp.c +8 -0
index a0c44eda..9501f3de 100644
@@ -3961,9 +3961,13 @@ static struct l_dbus_message *dpp_dbus_stop(struct l_dbus *dbus,
 {
 	struct dpp_sm *dpp = user_data;
 
+	l_debug("");
+
 	if (dpp->interface != DPP_INTERFACE_DPP)
 		return dbus_error_not_found(message);
 
+	dpp_reset(dpp);
+
 	return l_dbus_message_new_method_return(message);
 }
 
@@ -4340,9 +4344,13 @@ static struct l_dbus_message *dpp_dbus_pkex_stop(struct l_dbus *dbus,
 {
 	struct dpp_sm *dpp = user_data;
 
+	l_debug("");
+
 	if (dpp->interface != DPP_INTERFACE_PKEX)
 		return dbus_error_not_found(message);
 
+	dpp_reset(dpp);
+
 	return l_dbus_message_new_method_return(message);
 }
 
Signature · 1 line
2.25.1
#1 lore raw

Hi James,

Quoted 2 lines · James Prestwood

It seems in my patch reordering both stop methods lost the actual call to dpp_reset().

In the future, lets use the Fixes: tag for commits like this.

Quoted 4 lines
---
  src/dpp.c | 8 ++++++++
  1 file changed, 8 insertions(+)

Applied, thanks.

Regards,
-Denis