February 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial conn-oriented forwarding

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 ) Change subject: bsc_nat_fsm: initial conn-oriented forwarding ...................................................................... Patch Set 3: (2 comments) File src/osmo-bsc-nat/bsc_nat_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260/comment/ee5ae3d2_77942105 PS3, Line 74: static int sccp_sap_get_peer_addr_in(struct bsc_nat_ss7_inst *src, struct osmo_sccp_addr **peer_addr_in, > I think both *called_addr and *calling_addr arguments can be marked 'const'? Done https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260/comment/8c0ab1fe_f9cba3eb PS3, Line 78: *peer_addr_in = called_addr; > ... you would need to cast pointers here and below, but I think it's fine. Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3df79e4dfaa60f4fd098961ee57cda71e9773b82 Gerrit-Change-Number: 27260 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Feb 2022 13:09:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial conn-oriented forwarding

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 to look at the new patch set (#4). Change subject: bsc_nat_fsm: initial conn-oriented forwarding ...................................................................... bsc_nat_fsm: initial conn-oriented forwarding Implement a simple version of forwarding Connection Request, Connection Confirm, Data Form, Released SCCP messages. This is still assuming that there is just one BSC, one MSC, the same connection ID is used in RAN and CN. Future patches will add a mapping between RAN and CN sides and allow multiple BSCs. With this patch it is possible to perform a call between two MS in the following network structure: MS1 --. BTS --- BSC --- BSCNAT --- MSC MS2 --' Related: SYS#5560 Change-Id: I3df79e4dfaa60f4fd098961ee57cda71e9773b82 --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 88 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/60/27260/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3df79e4dfaa60f4fd098961ee57cda71e9773b82 Gerrit-Change-Number: 27260 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: Add ttcn3-ggsn-test-ogs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27268 ) Change subject: jobs/ttcn3-testsuites.yml: Add ttcn3-ggsn-test-ogs ...................................................................... jobs/ttcn3-testsuites.yml: Add ttcn3-ggsn-test-ogs Change-Id: I61950f4fc613faae3a731ace394b76c8754bd3c4 --- M jobs/ttcn3-testsuites.yml 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified pespin: Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 5df5553..dbf162b 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -60,6 +60,11 @@ Test osmo-ggsn latest with the Linux kernel built from master of <a href="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/"> torvalds/linux.git</a>. + - ttcn3-ggsn-test-ogs: + blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" + timer: 35 04 * * * + description: | + Test open5gs-smfd + open5gs-upfd main. - ttcn3-msc-test: blocking: "^(ttcn3|TTCN3-.*)-msc-test.*" timer: 40 04 * * * -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I61950f4fc613faae3a731ace394b76c8754bd3c4 Gerrit-Change-Number: 27268 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: TC_act_deact_retrans_duplicate: expect no diameter upon retrans

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27269 ) Change subject: ggsn: TC_act_deact_retrans_duplicate: expect no diameter upon retrans ...................................................................... ggsn: TC_act_deact_retrans_duplicate: expect no diameter upon retrans Change-Id: Ic579832bcaebfb22eb11156060c4385e41a5685a --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index bffdd4c..bef7949 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -474,7 +474,7 @@ T_default.stop; } - function f_pdp_ctx_del(PdpContext ctx, template BIT1 teardown_ind, OCT1 expect_causevalue := '80'O) runs on GT_CT { + function f_pdp_ctx_del(PdpContext ctx, template BIT1 teardown_ind, OCT1 expect_causevalue := '80'O, boolean expect_diameter := true) runs on GT_CT { var Gtp1cUnitdata ud; var default d; var OCT4 expect_teid; @@ -490,7 +490,7 @@ f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, ctx.teic_remote, ctx.nsapi, teardown_ind)); T_default.start; d := activate(pingpong()); - if (DIAMETER_PROC.checkstate("Connected")) { + if (DIAMETER_PROC.checkstate("Connected") and expect_diameter) { as_DIA_CCR(TERMINATION_REQUEST); } alt { @@ -1771,11 +1771,11 @@ duplicate. If it was not a duplicate, osmo-ggsn would answer with a failure since that PDP ctx was already deleted. */ g_c_seq_nr := g_c_seq_nr - 1; - f_pdp_ctx_del(ctx, '1'B); + f_pdp_ctx_del(ctx, '1'B, expect_diameter := false); /* Now send a new pdp ctx del (increased seqnum). It should fail with cause "non-existent": */ var OCT1 cause_nonexistent := 'C0'O; - f_pdp_ctx_del(ctx, '1'B, cause_nonexistent); + f_pdp_ctx_del(ctx, '1'B, cause_nonexistent, expect_diameter := false); } /* Activate PDP context + trigger Recovery procedure through EchoResp */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27269 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: Ic579832bcaebfb22eb11156060c4385e41a5685a Gerrit-Change-Number: 27269 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: scripts/osmo-ci-docker-rebuild: x86: skip deb11

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27265 ) Change subject: scripts/osmo-ci-docker-rebuild: x86: skip deb11 ...................................................................... scripts/osmo-ci-docker-rebuild: x86: skip deb11 Don't attempt to build debian-bullseye (11) in docker on debian 10 x86, as it results in: GPG error: http://security.debian.org/debian-security bullseye-security InRelease: At least one invalid signature was encountered. E: The repository 'http://security.debian.org/debian-security bullseye-security InRelease' is not signed. This is a temporary measure until we've upgraded the only jenkins node that runs debian 10 on x86, gtp0-deb10build32. Related: OS#5453 Change-Id: Iba7679c027ca89a29393c220d01b195cfce4fec3 --- M scripts/osmo-ci-docker-rebuild.sh 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index cf0b102..f46bec1 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -4,8 +4,19 @@ . scripts/common.sh docker_images_require \ "debian-stretch-jenkins" \ - "debian-buster-jenkins" \ - "debian-bullseye-erlang" \ + "debian-buster-jenkins" + +if [ "$(arch)" = "i686" ] && \ + grep -q '^ID=debian' /etc/os-release && \ + grep -q '^VERSION_ID="10"' /etc/os-release; then + # Attempting to run debian-bullseye (11) in docker on debian 10 x86 + # doesn't work. Skip it here for gtp0-deb10build32 until we've moved it + # away from debian 10. + echo "Skipping build of debian-bullseye-erlang (OS#5453)" +else + docker_images_require \ + "debian-bullseye-erlang" +fi if [ "$(arch)" = "x86_64" ]; then docker_images_require \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iba7679c027ca89a29393c220d01b195cfce4fec3 Gerrit-Change-Number: 27265 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: Add ttcn3-ggsn-test-ogs

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27268 ) Change subject: jobs/ttcn3-testsuites.yml: Add ttcn3-ggsn-test-ogs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I61950f4fc613faae3a731ace394b76c8754bd3c4 Gerrit-Change-Number: 27268 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Feb 2022 13:03:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-dev[master]: net: run.sh: fix infinite "q Enter to close" msgs

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27037 ) Change subject: net: run.sh: fix infinite "q Enter to close" msgs ...................................................................... net: run.sh: fix infinite "q Enter to close" msgs Fix the logic that is supposed to display a "q Enter to close" message once and wait for user input, in case one of the Osmocom programs crashed. Explicitly read from /dev/tty, as it may not be connected as default stdin anymore at this point. This happens when using the new code paths with tmux as terminal, but also happened before recent refactorings for me with all terminals. Related: https://media.ccc.de/v/osmodevcall-20211210-osmith-osmo-dev-ttcn3#t=801 Change-Id: Iebb799493f76fd57f24b15c998ded2bd8e284e6b --- M net/templates/run.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/net/templates/run.sh b/net/templates/run.sh index 1d78db5..64419a6 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -118,7 +118,7 @@ while true; do echo 'q Enter to close' - read q_to_close + read q_to_close < /dev/tty if [ "x\$q_to_close" = xq ]; then break fi -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iebb799493f76fd57f24b15c998ded2bd8e284e6b Gerrit-Change-Number: 27037 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-dev[master]: net/templates/run.sh: put log name in trace.pcap

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27267 ) Change subject: net/templates/run.sh: put log name in trace.pcap ...................................................................... net/templates/run.sh: put log name in trace.pcap It's hard to distinguish multiple wireshark windows with trace.pcap files, as only the file name and not the path is shown in the title. Make it easier to distinguish them by adding the log name to the file name. Change-Id: I7007d7c1e74aef46f1942f4f6f675adebb890955 --- M net/templates/run.sh 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/net/templates/run.sh b/net/templates/run.sh index 64419a6..0a8cfb1 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -298,11 +298,13 @@ newlogdir="log/$log_name" #scp "bts:/tmp/{bts,pcu}.log" "bts:neels/osmo-{bts,pcu}.cfg" "$logdir" else - newlogdir="autolog/log_$(date +%Y-%m-%d_%H-%M-%S)" + log_name="log_$(date +%Y-%m-%d_%H-%M-%S)" + newlogdir="autolog/$log_name" fi mkdir -p "$(dirname "$newlogdir")" mergecap -w "$logdir/trace.pcap" "$logdir/"*.single.pcap && rm -f "$logdir/"*.single.pcap +mv "$logdir/trace.pcap" "$logdir/trace-$log_name.pcap" if [ -x "$newlogdir" ]; then echo "already exists, move it manually: $newlogdir" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I7007d7c1e74aef46f1942f4f6f675adebb890955 Gerrit-Change-Number: 27267 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-dev[master]: net: run.sh: store all spawned pids in files

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27034 ) Change subject: net: run.sh: store all spawned pids in files ...................................................................... net: run.sh: store all spawned pids in files Replace the previous approach of only storing the PIDs of the spawned terminals, and then attempting to kill all other processes (the ones running inside the spawned terminals and tcpdump) with "killall". Instead, store PIDs of all spawned programs: * Terminals * Osmocom programs (new) * Tcpdump (new) Kill old processes at the start of run.sh as well, so even if run.sh was killed before it could clean up, the Osmocom programs don't fail to start anymore (as it was the case before). Change-Id: I379ef71de2f1ab0ac4a28064e5cf9e275c4c61e9 --- M net/templates/run.sh 1 file changed, 79 insertions(+), 57 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/net/templates/run.sh b/net/templates/run.sh index c2f42ee..426ed91 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -39,7 +39,8 @@ fi logdir="current_log" -mkdir -p "$logdir" +piddir="run/pids" +mkdir -p "$logdir" "$piddir" find_term() { # Find a terminal program and write to the global "terminal" variable @@ -68,15 +69,68 @@ exit 1 } +pidfiles_must_not_exist() { + local pidfile + + for pidfile in "$@"; do + if [ -e "$pidfile" ]; then + echo + echo "ERROR: pidfile exists: $pidfile" + echo + kill_pids + exit 1 + fi + done +} + term() { title="$2" if [ -z "$title" ]; then title="$(basename $@)" fi - exec $terminal -title "CN:$title" -e sh -c "export LD_LIBRARY_PATH='/usr/local/lib'; $1; echo; while true; do echo 'q Enter to close'; read q_to_close; if [ \"x\$q_to_close\" = xq ]; then break; fi; done" + + local pidfile="$piddir/$title.pid" + local pidfile_term="$piddir/$title.term.pid" + pidfiles_must_not_exist "$pidfile" "$pidfile_term" + + $terminal \ + -title "CN:$title" \ + -e sh -c "export LD_LIBRARY_PATH='/usr/local/lib' + $1 & + echo \$! > $pidfile + wait + echo + while true; do + echo 'q Enter to close' + read q_to_close + if [ \"x\$q_to_close\" = xq ]; then + break + fi + done" \ + & + + echo "$!" > "$pidfile_term" +} + +kill_pids() { + local pidfile + local pid + + for pidfile in "$piddir"/*.pid; do + if ! [ -e "$pidfile" ]; then + continue + fi + + pid="$(cat "$pidfile")" + + echo "killing $(basename "$pidfile") ($pid)" + sudo kill "$pid" + rm "$pidfile" + done } find_term +kill_pids hnbgw="osmo-hnbgw" msc="gdb -ex run --args $(which osmo-msc)" @@ -130,78 +184,66 @@ esac fi +PIDFILE_TCPDUMP_DEV="$piddir/tcpdump.$dev.pid" +PIDFILE_TCPDUMP_LO="$piddir/tcpdump.lo.pid" +pidfiles_must_not_exist "$PIDFILE_TCPDUMP_DEV" "$PIDFILE_TCPDUMP_LO" + sudo tcpdump -i $dev -n -w current_log/$dev.single.pcap -U not port 22 & +echo "$!" > "$PIDFILE_TCPDUMP_DEV" sudo tcpdump -i lo -n -w current_log/lo.single.pcap -U not port 22 & +echo "$!" > "$PIDFILE_TCPDUMP_LO" -PIDS="" - -term "$ggsn" GGSN & -PIDS="$PIDS $!" +term "$ggsn" GGSN if [ "${STP_CN_IP}" = "${STP_RAN_IP}" ]; then sleep .2 - term "$stp4cn" STP & - PIDS="$PIDS $!" + term "$stp4cn" STP else sleep .2 - term "$stp4cn" STP4CN & - PIDS="$PIDS $!" + term "$stp4cn" STP4CN sleep .2 - term "$stp4ran" STP4RAN & - PIDS="$PIDS $!" + term "$stp4ran" STP4RAN sleep .2 - term "$bscnat" BSCNAT & - PIDS="$PIDS $!" + term "$bscnat" BSCNAT fi sleep .2 -term "$hlr" HLR & -PIDS="$PIDS $!" +term "$hlr" HLR sleep .2 -term "$sgsn" SGSN & -PIDS="$PIDS $!" +term "$sgsn" SGSN sleep .2 -term "$gbproxy" GBPROXY & -PIDS="$PIDS $!" +term "$gbproxy" GBPROXY sleep .2 -term "$mgw4msc" MGW4MSC & -PIDS="$PIDS $!" +term "$mgw4msc" MGW4MSC sleep .2 -term "$mgw4bsc" MGW4BSC & -PIDS="$PIDS $!" +term "$mgw4bsc" MGW4BSC sleep .2 -term "$msc" MSC & -PIDS="$PIDS $!" +term "$msc" MSC sleep 2 -term "$hnbgw" HNBGW & -PIDS="$PIDS $!" +term "$hnbgw" HNBGW sleep .2 -term "$bsc" BSC & -PIDS="$PIDS $!" +term "$bsc" BSC if [ "x${MSC_MNCC}" != "xinternal" ]; then sleep .2 - term "$sipcon" SIPCON & - PIDS="$PIDS $!" + term "$sipcon" SIPCON sleep .2 case "${PBX_SERVER}" in "kamailio") - term "$kamailio" KAMAILIO & - PIDS="$PIDS $!" + term "$kamailio" KAMAILIO ;; "freeswitch") - term "./freeswitch/freeswitch.sh" FREESWITCH & - PIDS="$PIDS $!" + term "./freeswitch/freeswitch.sh" FREESWITCH ;; esac fi @@ -215,27 +257,7 @@ #ssh bts neels/stop_remote.sh -for i in $PIDS; do - kill "$i" -done -killall osmo-msc -killall osmo-bsc -killall osmo-gbproxy -killall osmo-sgsn -#killall osmo-hnbgw -killall osmo-mgw -killall osmo-hlr -killall -9 osmo-stp -sudo killall tcpdump -killall osmo-ggsn -killall osmo-bsc-nat - -if [ "x${MSC_MNCC}" != "xinternal" ]; then - # 'killall' seems to work only with the shortened name - killall osmo-sip-connec - killall "${PBX_SERVER}" -fi - +kill_pids set +e cp *.cfg "$logdir"/ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I379ef71de2f1ab0ac4a28064e5cf9e275c4c61e9 Gerrit-Change-Number: 27034 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-dev[master]: net: run.sh: write launcher command to shell script

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27035 ) Change subject: net: run.sh: write launcher command to shell script ...................................................................... net: run.sh: write launcher command to shell script Instead of passing a whole script to the terminal via command-line argument, write it to a file. This is in preparation to use the same script with tmux, see next patch. Change-Id: I15760d706b20628421c10a16514120f442d5477f --- M net/templates/run.sh 1 file changed, 27 insertions(+), 13 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/net/templates/run.sh b/net/templates/run.sh index 426ed91..332b168 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -40,7 +40,9 @@ logdir="current_log" piddir="run/pids" -mkdir -p "$logdir" "$piddir" +launcherdir="run/launchers" +rm -rf "$launcherdir" +mkdir -p "$logdir" "$piddir" "$launcherdir" find_term() { # Find a terminal program and write to the global "terminal" variable @@ -93,20 +95,32 @@ local pidfile_term="$piddir/$title.term.pid" pidfiles_must_not_exist "$pidfile" "$pidfile_term" + local launcher="$launcherdir/$title.sh" + + cat << EOF > "$launcher" +#!/bin/sh + +export LD_LIBRARY_PATH='/usr/local/lib' + +$1 & +echo \$! > $pidfile +wait + +echo + +while true; do + echo 'q Enter to close' + read q_to_close + if [ "x\$q_to_close" = xq ]; then + break + fi +done +EOF + chmod +x "$launcher" + $terminal \ -title "CN:$title" \ - -e sh -c "export LD_LIBRARY_PATH='/usr/local/lib' - $1 & - echo \$! > $pidfile - wait - echo - while true; do - echo 'q Enter to close' - read q_to_close - if [ \"x\$q_to_close\" = xq ]; then - break - fi - done" \ + -e sh -c "$launcher" \ & echo "$!" > "$pidfile_term" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I15760d706b20628421c10a16514120f442d5477f Gerrit-Change-Number: 27035 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022