pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39314?usp=email )

Change subject: server: Move conn->file_hdr release to osmo_pcap_conn_close() ......................................................................

server: Move conn->file_hdr release to osmo_pcap_conn_close()

We can always already release the file_hdr since we'll expect to receive a new one next time a connection is created.

Change-Id: Ib822a0544b7a487614df28214813f31234eb6a0f --- M src/osmo_server_core.c M src/osmo_server_network.c 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/osmo_server_core.c b/src/osmo_server_core.c index 5b9c2d4..9282694 100644 --- a/src/osmo_server_core.c +++ b/src/osmo_server_core.c @@ -339,6 +339,8 @@ conn->rem_wq.bfd.fd = -1; osmo_tls_release(&conn->tls_session); } + TALLOC_FREE(conn->file_hdr); + conn->file_hdr_len = 0;

osmo_pcap_conn_close_trace(conn); osmo_pcap_conn_event(conn, "disconnect", NULL); diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 21ff255..8f9d528 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -421,8 +421,6 @@ { osmo_pcap_conn_close(client);

- TALLOC_FREE(client->file_hdr); - client->file_hdr_len = 0; client->rem_wq.bfd.fd = new_fd; if (osmo_fd_register(&client->rem_wq.bfd) != 0) { LOGP(DSERVER, LOGL_ERROR, "Failed to register fd.\n");