X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2Fvserver.h;h=b997d299bcbf8b2dc351657056f8b75e40eeb186;hb=3eb1b2279739d0f16391a3724a9897c686f030d3;hp=f3080c39897c4d4e1837c2c6108e0cb6038555c0;hpb=8f22352c76cef3063f5b7fc95c2b7beb38236b07;p=util-vserver.git diff --git a/util-vserver/lib/vserver.h b/util-vserver/lib/vserver.h index f3080c3..b997d29 100644 --- a/util-vserver/lib/vserver.h +++ b/util-vserver/lib/vserver.h @@ -17,6 +17,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/** \file vserver.h + * \brief The public interface of the the libvserver library. + */ + #ifndef H_VSERVER_SYSCALL_H #define H_VSERVER_SYSCALL_H @@ -25,16 +29,52 @@ #include #include +#ifndef IS_DOXYGEN +#if defined(__GNUC__) +# define VC_ATTR_UNUSED __attribute__((__unused__)) +# define VC_ATTR_NORETURN __attribute__((__noreturn__)) +# define VC_ATTR_CONST __attribute__((__const__)) +# define VC_ATTR_DEPRECATED __attribute__((__deprecated__)) +# if __GNUC__*0x10000 + __GNUC_MINOR__*0x100 + __GNUC_PATCHLEVEL__ >= 0x30300 +# define VC_ATTR_NONNULL(ARGS) __attribute__((__nonnull__ ARGS)) +# define VC_ATTR_ALWAYSINLINE __attribute__((__always_inline__)) +# else +# define VC_ATTR_NONNULL(ARGS) +# define VC_ATTR_ALWAYSINLINE +# endif +# if __GNUC__*0x10000 + __GNUC_MINOR__*0x100 + __GNUC_PATCHLEVEL__ >= 0x30303 +# define VC_ATTR_PURE __attribute__((__pure__)) +# else +# define VC_ATTR_PURE +# endif +#else +# define VC_ATTR_NONNULL(ARGS) +# define VC_ATTR_UNUSED +# define VC_ATTR_NORETURN +# define VC_ATTR_ALWAYSINLINE +# define VC_ATTR_DEPRECATED +# define VC_ATTR_PURE +# define VC_ATTR_CONST +#endif +#endif // IS_DOXYGEN + /** the value which is returned in error-case (no ctx found) */ #define VC_NOCTX ((xid_t)(-1)) +#define VC_NOXID ((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)) +#define VC_NONID ((nid_t)(-1)) +#define VC_DYNAMIC_NID ((nid_t)(-1)) + #define VC_LIM_INFINITY (~0ULL) #define VC_LIM_KEEP (~1ULL) +#define VC_CDLIM_UNSET (0U) +#define VC_CDLIM_INFINITY (~0U) +#define VC_CDLIM_KEEP (~1U) #ifndef S_CTX_INFO_LOCK # define S_CTX_INFO_LOCK 1 @@ -64,6 +104,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 @@ -95,126 +139,571 @@ #define VC_CAP_LEASE 28 #define VC_CAP_QUOTACTL 29 -#define VC_IMMUTABLE_FILE_FL 0x00000010l -#define VC_IMMUTABLE_LINK_FL 0x00008000l +#define VC_IMMUTABLE_FILE_FL 0x0000010lu +#define VC_IMMUTABLE_LINK_FL 0x0008000lu #define VC_IMMUTABLE_ALL (VC_IMMUTABLE_LINK_FL|VC_IMMUTABLE_FILE_FL) -#define VC_IATTR_XID 0x01000000 +#define VC_IATTR_XID 0x01000000u + +#define VC_IATTR_ADMIN 0x00000001u +#define VC_IATTR_WATCH 0x00000002u +#define VC_IATTR_HIDE 0x00000004u +#define VC_IATTR_FLAGS 0x00000007u + +#define VC_IATTR_BARRIER 0x00010000u +#define VC_IATTR_IUNLINK 0x00020000u +#define VC_IATTR_IMMUTABLE 0x00040000u + + +// the flags +#define VC_VXF_INFO_LOCK 0x00000001ull +#define VC_VXF_INFO_NPROC 0x00000004ull +#define VC_VXF_INFO_PRIVATE 0x00000008ull +#define VC_VXF_INFO_INIT 0x00000010ull + +#define VC_VXF_INFO_HIDEINFO 0x00000020ull +#define VC_VXF_INFO_ULIMIT 0x00000040ull +#define VC_VXF_INFO_NAMESPACE 0x00000080ull + +#define VC_VXF_SCHED_HARD 0x00000100ull +#define VC_VXF_SCHED_PRIO 0x00000200ull +#define VC_VXF_SCHED_PAUSE 0x00000400ull + +#define VC_VXF_VIRT_MEM 0x00010000ull +#define VC_VXF_VIRT_UPTIME 0x00020000ull +#define VC_VXF_VIRT_CPU 0x00040000ull +#define VC_VXF_VIRT_LOAD 0x00080000ull + +#define VC_VXF_HIDE_MOUNT 0x01000000ull +#define VC_VXF_HIDE_NETIF 0x02000000ull + +#define VC_VXF_STATE_SETUP (1ULL<<32) +#define VC_VXF_STATE_INIT (1ULL<<33) + +#define VC_VXF_FORK_RSS (1ULL<<48) +#define VC_VXF_PROLIFIC (1ULL<<49) + +#define VC_VXF_IGNEG_NICE (1ULL<<52) + + +// the ccapabilities +#define VC_VXC_SET_UTSNAME 0x00000001ull +#define VC_VXC_SET_RLIMIT 0x00000002ull + +#define VC_VXC_RAW_ICMP 0x00000100ull + +#define VC_VXC_SECURE_MOUNT 0x00010000ull +#define VC_VXC_SECURE_REMOUNT 0x00020000ull + + +#define VC_VXSM_FILL_RATE 0x0001 +#define VC_VXSM_INTERVAL 0x0002 +#define VC_VXSM_TOKENS 0x0010 +#define VC_VXSM_TOKENS_MIN 0x0020 +#define VC_VXSM_TOKENS_MAX 0x0040 +#define VC_VXSM_PRIO_BIAS 0x0100 + -#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 +/** \defgroup syscalls Syscall wrappers + * Functions which are calling the vserver syscall directly. */ +/** \defgroup helper Helper functions + * Functions which are doing general helper tasks like parameter parsing. */ + +/** \typedef an_unsigned_integer_type xid_t + * The identifier of a context. */ + +#ifdef IS_DOXYGEN +typedef an_unsigned_integer_type xid_t; +typedef an_unsigned_integer_type nid_t; +#endif #ifdef __cplusplus extern "C" { #endif struct vc_ip_mask_pair { - uint32_t ip; - uint32_t mask; + uint32_t ip; + uint32_t mask; }; - /** Returns the version of the current kernel API. */ + /** \brief The generic vserver syscall + * \ingroup syscalls + * + * This function executes the generic vserver syscall. It uses the + * correct syscallnumber (which may differ between the different + * architectures). + * + * \param cmd the command to be executed + * \param xid the xid on which the cmd shall be applied + * \param data additional arguments; depends on \c cmd + * \returns depends on \c cmd; usually, -1 stands for an error + */ + int vc_syscall(uint32_t cmd, xid_t xid, void *data); + + /** \brief Returns the version of the current kernel API. + * \ingroup syscalls + * \returns The versionnumber of the kernel API + */ int vc_get_version(); - /** Puts current process into context , removes the given caps and - * sets flags. - * Special values for ctx are - * - VC_SAMECTX which means the current context (just for changing caps and flags) - * - VC_RANDCTX which means the next free context; this value can be used by - * ordinary users also + /** \brief Moves current process into a context + * \ingroup syscalls + * + * Puts current process into context \a ctx, removes the capabilities + * given in \a remove_cap and sets \a flags. + * + * \param ctx The new context; special values for are + * - VC_SAMECTX which means the current context (just for changing caps and flags) + * - VC_DYNAMIC_XID which means the next free context; this value can be used by + * ordinary users also + * \param remove_cap The linux capabilities which will be \b removed. + * \param flags Special flags which will be set. + * + * \returns The new context-id, or VC_NOCTX on errors; \c errno + * will be set appropriately + * * See http://vserver.13thfloor.at/Stuff/Logic.txt for details */ xid_t vc_new_s_context(xid_t ctx, unsigned int remove_cap, unsigned int flags); - /** Sets the ipv4root information. - * \precondition: nb<16 */ - int vc_set_ipv4root(uint32_t bcast, size_t nb, struct vc_ip_mask_pair const *ips); - - /* rlimit related functions */ - typedef uint64_t vc_limit_t; + /** \brief Sets the ipv4root information. + * \ingroup syscalls + * \pre \a nb < NB_IPV4ROOT && \a ips != 0 */ + int vc_set_ipv4root(uint32_t bcast, size_t nb, + struct vc_ip_mask_pair const *ips) VC_ATTR_NONNULL((3)); + + /** \brief Returns the value of NB_IPV4ROOT. + * \ingroup helper + * + * This function returns the value of NB_IPV4ROOT which was used when the + * library was built, but \b not the value which is used by the currently + * running kernel. */ + size_t vc_get_nb_ipv4root() VC_ATTR_CONST VC_ATTR_PURE; + + /** \brief Creates a context without starting it. + * \ingroup syscalls + * + * This functions initializes a new context. When already in a freshly + * created context, this old context will be discarded. + * + * \param xid The new context; special values are: + * - VC_DYNAMIC_XID which means to create a dynamic context + * + * \returns the xid of the created context, or VC_NOCTX on errors. \c errno + * will be set appropriately. */ + xid_t vc_ctx_create(xid_t xid); + + /** \brief Moves the current process into the specified context. + * \ingroup syscalls + * + * \param xid The new context + * \returns 0 on success, -1 on errors */ + int vc_ctx_migrate(xid_t xid); + /* rlimit related functions */ + /** \brief The type which is used for a single limit value. + * + * Special values are + * - VC_LIM_INFINITY ... which is the infinite value + * - VC_LIM_KEEP ... which is used to mark values which shall not be + * modified by the vc_set_rlimit() operation. + * + * Else, the interpretation of the value depends on the corresponding + * resource; it might be bytes, pages, seconds or litres of beer. */ + typedef uint_least64_t vc_limit_t; + + /** \brief The limits of a resources. + * + * This is a triple consisting of a minimum, soft and hardlimit. */ struct vc_rlimit { - vc_limit_t min; - vc_limit_t soft; - vc_limit_t hard; + vc_limit_t min; ///< the guaranted minimum of a resources + vc_limit_t soft; ///< the softlimit of a resource + vc_limit_t hard; ///< the absolute hardlimit of a resource }; + /** \brief Masks describing the supported limits. */ struct vc_rlimit_mask { - uint32_t min; - uint32_t soft; - uint32_t hard; + uint_least32_t min; ///< masks the resources supporting a minimum limit + uint_least32_t soft; ///< masks the resources supporting a soft limit + uint_least32_t hard; ///< masks the resources supporting a hard limit }; - int vc_get_rlimit(xid_t ctx, int resource, struct vc_rlimit *lim); - int vc_set_rlimit(xid_t ctx, int resource, struct vc_rlimit const *lim); - int vc_get_rlimit_mask(xid_t ctx, struct vc_rlimit_mask *lim); + /** \brief Returns the limits of \a resource. + * \ingroup syscalls + * + * \param xid The id of the context + * \param resource The resource which will be queried + * \param lim The result which will be filled with the limits + * + * \returns 0 on success, and -1 on errors. */ + int vc_get_rlimit(xid_t xid, int resource, + struct vc_rlimit /*@out@*/ *lim) VC_ATTR_NONNULL((3)); + /** \brief Sets the limits of \a resource. + * \ingroup syscalls + * + * \param xid The id of the context + * \param resource The resource which will be queried + * \param lim The new limits + * + * \returns 0 on success, and -1 on errors. */ + int vc_set_rlimit(xid_t xid, int resource, + struct vc_rlimit const /*@in@*/ *lim) VC_ATTR_NONNULL((3)); + int vc_get_rlimit_mask(xid_t xid, + struct vc_rlimit_mask *lim) VC_ATTR_NONNULL((2)); + /** \brief Parses a string describing a limit + * \ingroup helper + * + * This function parses \a str and interprets special words like \p "inf" + * or suffixes. Valid suffixes are + * - \p k ... 1000 + * - \p m ... 1000000 + * - \p K ... 1024 + * - \p M ... 1048576 + * + * \param str The string which shall be parsed + * \param res Will be filled with the interpreted value; in errorcase, + * this value is undefined. + * + * \returns \a true, iff the string \a str could be parsed. \a res will + * be filled with the interpreted value in this case. + * + * \pre \a str!=0 && \a res!=0 + */ + bool vc_parseLimit(char const /*@in@*/ *str, vc_limit_t /*@out@*/ *res) VC_ATTR_NONNULL((1,2)); + + + /** \brief Sends a signal to a context/pid + * \ingroup syscalls + * + * Special values for \a pid are: + * - -1 which means every process in ctx except the init-process + * - 0 which means every process in ctx inclusive the init-process */ + int vc_ctx_kill(xid_t ctx, pid_t pid, int sig); + + struct vc_nx_info { + nid_t nid; + }; - /** sends a signal to a context/pid - Special values for pid are: - * -1 which means every process in ctx except the init-process - * 0 which means every process in ctx inclusive the init-process */ - int vc_ctx_kill(xid_t ctx, pid_t pid, int sig); + nid_t vc_get_task_nid(pid_t pid); + int vc_get_nx_info(nid_t nid, struct vc_nx_info *) VC_ATTR_NONNULL((2)); + + typedef enum { vcNET_IPV4, vcNET_IPV6, vcNET_IPV4R, vcNET_IPV6R } vc_net_nx_type; + + struct vc_net_nx { + vc_net_nx_type type; + size_t count; + uint32_t ip; + uint32_t mask; + }; + nid_t vc_net_create(nid_t nid); + int vc_net_migrate(nid_t nid); + int vc_net_add(nid_t nid, struct vc_net_nx const *info); + int vc_net_remove(nid_t nid, struct vc_net_nx const *info); - int vc_set_iattr(char const *filename, xid_t xid, uint32_t flags, uint32_t mask); + struct vc_net_flags { + uint_least64_t flagword; + uint_least64_t mask; + }; + + int vc_get_nflags(nid_t, struct vc_net_flags *); + int vc_set_nflags(nid_t, struct vc_net_flags const *); + + + struct vc_net_caps { + uint_least64_t ncaps; + uint_least64_t cmask; + }; + + int vc_get_ncaps(nid_t, struct vc_net_caps *); + int vc_set_ncaps(nid_t, struct vc_net_caps const *); + + + + + int vc_set_iattr(char const *filename, xid_t xid, + uint_least32_t flags, uint_least32_t mask) VC_ATTR_NONNULL((1)); + + /** \brief Returns information about attributes and assigned context of a file. + * \ingroup syscalls + * + * This function returns the VC_IATTR_XXX flags and about the assigned + * context of a file. To request an information, the appropriate bit in + * \c mask must be set and the corresponding parameter (\a xid or \a + * flags) must not be NULL. + * + * E.g. to receive the assigned context, the \c VC_IATTR_XID bit must be + * set in \a mask, and \a xid must point to valid memory. + * + * Possible flags are \c VC_IATTR_ADMIN, \c VC_IATTR_WATCH , \c VC_IATTR_HIDE, + * \c VC_IATTR_BARRIER, \c VC_IATTR_IUNLINK and \c VC_IATTR_IMMUTABLE. + * + * \param filename The name of the file whose attributes shall be determined. + + * \param xid When non-zero and the VC_IATTR_XID bit is set in \a mask, + * the assigned context of \a filename will be stored there. + * \param flags When non-zero, a bitmask of current attributes will be + * stored there. These attributes must be requested explicitly + * by setting the appropriate bit in \a mask + * \param mask Points to a bitmask which tells which attributes shall be + * determined. On return, it will masquerade the attributes + * which were determined. + * + * \pre mask!=0 && !((*mask&VC_IATTR_XID) && xid==0) && !((*mask&~VC_IATTR_XID) && flags==0) */ int vc_get_iattr(char const *filename, xid_t * /*@null@*/ xid, - uint32_t * /*@null@*/ flags, uint32_t * /*@null@*/ mask); + uint_least32_t * /*@null@*/ flags, + uint_least32_t * /*@null@*/ mask) VC_ATTR_NONNULL((1)); struct vc_vx_info { xid_t xid; pid_t initpid; }; - /** Returns the context of the given process. pid==0 means the current process. */ + /** \brief Returns the context of the given process. + * \ingroup syscalls + * + * \param pid the process-id whose xid shall be determined; + * pid==0 means the current process. + * \returns the xid of process \c pid or -1 on errors + */ xid_t vc_get_task_xid(pid_t pid); - int vc_get_vx_info(xid_t xid, struct vc_vx_info *info); + int vc_get_vx_info(xid_t xid, struct vc_vx_info *info) VC_ATTR_NONNULL((2)); 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_set_vhi_name(xid_t xid, vc_uts_type type, + char const *val, size_t len) VC_ATTR_NONNULL((3)); + int vc_get_vhi_name(xid_t xid, vc_uts_type type, + char *val, size_t len) VC_ATTR_NONNULL((3)); + + /** Returns true iff \a xid is a dynamic xid */ + bool vc_is_dynamic_xid(xid_t xid); + int vc_enter_namespace(xid_t xid); + int vc_set_namespace(); + int vc_cleanup_namespace(); - 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(unsigned int); - - inline static int vc_get_securecaps() { - return ( (1<old \c != 0 \c <--> + * \a *valold > \a *valnew + * \post \a *valold \c == 0 \c ---> \a result == 0 + */ + char const * vc_lobcap2text(uint_least64_t *val) VC_ATTR_NONNULL((1)); + + /** \brief Converts a string into a bcapability-bitmask + * \ingroup helper + * + * Syntax of \a str: \verbinclude list2xxx.syntax + * + * When the \c `~' prefix is used, the bits will be unset and a `~' after + * another `~' will cancel both ones. The \c `^' prefix specifies a + * bitnumber instead of a bitmask. + * + * "literal name" is everything which will be accepted by the + * vc_text2bcap() function. The special values for \c NAME will be + * recognized case insensitively + * + * \param str The string to be parsed + * \param len The length of the string, or \c 0 for automatic detection + * \param err Pointer to a structure for error-information, or \c NULL. + * \param cap Pointer to a vc_ctx_caps structure holding the results; + * only the \a bcaps and \a bmask fields will be changed and + * already set values will not be honored. When an error + * occured, \a cap will have the value of all processed valid + * \c BCAP parts. + * + * \returns 0 on success, -1 on error. In error case, \a err will hold + * position and length of the first not understood BCAP part + * \pre \a str != 0 && \a cap != 0; + * \a cap->bcaps and \a cap->bmask must be initialized + */ + int vc_list2bcap(char const *str, size_t len, + struct vc_err_listparser *err, + struct vc_ctx_caps *cap) VC_ATTR_NONNULL((1,4)); + + uint_least64_t vc_text2ccap(char const *, size_t len); + char const * vc_loccap2text(uint_least64_t *); + int vc_list2ccap(char const *, size_t len, + struct vc_err_listparser *err, + struct vc_ctx_caps *); + + int vc_list2cflag(char const *, size_t len, + struct vc_err_listparser *err, + struct vc_ctx_flags *flags); + uint_least64_t vc_text2cflag(char const *, size_t len); + char const * vc_locflag2text(uint_least64_t *); + + uint_least32_t vc_list2cflag_compat(char const *, size_t len, + struct vc_err_listparser *err); + uint_least32_t vc_text2cflag_compat(char const *, size_t len); + char const * vc_hicflag2text_compat(uint_least32_t); + + int vc_text2cap(char const *); + char const * vc_cap2text(unsigned int); + + + int vc_list2nflag(char const *, size_t len, + struct vc_err_listparser *err, + struct vc_net_flags *flags); + uint_least64_t vc_text2nflag(char const *, size_t len); + char const * vc_lonflag2text(uint_least64_t *); + + uint_least64_t vc_text2ncap(char const *, size_t len); + char const * vc_loncap2text(uint_least64_t *); + int vc_list2ncap(char const *, size_t len, + struct vc_err_listparser *err, + struct vc_net_caps *); + + uint_least64_t vc_get_insecurebcaps() VC_ATTR_CONST; + inline static uint_least64_t vc_get_insecureccaps() { + return ~(VC_VXC_SET_UTSNAME|VC_VXC_RAW_ICMP); } - inline static xid_t vc_getfilecontext(char const *filename) { - xid_t res; - if (vc_get_iattr(filename, &res, 0,0)==-1) return VC_NOCTX; - return res; + inline static int vc_setfilecontext(char const *filename, xid_t xid) { + return vc_set_iattr(filename, xid, 0, VC_IATTR_XID); } + /** \brief Returns the context of \c filename + * \ingroup syscalls + * + * This function calls vc_get_iattr() with appropriate arguments to + * determine the context of \c filename. In error-case or when no context + * is assigned, \c VC_NOCTX will be returned. To differ between both cases, + * \c errno must be examined. + * + * \b WARNING: this function can modify \c errno although no error happened. + * + * \param filename The file to check + * \returns The assigned context, or VC_NOCTX when an error occured or no + * such assignment exists. \c errno will be 0 in the latter case */ + xid_t vc_getfilecontext(char const *filename) VC_ATTR_NONNULL((1)); + + + struct vc_set_sched { + uint_least32_t set_mask; + int_least32_t fill_rate; + int_least32_t interval; + int_least32_t tokens; + int_least32_t tokens_min; + int_least32_t tokens_max; + int_least32_t priority_bias; + }; + + int vc_set_sched(xid_t xid, struct vc_set_sched const *); + + + struct vc_ctx_dlimit { + uint_least32_t space_used; + uint_least32_t space_total; + uint_least32_t inodes_used; + uint_least32_t inodes_total; + uint_least32_t reserved; + }; + + + /** Add a disk limit to a file system. */ + int vc_add_dlimit(char const *filename, xid_t xid, + uint_least32_t flags) VC_ATTR_NONNULL((1)); + /** Remove a disk limit from a file system. */ + int vc_rem_dlimit(char const *filename, xid_t xid, + uint_least32_t flags) VC_ATTR_NONNULL((1)); + + /** Set a disk limit. */ + int vc_set_dlimit(char const *filename, xid_t xid, + uint_least32_t flags, + struct vc_ctx_dlimit const *limits) VC_ATTR_NONNULL((1,4)); + /** Get a disk limit. */ + int vc_get_dlimit(char const *filename, xid_t xid, + uint_least32_t flags, + struct vc_ctx_dlimit *limits) VC_ATTR_NONNULL((1)); + + + typedef enum { vcFEATURE_VKILL, vcFEATURE_IATTR, vcFEATURE_RLIMIT, + vcFEATURE_COMPAT, vcFEATURE_MIGRATE, vcFEATURE_NAMESPACE, + vcFEATURE_SCHED, vcFEATURE_VINFO, vcFEATURE_VHI, + vcFEATURE_VSHELPER0, vcFEATURE_VSHELPER } + vcFeatureSet; + + bool vc_isSupported(vcFeatureSet) VC_ATTR_CONST; + bool vc_isSupportedString(char const *); + + typedef enum { vcTYPE_INVALID, vcTYPE_MAIN, vcTYPE_WATCH, + vcTYPE_STATIC, vcTYPE_DYNAMIC } + vcXidType; + + vcXidType vc_getXIDType(xid_t xid) VC_ATTR_CONST; + /* The management part */ #define VC_LIMIT_VSERVER_NAME_LEN 1024 @@ -224,6 +713,10 @@ extern "C" { vcCFG_RECENT_SHORT, vcCFG_RECENT_FULL } vcCfgStyle; + + /** Maps an xid given at '--xid' options to an xid_t */ + xid_t vc_xidopt2xid(char const *, bool honor_static, char const **err_info); + vcCfgStyle vc_getVserverCfgStyle(char const *id); /** Resolves the name of the vserver. The result will be allocated and must @@ -261,17 +754,24 @@ extern "C" { freed by the caller. */ char * vc_getVserverByCtx(xid_t ctx, /*@null@*/vcCfgStyle *style, /*@null@*/char const *revdir); - + #define vcSKEL_INTERFACES 1u #define vcSKEL_PKGMGMT 2u #define vcSKEL_FILESYSTEM 4u - + /** Create a basic configuration skeleton for a vserver plus toplevel * directories for pkgmanagemt and filesystem (when requested). */ int vc_createSkeleton(char const *id, vcCfgStyle style, int flags); - + + #ifdef __cplusplus } #endif +#undef VC_ATTR_PURE +#undef VC_ATTR_ALWAYSINLINE +#undef VC_ATTR_NORETURN +#undef VC_ATTR_UNUSED +#undef VC_ATTR_NONNULL + #endif