January 2025 - gerrit-log - lists.osmocom.org

[L] Change in osmo-pcap[master]: client: Support generation of pcapng file format

by pespin

Attention is currently required from: daniel, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39265?usp=email ) Change subject: client: Support generation of pcapng file format ...................................................................... Patch Set 8: (3 comments) File doc/manuals/chapters/client.adoc: https://gerrit.osmocom.org/c/osmo-pcap/+/39265/comment/01f3e45b_9d5c6dc3?us… : PS8, Line 59: reate > create Done File include/osmo-pcap/osmo_pcap_file.h: https://gerrit.osmocom.org/c/osmo-pcap/+/39265/comment/0df37a3e_3053cca0?us… : PS8, Line 87: /* uint32_t block_total_length */ > looks like a leftover, because block_total_length is already in line 85 Nope, it's fine, the field is duplicated at the end of block_body so that the file can be navigated backwards. See pcapng spec 😊 File src/osmo_client_network.c: https://gerrit.osmocom.org/c/osmo-pcap/+/39265/comment/da2123ef_81082df2?us… : PS8, Line 389: . > (remove the dot?) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39265?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: I3c80518a1e53a1f77e1aca8dfa83f683f9516ad6 Gerrit-Change-Number: 39265 Gerrit-PatchSet: 8 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Jan 2025 16:14:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

5 months, 1 week

1
0
0 0

[S] Change in osmo-pcap[master]: Cleanup and reorder includes in header files

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39285?usp=email ) Change subject: Cleanup and reorder includes in header files ...................................................................... Cleanup and reorder includes in header files Put all includes in same order of dependencies. Include stdint.h instead of inttypes.h since that's the file actually containing the standard int types. Change-Id: I0467d3c3a2687a7990c0db7371d0c89f97e8400a --- M include/osmo-pcap/osmo_pcap_client.h M include/osmo-pcap/osmo_pcap_server.h M include/osmo-pcap/osmo_tls.h M include/osmo-pcap/wireformat.h M src/osmo_server_network.c 5 files changed, 15 insertions(+), 15 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_client.h b/include/osmo-pcap/osmo_pcap_client.h index 09a4674..442244e 100644 --- a/include/osmo-pcap/osmo_pcap_client.h +++ b/include/osmo-pcap/osmo_pcap_client.h @@ -21,8 +21,6 @@ */ #pragma once -#include "osmo_tls.h" - #include <inttypes.h> #include <pcap.h> @@ -32,6 +30,8 @@ #include <osmocom/core/rate_ctr.h> #include <osmocom/core/write_queue.h> +#include <osmo-pcap/osmo_tls.h> + #define WQUEUE_MAXLEN_DEFAULT 1000 enum pcap_client_ctr { diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index 988ac96..da39d99 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -21,21 +21,20 @@ */ #pragma once -#include "wireformat.h" -#include "osmo_tls.h" - -#include <osmocom/core/select.h> -#include <osmocom/core/linuxlist.h> -#include <osmocom/core/write_queue.h> - +#include <stdbool.h> +#include <time.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> #include <pcap.h> -#include <stdbool.h> -#include <time.h> +#include <osmocom/core/select.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/write_queue.h> + +#include <osmo-pcap/wireformat.h> +#include <osmo-pcap/osmo_tls.h> struct rate_ctr_group; struct rate_ctr_group_desc; diff --git a/include/osmo-pcap/osmo_tls.h b/include/osmo-pcap/osmo_tls.h index 1b15168..716604e 100644 --- a/include/osmo-pcap/osmo_tls.h +++ b/include/osmo-pcap/osmo_tls.h @@ -20,12 +20,12 @@ */ #pragma once -#include <gnutls/gnutls.h> -#include <gnutls/abstract.h> - #include <stdbool.h> #include <stdint.h> +#include <gnutls/gnutls.h> +#include <gnutls/abstract.h> + struct osmo_fd; struct osmo_wqueue; struct osmo_pcap_client_conn; diff --git a/include/osmo-pcap/wireformat.h b/include/osmo-pcap/wireformat.h index 3838830..40b5b0e 100644 --- a/include/osmo-pcap/wireformat.h +++ b/include/osmo-pcap/wireformat.h @@ -21,7 +21,7 @@ */ #pragma once -#include <inttypes.h> +#include <stdint.h> #include <pcap.h> enum OsmoPcapDataType { diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 64d772a..c2b0e34 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -41,6 +41,7 @@ #include <unistd.h> #include <limits.h> #include <stdlib.h> +#include <inttypes.h> #include <libgen.h> static void pcap_zmq_send(void *publ, const void *data, size_t len, int flags) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39285?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: I0467d3c3a2687a7990c0db7371d0c89f97e8400a Gerrit-Change-Number: 39285 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>

5 months, 1 week

1
0
0 0

[S] Change in osmo-pcap[master]: Makefile.am: proper format and reorder source file lists

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39286?usp=email ) Change subject: Makefile.am: proper format and reorder source file lists ...................................................................... Makefile.am: proper format and reorder source file lists Change-Id: Ie39bd0348f4f329539c1d9dabc8fa87f3e4bbefe --- M include/osmo-pcap/Makefile.am M src/Makefile.am 2 files changed, 8 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmo-pcap/Makefile.am b/include/osmo-pcap/Makefile.am index b71e70c..e377b6a 100644 --- a/include/osmo-pcap/Makefile.am +++ b/include/osmo-pcap/Makefile.am @@ -1 +1,7 @@ -noinst_HEADERS = common.h osmo_pcap_client.h osmo_pcap_server.h wireformat.h osmo_tls.h +noinst_HEADERS = \ + common.h \ + osmo_pcap_client.h \ + osmo_pcap_server.h \ + osmo_tls.h \ + wireformat.h \ + $(NULL) diff --git a/src/Makefile.am b/src/Makefile.am index b35227c..00c9ce9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,9 +17,9 @@ osmo_client_main.c \ osmo_common.c \ osmo_client_core.c \ - osmo_client_vty.c \ osmo_client_network.c \ osmo_client_stats.c \ + osmo_client_vty.c \ osmo_tls.c \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39286?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: Ie39bd0348f4f329539c1d9dabc8fa87f3e4bbefe Gerrit-Change-Number: 39286 Gerrit-PatchSet: 2 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>

5 months, 1 week

1
0
0 0

[S] Change in osmo-pcap[master]: server: Delay reopen of pcap only until necessary

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39272?usp=email ) Change subject: server: Delay reopen of pcap only until necessary ...................................................................... server: Delay reopen of pcap only until necessary If we are asked to reopen a pcap file (eg due to external SIGUSR1) while in the middle of receiving a data packet (we already received the header of the segment so data will arrive soon), code exists to delay reopening so that we can include that last packet which arrived because the time where we were asked to reopen. However, the new pcap file was reopened only after next packet arrived. Instead, we want to reopen it as soon as that last packet is received, so that a new pcap file is created. This allows better tracking eg. empty traffic during time in between last data packet before reopen and the next data packet arriving. While at it, rename the variable to make it more informative, and convert it to a bool. Change-Id: Id79500717a2e186aac979cded340a5af6ce3035b --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_network.c 2 files changed, 8 insertions(+), 7 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 dad81d3..030a353 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -97,7 +97,7 @@ /* read buffering */ int state; int pend; - int reopen; + bool reopen_delayed; struct osmo_pcap_data *data; /* statistics */ diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 55c84cf..7d46b90 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -686,6 +686,12 @@ OSMO_ASSERT(0); } + if (conn->reopen_delayed) { + LOGP(DSERVER, LOGL_INFO, "Reopening log for %s now.\n", conn->name); + restart_pcap(conn); + conn->reopen_delayed = false; + } + return rc; } @@ -693,11 +699,6 @@ static int dispatch_read(struct osmo_pcap_conn *conn) { if (conn->state == STATE_INITIAL) { - if (conn->reopen) { - LOGP(DSERVER, LOGL_INFO, "Reopening log for %s now.\n", conn->name); - restart_pcap(conn); - conn->reopen = 0; - } return read_cb_initial(conn); } else if (conn->state == STATE_DATA) { return read_cb_data(conn); @@ -874,7 +875,7 @@ restart_pcap(conn); } else { LOGP(DSERVER, LOGL_INFO, "Delaying %s until current packet is complete.\n", conn->name); - conn->reopen = 1; + conn->reopen_delayed = true; } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39272?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: Id79500717a2e186aac979cded340a5af6ce3035b Gerrit-Change-Number: 39272 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>

5 months, 1 week

1
0
0 0

[XS] Change in osmo-pcap[master]: server: Store read buf max len as conn field

by pespin

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>

5 months, 1 week

1
0
0 0

[S] Change in osmo-pcap[master]: server: Split osmo_pcap_conn alloc to its own function

by pespin

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>

5 months, 1 week

1
0
0 0

[XS] Change in osmo-pcap[master]: server: Rename function osmo_pcap_server_delete -> osmo_pcap_conn_free

by pespin

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>

5 months, 1 week

1
0
0 0

[XS] Change in osmo-pcap[master]: server: Rename func client_data() -> zmq_send_client_data()

by pespin

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>

5 months, 1 week

1
0
0 0

[XS] Change in osmo-pcap[master]: cosmetic: server: Fix typo in comment

by pespin

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>

5 months, 1 week

1
0
0 0

[S] Change in osmo-pcap[master]: cosmetic: server: document functions

by pespin

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>

5 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2025