X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2Fvserver.h;h=10564944bb8468854ae1b9d3131506a546ce8522;hb=b6e1f39d63509d5aea3ff02ed624b057b7bb050a;hp=48b2c6892ba542004a37d115a85b935c287f3e11;hpb=93ca33f8fef9038e57493cc780329c8fbe06c9dc;p=util-vserver.git diff --git a/util-vserver/lib/vserver.h b/util-vserver/lib/vserver.h index 48b2c68..1056494 100644 --- a/util-vserver/lib/vserver.h +++ b/util-vserver/lib/vserver.h @@ -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 @@ -99,6 +103,16 @@ #define VC_IMMUTABLE_LINK_FL 0x00008000l #define VC_IMMUTABLE_ALL (VC_IMMUTABLE_LINK_FL|VC_IMMUTABLE_FILE_FL) +#define VC_IATTR_XID 0x01000000 + +#define VC_IATTR_ADMIN 0x00000001 +#define VC_IATTR_WATCH 0x00000002 +#define VC_IATTR_HIDE 0x00000004 + +#define VC_IATTR_BARRIER 0x00010000 +#define VC_IATTR_IUNLINK 0x00020000 + + #ifdef __cplusplus extern "C" { #endif @@ -108,8 +122,8 @@ extern "C" { uint32_t mask; }; - /** Returns version of the given API-category */ - int vc_get_version(int category); + /** Returns the version of the current kernel API. */ + int vc_get_version(); /** Puts current process into context , removes the given caps and * sets flags. @@ -118,7 +132,7 @@ extern "C" { * - VC_RANDCTX which means the next free context; this value can be used by * ordinary users also * See http://vserver.13thfloor.at/Stuff/Logic.txt for details */ - int vc_new_s_context(xid_t ctx, unsigned int remove_cap, unsigned int flags); + xid_t vc_new_s_context(xid_t ctx, unsigned int remove_cap, unsigned int flags); /** Sets the ipv4root information. * \precondition: nb<16 */ @@ -152,22 +166,39 @@ extern "C" { int vc_ctx_kill(xid_t ctx, pid_t pid, int sig); - /** Returns the context of the given process. pid==0 means the current process. */ - xid_t vc_X_getctx(pid_t pid); - /** Returns the pid of the 'init' process */ - pid_t vc_X_getinitpid(pid_t pid); + 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); + + struct vc_vx_info { + xid_t xid; + pid_t initpid; + }; + + /** Returns the context of the given process. pid==0 means the current process. */ + xid_t vc_get_task_xid(pid_t pid); + int vc_get_vx_info(xid_t xid, struct vc_vx_info *info); - xid_t vc_X_get_filecontext(int fd); - int vc_X_set_filecontext(int fd, xid_t ctx); + typedef enum { vcVHI_CONTEXT, vcVHI_SYSNAME, vcVHI_NODENAME, + vcVHI_RELEASE, vcVHI_VERSION, vcVHI_MACHINE, + vcVHI_DOMAINNAME } vc_uts_type; + + 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_X_get_ext2flags(int fd, long *flags); - int vc_X_set_ext2flags(int fd, long set_flags, long del_flags); + int vc_enter_namespace(xid_t xid); + + 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<