pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36867?usp=email )
Change subject: ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pcap parent dir
......................................................................
ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pcap parent dir
dumpcap seems to be opening the pcap file it writes to *after* dropping
privileges, which means even if running it as root, it will fail to
create the pcap file inside a directory where that same user (even if
root) doesn't have write+execute permissions.
This is exactly what happens when one tries to run the
ttcn3-tcmpdump-start.sh script inside docker with "--cap-add=NET_ADMIN
--cap-add=SYS_RESOURCE" and root user, where it then tells dumpcap to
write to a volume mounted inside docker which was created by the user
outside user, hence with UID=1000 instead of UID=0 inside docker.
Since tcpdump works fine in this setup, simply skip using dumpcap if it
would fail to create the pcap file.
Related: OS#6455
Change-Id: If8ea5bb62f4866042761d3e08fe83179bf10c75a
---
M ttcn3-tcpdump-start.sh
1 file changed, 30 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/36867/1
diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh
index 5b6c9ea..7c4b78f 100755
--- a/ttcn3-tcpdump-start.sh
+++ b/ttcn3-tcpdump-start.sh
@@ -62,7 +62,12 @@
fi
if [ -u $DUMPCAP -o "$CAP_ERR" = "0" ]; then
- CMD="$DUMPCAP -q"
+ # dumpcap, *after dropping permissions*, needs to be able to write to the directory to create the pcap file:
+ if [ "$(stat -L -c "%u" "$TTCN3_PCAP_PATH")" = "$(id -u)" ] && [ "$(stat -L -c "%A" "$TTCN3_PCAP_PATH" | head -c 4)" = "drwx" ]; then
+ CMD="$DUMPCAP -q"
+ else
+ echo "NOTE: unable to use dumpcap due to missing permissions in $TTCN3_PCAP_PATH"
+ fi
else
echo "NOTE: unable to use dumpcap due to missing capabilities or suid bit"
fi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36867?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: If8ea5bb62f4866042761d3e08fe83179bf10c75a
Gerrit-Change-Number: 36867
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria, osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email )
Change subject: tests: don't run osmotestconfig.py in distcheck
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
As of now I think it's fine having it run twice when you run make check and make distcheck. That's what they are suppsoed to each tone, run tests...
So looks like we should instead try to fix make distcheck.
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I68e33a229a1cd035a9acef1210068af0e476bff3
Gerrit-Change-Number: 36864
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 17 May 2024 15:54:07 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/36865?usp=email )
Change subject: libmsc: reset the LU delay timer (X5) on MO/MT SMS
......................................................................
libmsc: reset the LU delay timer (X5) on MO/MT SMS
We don't want to delay the BSSAP/RANAP connection release any longer
than it takes to submit or deliver an SMS. Thus, whenever a new SMS
transaction is being allocated, drop the LU token.
Change-Id: Iad4ace6038be4b6037e341e7d9d187bef2917d80
Related: osmo-ttcn3-hacks.git I74fa174ea649adb2112c8e471c0e339a2197a08d
Related: SYS#6913
---
M src/libmsc/gsm_04_11.c
1 file changed, 22 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/65/36865/1
diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
index aa87a19..cbacb43 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -1081,6 +1081,13 @@
else
msc_a_put(msc_a, MSC_A_USE_CM_SERVICE_SMS);
}
+
+ /* If we're re-using the existing LU connection, drop the LU token.
+ * The idea behind this timer is explained in msc_a_put_use_lu(). */
+ if (osmo_timer_pending(&msc_a->lu_delay_timer)) {
+ osmo_timer_del(&msc_a->lu_delay_timer);
+ msc_a_put(msc_a, MSC_A_USE_LOCATION_UPDATING);
+ }
}
/* Init both SMC and SMR state machines */
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36865?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Iad4ace6038be4b6037e341e7d9d187bef2917d80
Gerrit-Change-Number: 36865
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria, pespin.
Hello Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review+1 by pespin, Verified+1 by Jenkins Builder
Change subject: msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer
......................................................................
msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer
Change-Id: I74fa174ea649adb2112c8e471c0e339a2197a08d
Related: osmo-msc.git Ic519cab55d65e47b2636124427dab1a1d80fab78
Related: SYS#6913
---
M msc/BSC_ConnectionHandler.ttcn
M msc/MSC_Tests.ttcn
M msc/expected-results.xml
3 files changed, 79 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/36772/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I74fa174ea649adb2112c8e471c0e339a2197a08d
Gerrit-Change-Number: 36772
Gerrit-PatchSet: 3
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-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: fixeria.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email )
Change subject: doc: set state-dir to /var/lib/osmocom/osmo-sgsn
......................................................................
Patch Set 5:
This change is ready for review.
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I309807ff0bc125d4653222b2b4ba69ded3bbff70
Gerrit-Change-Number: 36845
Gerrit-PatchSet: 5
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 17 May 2024 14:56:24 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment