X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2Fvserver.h;h=88423fb6d2bf000255e06be8445578aa2a73c856;hb=38fe8b4a2dd28aebf52787c5b65cc79490fa53d3;hp=af422485e0dd554182e6ea3c53b67f7cc51ce880;hpb=5317ec5570ec01f770ed21a0349ade53f638ecff;p=util-vserver.git diff --git a/util-vserver/lib/vserver.h b/util-vserver/lib/vserver.h index af42248..88423fb 100644 --- a/util-vserver/lib/vserver.h +++ b/util-vserver/lib/vserver.h @@ -65,6 +65,9 @@ /** 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) @@ -132,53 +135,53 @@ #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 0x00000001 -#define VC_IATTR_WATCH 0x00000002 -#define VC_IATTR_HIDE 0x00000004 -#define VC_IATTR_FLAGS 0x00000007 +#define VC_IATTR_ADMIN 0x00000001u +#define VC_IATTR_WATCH 0x00000002u +#define VC_IATTR_HIDE 0x00000004u +#define VC_IATTR_FLAGS 0x00000007u -#define VC_IATTR_BARRIER 0x00010000 -#define VC_IATTR_IUNLINK 0x00020000 -#define VC_IATTR_IMMUTABLE 0x00040000 +#define VC_IATTR_BARRIER 0x00010000u +#define VC_IATTR_IUNLINK 0x00020000u +#define VC_IATTR_IMMUTABLE 0x00040000u // the flags -#define VC_VXF_INFO_LOCK 0x00000001 -#define VC_VXF_INFO_NPROC 0x00000004 -#define VC_VXF_INFO_PRIVATE 0x00000008 -#define VC_VXF_INFO_INIT 0x00000010 +#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 0x00000020 -#define VC_VXF_INFO_ULIMIT 0x00000040 -#define VC_VXF_INFO_NAMESPACE 0x00000080 +#define VC_VXF_INFO_HIDEINFO 0x00000020ull +#define VC_VXF_INFO_ULIMIT 0x00000040ull +#define VC_VXF_INFO_NAMESPACE 0x00000080ull -#define VC_VXF_SCHED_HARD 0x00000100 -#define VC_VXF_SCHED_PRIO 0x00000200 -#define VC_VXF_SCHED_PAUSE 0x00000400 +#define VC_VXF_SCHED_HARD 0x00000100ull +#define VC_VXF_SCHED_PRIO 0x00000200ull +#define VC_VXF_SCHED_PAUSE 0x00000400ull -#define VC_VXF_VIRT_MEM 0x00010000 -#define VC_VXF_VIRT_UPTIME 0x00020000 -#define VC_VXF_VIRT_CPU 0x00040000 +#define VC_VXF_VIRT_MEM 0x00010000ull +#define VC_VXF_VIRT_UPTIME 0x00020000ull +#define VC_VXF_VIRT_CPU 0x00040000ull -#define VC_VXF_HIDE_MOUNT 0x01000000 -#define VC_VXF_HIDE_NETIF 0x02000000 +#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) // the ccapabilities -#define VC_VXC_SET_UTSNAME 0x00000001 -#define VC_VXC_SET_RLIMIT 0x00000002 +#define VC_VXC_SET_UTSNAME 0x00000001ull +#define VC_VXC_SET_RLIMIT 0x00000002ull -#define VC_VXC_ICMP_PING 0x00000100 +#define VC_VXC_ICMP_PING 0x00000100ull -#define VC_VXC_SECURE_MOUNT 0x00010000 +#define VC_VXC_SECURE_MOUNT 0x00010000ull /** \defgroup syscalls Syscall wrappers @@ -192,6 +195,7 @@ #ifdef IS_DOXYGEN typedef an_unsigned_integer_type xid_t; +typedef an_unsigned_integer_type nid_t; #endif #ifdef __cplusplus @@ -253,14 +257,14 @@ extern "C" { * * \returns the xid of the created context, or VC_NOCTX on errors. errno * will be set appropriately. */ - xid_t vc_create_context(xid_t xid); + 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_migrate_context(xid_t xid); + int vc_ctx_migrate(xid_t xid); /* rlimit related functions */ @@ -344,6 +348,47 @@ extern "C" { int vc_ctx_kill(xid_t ctx, pid_t pid, int sig); + struct vc_nx_info { + nid_t nid; + }; + + 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); + + 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)); @@ -377,34 +422,105 @@ extern "C" { int vc_set_namespace(); int vc_cleanup_namespace(); + + /** \brief Flags of process-contexts + */ struct vc_ctx_flags { + /** \brief Mask of set context flags */ uint_least64_t flagword; + /** \brief Mask of set and unset context flags when used by set + * operations, or modifiable flags when used by get + * operations */ uint_least64_t mask; }; - + + /** \brief Capabilities of process-contexts */ struct vc_ctx_caps { + /** \brief Mask of set common system capabilities */ uint_least64_t bcaps; + /** \brief Mask of set and unset common system capabilities when used by + * set operations, or the modifiable capabilities when used by + * get operations */ uint_least64_t bmask; + /** \brief Mask of set process context capabilities */ uint_least64_t ccaps; + /** \brief Mask of set and unset process context capabilities when used + * by set operations, or the modifiable capabilities when used + * by get operations */ uint_least64_t cmask; }; + /** \brief Information about parsing errors + */ struct vc_err_listparser { - char const *ptr; - size_t len; + char const *ptr; ///< Pointer to the first character of an erroneous string + size_t len; ///< Length of the erroneous string }; - int vc_get_flags(xid_t xid, struct vc_ctx_flags *) VC_ATTR_NONNULL((2)); - int vc_set_flags(xid_t xid, struct vc_ctx_flags const *) VC_ATTR_NONNULL((2)); + int vc_get_cflags(xid_t xid, struct vc_ctx_flags *) VC_ATTR_NONNULL((2)); + int vc_set_cflags(xid_t xid, struct vc_ctx_flags const *) VC_ATTR_NONNULL((2)); int vc_get_ccaps(xid_t xid, struct vc_ctx_caps *); int vc_set_ccaps(xid_t xid, struct vc_ctx_caps const *); - uint_least64_t vc_text2bcap(char const *, size_t len); - char const * vc_lobcap2text(uint_least64_t *); - int vc_list2bcap(char const *, size_t len, + /** \brief Converts a single string into bcapability + * \ingroup helper + * + * \param str The string to be parsed; + * both "CAP_xxx" and "xxx" will be accepted + * \param len The length of the string, or \c 0 for automatic detection + * + * \returns 0 on error; a bitmask on success + * \pre \a str != 0 + */ + uint_least64_t vc_text2bcap(char const *str, size_t len); + + /** \brief Converts the lowest bit of a bcapability or the entire value + * (when possible) to a textual representation + * \ingroup helper + * + * \param val The string to be converted; on success, the detected bit(s) + * will be unset, in errorcase only the lowest set bit + * + * \returns A textual representation of \a val resp. of its lowest set bit; + * or \c NULL in errorcase. + * \pre \a val!=0 + * \post \a *valold \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 *); + 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 *); @@ -412,22 +528,38 @@ extern "C" { struct vc_err_listparser *err, struct vc_ctx_caps *); - int vc_list2flag(char const *, size_t len, + int vc_list2cflag(char const *, size_t len, struct vc_err_listparser *err, struct vc_ctx_flags *flags); - uint_least64_t vc_text2flag(char const *, size_t len); - char const * vc_loflag2text(uint_least64_t *); + uint_least64_t vc_text2cflag(char const *, size_t len); + char const * vc_locflag2text(uint_least64_t *); - uint_least32_t vc_list2flag_compat(char const *, size_t len, + uint_least32_t vc_list2cflag_compat(char const *, size_t len, struct vc_err_listparser *err); - uint_least32_t vc_text2flag_compat(char const *, size_t len); - char const * vc_hiflag2text_compat(uint_least32_t); + uint_least32_t vc_text2cflag_compat(char const *, size_t len); + char const * vc_hicflag2text_compat(uint_least32_t); - uint_least32_t vc_get_insecurecaps() VC_ATTR_CONST; 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_ICMP_PING); + } + inline static int vc_setfilecontext(char const *filename, xid_t xid) { return vc_set_iattr(filename, xid, 0, VC_IATTR_XID); } @@ -454,7 +586,7 @@ extern "C" { typedef enum { vcFEATURE_VKILL, vcFEATURE_IATTR, vcFEATURE_RLIMIT, vcFEATURE_COMPAT, vcFEATURE_MIGRATE, vcFEATURE_NAMESPACE, vcFEATURE_SCHED, vcFEATURE_VINFO, vcFEATURE_VHI, - vcFEATURE_VSHELPER } + vcFEATURE_VSHELPER0, vcFEATURE_VSHELPER } vcFeatureSet; bool vc_isSupported(vcFeatureSet) VC_ATTR_CONST;