Attention is currently required from: fixeria.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-pcap/+/39948?usp=email
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: client: use pcap_dispatch to avoid extra pkt buffer copy
......................................................................
client: use pcap_dispatch to avoid extra pkt buffer copy
pcap_next() allows use of returned buffer until next time the same API
is called. In order to do so, it internally calls pcap_dispatch() with
an internal handler (in the case of linux pcapint_oneshot_linux()).
That handler basically memcpy()s the pkt buffer obtained in the
pcap_dispatch callback into a temporary static buffer which is then
returned.
We don't need any of that here, and by using pcap_dispatch() directly
(as recommended in pcapint_oneshot_linux() function documentation) we
can skip an extra memcpy() of each packet buffer captured.
Furthermore, it will allow us processing multiple packets from the
captured queue (RA_SOCKET+mmap implementation in linux) in one poll
iteration if several packets have been captured. This will be done in a
follow-up patch.
pcap handle is marked non-blocking to allow polling from it without
ending up blocked. Applying filter is moved beforehand, as seen in
libpcap capturetest example.
Related: SYS#7290
Change-Id: I055efb66fac5e04c541d75ec2c0f654cdfb17838
---
M src/osmo_client_core.c
1 file changed, 28 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/48/39948/4
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39948?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: I055efb66fac5e04c541d75ec2c0f654cdfb17838
Gerrit-Change-Number: 39948
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Attention is currently required from: osmith.
pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/39973?usp=email )
Change subject: debian-bookworm-build: remove pysispm, pydbus
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Those are indeed needed by osmo-gsm-tester. Which means may be somehow imported when running https://jenkins.osmocom.org/jenkins/job/osmo-gsm-tester_virtual/
In theory they are not strictly needed for that testsuite, since pydbus is used to control hw modems through ofono, and pysispm to power on/off some BTS connected to smart plugs.
If that job fails after this patch gets merged, then we can fix osmo-gsm-tester to import those only when needed.
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39973?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I731e171c85d530984279dc05544b6f02cec7cb3c
Gerrit-Change-Number: 39973
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Apr 2025 12:01:56 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Attention is currently required from: fixeria.
pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-msc/+/39952?usp=email )
Change subject: SMS-over-GSUP: send network-originated MT-forwardSM-Err
......................................................................
Patch Set 1:
(1 comment)
File src/libmsc/gsm_04_11.c:
https://gerrit.osmocom.org/c/osmo-msc/+/39952/comment/2b592b5a_4457fbd5?usp… :
PS1, Line 1332: rate_ctr_inc(rate_ctr_group_get_ctr(net->msc_ctrs, MSC_CTR_SMS_DELIVERED));
> Wrong place for what? This FIXME is about incrementing a counter way too early. […]
I'm not saying it's related to this patch, just flagged it in case you want to take the chance to fix it now that you have the code fresh, since it may be easy to fix.
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/39952?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I51d92752471147e6d21a5059bebb0702b32642a5
Gerrit-Change-Number: 39952
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Apr 2025 11:59:04 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Attention is currently required from: laforge.
pespin has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/docker-playground/+/39972?usp=email )
Change subject: upgrade to gerrit 3.10.x as 3.9 is EOL on May 12th
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39972?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I906b4ff47cf714010697eeb226af826edfbaf911
Gerrit-Change-Number: 39972
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 08 Apr 2025 11:58:04 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: fixeria.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39948?usp=email )
Change subject: client: use pcap_dispatch to avoid extra pkt buffer copy
......................................................................
Patch Set 3:
(2 comments)
File src/osmo_client_core.c:
https://gerrit.osmocom.org/c/osmo-pcap/+/39948/comment/05710340_3502942e?us… :
PS2, Line 464: one
> Why not just passing `1`? It needs a value, not a pointer.
Oh indeed, when I saw the example it was using a var so I thought it was similar to a setsockopt. I'll rework this.
https://gerrit.osmocom.org/c/osmo-pcap/+/39948/comment/1926672d_00e7004b?us… :
PS2, Line 464: == -1
> Maybe it's better to check `!= 0` instead? Looking at the man page, I see it may return `PCAP_ERROR_ […]
Will have a look thanks.
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39948?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: I055efb66fac5e04c541d75ec2c0f654cdfb17838
Gerrit-Change-Number: 39948
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Apr 2025 11:56:02 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/39973?usp=email )
Change subject: debian-bookworm-build: remove pysispm, pydbus
......................................................................
debian-bookworm-build: remove pysispm, pydbus
Remove pysispm as it currently breaks building the container and as it
is unlikely that we actually need this library as it is for switching
on/off power strips.
I've seen it mentioned first in c9fa2a ("Introduce osmo-gsm-tester
docker setup") from where it apparently was copy pasted to debian 10, 11
and 12 containers afterwards c1f302c2 ("Add debian-buster-jenkins docker
setup").
Remove pydbus as well, it was apparently copy pasted with the same
history and isn't used in Osmocom software.
Fix for:
#17 30.93 ERROR: Could not find a version that satisfies the requirement pysispm (from versions: none)
#17 30.93 ERROR: No matching distribution found for pysispm
Change-Id: I731e171c85d530984279dc05544b6f02cec7cb3c
---
M debian-bookworm-build/Dockerfile
1 file changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/73/39973/1
diff --git a/debian-bookworm-build/Dockerfile b/debian-bookworm-build/Dockerfile
index b7744f6..170d363 100644
--- a/debian-bookworm-build/Dockerfile
+++ b/debian-bookworm-build/Dockerfile
@@ -182,8 +182,6 @@
'git+https://github.com/eriwen/lcov-to-cobertura-xml.git@028da3798355d0260c6…' \
'git+https://github.com/osmocom/sphinx-argparse@inside-classes#egg=sphinx-ar…' \
'git+https://github.com/podshumok/python-smpplib.git' \
- 'pydbus' \
- 'pysispm' \
'ruff' \
'sphinx' \
'sphinxcontrib-napoleon' \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39973?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I731e171c85d530984279dc05544b6f02cec7cb3c
Gerrit-Change-Number: 39973
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Attention is currently required from: pespin.
fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-msc/+/39952?usp=email )
Change subject: SMS-over-GSUP: send network-originated MT-forwardSM-Err
......................................................................
Patch Set 1:
(2 comments)
File src/libmsc/gsm_04_11.c:
https://gerrit.osmocom.org/c/osmo-msc/+/39952/comment/16484084_7d99a05e?usp… :
PS1, Line 1332: rate_ctr_inc(rate_ctr_group_get_ctr(net->msc_ctrs, MSC_CTR_SMS_DELIVERED));
> (as FIXME mentions, this is probably in the wrong place).
Wrong place for what? This FIXME is about incrementing a counter way too early.
I don't see how this might be related to this patch.
https://gerrit.osmocom.org/c/osmo-msc/+/39952/comment/a33f2e12_4c1d7f99?usp… :
PS1, Line 1457: }
> (we may want to add a rate counter for failed deliveries here. […]
Yeah, but I would prefer doing this in a separate patch.
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/39952?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I51d92752471147e6d21a5059bebb0702b32642a5
Gerrit-Change-Number: 39952
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Apr 2025 09:30:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/39972?usp=email )
Change subject: upgrade to gerrit 3.10.x as 3.9 is EOL on May 12th
......................................................................
upgrade to gerrit 3.10.x as 3.9 is EOL on May 12th
Change-Id: I906b4ff47cf714010697eeb226af826edfbaf911
---
M gerrit/Dockerfile
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/72/39972/1
diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile
index e57c9eb..fa9c163 100644
--- a/gerrit/Dockerfile
+++ b/gerrit/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.9.7
+FROM gerritcodereview/gerrit:3.10.5
USER root
RUN yum -y install zip unzip patch
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39972?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I906b4ff47cf714010697eeb226af826edfbaf911
Gerrit-Change-Number: 39972
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>