4 files changed, 45 insertions, 6 deletions
diff --git a/data/dune b/data/dune
index e5ffaa6..df63152 100644
--- a/data/dune
+++ b/data/dune
@@ -1,3 +1,3 @@
 (install
- (files vyconfd.conf vyconf.proto)
+ (files vyconfd.conf vyconf.proto vycall.proto)
  (section share))
diff --git a/data/vycall.proto b/data/vycall.proto
new file mode 100644
index 0000000..0037aa7
--- /dev/null
+++ b/data/vycall.proto
@@ -0,0 +1,21 @@
+message Status {
+    required bool success = 1;
+    required string out = 2;
+}
+
+message Call {
+    required string script_name = 1;
+    optional string tag_value = 2;
+    optional string arg_value = 3;
+    optional Status reply = 4;
+}
+
+message Commit {
+    required string session_id = 1;
+    required bool dry_run = 4;
+    required bool atomic = 5;
+    required bool background = 6;
+
+    optional Status init = 7;
+    repeated Call calls = 8;
+}
diff --git a/data/vyconf.proto b/data/vyconf.proto
index a09d84a..815ec68 100644
--- a/data/vyconf.proto
+++ b/data/vyconf.proto
@@ -9,7 +9,7 @@ message Request {
     OutJSON = 1;
   }
 
-  message Status {
+  message Prompt {
   }
 
   message SetupSession {
@@ -28,13 +28,20 @@ message Request {
 
   message Set {
     repeated string Path = 1;
-    optional bool Ephemeral = 3; 
   }
 
   message Delete {
     repeated string Path = 1;
   }
 
+  message Discard {
+    optional int32 dummy = 1;
+  }
+
+  message SessionChanged {
+    optional int32 dummy = 1;
+  }
+
   message Rename {
     repeated string EditLevel = 1;
     required string From = 2;
@@ -56,6 +63,7 @@ message Request {
     optional bool Confirm = 1;
     optional int32 ConfirmTimeout = 2;
     optional string Comment = 3;
+    optional bool DryRun = 4;
   }
 
   message Rollback {
@@ -125,7 +133,7 @@ message Request {
 
 
   oneof msg {
-    Status status = 1;
+    Prompt prompt = 1;
     SetupSession setup_session = 2;
     Set set = 3;
     Delete delete = 4;
@@ -148,6 +156,9 @@ message Request {
     Validate validate = 21;
     Teardown teardown = 22;
     ReloadReftree reload_reftree = 23;
+    Load load = 24;
+    Discard discard = 25;
+    SessionChanged session_changed = 26;
   }
 }
 
@@ -156,7 +167,7 @@ message RequestEnvelope {
     required Request request = 2;
 }
 
-enum Status {
+enum Errnum {
   SUCCESS = 0;
   FAIL = 1;
   INVALID_PATH = 2;
@@ -169,7 +180,7 @@ enum Status {
 }
 
 message Response {
-  required Status status = 1;
+  required Errnum status = 1;
   optional string output = 2;
   optional string error = 3;
   optional string warning = 4;
diff --git a/data/vyconfd.conf b/data/vyconfd.conf
index bcde860..d1ae247 100644
--- a/data/vyconfd.conf
+++ b/data/vyconfd.conf
@@ -6,6 +6,7 @@ data_dir = "/usr/share/vyos/vyconf"
 program_dir = "/usr/libexec/vyos"
 config_dir = "/usr/libexec/vyos/vyconf/config"
 reftree_dir = "/usr/libexec/vyos/vyconf/reftree"
+session_dir = "/usr/libexec/vyos/vyconf/session"
 
 # paths relative to config_dir
 primary_config = "config.boot"
@@ -14,6 +15,12 @@ fallback_config = "config.failsafe"
 # paths relative to reftree_dir
 reference_tree = "reftree.cache"
 
+# paths relative to session_dir
+running_cache = "running_cache"
+session_cache = "session_cache"
+
+commitd_socket = "/var/run/vyos-commitd.sock"
+
 [vyconf]
 
 socket = "/var/run/vyconfd.sock"