Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-pcap/+/39270?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/70/39270/3
--
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: newpatchset
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
pespin has uploaded this change for review. ( 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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/73/39273/1
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 891ebab..21200ef 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: newchange
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: I8f62aa0bdb04e73223c0c6803a58241f83a5ebe9
Gerrit-Change-Number: 39273
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-pcap/+/39271?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/71/39271/2
--
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: newpatchset
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: Ib609af3b1788fe02d9d6957a08d85bc8bae821e8
Gerrit-Change-Number: 39271
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Attention is currently required from: laforge, pespin.
csaba.sipos has posted comments on this change by csaba.sipos. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39252?usp=email )
Change subject: nokia_site: add missing element names
......................................................................
Patch Set 3:
(1 comment)
File src/osmo-bsc/bts_nokia_site.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/39252/comment/dacf1c14_ffd2010b?usp… :
PS1, Line 551: if
> As far as I read the diff, the original code has "Abis If" for 0xFA and you replace it with "Abis if […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39252?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: Ia4026bbe458817e164b756847229cf6a90d02865
Gerrit-Change-Number: 39252
Gerrit-PatchSet: 3
Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 09 Jan 2025 17:14:05 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: csaba.sipos <metro4(a)freemail.hu>
Attention is currently required from: csaba.sipos, laforge, pespin.
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/39252?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder
Change subject: nokia_site: add missing element names
......................................................................
nokia_site: add missing element names
Change-Id: Ia4026bbe458817e164b756847229cf6a90d02865
Signed-off-by: csaba.sipos <metro4(a)freemail.hu>
---
M src/osmo-bsc/bts_nokia_site.c
1 file changed, 81 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/52/39252/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39252?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ia4026bbe458817e164b756847229cf6a90d02865
Gerrit-Change-Number: 39252
Gerrit-PatchSet: 3
Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: csaba.sipos <metro4(a)freemail.hu>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
pespin has uploaded this change for review. ( 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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/72/39272/1
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 f4f6b06..d57b42b 100644
--- a/src/osmo_server_network.c
+++ b/src/osmo_server_network.c
@@ -684,6 +684,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;
}
@@ -691,11 +697,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);
@@ -872,7 +873,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: newchange
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: Id79500717a2e186aac979cded340a5af6ce3035b
Gerrit-Change-Number: 39272
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>