Projects
osmocom:master
osmo-pcap
Log In
Username
Password
File not found: osmo-msc_1.11.1.5.1759.202311062026.dsc
×
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 31
View file
osmo-pcap.spec
Changed
@@ -14,13 +14,13 @@ Name: osmo-pcap Requires: osmocom-master -Version: 0.5.0.49.b657e +Version: 0.5.0.52.3801 Release: 0 Summary: Osmocom's PCAP client and server License: AGPL-3.0-or-later AND GPL-2.0-or-later Group: Productivity/Telephony/Servers URL: https://osmocom.org/projects/osmo-pcap -Source: osmo-pcap_0.5.0.49.b657e.tar.xz +Source: osmo-pcap_0.5.0.52.3801.tar.xz Source1: rpmlintrc BuildRequires: autoconf BuildRequires: automake >= 1.6
View file
commit_38016e40c3d318382ff1da689d2b7fc9992f69c8.txt
Added
View file
commit_b657ea9b8d41e18bc0a9095ed6238bd617b75c87.txt
Deleted
View file
osmo-pcap_0.5.0.49.b657e.dsc -> osmo-pcap_0.5.0.52.3801.dsc
Changed
@@ -2,7 +2,7 @@ Source: osmo-pcap Binary: osmo-pcap-client, osmo-pcap-server, osmo-pcap-client-dbg, osmo-pcap-server-dbg Architecture: any -Version: 0.5.0.49.b657e +Version: 0.5.0.52.3801 Maintainer: Osmocom team <openbsc@lists.osmocom.org> Homepage: https://osmocom.org/projects/osmo-pcap Standards-Version: 3.9.1 @@ -15,8 +15,8 @@ osmo-pcap-server deb net extra arch=any osmo-pcap-server-dbg deb net extra arch=any Checksums-Sha1: - cb9bf15161a9bff55ffda6bc1e4ba2fea675425a 61860 osmo-pcap_0.5.0.49.b657e.tar.xz + 8df4e22cc3c9c7c1b859a87eae37f091234bc7ea 61968 osmo-pcap_0.5.0.52.3801.tar.xz Checksums-Sha256: - b98fc27e29a5e38492ab103a66304bdcfe77cf48b00b8a9f1b455544abeb63ff 61860 osmo-pcap_0.5.0.49.b657e.tar.xz + c3af2091cd92da3b3eea1221ab763b8acd8d20b26d19218871cabf6fa6a484db 61968 osmo-pcap_0.5.0.52.3801.tar.xz Files: - 981e143ce56bef062b7f6076faf1857c 61860 osmo-pcap_0.5.0.49.b657e.tar.xz + 3942a7753b33140ea1defcd39a2f08b3 61968 osmo-pcap_0.5.0.52.3801.tar.xz
View file
osmo-pcap_0.5.0.49.b657e.tar.xz/.tarball-version -> osmo-pcap_0.5.0.52.3801.tar.xz/.tarball-version
Changed
@@ -1 +1 @@ -0.5.0.49-b657e +0.5.0.52-3801
View file
osmo-pcap_0.5.0.49.b657e.tar.xz/debian/changelog -> osmo-pcap_0.5.0.52.3801.tar.xz/debian/changelog
Changed
@@ -1,8 +1,8 @@ -osmo-pcap (0.5.0.49.b657e) unstable; urgency=medium +osmo-pcap (0.5.0.52.3801) unstable; urgency=medium * Automatically generated changelog entry for building the Osmocom master feed - -- Osmocom OBS scripts <info@osmocom.org> Tue, 14 Jan 2025 12:37:04 +0000 + -- Osmocom OBS scripts <info@osmocom.org> Wed, 15 Jan 2025 12:41:47 +0000 osmo-pcap (0.5.0) unstable; urgency=medium
View file
osmo-pcap_0.5.0.49.b657e.tar.xz/include/osmo-pcap/osmo_pcap_server.h -> osmo-pcap_0.5.0.52.3801.tar.xz/include/osmo-pcap/osmo_pcap_server.h
Changed
@@ -32,6 +32,7 @@ #include <osmocom/core/select.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/write_queue.h> +#include <osmocom/core/socket.h> #include <osmo-pcap/wireformat.h> #include <osmo-pcap/osmo_tls.h> @@ -80,7 +81,7 @@ char *name; char *remote_host; bool store; - struct in_addr remote_addr; + struct osmo_sockaddr rem_addr; /* Remote connection */ struct osmo_wqueue rem_wq;
View file
osmo-pcap_0.5.0.49.b657e.tar.xz/src/osmo_server_main.c -> osmo-pcap_0.5.0.52.3801.tar.xz/src/osmo_server_main.c
Changed
@@ -271,5 +271,5 @@ osmo_select_main(0); } - return(0); + return 0; }
View file
osmo-pcap_0.5.0.49.b657e.tar.xz/src/osmo_server_network.c -> osmo-pcap_0.5.0.52.3801.tar.xz/src/osmo_server_network.c
Changed
@@ -462,13 +462,15 @@ static int accept_cb(struct osmo_fd *fd, unsigned int when) { - struct osmo_pcap_conn *conn; + struct osmo_pcap_conn *conn = NULL; struct osmo_pcap_server *server; - struct sockaddr_in addr; - socklen_t size = sizeof(addr); + char strINET6_ADDRSTRLEN; + struct osmo_sockaddr osa; + socklen_t len = sizeof(osa.u.sas); int new_fd; - new_fd = accept(fd->fd, (struct sockaddr *) &addr, &size); + memset(&osa, 0, sizeof(osa)); + new_fd = accept(fd->fd, &osa.u.sa, &len); if (new_fd < 0) { LOGP(DSERVER, LOGL_ERROR, "Failed to accept socket: %d\n", errno); return -1; @@ -480,13 +482,20 @@ rate_ctr_inc2(server->ctrg, SERVER_CTR_CONNECT); llist_for_each_entry(conn, &server->conn, entry) { - if (conn->remote_addr.s_addr == addr.sin_addr.s_addr) { - LOGP(DSERVER, LOGL_NOTICE, - "New connection from %s\n", conn->name); - osmo_pcap_conn_event(conn, "connect", NULL); - new_connection(server, conn, new_fd); - return 0; - } + if (conn->rem_addr.u.sa.sa_family != osa.u.sa.sa_family) + continue; + switch (conn->rem_addr.u.sa.sa_family) { + case AF_INET: + if (conn->rem_addr.u.sin.sin_addr.s_addr != osa.u.sin.sin_addr.s_addr) + continue; + goto found; + case AF_INET6: + if (memcmp(&conn->rem_addr.u.sin6.sin6_addr, &osa.u.sin6.sin6_addr, sizeof(struct in6_addr))) + continue; + goto found; + default: + continue; + }; } rate_ctr_inc2(server->ctrg, SERVER_CTR_NOCLIENT); @@ -496,10 +505,16 @@ * this client. */ - LOGP(DSERVER, LOGL_ERROR, - "Failed to find client for %s\n", inet_ntoa(addr.sin_addr)); + LOGP(DSERVER, LOGL_ERROR, "Failed to find client for %s\n", + osmo_sockaddr_ntop(&osa.u.sa, str)); close(new_fd); return -1; + +found: + LOGP(DSERVER, LOGL_NOTICE, "New connection from %s\n", conn->name); + osmo_pcap_conn_event(conn, "connect", NULL); + new_connection(server, conn, new_fd); + return 0; } int osmo_pcap_server_listen(struct osmo_pcap_server *server)
View file
osmo-pcap_0.5.0.49.b657e.tar.xz/src/osmo_server_vty.c -> osmo-pcap_0.5.0.52.3801.tar.xz/src/osmo_server_vty.c
Changed
@@ -360,9 +360,11 @@ return CMD_WARNING; } - talloc_free(conn->remote_host); - conn->remote_host = talloc_strdup(pcap_server, remote_host); - inet_aton(remote_host, &conn->remote_addr); + if (osmo_sockaddr_from_str_and_uint(&conn->rem_addr, remote_host, 0) < 0) { + vty_out(vty, "Failed parsing address\n"); + return CMD_WARNING; + } + osmo_talloc_replace_string(pcap_server, &conn->remote_host, remote_host); /* Checking store and maybe closing a pcap file */ if (!store)
View file
osmo-pcap_0.5.0.49.b657e.tar.xz/tests/rotate_localtime/Makefile.am -> osmo-pcap_0.5.0.52.3801.tar.xz/tests/rotate_localtime/Makefile.am
Changed
@@ -28,9 +28,7 @@ $(NULL) rotate_localtime_test_LDADD = \ - $(top_builddir)/src/osmo_pcap_file.o \ $(top_builddir)/src/osmo_server_core.o \ - $(top_builddir)/src/osmo_server_network.o \ $(top_builddir)/src/osmo_server_stats.o \ $(top_builddir)/src/osmo_tls.o \ $(LIBOSMOCORE_LIBS) \
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.