X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fnflags-net.c;h=f304496b97645ad8d9b04b8a790a9754c5810c8b;hb=2dc6a72eac959d1bbccb7e8506b97999890030ea;hp=434ff96b6259a0ad6d7d9965cd998d7d649327bd;hpb=9c78378bebc1a9f3d400f422df8ede9efea57dea;p=util-vserver.git diff --git a/lib/nflags-net.c b/lib/nflags-net.c index 434ff96..f304496 100644 --- a/lib/nflags-net.c +++ b/lib/nflags-net.c @@ -25,19 +25,47 @@ #include #include +#include #include #define DECL(STR, VAL) { STR, sizeof(STR)-1, VAL } static struct Mapping_uint64 const VALUES[] = { -#warning Add the 'nflags' values here - DECL("", 0) + DECL("lock", VC_NXF_INFO_LOCK), + DECL("private", VC_NXF_INFO_PRIVATE), + + DECL("single_ip", VC_NXF_SINGLE_IP), + + DECL("hide_netif", VC_NXF_HIDE_NETIF), + + DECL("state_setup", VC_NXF_STATE_SETUP), + DECL("state_admin", VC_NXF_STATE_ADMIN), + + DECL("sc_helper", VC_NXF_SC_HELPER), + DECL("persistent", VC_NXF_PERSISTENT), + + // Aliases for the legacy flags + DECL("info_lock", VC_NXF_INFO_LOCK), + DECL("info_private", VC_NXF_INFO_PRIVATE), }; +inline static char const * +removePrefix(char const *str, size_t *len) +{ + if ((len==0 || *len==0 || *len>4) && + strncasecmp("nxf_", str, 4)==0) { + if (len && *len>4) *len -= 4; + return str+4; + } + else + return str; +} + uint_least64_t vc_text2nflag(char const *str, size_t len) { - ssize_t idx = utilvserver_value2text_uint64(str, len, + char const * tmp = removePrefix(str, &len); + ssize_t idx = utilvserver_value2text_uint64(tmp, len, VALUES, DIM_OF(VALUES)); if (idx==-1) return 0; else return VALUES[idx].val;