X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fvserver.h;h=bbc8049b2cf59f63aa015f4d9b87fdcbe1d3b754;hb=99d33f6844e093ed5119203557a606ce60f83de5;hp=e0ca826c60bce9dfc4a5f8104cd38058fd03ddfe;hpb=a6be71d3e49f0f633705ba5e4e08cc1cac811344;p=util-vserver.git diff --git a/lib/vserver.h b/lib/vserver.h index e0ca826..bbc8049 100644 --- a/lib/vserver.h +++ b/lib/vserver.h @@ -236,8 +236,10 @@ #define VC_NXF_INFO_PRIVATE 0x00000008ull #define VC_NXF_SINGLE_IP 0x00000100ull +#define VC_NXF_LBACK_REMAP 0x00000200ull #define VC_NXF_HIDE_NETIF 0x02000000ull +#define VC_NXF_HIDE_LBACK 0x04000000ull #define VC_NXF_STATE_SETUP (1ULL<<32) #define VC_NXF_STATE_ADMIN (1ULL<<34) @@ -246,6 +248,10 @@ #define VC_NXF_PERSISTENT (1ULL<<38) +// the network capabilities +#define VC_NXC_RAW_ICMP 0x00000100ull + + // the vserver specific limits #define VC_VLIMIT_NSOCK 16 #define VC_VLIMIT_OPENFD 17 @@ -261,6 +267,7 @@ #define VC_VCI_NO_DYNAMIC (1 << 0) #define VC_VCI_SPACES (1 << 10) #define VC_VCI_NETV2 (1 << 11) +#define VC_VCI_PPTAG (1 << 28) // the device mapping flags @@ -317,6 +324,7 @@ #ifdef IS_DOXYGEN typedef an_unsigned_integer_type xid_t; typedef an_unsigned_integer_type nid_t; +typedef an_unsigned_integer_type tag_t; #endif #ifdef __cplusplus @@ -343,11 +351,12 @@ extern "C" { */ int vc_get_version(); + typedef uint64_t vc_vci_t; /** \brief Returns the kernel configuration bits * \ingroup syscalls * \returns The kernel configuration bits */ - int vc_get_vci(); + vc_vci_t vc_get_vci(); /** \brief Moves current process into a context * \ingroup syscalls @@ -763,6 +772,15 @@ extern "C" { uint_least32_t flags, struct vc_ctx_dlimit *limits) VC_ATTR_NONNULL((1)); + /** Get the filesystem tag for a process. */ + tag_t vc_get_task_tag(pid_t pid); + + /** Create a new filesystem tag space. */ + int vc_tag_create(tag_t tag); + + /** Migrate to an existing filesystem tag space. */ + int vc_tag_migrate(tag_t tag); + /* scheduler related syscalls */ struct vc_set_sched { uint_least32_t set_mask; @@ -795,6 +813,7 @@ extern "C" { /* misc. syscalls */ int vc_set_mapping(xid_t xid, const char *device, const char *target, uint32_t flags); + int vc_unset_mapping(xid_t xid, const char *device, const char *target, uint32_t flags); /** \brief Information about parsing errors @@ -925,7 +944,7 @@ extern "C" { vcFEATURE_COMPAT, vcFEATURE_MIGRATE, vcFEATURE_NAMESPACE, vcFEATURE_SCHED, vcFEATURE_VINFO, vcFEATURE_VHI, vcFEATURE_VSHELPER0, vcFEATURE_VSHELPER, vcFEATURE_VWAIT, - vcFEATURE_VNET, vcFEATURE_VSTAT } + vcFEATURE_VNET, vcFEATURE_VSTAT, vcFEATURE_PPTAG, } vcFeatureSet; bool vc_isSupported(vcFeatureSet) VC_ATTR_CONST; @@ -956,6 +975,8 @@ extern "C" { xid_t vc_xidopt2xid(char const *, bool honor_static, char const **err_info); /** Maps a nid given at '--nid' options to a nid_t */ nid_t vc_nidopt2nid(char const *, bool honor_static, char const **err_info); + /** Maps a tag given at '--tag' options to a tag_t */ + tag_t vc_tagopt2tag(char const *, bool honor_static, char const **err_info); vcCfgStyle vc_getVserverCfgStyle(char const *id); @@ -978,6 +999,11 @@ extern "C" { * allocated and must be freed by the caller. */ char * vc_getVserverVdir(char const *id, vcCfgStyle style, bool physical); + typedef enum { vcCTX_XID = 1, + vcCTX_NID, + vcCTX_TAG, + } vcCtxType; + /** Returns the ctx of the given vserver. When vserver is not running and * 'honor_static' is false, VC_NOCTX will be returned. Else, when * 'honor_static' is true and a static assignment exists, those value will @@ -986,7 +1012,8 @@ extern "C" { * When 'is_running' is not null, the status of the vserver will be * assigned to this variable. */ xid_t vc_getVserverCtx(char const *id, vcCfgStyle style, - bool honor_static, bool /*@null@*/ *is_running); + bool honor_static, bool /*@null@*/ *is_running, + vcCtxType type); /** Resolves the cfg-path of the vserver owning the given ctx. 'revdir' will be used as the directory holding the mapping-links; when NULL, the