- gerrit-log - lists.osmocom.org

[XS] Change in osmo-pcap[master]: server: Store read buf max len as conn field
by pespin 13 Jan '25

13 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39273?usp=email ) Change subject: server: Store read buf max len as conn field ...................................................................... server: Store read buf max len as conn field This will be useful later on when adding pcapng support, since checks will become more complex due to different data types to be checked, based on information from pcap vs pcapng gathered from magic field inside the received link_hdr buffer. Change-Id: I8f62aa0bdb04e73223c0c6803a58241f83a5ebe9 --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_network.c 2 files changed, 4 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index 030a353..ae578b4 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -99,6 +99,7 @@ int pend; bool reopen_delayed; struct osmo_pcap_data *data; + size_t data_max_len; /* size of allocated buffer in data->data. */ /* statistics */ struct rate_ctr_group *ctrg; diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 7d46b90..044e0ec 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -504,7 +504,6 @@ { struct rate_ctr_group_desc *desc; struct osmo_pcap_conn *conn; - size_t buf_size; llist_for_each_entry(conn, &server->conn, entry) { if (strcmp(conn->name, name) == 0) @@ -518,10 +517,9 @@ return NULL; } - buf_size = sizeof(struct osmo_pcap_data); - buf_size += OSMO_MAX(sizeof(struct pcap_file_header), - sizeof(struct osmo_pcap_pkthdr) + server->max_snaplen); - conn->data = talloc_zero_size(conn, buf_size); + conn->data_max_len = OSMO_MAX(sizeof(struct pcap_file_header), + sizeof(struct osmo_pcap_pkthdr) + server->max_snaplen); + conn->data = talloc_zero_size(conn, sizeof(struct osmo_pcap_data) + conn->data_max_len); /* a bit nasty. we do not work with ids but names */ desc = talloc_zero(conn, struct rate_ctr_group_desc); if (!desc) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39273?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I8f62aa0bdb04e73223c0c6803a58241f83a5ebe9 Gerrit-Change-Number: 39273 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-pcap[master]: server: Split osmo_pcap_conn alloc to its own function
by pespin 13 Jan '25

13 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39274?usp=email ) Change subject: server: Split osmo_pcap_conn alloc to its own function ...................................................................... server: Split osmo_pcap_conn alloc to its own function Change-Id: I622c9662b0a451ca5466e053a046346b536ed0a6 --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_network.c M src/osmo_server_vty.c 3 files changed, 19 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index ae578b4..df4d171 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -161,7 +161,7 @@ void osmo_pcap_server_reopen(struct osmo_pcap_server *server); int osmo_pcap_server_listen(struct osmo_pcap_server *server); -struct osmo_pcap_conn *osmo_pcap_server_find(struct osmo_pcap_server *ser, +struct osmo_pcap_conn *osmo_pcap_server_find_or_create(struct osmo_pcap_server *ser, const char *name); void osmo_pcap_server_delete(struct osmo_pcap_conn *conn); void vty_server_init(void); diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 044e0ec..0567b21 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -499,16 +499,11 @@ talloc_free(conn); } -struct osmo_pcap_conn *osmo_pcap_server_find(struct osmo_pcap_server *server, - const char *name) +static struct osmo_pcap_conn *osmo_pcap_conn_alloc(struct osmo_pcap_server *server, + const char *name) { - struct rate_ctr_group_desc *desc; struct osmo_pcap_conn *conn; - - llist_for_each_entry(conn, &server->conn, entry) { - if (strcmp(conn->name, name) == 0) - return conn; - } + struct rate_ctr_group_desc *desc; conn = talloc_zero(server, struct osmo_pcap_conn); if (!conn) { @@ -563,6 +558,19 @@ return conn; } +struct osmo_pcap_conn *osmo_pcap_server_find_or_create( + struct osmo_pcap_server *server, + const char *name) +{ + struct osmo_pcap_conn *conn; + + llist_for_each_entry(conn, &server->conn, entry) { + if (strcmp(conn->name, name) == 0) + return conn; + } + return osmo_pcap_conn_alloc(server, name); +} + static int do_read_tls(struct osmo_pcap_conn *conn, void *buf, size_t want_size) { size_t size = want_size; diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index b976857..aed382f 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -354,7 +354,7 @@ bool store, bool use_tls) { struct osmo_pcap_conn *conn; - conn = osmo_pcap_server_find(pcap_server, name); + conn = osmo_pcap_server_find_or_create(pcap_server, name); if (!conn) { vty_out(vty, "Failed to create a pcap server.\n"); return CMD_WARNING; @@ -403,7 +403,7 @@ NO_STR CLIENT_STR "The name\n") { struct osmo_pcap_conn *conn; - conn = osmo_pcap_server_find(pcap_server, argv[0]); + conn = osmo_pcap_server_find_or_create(pcap_server, argv[0]); if (!conn) { vty_out(vty, "Failed to create a pcap server.\n"); return CMD_WARNING; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39274?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I622c9662b0a451ca5466e053a046346b536ed0a6 Gerrit-Change-Number: 39274 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: server: Rename function osmo_pcap_server_delete -> osmo_pcap_conn_free
by pespin 13 Jan '25

13 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39275?usp=email ) Change subject: server: Rename function osmo_pcap_server_delete -> osmo_pcap_conn_free ...................................................................... server: Rename function osmo_pcap_server_delete -> osmo_pcap_conn_free Change-Id: I72372b43eddc74e80c430c9a9e4337809c123ed6 --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_network.c M src/osmo_server_vty.c 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index df4d171..988ac96 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -163,7 +163,7 @@ int osmo_pcap_server_listen(struct osmo_pcap_server *server); struct osmo_pcap_conn *osmo_pcap_server_find_or_create(struct osmo_pcap_server *ser, const char *name); -void osmo_pcap_server_delete(struct osmo_pcap_conn *conn); +void osmo_pcap_conn_free(struct osmo_pcap_conn *conn); void vty_server_init(void); void osmo_pcap_server_close_trace(struct osmo_pcap_conn *conn); void osmo_pcap_server_close_conn(struct osmo_pcap_conn *conn); diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 0567b21..be2c6e0 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -492,7 +492,7 @@ } -void osmo_pcap_server_delete(struct osmo_pcap_conn *conn) +void osmo_pcap_conn_free(struct osmo_pcap_conn *conn) { close_connection(conn); llist_del(&conn->entry); diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index aed382f..9ba5f74 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -409,7 +409,7 @@ return CMD_WARNING; } - osmo_pcap_server_delete(conn); + osmo_pcap_conn_free(conn); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39275?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I72372b43eddc74e80c430c9a9e4337809c123ed6 Gerrit-Change-Number: 39275 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: server: Rename func client_data() -> zmq_send_client_data()
by pespin 13 Jan '25

13 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39283?usp=email ) Change subject: server: Rename func client_data() -> zmq_send_client_data() ...................................................................... server: Rename func client_data() -> zmq_send_client_data() Change-Id: I1b22046464cf969fb5d74b6c2580aaec1feffefa --- M src/osmo_server_network.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index f05413e..64d772a 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -89,8 +89,8 @@ pcap_zmq_send(conn->server->zmq_publ, data, strlen(data), 0); } -static void client_data(struct osmo_pcap_conn *conn, - struct osmo_pcap_data *data) +static void zmq_send_client_data(struct osmo_pcap_conn *conn, + struct osmo_pcap_data *data) { char *event_name; @@ -101,7 +101,7 @@ * This multi-part support is insane... so if we lose the first * or the last part of the multipart message stuff is going out * of sync. *great* As we can't do anything about it right now - * just close the eyese and send it. + * just close the eyes and send it. */ event_name = talloc_asprintf(conn, "data.v1.%s", conn->name); pcap_zmq_send(conn->server->zmq_publ, event_name, strlen(event_name), ZMQ_SNDMORE); @@ -466,7 +466,7 @@ time_t now = time(NULL); int rc; - client_data(conn, data); + zmq_send_client_data(conn, data); if (!conn->store) { update_last_write(conn, now); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39283?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I1b22046464cf969fb5d74b6c2580aaec1feffefa Gerrit-Change-Number: 39283 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: cosmetic: server: Fix typo in comment
by pespin 13 Jan '25

13 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39282?usp=email ) Change subject: cosmetic: server: Fix typo in comment ...................................................................... cosmetic: server: Fix typo in comment Change-Id: I03aa0137d5470717104f27cb55d4bde802d00a95 --- M src/osmo_server_network.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index be2c6e0..f05413e 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -135,7 +135,7 @@ if (!server->completed_path) return; - /* Assumption: curr_filename is anonicalized absolute pathname. */ + /* Assumption: curr_filename is canonical absolute pathname. */ /* basename and dirname may modify input param, and return a string * which shall not be freed, potentially pointing to the input param. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39282?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I03aa0137d5470717104f27cb55d4bde802d00a95 Gerrit-Change-Number: 39282 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-pcap[master]: cosmetic: server: document functions
by pespin 13 Jan '25

13 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39270?usp=email ) Change subject: cosmetic: server: document functions ...................................................................... cosmetic: server: document functions Change-Id: I6709b720e236514b8572fe60834a990558e67f5c --- M src/osmo_server_network.c 1 file changed, 9 insertions(+), 3 deletions(-) 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 d55b30d..3bf8113 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -296,6 +296,7 @@ update_last_write(conn, now); } +/* returns >0 on success, <= 0 on failure (closes conn) */ static int rx_link_hdr(struct osmo_pcap_conn *conn, struct osmo_pcap_data *data) { struct pcap_file_header *hdr; @@ -459,9 +460,7 @@ return true; } -/* - * Check if we are past the limit or on a day change - */ +/* returns >0 on success, <= 0 on failure (closes conn) */ static int rx_link_data(struct osmo_pcap_conn *conn, struct osmo_pcap_data *data) { time_t now = time(NULL); @@ -479,6 +478,7 @@ return -1; } + /* Check if we are past the limit or on a day change. */ if (!check_restart_pcap_max_size(conn, data)) check_restart_pcap_localtime(conn, now); @@ -610,6 +610,8 @@ return true; } +/* 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) { int rc; @@ -639,6 +641,8 @@ 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) { int rc; @@ -680,6 +684,7 @@ return 1; } +/* returns >0 on success, <= 0 on failure (closes conn) */ static int dispatch_read(struct osmo_pcap_conn *conn) { if (conn->state == STATE_INITIAL) { @@ -760,6 +765,7 @@ rate_ctr_inc2(client->ctrg, PEER_CTR_CONNECT); + /* Prepare for first read of segment header: */ client->state = STATE_INITIAL; client->pend = sizeof(*client->data); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39270?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I6709b720e236514b8572fe60834a990558e67f5c Gerrit-Change-Number: 39270 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-pcap[master]: server: Simplify (store|no-store) feature
by pespin 13 Jan '25

13 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39269?usp=email ) Change subject: server: Simplify (store|no-store) feature ...................................................................... server: Simplify (store|no-store) feature Having a bool variable with a negation in its name just makes everything more complex for no good reason. Change-Id: If0b76e7a922c26859d04d339bcc3bdccd66a6922 --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_network.c M src/osmo_server_vty.c 3 files changed, 21 insertions(+), 27 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index bed1cb5..dad81d3 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -79,7 +79,7 @@ /* name */ char *name; char *remote_host; - int no_store; + bool store; struct in_addr remote_addr; /* Remote connection */ diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index a784af2..d55b30d 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -254,7 +254,7 @@ osmo_pcap_server_close_trace(conn); /* omit any storing/creation of the file */ - if (conn->no_store) { + if (!conn->store) { update_last_write(conn, now); talloc_free(conn->curr_filename); conn->curr_filename = NULL; @@ -309,10 +309,12 @@ return -1; } - if (!conn->no_store && conn->local_fd < 0) { + if (conn->store && conn->local_fd < 0) { + /* First received link hdr in conn */ conn->file_hdr = *hdr; restart_pcap(conn); } else if (memcmp(&conn->file_hdr, hdr, sizeof(*hdr)) != 0) { + /* Client changed the link hdr in conn */ conn->file_hdr = *hdr; restart_pcap(conn); } @@ -467,7 +469,7 @@ client_data(conn, data); - if (conn->no_store) { + if (!conn->store) { update_last_write(conn, now); return 1; } diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index 1e8e05c..b976857 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -128,7 +128,7 @@ llist_for_each_entry(conn, &pcap_server->conn, entry) { vty_out(vty, " client %s %s%s%s%s", conn->name, conn->remote_host, - conn->no_store ? " no-store" : " store", + conn->store ? " store" : " no-store", conn->tls_use ? " tls" : "", VTY_NEWLINE); } @@ -351,7 +351,7 @@ static int manage_client(struct osmo_pcap_server *pcap_server, struct vty *vty, const char *name, const char *remote_host, - bool no_store, bool use_tls) + bool store, bool use_tls) { struct osmo_pcap_conn *conn; conn = osmo_pcap_server_find(pcap_server, name); @@ -364,12 +364,10 @@ conn->remote_host = talloc_strdup(pcap_server, remote_host); inet_aton(remote_host, &conn->remote_addr); - /* Checking no-store and maybe closing a pcap file */ - if (no_store) { + /* Checking store and maybe closing a pcap file */ + if (!store) osmo_pcap_server_close_trace(conn); - conn->no_store = 1; - } else - conn->no_store = 0; + conn->store = store; if (use_tls) { /* force moving to TLS */ @@ -383,25 +381,20 @@ return CMD_SUCCESS; } - DEFUN(cfg_server_client, cfg_server_client_cmd, - "client NAME A.B.C.D [no-store] [tls]", - CLIENT_STR "Remote name used in filenames\n" - "IP of the remote\n" "Do not store traffic\n" + "client NAME A.B.C.D [(store|no-store)] [tls]", + CLIENT_STR + "Remote name used in filenames\n" + "IP of the remote\n" + "Store traffic\n" "Do not store traffic\n" "Use Transport Level Security\n") { - return manage_client(pcap_server, vty, argv[0], argv[1], argc >= 3, argc >= 4); -} - -DEFUN(cfg_server_client_store_tls, - cfg_server_client_store_tls_cmd, - "client NAME A.B.C.D store [tls]", - CLIENT_STR "Remote name used in filenames\n" - "IP of the remote\n" "Do not store traffic\n" - "Use Transport Level Security\n") -{ - return manage_client(pcap_server, vty, argv[0], argv[1], false, argc >= 3); + bool store = true; + if (argc >= 3 && strcmp(argv[2], "no-store") == 0) + store = false; + bool tls = argc >= 4; + return manage_client(pcap_server, vty, argv[0], argv[1], store, tls); } DEFUN(cfg_server_no_client, @@ -734,6 +727,5 @@ install_element(SERVER_NODE, &cfg_tls_dh_pkcs3_cmd); install_element(SERVER_NODE, &cfg_server_client_cmd); - install_element(SERVER_NODE, &cfg_server_client_store_tls_cmd); install_element(SERVER_NODE, &cfg_server_no_client_cmd); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39269?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: If0b76e7a922c26859d04d339bcc3bdccd66a6922 Gerrit-Change-Number: 39269 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-pcap[master]: server: Simplify code paths in read_cb_*
by pespin 13 Jan '25

13 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39271?usp=email ) Change subject: server: Simplify code paths in read_cb_* ...................................................................... server: Simplify code paths in read_cb_* Change-Id: Ib609af3b1788fe02d9d6957a08d85bc8bae821e8 --- M src/osmo_server_network.c 1 file changed, 31 insertions(+), 26 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 3bf8113..55c84cf 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -628,16 +628,17 @@ LOGP(DSERVER, LOGL_ERROR, "Someone got the pending read wrong: %d\n", conn->pend); return -1; - } else if (conn->pend == 0) { - conn->data->len = ntohs(conn->data->len); - - if (!pcap_data_valid(conn)) - return -1; - - conn->state = STATE_DATA; - conn->pend = conn->data->len; } + if (conn->pend > 0) + return 1; /* Wait for more data before continuing */ + conn->data->len = ntohs(conn->data->len); + + if (!pcap_data_valid(conn)) + return -1; + + conn->state = STATE_DATA; + conn->pend = conn->data->len; return 1; } @@ -659,29 +660,33 @@ LOGP(DSERVER, LOGL_ERROR, "Someone got the pending read wrong: %d\n", conn->pend); return -1; - } else if (conn->pend == 0) { - conn->state = STATE_INITIAL; - conn->pend = sizeof(*conn->data); + } + if (conn->pend > 0) + return 1; /* Wait for more data before continuing */ - /* count the full packet we got */ - rate_ctr_inc2(conn->ctrg, PEER_CTR_PKTS); - rate_ctr_inc2(conn->server->ctrg, SERVER_CTR_PKTS); + conn->state = STATE_INITIAL; + conn->pend = sizeof(*conn->data); - /* count the bytes of it */ - rate_ctr_add2(conn->ctrg, PEER_CTR_BYTES, conn->data->len); - rate_ctr_add2(conn->server->ctrg, SERVER_CTR_BYTES, conn->data->len); + /* count the full packet we got */ + rate_ctr_inc2(conn->ctrg, PEER_CTR_PKTS); + rate_ctr_inc2(conn->server->ctrg, SERVER_CTR_PKTS); - switch (conn->data->type) { - case PKT_LINK_HDR: - return rx_link_hdr(conn, conn->data); - break; - case PKT_LINK_DATA: - return rx_link_data(conn, conn->data); - break; - } + /* count the bytes of it */ + rate_ctr_add2(conn->ctrg, PEER_CTR_BYTES, conn->data->len); + rate_ctr_add2(conn->server->ctrg, SERVER_CTR_BYTES, conn->data->len); + + switch (conn->data->type) { + case PKT_LINK_HDR: + rc = rx_link_hdr(conn, conn->data); + break; + case PKT_LINK_DATA: + rc = rx_link_data(conn, conn->data); + break; + default: + OSMO_ASSERT(0); } - return 1; + return rc; } /* returns >0 on success, <= 0 on failure (closes conn) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39271?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ib609af3b1788fe02d9d6957a08d85bc8bae821e8 Gerrit-Change-Number: 39271 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-bsc[master]: nokia_site: introduce hopping control for Nokia *Site
by csaba.sipos 13 Jan '25

13 Jan '25

Attention is currently required from: fixeria, laforge, pespin. csaba.sipos has posted comments on this change by csaba.sipos. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39290?usp=email ) Change subject: nokia_site: introduce hopping control for Nokia *Site ...................................................................... Patch Set 7: (1 comment) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/39290/comment/2ebc7202_1016cdf9?usp… : PS6, Line 468: DEFUN_ATTR(cfg_bts_nokia_site_hopping_type, > yes I think those, I recall we had some hopping support already for somo-bts, but maybe not the same […] This is just a Nokia specific OML extension the BTS needs. This patch is in no way altering the existing hopping logic on the TS level, just allows the user to configure the existing infrastructure from the VTY. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39290?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idb1d269d2ee80d72ede2394125e8acedf0ee8b06 Gerrit-Change-Number: 39290 Gerrit-PatchSet: 7 Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Jan 2025 16:01:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[L] Change in osmo-pcap[master]: server: Support storing of pcapng format
by osmith 13 Jan '25

13 Jan '25

Attention is currently required from: daniel, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39287?usp=email ) Change subject: server: Support storing of pcapng format ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/osmo_server_network.c: https://gerrit.osmocom.org/c/osmo-pcap/+/39287/comment/88bddc0e_34f4ae1a?us… : PS4, Line 314: "The recvd pcap_file_header contains too big snaplen %zu > %zu\n", : (size_t) hdr->snaplen, (size_t) conn->server->max_snaplen); missing indentation -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39287?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I275d28ab418a1514fa9c5c7c20f3d831cc6af8bb Gerrit-Change-Number: 39287 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Jan 2025 15:58:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log