From 1c1a9da7a4f9c4c1990192e14763ebf423d812a9 Mon Sep 17 00:00:00 2001
From: Alice Frosi <afrosi@redhat.com>
Date: Wed, 7 Jun 2023 16:54:53 +0200
Subject: seitan, cooker: refactor op_return

Refactor OP_RETURN:
  - merged OP_BLOCK and OP_CONT into OP_RETURN
  - add desc field for op_return
  - updated the demo files
---
 demo/connect.hjson | 16 ++++++++--------
 demo/ioctl.hjson   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'demo')

diff --git a/demo/connect.hjson b/demo/connect.hjson
index f3a9ad8..3bf0747 100644
--- a/demo/connect.hjson
+++ b/demo/connect.hjson
@@ -1,10 +1,4 @@
 [
-  { /* fake connect syscall */
-    "match": [
-      { "connect": { "addr": { "family": "unix", "path": "/fake.sock" } } }
-    ],
-    "return": 0
-  },
   { /* connect to another path (/var/run/pr-helper.sock -> /tmp/demo.sock) */
     "match": [
       { "connect": { "addr": { "family": "unix", "path": "/var/run/pr-helper.sock" }, "fd": { "tag": "fd" } } }
@@ -14,12 +8,18 @@
       { "connect": { "fd": { "tag": { "get": "new_fd" } }, "addr": { "family": "unix", "path": "/tmp/demo.sock" } }, "ret": "y" }
     ],
     "fd": { "src": { "tag": "fd" }, "new": { "tag": "new_fd" }, "close_on_exec": false },
-    "return": 0
+    "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" } } }
     ],
-    "block": -1
+    "return": { "value": 0, "error": -1 }
   }
 ]
diff --git a/demo/ioctl.hjson b/demo/ioctl.hjson
index 53b59f5..b8d2de0 100644
--- a/demo/ioctl.hjson
+++ b/demo/ioctl.hjson
@@ -3,6 +3,6 @@
     "match": [
       { "ioctl": { "path": "/dev/net/tun", "request": "TUNSETIFF" } }
     ],
-    "return": 0
+    "return": { "value": 0 }
   }
 ]
-- 
cgit v1.2.3