Update CRIU protobufs

SquareandCompass · Nov 2, 2021 · 277a42e · 277a42e
1 parent fff39f7
commit 277a42e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/proto/criu/inventory.proto b/proto/criu/inventory.proto
@@ -24,4 +24,5 @@ message inventory_entry {
 	optional uint64			dump_uptime	= 8;
 	optional uint32			pre_dump_mode	= 9;
 	optional bool			tcp_close	= 10;
+	optional uint32			network_lock_method	= 11;
 }
diff --git a/proto/criu/rpc.proto b/proto/criu/rpc.proto
@@ -53,6 +53,11 @@ enum criu_cg_mode {
 	DEFAULT = 6;
 };
 
+enum criu_network_lock_method {
+	IPTABLES = 	1;
+	NFTABLES = 	2;
+};
+
 enum criu_pre_dump_mode {
 	SPLICE = 	1;
 	VM_READ =	2;
@@ -135,6 +140,7 @@ message criu_opts {
 	optional criu_pre_dump_mode	pre_dump_mode		= 61 [default = SPLICE];
 	optional int32			pidfd_store_sk		= 62;
 	optional string			lsm_mount_context	= 63;
+	optional criu_network_lock_method	network_lock		= 64 [default = IPTABLES];
 /*	optional bool			check_mounts		= 128;	*/
 }
 

diff --git a/proto/sync_criu_proto_files.sh b/proto/sync_criu_proto_files.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 set -eux
 
-sed --version > /dev/null # This commeand fails on BSD, and we don't want the BSD version of sed
+SCRIPT_DIR=$(dirname -- "$(readlink -f -- "$0")")
+cd "$SCRIPT_DIR"
+
+sed --version > /dev/null # This command fails on BSD, and we don't want the BSD version of sed
 
 if [ $# != 1 ]; then
   echo "Usage: $0 /path/to/criu/project"