Hello Jenkins Builder, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/122 to review the following change. osmux: Add function to delete all msgs pending for a circuit Use this function in osmux_batch_del_circuit() since msgs are stored in a list per circuit. After the circuit is free()d the msgs are lost. Before this patch any messages enqueued inside a batch when the circiut is deleted were leaking. Change-Id: Ib0311652183332d0475bf7347023d518d38487ef Ticket: OS#1733 Reviewed-on: https://gerrit.osmocom.org/120 Tested-by: Jenkins Builder Reviewed-by: Holger Freyther <holger(a)freyther.de> --- M src/osmux.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/22/122/1 diff --git a/src/osmux.c b/src/osmux.c index 1f5bbe2..0bee9cc 100644 --- a/src/osmux.c +++ b/src/osmux.c @@ -225,6 +225,16 @@ circuit->nmsgs--; } +static void osmux_circuit_del_msgs(struct osmux_batch *batch, struct osmux_circuit *circuit) +{ + struct msgb *cur, *tmp; + llist_for_each_entry_safe(cur, tmp, &circuit->msg_list, list) { + osmux_batch_dequeue(cur, circuit); + msgb_free(cur); + batch->nmsgs--; + } +} + struct osmux_input_state { struct msgb *out_msg; struct msgb *msg; @@ -538,6 +548,7 @@ if (circuit->dummy) batch->ndummy--; llist_del(&circuit->head); + osmux_circuit_del_msgs(batch, circuit); talloc_free(circuit); } -- To view, visit https://gerrit.osmocom.org/122 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0311652183332d0475bf7347023d518d38487ef Gerrit-PatchSet: 1 Gerrit-Project: libosmo-netif Gerrit-Branch: releases/0.0.6-stable Gerrit-Owner: Holger Freyther <holger(a)freyther.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>