demo: simplify and adjust scripts

4 files changed, 14 insertions, 29 deletions

diff --git a/demo/connect.hjson b/demo/connect.hjson
index de4c119..551c335 100644
--- a/demo/connect.hjson
+++ b/demo/connect.hjson
@@ -10,12 +10,6 @@
     "fd": { "src": { "tag": "fd" }, "new": { "tag": "new_fd" }, "close_on_exec": false },
     "return": { "value": 0, "error": 0 }
   },
-  { /* fake connect syscall */
-    "match": [
-      { "connect": { "addr": { "family": "unix", "path": "/fake.sock" } } }
-    ],
-    "return": { "value": 0, "error": 0 }
-  },
   { /* Inject permission denied error */
     "match": [
       { "connect": { "addr": { "family": "unix", "path": "/error.sock" } } }
diff --git a/web/common.sh b/web/common.sh
index b815dd4..c269fe1 100644
--- a/web/common.sh
+++ b/web/common.sh
@@ -79,6 +79,11 @@ clear_panes() {
         sleep 1
 }
 
+get_first_pane() {
+	pane=$(tmux list-panes | awk 'NR==1{ print $1 }' | sed 's/://')
+	echo $pane
+}
+
 teardown_common() {
         sleep 5
         tmux kill-session -t $SESSION
diff --git a/web/demo_connect.sh b/web/demo_connect.sh
index 0d27022..64938a2 100755
--- a/web/demo_connect.sh
+++ b/web/demo_connect.sh
@@ -10,9 +10,6 @@
 
 SESSION=demo
 VIDEO=seitan-connect
-PSEITAN=1
-PEATER=2
-PSERVER=3
 
 source web/common.sh
 
@@ -40,13 +37,7 @@ socat UNIX-LISTEN:/tmp/demo.sock -
 
 SCRIPT_eater_connect='
 #
-./seitan-eater -i demo/connect.bpf -- socat OPEN:abcd UNIX-CONNECT:/var/run/pr-helper.sock
-#
-'
-
-SCRIPT_eater_connect_fake='
-#
-./seitan-eater -i demo/connect.bpf -- socat - UNIX-CONNECT:/fake.sock
+./seitan-eater -i demo/connect.bpf -- socat OPEN:abcd UNIX-CONNECT:/cool.sock
 #
 '
 
@@ -71,7 +62,11 @@ tmux rename-window -t $SESSION 'Seitan demo: generate input files'
 
 asciinema rec --overwrite ${VIDEO}.cast -c 'tmux attach -t $SESSION' &
 sleep 1
-tmux refresh-client
+#tmux refresh-client
+
+PSEITAN=$(get_first_pane)
+PEATER=$((PSEITAN+1))
+PSERVER=$((PEATER+1))
 
 # Input generation
 tmux select-pane -t $PSEITAN
@@ -95,16 +90,6 @@ clear_panes
 tmux kill-pane -t $PSERVER
 
 # Second part
-tmux rename-window -t $SESSION 'Seitan demo: mock connect syscall'
-tmux select-pane -t $PEATER
-script eater_connect_fake
-tmux select-pane -t $PSEITAN
-script seitan
-
-sleep 4
-clear_panes
-
-# Third part
 tmux rename-window -t $SESSION 'Seitan demo: error injection (EPERM)'
 tmux select-pane -t $PEATER
 script eater_connect_error
diff --git a/web/demo_mknod_podman.sh b/web/demo_mknod_podman.sh
index 3650e18..7218374 100755
--- a/web/demo_mknod_podman.sh
+++ b/web/demo_mknod_podman.sh
@@ -3,8 +3,6 @@
 
 SESSION=dmknod
 VIDEO=seitan-mknod
-PSEITAN=2
-PPODMAN=1
 source web/common.sh
 
 split_panes() {
@@ -55,6 +53,9 @@ tmux send-keys -t $SESSION C-m
 tmux rename-window -t $SESSION 'Seitan demo: run mknod in container'
 sleep 10
 
+PSEITAN=$(get_first_pane)
+PPODMAN=$((PSEITAN+1))
+
 asciinema rec --overwrite ${VIDEO}.cast -c 'tmux attach -t $SESSION' &
 tmux refresh-client