diff options
author | Pavel Tikhomirov <ptikhomirov@virtuozzo.com> | 2016-04-28 19:38:50 +0300 |
---|---|---|
committer | Pavel Emelyanov <xemul@virtuozzo.com> | 2016-05-27 13:32:03 +0300 |
commit | 7ea8601c99a89832b804ef77bbcb047875978758 (patch) | |
tree | ff2aab0ec1290306925806e182497d2986a094e1 /images | |
parent | 3f6ad33f8f1965a238fb6be7c081599dc4388748 (diff) |
protobuf: add SysctlEntry for ipv4/ipv6 sysctl confs or some others
int32 with boolean value in protobuf has the same size with bool,
many sysctls are boolean but we don't lose anything by storing them
in int32, so add only int32 and string fields
will need string field for stable_secret ipv6 sysctl
also such fromat allows us to easily handle non-present int sysctls
we can check if we have it using has_*arg
v3: rebase images/Makefile to criu-dev branch
v4: use enum for type
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Reviewed-by: Andrew Vagin <avagin@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Diffstat (limited to 'images')
-rw-r--r-- | images/Makefile | 1 | ||||
-rw-r--r-- | images/netdev.proto | 6 | ||||
-rw-r--r-- | images/sysctl.proto | 11 |
3 files changed, 18 insertions, 0 deletions
diff --git a/images/Makefile b/images/Makefile index a29a04922..a8420de1c 100644 --- a/images/Makefile +++ b/images/Makefile @@ -58,6 +58,7 @@ proto-obj-y += opts.o proto-obj-y += seccomp.o proto-obj-y += binfmt-misc.o proto-obj-y += time.o +proto-obj-y += sysctl.o CFLAGS += -iquote $(obj)/ diff --git a/images/netdev.proto b/images/netdev.proto index dafa2bd8f..ce0daebae 100644 --- a/images/netdev.proto +++ b/images/netdev.proto @@ -1,5 +1,6 @@ import "opts.proto"; import "tun.proto"; +import "sysctl.proto"; enum nd_type { LOOPBACK = 1; @@ -31,9 +32,14 @@ message net_device_entry { optional bytes address = 7; repeated int32 conf = 8; + + repeated sysctl_entry conf4 = 9; } message netns_entry { repeated int32 def_conf = 1; repeated int32 all_conf = 2; + + repeated sysctl_entry def_conf4 = 3; + repeated sysctl_entry all_conf4 = 4; } diff --git a/images/sysctl.proto b/images/sysctl.proto new file mode 100644 index 000000000..c64789a7f --- /dev/null +++ b/images/sysctl.proto @@ -0,0 +1,11 @@ +enum SysctlType { + __CTL_STR = 5; + CTL_32 = 6; +} + +message sysctl_entry { + required SysctlType type = 1; + + optional int32 iarg = 2; + optional string sarg = 3; +} |