pespin has uploaded this change for review.
server: Use osmo_stream_srv for non-tls read tcp sock
TLS handling adds a lot of complexity, so TLS sockets are still read
through the previous code paths, and conversion to osmo_stream_srv is
left as a future improvement.
Related: SYS#7080
Depends: libosmocore.git Change-Id I6f9125916a301414301587f84fc3db98549a2f3f
Change-Id: I537620fcad6c8e65206a41a1c21bd4b6453fbed4
---
A TODO-RELEASE
M include/osmo-pcap/osmo_pcap_server.h
M src/osmo_server_core.c
M src/osmo_server_network.c
4 files changed, 114 insertions(+), 64 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/43/39343/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
new file mode 100644
index 0000000..a6ff496
--- /dev/null
+++ b/TODO-RELEASE
@@ -0,0 +1,11 @@
+# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install
+# according to https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release
+# In short: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info
+# LIBVERSION=c:r:a
+# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a.
+# If any interfaces have been added, removed, or changed since the last update: c + 1:0:a.
+# 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
+
diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h
index 0543ca4..a808bff 100644
--- a/include/osmo-pcap/osmo_pcap_server.h
+++ b/include/osmo-pcap/osmo_pcap_server.h
@@ -85,10 +85,11 @@
struct osmo_sockaddr rem_addr;
/* Remote connection */
- struct osmo_wqueue rem_wq;
- int local_fd;
+ struct osmo_stream_srv *srv;
/* canonicalized absolute pathname of pcap file we write to */
char *curr_filename;
+ /* file descriptor of the file we write to */
+ int local_fd;
/* Current write offset of the file we write to (local_fd) */
off_t wr_offset;
@@ -105,7 +106,6 @@
int state;
int pend;
bool reopen_delayed;
- struct osmo_pcap_data *data;
size_t data_max_len; /* size of allocated buffer in data->data. */
/* statistics */
@@ -113,9 +113,10 @@
/* tls */
bool tls_use;
- bool direct_read;
size_t tls_limit_read;
struct osmo_tls_session tls_session;
+ struct osmo_wqueue rem_wq;
+ struct osmo_pcap_data *data; /* Used to store TLS decoded data */
};
void osmo_pcap_conn_free(struct osmo_pcap_conn *conn);
diff --git a/src/osmo_server_core.c b/src/osmo_server_core.c
index c384ed9..2230cf7 100644
--- a/src/osmo_server_core.c
+++ b/src/osmo_server_core.c
@@ -336,6 +336,12 @@
void osmo_pcap_conn_close(struct osmo_pcap_conn *conn)
{
+ /* No TLS: */
+ if (conn->srv) {
+ osmo_stream_srv_destroy(conn->srv);
+ conn->srv = NULL;
+ }
+ /* TLS: */
if (conn->rem_wq.bfd.fd >= 0) {
osmo_fd_unregister(&conn->rem_wq.bfd);
close(conn->rem_wq.bfd.fd);
diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c
index c93ce6d..e6bd67b 100644
--- a/src/osmo_server_network.c
+++ b/src/osmo_server_network.c
@@ -25,6 +25,8 @@
#include <osmo-pcap/common.h>
#include <osmo-pcap/wireformat.h>
+#include <osmocom/core/byteswap.h>
+#include <osmocom/core/osmo_io.h>
#include <osmocom/core/socket.h>
#include <osmocom/core/talloc.h>
#include <osmocom/core/rate_ctr.h>
@@ -299,20 +301,13 @@
return gnutls_record_recv(conn->tls_session.session, buf, size);
}
-static int do_read(struct osmo_pcap_conn *conn, void *buf, size_t size)
-{
- if (conn->direct_read)
- return read(conn->rem_wq.bfd.fd, buf, size);
- return do_read_tls(conn, buf, size);
-}
-
/* Read segment header, struct osmo_pcap_data (without payload)
* returns >0 on success, <= 0 on failure (closes conn) */
-static int read_cb_initial(struct osmo_pcap_conn *conn)
+static int tls_read_cb_initial(struct osmo_pcap_conn *conn)
{
int rc;
- rc = do_read(conn, ((uint8_t*)conn->data) + sizeof(*conn->data) - conn->pend, conn->pend);
+ rc = do_read_tls(conn, ((uint8_t *)conn->data) + sizeof(*conn->data) - conn->pend, conn->pend);
if (rc <= 0) {
LOGP(DSERVER, LOGL_ERROR,
"Too short packet. Got %d, wanted %d\n", rc, conn->data->len);
@@ -341,13 +336,11 @@
return 1;
}
-/* Read segment payload, of size conn->data->len.
- * returns >0 on success, <= 0 on failure (closes conn) */
-static int read_cb_data(struct osmo_pcap_conn *conn)
+static int tls_read_cb_data(struct osmo_pcap_conn *conn)
{
int rc;
- rc = do_read(conn, &conn->data->data[conn->data->len - conn->pend], conn->pend);
+ rc = do_read_tls(conn, &conn->data->data[conn->data->len - conn->pend], conn->pend);
if (rc <= 0) {
LOGP(DSERVER, LOGL_ERROR,
"Too short packet. Got %d, wanted %d\n", rc, conn->data->len);
@@ -370,29 +363,17 @@
}
/* returns >0 on success, <= 0 on failure (closes conn) */
-static int dispatch_read(struct osmo_pcap_conn *conn)
+static int tls_dispatch_read(struct osmo_pcap_conn *conn)
{
if (conn->state == STATE_INITIAL) {
- return read_cb_initial(conn);
+ return tls_read_cb_initial(conn);
} else if (conn->state == STATE_DATA) {
- return read_cb_data(conn);
+ return tls_read_cb_data(conn);
}
return 0;
}
-static int read_cb(struct osmo_fd *fd)
-{
- struct osmo_pcap_conn *conn;
- int rc;
-
- conn = fd->data;
- rc = dispatch_read(conn);
- if (rc <= 0)
- osmo_pcap_conn_close(conn);
- return 0;
-}
-
static void tls_error_cb(struct osmo_tls_session *session)
{
struct osmo_pcap_conn *conn;
@@ -408,7 +389,7 @@
conn = container_of(session, struct osmo_pcap_conn, tls_session);
conn->tls_limit_read = 0;
- rc = dispatch_read(conn);
+ rc = tls_dispatch_read(conn);
if (rc <= 0)
return rc;
@@ -421,7 +402,7 @@
*/
while ((pend = osmo_tls_pending(session)) > 0) {
conn->tls_limit_read = pend;
- rc = dispatch_read(conn);
+ rc = tls_dispatch_read(conn);
if (rc <= 0)
return rc;
}
@@ -429,45 +410,96 @@
return 1;
}
-static void new_connection(struct osmo_pcap_server *server,
- struct osmo_pcap_conn *client, int new_fd)
+int conn_read_cb(struct osmo_stream_srv *srv, int res, struct msgb *msg)
{
- osmo_pcap_conn_close(client);
+ struct osmo_pcap_conn *conn = osmo_stream_srv_get_data(srv);
+ struct osmo_pcap_data *data;
+ int rc;
- 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");
- client->rem_wq.bfd.fd = -1;
+ if (res <= 0) {
+ LOGP(DSERVER, LOGL_ERROR, "Read from conn failed: %d\n", res);
+ osmo_pcap_conn_close(conn);
+ return 0;
+ }
+
+ data = (struct osmo_pcap_data *)msgb_data(msg);
+ data->len = osmo_ntohs(data->len);
+
+ rc = rx_link(conn, data);
+ msgb_free(msg);
+ if (rc <= 0)
+ osmo_pcap_conn_close(conn);
+ return 0;
+}
+
+int conn_segmentation_cb2(struct osmo_stream_srv *srv, struct msgb *msg)
+{
+ struct osmo_pcap_conn *conn = osmo_stream_srv_get_data(srv);
+
+ const struct osmo_pcap_data *hh = (struct osmo_pcap_data *) msgb_data(msg);
+ size_t payload_len, total_len;
+ size_t available = msgb_length(msg) + msgb_tailroom(msg);
+
+ if (msgb_length(msg) < sizeof(*hh)) {
+ /* Haven't even read the entire header */
+ return -EAGAIN;
+ }
+ payload_len = osmo_ntohs(hh->len);
+ total_len = sizeof(*hh) + payload_len;
+
+ if (OSMO_UNLIKELY(total_len > conn->data_max_len)) {
+ LOGP(DSERVER, LOGL_ERROR, "Implausible data length: %zu > %zu (snaplen %u)\n",
+ total_len, conn->data_max_len, conn->server->max_snaplen);
+ return -ENOBUFS;
+ }
+
+ if (OSMO_UNLIKELY(total_len > available)) {
+ LOGP(DSERVER, LOGL_ERROR,
+ "Not enough space left in message buffer. Have %zu octets, but need %zu\n",
+ available, total_len);
+ return -ENOBUFS;
+ }
+ return total_len;
+}
+
+static void new_connection(struct osmo_pcap_server *server,
+ struct osmo_pcap_conn *conn, int new_fd)
+{
+ osmo_pcap_conn_close(conn);
+
+ rate_ctr_inc2(conn->ctrg, PEER_CTR_CONNECT);
+
+ if (conn->tls_use && !server->tls_on) {
+ LOGP(DSERVER, LOGL_NOTICE, "Require TLS but not enabled on conn=%s\n", conn->name);
close(new_fd);
return;
}
- rate_ctr_inc2(client->ctrg, PEER_CTR_CONNECT);
-
- /* Prepare for first read of segment header: */
- client->state = STATE_INITIAL;
- client->pend = sizeof(*client->data);
-
- if (client->tls_use && !server->tls_on) {
- LOGP(DSERVER, LOGL_NOTICE,
- "Require TLS but not enabled on conn=%s\n",
- client->name);
- osmo_pcap_conn_close(client);
- return;
- } else if (client->tls_use) {
- if (!osmo_tls_init_server_session(client, server)) {
- osmo_pcap_conn_close(client);
+ if (conn->tls_use) {
+ conn->rem_wq.bfd.fd = new_fd;
+ if (osmo_fd_register(&conn->rem_wq.bfd) != 0) {
+ LOGP(DSERVER, LOGL_ERROR, "Failed to register fd.\n");
+ conn->rem_wq.bfd.fd = -1;
+ close(new_fd);
return;
}
- client->tls_session.error = tls_error_cb;
- client->tls_session.read = tls_read_cb;
- client->direct_read = false;
+ /* Prepare for first read of segment header: */
+ conn->state = STATE_INITIAL;
+ conn->pend = sizeof(struct osmo_pcap_data);
+ if (!osmo_tls_init_server_session(conn, server)) {
+ osmo_pcap_conn_close(conn);
+ return;
+ }
+ conn->tls_session.error = tls_error_cb;
+ conn->tls_session.read = tls_read_cb;
} else {
- client->rem_wq.bfd.cb = osmo_wqueue_bfd_cb;
- client->rem_wq.bfd.data = client;
- client->rem_wq.bfd.when = OSMO_FD_READ;
- client->rem_wq.read_cb = read_cb;
- client->direct_read = true;
+ conn->srv = osmo_stream_srv_create2(conn, server->srv_link, new_fd, conn);
+ OSMO_ASSERT(conn->srv);
+ osmo_stream_srv_set_name(conn->srv, "pcap_conn");
+ osmo_stream_srv_set_read_cb(conn->srv, conn_read_cb);
+ osmo_stream_srv_set_segmentation_cb2(conn->srv, conn_segmentation_cb2);
+ struct osmo_io_fd *iofd = osmo_stream_srv_get_iofd(conn->srv);
+ osmo_iofd_set_alloc_info(iofd, conn->data_max_len, 0);
}
}
To view, visit change 39343. To unsubscribe, or for help writing mail filters, visit settings.