Attention is currently required from: osmith.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27032 )
Change subject: net/templates/.editorconfig: new file
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27032
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Ieeb67a10c7b7c27a5e0e9dbc8399fe2add9f34d4
Gerrit-Change-Number: 27032
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 31 Jan 2022 17:07:18 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith, neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662 )
Change subject: Add bsc_nat fsm
......................................................................
Patch Set 8:
(1 comment)
File src/osmo-bsc-nat/bsc_nat_fsm.c:
https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662/comment/4a7c57be_a0f62978
PS8, Line 129: ss7_inst_free(bsc_nat->cn);
This looks really strange. I'd expect a "free()" function called on a pointer to completely free the memory pointed by the ponter, so one should never use the pointer again. Yet I see you call talloc_free() on it afterwards. This is really confusing.
My previous comment was in the line of doing:
*_free(bsc_nat->cn);
bsc_nat->cn = NULL;
since you are not freeing the bsc_nat parent object here, so it looks legityimate to set the pointer to null to avoid acessing the memory while the bsc_nat object is still alive.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662
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: I7d52fa649c397582b18a1a7dcc40bb407f3b2c97
Gerrit-Change-Number: 26662
Gerrit-PatchSet: 8
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 31 Jan 2022 17:04:03 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: osmith, laforge, fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26982 )
Change subject: osmo-uecups-master/Dockerfile: do not pass command line options
......................................................................
Patch Set 3: Code-Review+1
(1 comment)
Patchset:
PS3:
I'd also go for adding the -c param to osmo-uecups, instead of diverging here and in other places in the future.
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26982
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ia9b220e4cfbc89b800fafdd153bd63d6d95799e2
Gerrit-Change-Number: 26982
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 31 Jan 2022 16:57:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27036 )
Change subject: net: run.sh: support tmux as terminal
......................................................................
net: run.sh: support tmux as terminal
Create one tmux session, with each Osmocom program in one window, if
tmux is chosen as "terminal". This allows using osmo-dev's run.sh over
ssh without X forwarding. Also the existing supported terminals
automatically scroll to the bottom as soon as there is new output,
making it hard to read logs.
Change-Id: Iaef08fb3cb3c6f58cd8490a631e177a03af9c974
---
M net/config_2g3g
M net/templates/run.sh
2 files changed, 22 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/36/27036/1
diff --git a/net/config_2g3g b/net/config_2g3g
index ab6c2a2..95d8290 100644
--- a/net/config_2g3g
+++ b/net/config_2g3g
@@ -1,5 +1,5 @@
# Terminal for launching Osmocom programs
-# Supported: auto, urxvt, xterm
+# Supported: auto, urxvt, xterm, tmux
TERMINAL="auto"
ETH_DEV=eth0
diff --git a/net/templates/run.sh b/net/templates/run.sh
index 19e7e9b..a611926 100755
--- a/net/templates/run.sh
+++ b/net/templates/run.sh
@@ -1,5 +1,13 @@
#!/usr/bin/env bash
+# tmux: start this script inside a new session
+tmux_session="CN"
+if [ "${TERMINAL}" = "tmux" ] && [ "$1" != "inside-tmux" ]; then
+ echo "Starting tmux session '$tmux_session'"
+ unset TMUX
+ exec tmux new-session -s "$tmux_session" -n "RUN" "$0" "inside-tmux"
+fi
+
if ! ../fill_config.py --check-stale; then
echo
echo "WARNING: STALE CONFIGS - your net configs are older than the templates they should be based on!"
@@ -46,7 +54,7 @@
find_term() {
# Find a terminal program and write to the global "terminal" variable
- local programs="urxvt xterm"
+ local programs="urxvt xterm tmux"
if [ -n "${TERMINAL}" ] && [ "${TERMINAL}" != "auto" ]; then
case " $programs " in
@@ -122,12 +130,19 @@
EOF
chmod +x "$wrapper"
- $terminal \
- -title "CN:$title" \
- -e sh -c "$wrapper" \
- &
+ case "$terminal" in
+ tmux)
+ tmux new-window -d -n "$title" "$wrapper &; echo \$! > $pidfile_term; fg; wait"
+ ;;
+ *)
+ $terminal \
+ -title "CN:$title" \
+ -e sh -c "$wrapper" \
+ &
- echo "$!" > "$pidfile_term"
+ echo "$!" > "$pidfile_term"
+ ;;
+ esac
}
kill_pids() {
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27036
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Iaef08fb3cb3c6f58cd8490a631e177a03af9c974
Gerrit-Change-Number: 27036
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27037 )
Change subject: net: run.sh: tweak quit logic
......................................................................
net: run.sh: tweak quit logic
In some cases, the shell doesn't wait for the read to complete and just
keeps on printing "q Enter to close" in an infinite loop, making it
impossible to read the logs above. This happens with all terminals. I'm
not sure about the exact cause, work around it by only printing the
message once and sleeping inside the while true loop.
Change-Id: Iebb799493f76fd57f24b15c998ded2bd8e284e6b
---
M net/templates/run.sh
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/37/27037/1
diff --git a/net/templates/run.sh b/net/templates/run.sh
index a611926..3690b39 100755
--- a/net/templates/run.sh
+++ b/net/templates/run.sh
@@ -120,12 +120,14 @@
echo
+echo '---'
+echo 'q Enter / ^C to close'
while true; do
- echo 'q Enter to close'
read q_to_close
if [ "x\$q_to_close" = xq ]; then
break
fi
+ sleep 0.1
done
EOF
chmod +x "$wrapper"
--
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: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange