[PATCH 1/2] frame-watch: Actually unregister removed groups

[PATCH 1/2] frame-watch: Actually unregister removed groups

[Andrew Zaborowski]

[-- Attachment #1: Type: text/plain, Size: 642 bytes --]

Actually close the sockets for removed groups an free resources
---
 src/frame-xchg.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/frame-xchg.c b/src/frame-xchg.c
index 0a6c1fc6..4c8b4a9f 100644
--- a/src/frame-xchg.c
+++ b/src/frame-xchg.c
@@ -362,8 +362,10 @@ static bool frame_watch_group_remove_wdev(void *data, void *user_data)
 	struct watch_group *group = data;
 	const uint64_t *wdev_id = user_data;
 
-	if (group->wdev_id == *wdev_id)
+	if (group->wdev_id == *wdev_id) {
+		frame_watch_group_destroy(group);
 		return true;
+	}
 
 	if (group->id != 0)
 		return false;
-- 
2.20.1

[PATCH 2/2] frame-watch: Fix an l_queue_foreach_remove call

[Andrew Zaborowski]

[-- Attachment #1: Type: text/plain, Size: 642 bytes --]

A pointer to the wdev_id is expected in this call inside
frame_watch_group_remove_wdev instead of a pointer to the pointer.
---
 src/frame-xchg.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/frame-xchg.c b/src/frame-xchg.c
index 4c8b4a9f..31d9c229 100644
--- a/src/frame-xchg.c
+++ b/src/frame-xchg.c
@@ -375,8 +375,7 @@ static bool frame_watch_group_remove_wdev(void *data, void *user_data)
 	 * internals.
 	 */
 	l_queue_foreach_remove(group->watches.items,
-				frame_watch_item_remove_wdev,
-				&wdev_id);
+				frame_watch_item_remove_wdev, user_data);
 	return false;
 }
 
-- 
2.20.1

Re: [PATCH 1/2] frame-watch: Actually unregister removed groups

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 265 bytes --]

Hi Andrew,

On 2/4/20 5:23 AM, Andrew Zaborowski wrote:
> Actually close the sockets for removed groups an free resources
> ---
>   src/frame-xchg.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 

Both applied, thanks.

Regards,
-Denis