osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39517?usp=email )

Change subject: Bump version: 0.5.0.63-222b-dirty → 0.6.0 ......................................................................

Bump version: 0.5.0.63-222b-dirty → 0.6.0

Change-Id: I3bceee1838aa5e5a2830726dd21b3914efffc487 --- M TODO-RELEASE M configure.ac M contrib/osmo-pcap.spec.in M debian/changelog M debian/control 5 files changed, 81 insertions(+), 14 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/17/39517/1

diff --git a/TODO-RELEASE b/TODO-RELEASE index ba1c710..0ed7189 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,5 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmocore >1.10.0 iofd_msgb_alloc() supports allocating 0xfffff bytes. libosmocore Change-Id I6f9125916a301414301587f84fc3db98549a2f3f -libosmo-netif >1.5.0 osmo_stream_srv_set_segmentation_cb2() diff --git a/configure.ac b/configure.ac index 1baa5b9..76ae2ae 100644 --- a/configure.ac +++ b/configure.ac @@ -163,12 +163,12 @@ AC_SUBST([PCAP_CFLAGS])

dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.11.0) # libosmogb: needed for osmocom/gprs includes -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.10.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.10.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.11.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.6.0) PKG_CHECK_MODULES(LIBZMQ, libzmq >= 3.2.2) PKG_CHECK_MODULES(LIBGNUTLS, gnutls)

diff --git a/contrib/osmo-pcap.spec.in b/contrib/osmo-pcap.spec.in index 406ef31..72a92ab 100644 --- a/contrib/osmo-pcap.spec.in +++ b/contrib/osmo-pcap.spec.in @@ -29,11 +29,11 @@ %endif BuildRequires: pkgconfig BuildRequires: pkgconfig(gnutls) -BuildRequires: pkgconfig(libosmo-netif) >= 1.5.0 -BuildRequires: pkgconfig(libosmocore) >= 1.10.0 -BuildRequires: pkgconfig(libosmogb) >= 1.10.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.10.0 -BuildRequires: pkgconfig(libosmovty) >= 1.10.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.6.0 +BuildRequires: pkgconfig(libosmocore) >= 1.11.0 +BuildRequires: pkgconfig(libosmogb) >= 1.11.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.11.0 +BuildRequires: pkgconfig(libosmovty) >= 1.11.0 BuildRequires: pkgconfig(libzmq) >= 3.2.2 %{?systemd_requires}

diff --git a/debian/changelog b/debian/changelog index af78d30..c2e1781 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,72 @@ +osmo-pcap (0.6.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * pcap-server: Take into account PDU len when calculating pcap max-size + * pcap-server: Move write checks to reopen pcap into helper functions + * pcap-server: New vty command 'no max-file-size' + * tests/Makefile.am: Fix trailing whitespace + * src/Makefile.am: Improve formatting + * pcap-server: Fix [no] max-file-size regression + * pcap-server: Move stats to its own file + * pcap-server: Make rotate-localtime feature configurable through VTY + * pcap-server: Improve log error opening pcap file + * pcap-server: Avoid pcap time-based rotation if wall clock went backwards + * pcap-client: Move conns llist initialization to constructor + * pcap-client: Split client-conn allocation to its own constructor function + * pcap-client: Alloc default client conn similarly to other ones + * pcap-client: Add missing '_conn' in function names + * pcap-client: Split wrapped ctr generic calculation to helper function + * pcap-client: Decouple dev capture handling from client + * pcap-client: Improve pcap_handle logging + * pcap-client: Improve conn logging + * pcap-client: Move stats to its own file + * pcap-client,pcap-server: Use rate_ctr_inc2 and rate_ctr_add2 APIs + * pcap-client: Add per iface counter group instance + * pcap-client: Allow recording on several interfaces + * pcap-server: Use osmo_talloc_replace_string() to replace base-path + * pcap-server: Move struct osmo_pcap_server alloc to its own helper function + * pcap-server: remove unneeded check for null base_path + * pcap-server: Resolve real path of pcap file before opening + * pcap-server: Introduce VTY cmd '[no] completed-path' + * Use #pragma once in all header files + * server: Rename static functions + * server: Simplify (store|no-store) feature + * cosmetic: server: document functions + * server: Simplify code paths in read_cb_* + * server: Delay reopen of pcap only until necessary + * server: Store read buf max len as conn field + * server: Split osmo_pcap_conn alloc to its own function + * server: Rename function osmo_pcap_server_delete -> osmo_pcap_conn_free + * cosmetic: server: Fix typo in comment + * server: Rename func client_data() -> zmq_send_client_data() + * Cleanup and reorder includes in header files + * Makefile.am: proper format and reorder source file lists + * client: Introduce osmo_pcap_file to prepare support for pcapng + * client: Support generation of pcapng file format + * server: Support storing of pcapng format + * server: Rename osmo_pcap_server_close_trace -> osmo_pcap_conn_close_trace + * Rename osmo_pcap_server_close_conn -> osmo_pcap_conn_close + * server: Split network code into its own file + * server: Avoid lseek syscall on every packet write to pcap file + * cosmetic: osmo_tls: Fix indentation whitespace + * server: Move osmo_pcap_server_alloc() to osmo_server_core.c + * server: Use osmo_sockaddr in remote_addr field + * tests: Remove unneeded .o files after osmo-pcap-server network/core file split + * cosmetic: server: Fix formatting of return in main() + * server: Move conn->file_hdr release to osmo_pcap_conn_close() + * server: Add osmo_pcap_server_free() for completeness + * server: Split buffer read from full msg handling + * server: Log unable to figure out pcap vs pcapng + * server: Limit rx buffer size to UINT16_MAX + * server: Use osmo_stream_srv_link on tcp listen socket + * server: Correct error check calling osmo_pcap_conn_process_data() + * server: Use osmo_stream_srv for non-tls read tcp sock + * server: Introduce struct osmo_pcap_wr_file + * server: Implement non-blocking write to pcap file with osmo_io + * server: zero-copy msgb from tcp read to file write + + -- Oliver Smith osmith@sysmocom.de Wed, 12 Feb 2025 12:50:57 +0100 + osmo-pcap (0.5.0) unstable; urgency=medium

[ Andreas Eversberg ] diff --git a/debian/control b/debian/control index b7da2b2..5c28919 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ autotools-dev, libpcap0.8-dev, pkg-config, - libosmocore-dev (>= 1.10.0), - libosmo-netif-dev (>= 1.5.0), + libosmocore-dev (>= 1.11.0), + libosmo-netif-dev (>= 1.6.0), libgnutls28-dev, libzmq3-dev (>= 3.2.2) Standards-Version: 3.9.1