laforge submitted this change.

Approvals:
  osmith: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

pcap-server: Avoid closing cli conn if writing to disk fails

Related: SYS#7374
Change-Id: I06b20a17fae064a74e2acdc4549df400ad9c4930
---
M src/osmo_server_core.c
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/osmo_server_core.c b/src/osmo_server_core.c
index 9629423..cebc70a 100644
--- a/src/osmo_server_core.c
+++ b/src/osmo_server_core.c
@@ -547,8 +547,9 @@
 	rc = osmo_pcap_wr_file_write_msgb(conn->wrf, msg);
 	if (rc < 0) {
 		LOGP(DSERVER, LOGL_ERROR, "%s: Failed writing to file\n", conn->name);
-		/* msgb will be freed by caller */
-		return -1;
+		msgb_free(msg);
+		/* Avoid closing conn. msgb won't be freed by caller */
+		return 0;
 	}
 	update_last_write(conn, now);
 	/* msgb is now owned by conn->wrf. */

To view, visit change 39772. To unsubscribe, or for help writing mail filters, visit settings.