From 02f2c34f8a1fa726e3c3fa3f6e564eb18faaca88 Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Wed, 4 Nov 2020 17:32:56 +0100 Subject: osmo-gbproxy: Free msgb in ns2 prim callback Commit cce88282388f in libosmocore changed the msg ownership model - the callback that the user registers is now responsible for freeing the msg. Change-Id: Iee940aba7d94afefb5957dbe5f0b04dcf951b31c Related: SYS#4998 --- src/gbproxy/gb_proxy.c | 1 + tests/gbproxy/gbproxy_test.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c index ccf3f7349..fb58284d2 100644 --- a/src/gbproxy/gb_proxy.c +++ b/src/gbproxy/gb_proxy.c @@ -1470,6 +1470,7 @@ int gprs_ns2_prim_cb(struct osmo_prim_hdr *oph, void *ctx) msgb_nsei(oph->msg) = nsp->nsei; rc = gbprox_rcvmsg(cfg, oph->msg); + msgb_free(oph->msg); break; case PRIM_NS_STATUS: gprs_ns_prim_status_cb(cfg, nsp); diff --git a/tests/gbproxy/gbproxy_test.c b/tests/gbproxy/gbproxy_test.c index 166298007..76fc000d5 100644 --- a/tests/gbproxy/gbproxy_test.c +++ b/tests/gbproxy/gbproxy_test.c @@ -505,7 +505,6 @@ static void send_ns_unitdata(struct gprs_ns2_inst *nsi, const char *text, PRIM_OP_INDICATION, msg); gprs_ns2_callback(&nsp.oph, &gbcfg); - talloc_free(msg); } static int gbprox_test_bssgp_send_cb(void *ctx, struct msgb *msg); @@ -1037,9 +1036,8 @@ static int gprs_ns2_callback(struct osmo_prim_hdr *oph, void *ctx) break; } - /* Hand off to gbproxy */ + /* Hand off to gbproxy which will free the msg */ return gprs_ns2_prim_cb(oph, ctx); - } /* Get the next message from the receive FIFO -- cgit v1.2.3