X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2Fvserver.h;h=0d5e2935e6ed4e1f3d0924648559571a6e2885eb;hb=de7c77f60f210a6b06d98ad044cb6f8adb6e8732;hp=7a517a6f0f19abbd31e59874e149dd3ce57a3239;hpb=a482115036f98943ffaa27e32118d56311c36c66;p=util-vserver.git diff --git a/util-vserver/lib/vserver.h b/util-vserver/lib/vserver.h index 7a517a6..0d5e293 100644 --- a/util-vserver/lib/vserver.h +++ b/util-vserver/lib/vserver.h @@ -28,7 +28,7 @@ /** the value which is returned in error-case (no ctx found) */ #define VC_NOCTX ((xid_t)(-1)) /** the value which means a random (the next free) ctx */ -#define VC_RANDCTX ((xid_t)(-1)) +#define VC_DYNAMIC_XID ((xid_t)(-1)) /** the value which means the current ctx */ #define VC_SAMECTX ((xid_t)(-2)) @@ -64,6 +64,10 @@ # define S_CTX_INFO_ULIMIT 64 #endif +#ifndef S_CTX_INFO_NAMESPACE +# define S_CTX_INFO_NAMESPACE 128 +#endif + #define VC_CAP_CHOWN 0 #define VC_CAP_DAC_OVERRIDE 1 #define VC_CAP_DAC_READ_SEARCH 2 @@ -133,11 +137,13 @@ extern "C" { /** Sets the ipv4root information. * \precondition: nb<16 */ int vc_set_ipv4root(uint32_t bcast, size_t nb, struct vc_ip_mask_pair const *ips); + + xid_t vc_create_context(xid_t xid); + int vc_migrate_context(xid_t xid); /* rlimit related functions */ typedef uint64_t vc_limit_t; - - + struct vc_rlimit { vc_limit_t min; vc_limit_t soft; @@ -163,22 +169,10 @@ extern "C" { - int vc_set_iattr(dev_t dev, ino_t ino, xid_t xid, uint32_t flags, uint32_t mask); - int vc_get_iattr(dev_t dev, ino_t ino, xid_t * /*@null@*/ xid, + int vc_set_iattr(char const *filename, xid_t xid, uint32_t flags, uint32_t mask); + int vc_get_iattr(char const *filename, xid_t * /*@null@*/ xid, uint32_t * /*@null@*/ flags, uint32_t * /*@null@*/ mask); - int vc_set_iattr_compat(char const *filename, - dev_t dev, ino_t ino, xid_t xid, - uint32_t flags, uint32_t mask, - mode_t const * /*@null@*/ mode); - - int vc_get_iattr_compat(char const *filename, - dev_t dev, ino_t ino, - xid_t * /*@null@*/ xid, - uint32_t * /*@null@*/ flags, - uint32_t * /*@inout@*/ mask, - mode_t const * /*@null@*/ mode); - struct vc_vx_info { xid_t xid; pid_t initpid; @@ -196,9 +190,26 @@ extern "C" { int vc_set_vhi_name(xid_t xid, vc_uts_type type, char const *val, size_t len); int vc_get_vhi_name(xid_t xid, vc_uts_type type, char *val, size_t len); + + int vc_enter_namespace(xid_t xid); + int vc_set_namespace(); + int vc_cleanup_namespace(); + + struct vc_ctx_flags { + uint64_t flagword; + uint64_t mask; + }; + + int vc_get_flags(xid_t xid, struct vc_ctx_flags *); + int vc_set_flags(xid_t xid, struct vc_ctx_flags const *); + + uint32_t vc_textlist2flag(char const *, size_t len, + char const **err_ptr, size_t *err_len); + uint32_t vc_text2flag(char const *, size_t len); + char const * vc_hiflag2text(unsigned int); int vc_text2cap(char const *); - char const * vc_cap2text(int); + char const * vc_cap2text(unsigned int); inline static int vc_get_securecaps() { return ( (1<