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

Change subject: pcap-server: Take into account PDU len when calculating pcap max-size ......................................................................

pcap-server: Take into account PDU len when calculating pcap max-size

We never want to overpass the configured max-size.

Change-Id: I666830fbbc23ce34007d45bbf8c7a13a1f2a93ea --- M src/osmo_server_network.c 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index b566bd2..41d0b3f 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -234,7 +234,7 @@ }

off_t cur = lseek(conn->local_fd, 0, SEEK_CUR); - if (cur > conn->server->max_size) { + if (cur + data->len > conn->server->max_size) { LOGP(DSERVER, LOGL_NOTICE, "Rolling over file for %s\n", conn->name); restart_pcap(conn); } else if (conn->last_write.tm_mday != tm->tm_mday ||